Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce BeansXML API for beans.xml file creation. #224

Merged
merged 2 commits into from
Apr 16, 2021
Merged

Introduce BeansXML API for beans.xml file creation. #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad086e2
Introduce BeansXML API for beans.xml file creation.
manovotn Mar 15, 2021
5e937dc
Add test for explicit archive bean discovery with beans.xml version 1…
manovotn Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions ...boss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
12 changes: 3 additions & 9 deletions ...terceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
12 changes: 3 additions & 9 deletions ...nterceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
13 changes: 4 additions & 9 deletions ...nterceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
16 changes: 5 additions & 11 deletions ...oss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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();
}

Expand Down
8 changes: 3 additions & 5 deletions ...g/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
12 changes: 3 additions & 9 deletions ...boss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions ...boss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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")
Expand Down
14 changes: 5 additions & 9 deletions ...nterceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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")
Expand Down
13 changes: 4 additions & 9 deletions ...oss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions ...ceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
8 changes: 2 additions & 6 deletions ...ontract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
Loading