From c341515a537356d36cc9e991072eb8562d8dd59f Mon Sep 17 00:00:00 2001 From: Takahiro Nagao Date: Tue, 14 Jun 2022 18:30:00 +0900 Subject: [PATCH 1/2] Undo commit d7822ec6f9b644524a8b966ac02987c8944fc26b Signed-off-by: Takahiro Nagao --- .../main/java/org/glassfish/weld/RootBeanDeploymentArchive.java | 2 +- .../java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java index e8186911349..57bd105c81e 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/RootBeanDeploymentArchive.java @@ -99,7 +99,7 @@ public Collection> getModuleBeanClassObjects() { @Override public BeansXml getBeansXml() { - return getModuleBda().getBeansXml(); + return null; } @Override diff --git a/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java b/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java index 95fdab06671..11184f8e9ac 100644 --- a/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java +++ b/appserver/web/weld-integration/src/test/java/org/glassfish/weld/RootBeanDeploymentArchiveTest.java @@ -21,6 +21,7 @@ import static org.easymock.EasyMock.expect; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -115,6 +116,7 @@ public void testConstructor() throws Exception { assertEquals(WeldUtils.BDAType.UNKNOWN, rootBeanDeploymentArchive.getBDAType()); assertEquals(0, rootBeanDeploymentArchive.getBeanClasses().size()); assertEquals(0, rootBeanDeploymentArchive.getBeanClassObjects().size()); + assertNull(rootBeanDeploymentArchive.getBeansXml()); BeanDeploymentArchiveImpl moduleBda = (BeanDeploymentArchiveImpl) rootBeanDeploymentArchive.getModuleBda(); assertNotNull(moduleBda); From d78d6a34e1368f73a504e2e03f945eb0d3011173 Mon Sep 17 00:00:00 2001 From: Takahiro Nagao Date: Tue, 14 Jun 2022 18:38:21 +0900 Subject: [PATCH 2/2] Override getKnownClasses for CDI TCK Signed-off-by: Takahiro Nagao --- .../java/org/glassfish/weld/BeanDeploymentArchiveImpl.java | 5 +++++ .../src/main/java/org/glassfish/weld/DeploymentImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanDeploymentArchiveImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanDeploymentArchiveImpl.java index 9ed566dac86..9644959e12a 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanDeploymentArchiveImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanDeploymentArchiveImpl.java @@ -252,6 +252,11 @@ public void addBeanClass(String beanClassName) { } } + @Override + public Collection getKnownClasses() { + return moduleClassNames; + } + @Override public BeansXml getBeansXml() { WeldBootstrap weldBootstrap = context.getTransientAppMetaData(WELD_BOOTSTRAP, WeldBootstrap.class); diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java index 94c32d775a2..4e8cb85836f 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java @@ -320,7 +320,7 @@ public BeanDeploymentArchive getBeanDeploymentArchive(Class beanClass) { for (BeanDeploymentArchive beanDeploymentArchive : beanDeploymentArchives) { BeanDeploymentArchiveImpl beanDeploymentArchiveImpl = (BeanDeploymentArchiveImpl) beanDeploymentArchive; - if (beanDeploymentArchiveImpl.getBeanClassObjects().contains(beanClass)) { + if (beanDeploymentArchiveImpl.getKnownClasses().contains(beanClass.getName())) { return beanDeploymentArchive; } }