This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit e16bd693947718d652123bc1ff9d57ec6158b4f8 Author: Mark Struberg <[email protected]> AuthorDate: Tue May 12 09:35:43 2026 +0200 DELTASPIKE-1366 switch to @Priority for internal test classes --- .../org/apache/deltaspike/test/testcontrol5/CustomMockManager.java | 2 ++ .../test/testcontrol5/mock/uc015/TestInterceptorImplementation.java | 2 ++ .../test/testcontrol5/uc011/TestInterceptorImplementation.java | 2 ++ .../test-control5/impl/src/test/resources/META-INF/beans.xml | 6 ------ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/CustomMockManager.java b/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/CustomMockManager.java index dedb3da3e..dcbda003a 100644 --- a/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/CustomMockManager.java +++ b/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/CustomMockManager.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol5; +import jakarta.annotation.Priority; import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.testcontrol5.api.mock.DynamicMockManager; import org.apache.deltaspike.testcontrol5.impl.mock.SimpleMockManager; @@ -30,6 +31,7 @@ import java.lang.annotation.Annotation; @RequestScoped @Typed(DynamicMockManager.class) +@Priority(1000) public class CustomMockManager extends SimpleMockManager { private static boolean isCalled; diff --git a/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/mock/uc015/TestInterceptorImplementation.java b/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/mock/uc015/TestInterceptorImplementation.java index f15c80e72..30407e34f 100644 --- a/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/mock/uc015/TestInterceptorImplementation.java +++ b/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/mock/uc015/TestInterceptorImplementation.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol5.mock.uc015; +import jakarta.annotation.Priority; import jakarta.inject.Inject; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; @@ -26,6 +27,7 @@ import java.io.Serializable; @TestInterceptor @Interceptor +@Priority(1000) public class TestInterceptorImplementation implements Serializable { @Inject diff --git a/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/uc011/TestInterceptorImplementation.java b/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/uc011/TestInterceptorImplementation.java index 29c7ae4ec..697dcca03 100644 --- a/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/uc011/TestInterceptorImplementation.java +++ b/deltaspike/modules/test-control5/impl/src/test/java/org/apache/deltaspike/test/testcontrol5/uc011/TestInterceptorImplementation.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol5.uc011; +import jakarta.annotation.Priority; import jakarta.inject.Inject; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; @@ -26,6 +27,7 @@ import java.io.Serializable; @TestInterceptor @Interceptor +@Priority(1000) public class TestInterceptorImplementation implements Serializable { @Inject diff --git a/deltaspike/modules/test-control5/impl/src/test/resources/META-INF/beans.xml b/deltaspike/modules/test-control5/impl/src/test/resources/META-INF/beans.xml index cffd0f702..72a9012ca 100644 --- a/deltaspike/modules/test-control5/impl/src/test/resources/META-INF/beans.xml +++ b/deltaspike/modules/test-control5/impl/src/test/resources/META-INF/beans.xml @@ -22,14 +22,8 @@ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"; version="3.0" bean-discovery-mode="all"> <trim/> - <interceptors> - <class>org.apache.deltaspike.test.testcontrol5.uc011.TestInterceptorImplementation</class> - <class>org.apache.deltaspike.test.testcontrol5.mock.uc015.TestInterceptorImplementation</class> - </interceptors> <alternatives> - <class>org.apache.deltaspike.test.testcontrol5.CustomMockManager</class> - <!-- with cdi 1.1+ the following can be replaced with @Priority(...)--> <class>org.apache.deltaspike.test.testcontrol5.uc019.TestServiceLabelX</class> <class>org.apache.deltaspike.test.testcontrol5.uc019.TestServiceLabelY</class>
