From d7822ec6f9b644524a8b966ac02987c8944fc26b Mon Sep 17 00:00:00 2001 From: Arjan Tijms Date: Sun, 22 May 2022 15:57:50 +0200 Subject: [PATCH] Fix Weld processing a beans.xml, e.g. enabling interceptors Signed-off-by: Arjan Tijms --- .../weld/RootBeanDeploymentArchive.java | 3 ++- .../weld/RootBeanDeploymentArchiveTest.java | 18 ++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) 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 495e4e367ce..2fd457a92d1 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 @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, 2022 Contributors to Eclipse Foundation. * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -92,7 +93,7 @@ public Collection> getModuleBeanClassObjects() { @Override public BeansXml getBeansXml() { - return null; + return getModuleBda().getBeansXml(); } @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 504f987dae4..95fdab06671 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 @@ -1,6 +1,6 @@ /* + * Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2021 Contributors to the Eclipse Foundation * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,7 +17,12 @@ package org.glassfish.weld; -import com.sun.enterprise.deployment.EjbDescriptor; +import static org.easymock.EasyMock.anyObject; +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.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URI; import java.net.URL; @@ -34,13 +39,7 @@ import org.jboss.weld.bootstrap.spi.BeansXml; import org.junit.jupiter.api.Test; -import static org.easymock.EasyMock.anyObject; -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; +import com.sun.enterprise.deployment.EjbDescriptor; /** * @author JJ Snyder @@ -116,7 +115,6 @@ 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);