Merge pull request #17438 from cescoffier/update-smallrye-reactive-me…

…ssaging-3.3.2 Update to SmallRye Reactive Messaging 3.3.2
quarkusio · May 25, 2021 · ed738e1 · ed738e1
2 parents 0ec1a21 + cebed4d
commit ed738e1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -53,7 +53,7 @@
         <smallrye-context-propagation.version>1.2.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-utils.version>2.5.1</smallrye-reactive-utils.version>
-        <smallrye-reactive-messaging.version>3.3.0</smallrye-reactive-messaging.version>
+        <smallrye-reactive-messaging.version>3.3.2</smallrye-reactive-messaging.version>
         <smallrye-safer-annotations.version>1.0.3</smallrye-safer-annotations.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>

diff --git a/...va/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java b/...va/io/quarkus/smallrye/reactivemessaging/deployment/QuarkusMediatorConfigurationUtil.java
@@ -39,7 +39,7 @@ private QuarkusMediatorConfigurationUtil() {
 
     public static QuarkusMediatorConfiguration create(MethodInfo methodInfo, boolean isSuspendMethod, BeanInfo bean,
             RecorderContext recorderContext,
-            ClassLoader cl) {
+            ClassLoader cl, boolean strict) {
 
         Class[] parameterTypeClasses;
         Class<?> returnTypeClass;
@@ -69,6 +69,10 @@ public static QuarkusMediatorConfiguration create(MethodInfo methodInfo, boolean
                 methodInfo.parameters().isEmpty() ? new AlwaysInvalidIndexGenericTypeAssignable()
                         : new MethodParamGenericTypeAssignable(methodInfo, 0, cl));
 
+        if (strict) {
+            mediatorConfigurationSupport.strict();
+        }
+
         configuration.setBeanId(bean.getIdentifier());
         configuration.setMethodName(methodInfo.name());
 

diff --git a/.../io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java b/.../io/quarkus/smallrye/reactivemessaging/deployment/SmallRyeReactiveMessagingProcessor.java
@@ -383,7 +383,7 @@ public void build(SmallRyeReactiveMessagingRecorder recorder, RecorderContext re
 
                 QuarkusMediatorConfiguration mediatorConfiguration = QuarkusMediatorConfigurationUtil
                         .create(methodInfo, isSuspendMethod, bean, recorderContext,
-                                Thread.currentThread().getContextClassLoader());
+                                Thread.currentThread().getContextClassLoader(), conf.strict);
                 mediatorConfigurations.add(mediatorConfiguration);
 
                 String generatedInvokerName = generateInvoker(bean, methodInfo, isSuspendMethod, mediatorConfiguration,

diff --git a/...in/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java b/...in/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfiguration.java
@@ -13,4 +13,10 @@ public class ReactiveMessagingConfiguration {
      */
     @ConfigItem(name = "metrics.enabled")
     public boolean metricsEnabled;
+
+    /**
+     * Enables or disables the strict validation mode.
+     */
+    @ConfigItem(name = "strict", defaultValue = "false")
+    public boolean strict;
 }
diff --git a/...ava/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java b/...ava/io/quarkus/smallrye/reactivemessaging/runtime/SmallRyeReactiveMessagingLifecycle.java
@@ -5,6 +5,7 @@
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.Initialized;
 import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.DefinitionException;
 import javax.enterprise.inject.spi.DeploymentException;
 import javax.inject.Inject;
 import javax.interceptor.Interceptor;
@@ -39,7 +40,7 @@ void onApplicationStart(@Observes @Priority(Interceptor.Priority.LIBRARY_BEFORE)
         try {
             mediatorManager.start();
         } catch (Exception e) {
-            if (e instanceof DeploymentException) {
+            if (e instanceof DeploymentException || e instanceof DefinitionException) {
                 throw e;
             }
             throw new DeploymentException(e);

diff --git a/tcks/microprofile-reactive-messaging/pom.xml b/tcks/microprofile-reactive-messaging/pom.xml
@@ -23,6 +23,7 @@
                         <!-- Disable quarkus optimization -->
                         <quarkus.arc.remove-unused-beans>false</quarkus.arc.remove-unused-beans>
                         <smallrye-messaging-strict-binding>true</smallrye-messaging-strict-binding>
+                        <quarkus.reactive-messaging.strict>true</quarkus.reactive-messaging.strict>
                     </systemPropertyVariables>
                     <!-- This workaround allows us to run a single test using
                         the "test" system property -->
@@ -33,9 +34,6 @@
                     <excludes>
                         <!-- The new wiring fails at the Quarkus startup because of the incorrect configuration -->
                         <exclude>org.eclipse.microprofile.reactive.messaging.tck.invalid.InvalidConfigurationTest</exclude>
-                        <exclude>org.eclipse.microprofile.reactive.messaging.tck.connector.MissingConnectorTest</exclude>
-                        <exclude>org.eclipse.microprofile.reactive.messaging.tck.channel.EmitterInjectionMissingChannelTest</exclude>
-                        <exclude>org.eclipse.microprofile.reactive.messaging.tck.signatures.invalid.InvalidSubscriberSignatureTest</exclude>
 
                         <!-- the test need to be challenged - the error emission may happen after -->
                         <exclude>org.eclipse.microprofile.reactive.messaging.tck.channel.overflow.DefaultOverflowStrategyOverflowTest</exclude>