Merge pull request #224 from manovotn/issue222

Introduce BeansXML API for beans.xml file creation.
jakartaee · Apr 16, 2021 · ce163b6 · ce163b6
2 parents e158bcc + 5e937dc
commit ce163b6
Show file tree

Hide file tree

Showing 206 changed files with 1,142 additions and 1,104 deletions.
diff --git a/...boss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java b/...boss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java
@@ -23,14 +23,12 @@
 import static org.jboss.cdi.tck.util.ActionSequence.assertSequenceDataEquals;
 
 import jakarta.enterprise.inject.Instance;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.cdi.tck.util.ActionSequence;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -50,12 +48,8 @@ public class ConstructorInterceptionTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(ConstructorInterceptionTest.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(AlphaInterceptor1.class.getName(), AlphaInterceptor2.class.getName(),
-                                        BravoInterceptor.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class))
+                .build();
     }
 
     @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER)

diff --git a/...terceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java b/...terceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java
@@ -22,14 +22,12 @@
 import static org.jboss.cdi.tck.util.ActionSequence.assertSequenceDataEquals;
 
 import jakarta.enterprise.inject.Instance;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.cdi.tck.util.ActionSequence;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -49,12 +47,8 @@ public class SessionBeanConstructorInterceptionTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(SessionBeanConstructorInterceptionTest.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(AlphaInterceptor1.class.getName(), AlphaInterceptor2.class.getName(),
-                                        BravoInterceptor.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class))
+                .build();
     }
 
     @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER)

diff --git a/...nterceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java b/...nterceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java
@@ -19,14 +19,12 @@
 import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_BINDING_TYPES_WITH_MEMBERS;
 
 import jakarta.enterprise.inject.spi.DefinitionException;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -47,12 +45,8 @@ public static WebArchive createTestArchive() {
                 .withClasses(Bar.class, FooBinding.class, BarBinding.class, BazBinding.class, FooInterceptor.class,
                         BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class, FooStereotype.class,
                         BarStereotype.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(FooInterceptor.class.getName(), BarInterceptor.class.getName(),
-                                        YesBazInterceptor.class.getName(), NoBazInterceptor.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(FooInterceptor.class, BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class))
+                .build();
     }
 
     @Test

diff --git a/...nterceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java b/...nterceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java
@@ -19,14 +19,12 @@
 import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_BINDING_TYPES_WITH_MEMBERS;
 
 import jakarta.enterprise.inject.spi.DefinitionException;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -44,12 +42,9 @@ public static WebArchive createTestArchive() {
                 .withTestClass(InvalidTransitiveInterceptorBindingAnnotationsTest.class)
                 .withClasses(Foo.class, FooBinding.class, BarBinding.class, BazBinding.class, FooInterceptor.class,
                         BarInterceptor.class, YesBazInterceptor.class, NoBazInterceptor.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(FooInterceptor.class.getName(), BarInterceptor.class.getName(),
-                                        YesBazInterceptor.class.getName(), NoBazInterceptor.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(FooInterceptor.class, BarInterceptor.class,
+                        YesBazInterceptor.class, NoBazInterceptor.class))
+                .build();
     }
 
     @Test

diff --git a/...oss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java b/...oss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java
@@ -21,22 +21,20 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import java.util.List;
-
 import jakarta.enterprise.inject.spi.InterceptionType;
 import jakarta.enterprise.inject.spi.Interceptor;
 import jakarta.enterprise.util.AnnotationLiteral;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
+import java.util.List;
+
 /**
  * Tests for interceptor bindings types with members.
  *
@@ -55,12 +53,8 @@ public abstract class PlantInterceptorBindingLiteral extends AnnotationLiteral<P
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(InterceptorBindingTypeWithMemberTest.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(IncreasingInterceptor.class.getName(), DecreasingInterceptor.class.getName(),
-                                        VehicleCountInterceptor.class.getName(), PlantInterceptor.class.getName()).up())
+                .withBeansXml(new BeansXml()
+                        .interceptors(IncreasingInterceptor.class, DecreasingInterceptor.class, VehicleCountInterceptor.class, PlantInterceptor.class))
                 .build();
     }
 

diff --git a/...g/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java b/...g/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java
@@ -25,8 +25,7 @@
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -38,9 +37,8 @@ public class MultipleInterceptorBindingsTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(MultipleInterceptorBindingsTest.class)
-                .withBeansXml(
-                        Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors()
-                                .clazz(MissileInterceptor.class.getName(), LockInterceptor.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class, LockInterceptor.class))
+                .build();
     }
 
     @Test

diff --git a/...boss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java b/...boss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java
@@ -21,13 +21,11 @@
 import static org.testng.Assert.assertEquals;
 
 import jakarta.inject.Inject;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -49,12 +47,8 @@ public class InterceptorBindingOverridingTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(InterceptorBindingOverridingTest.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(NegatingInterceptor.class.getName(), FastAgingInterceptor.class.getName(),
-                                        SlowAgingInterceptor.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(NegatingInterceptor.class, FastAgingInterceptor.class, SlowAgingInterceptor.class))
+                .build();
     }
 
     @Inject

diff --git a/...boss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java b/...boss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java
@@ -38,6 +38,7 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
 import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -54,11 +55,9 @@ public class InterceptorBindingResolutionTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(InterceptorBindingResolutionTest.class)
-                .withBeansXml(
-                        Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors()
-                                .clazz(ComplicatedInterceptor.class.getName(), ComplicatedLifecycleInterceptor.class.getName(),
-                                        ComplicatedAroundConstructInterceptor.class.getName())
-                                .up()).build();
+                .withBeansXml(new BeansXml()
+                        .interceptors(ComplicatedInterceptor.class, ComplicatedLifecycleInterceptor.class, ComplicatedAroundConstructInterceptor.class))
+                .build();
     }
 
     @SuppressWarnings("serial")

diff --git a/...nterceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java b/...nterceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java
@@ -25,25 +25,23 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-import java.util.concurrent.TimeUnit;
-
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.spi.Bean;
 import jakarta.enterprise.inject.spi.InterceptionType;
 import jakarta.enterprise.util.AnnotationLiteral;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.cdi.tck.util.Timer;
 import org.jboss.cdi.tck.util.Timer.StopCondition;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Interceptor resolution test.
  *
@@ -57,10 +55,8 @@ public class EnterpriseInterceptorBindingResolutionTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(EnterpriseInterceptorBindingResolutionTest.class)
-                .withBeansXml(
-                        Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors()
-                                .clazz(ComplicatedInterceptor.class.getName(), ComplicatedLifecycleInterceptor.class.getName())
-                                .up()).build();
+                .withBeansXml(new BeansXml().interceptors(ComplicatedInterceptor.class, ComplicatedLifecycleInterceptor.class))
+                .build();
     }
 
     @SuppressWarnings("serial")

diff --git a/...oss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java b/...oss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java
@@ -26,14 +26,12 @@
 import static org.testng.Assert.fail;
 
 import jakarta.enterprise.inject.Instance;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.cdi.tck.util.ActionSequence;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -54,12 +52,9 @@ public class AroundConstructTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(AroundConstructTest.class)
-                .withBeansXml(
-                        Descriptors
-                                .create(BeansDescriptor.class)
-                                .getOrCreateInterceptors()
-                                .clazz(AlphaInterceptor.class.getName(), BravoInterceptor.class.getName(),
-                                        CharlieInterceptor1.class.getName(), CharlieInterceptor2.class.getName()).up()).build();
+                .withBeansXml(new BeansXml().interceptors(AlphaInterceptor.class, BravoInterceptor.class,
+                        CharlieInterceptor1.class, CharlieInterceptor2.class))
+                .build();
     }
 
     @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER)

diff --git a/...ceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java b/...ceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java
@@ -30,6 +30,7 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
 import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -41,9 +42,7 @@ public class LifecycleInterceptorDefinitionTest extends AbstractTest {
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(LifecycleInterceptorDefinitionTest.class)
-                .withBeansXml(
-                        Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors()
-                                .clazz(AirborneInterceptor.class.getName(), DestructionInterceptor.class.getName()).up())
+                .withBeansXml(new BeansXml().interceptors(AirborneInterceptor.class, DestructionInterceptor.class))
                 .build();
     }
 

diff --git a/...ontract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java b/...ontract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java
@@ -23,14 +23,12 @@
 
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.spi.Bean;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.cdi.tck.AbstractTest;
 import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder;
 import org.jboss.cdi.tck.util.ActionSequence;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
@@ -42,9 +40,7 @@ public class SessionBeanLifecycleInterceptorDefinitionTest extends AbstractTest
     public static WebArchive createTestArchive() {
         return new WebArchiveBuilder()
                 .withTestClassPackage(SessionBeanLifecycleInterceptorDefinitionTest.class)
-                .withBeansXml(
-                        Descriptors.create(BeansDescriptor.class).getOrCreateInterceptors()
-                                .clazz(AirborneInterceptor.class.getName(), DestructionInterceptor.class.getName()).up())
+                .withBeansXml(new BeansXml().interceptors(AirborneInterceptor.class, DestructionInterceptor.class))
                 .build();
     }