Fixes for 4.0.0-SNAPSHOT (#210)

Accept API changes Switch ConversionContext from Generic * Caffeine must be an API dependency * Micronaut test 4.0.0 and Kotest 5 * Remove Caffeine and java 17 fixes * Fix for latest 4.0.0 Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>
micronaut-projects · Dec 14, 2022 · 6dfda17 · 6dfda17
1 parent 5d26cd7
commit 6dfda17
Show file tree

Hide file tree

Showing 24 changed files with 177 additions and 63 deletions.
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.mqtt-tests.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.mqtt-tests.gradle
@@ -1,17 +1,3 @@
 plugins {
     id "io.micronaut.build.internal.mqtt-base"
 }
-configurations.all {
-    resolutionStrategy.dependencySubstitution {
-        substitute(module("org.codehaus.groovy:groovy"))
-                .using(module("org.apache.groovy:groovy:4.0.6"))
-    }
-}
-
-configurations.all {
-    resolutionStrategy.eachDependency { details ->
-        if (details.requested.group == 'org.spockframework') {
-            details.useVersion "2.3-groovy-4.0"
-        }
-    }
-}
diff --git a/config/accepted-api-changes.json b/config/accepted-api-changes.json
@@ -3,5 +3,135 @@
     "type": "io.micronaut.mqtt.serdes.JsonMqttPayloadSerDes",
     "member": "Constructor io.micronaut.mqtt.serdes.JsonMqttPayloadSerDes(com.fasterxml.jackson.databind.ObjectMapper)",
     "reason": "Removed deprecated constructor for Micronaut 4.0.x"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.$BeanConfiguration",
+    "member": "Field $ANNOTATION_METADATA",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.$BeanConfiguration",
+    "member": "Constructor io.micronaut.mqtt.v3.$BeanConfiguration()",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationSource",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.inject.BeanContextConditional",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationMetadataProvider",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.inject.BeanConfiguration",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Field $ANNOTATION_METADATA",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Constructor io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference()",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationSource",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.inject.BeanContextConditional",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationMetadataProvider",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.inject.BeanType",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v3.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.inject.BeanDefinitionReference",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.$BeanConfiguration",
+    "member": "Field $ANNOTATION_METADATA",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.$BeanConfiguration",
+    "member": "Constructor io.micronaut.mqtt.v5.$BeanConfiguration()",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationSource",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.inject.BeanContextConditional",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationMetadataProvider",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.$BeanConfiguration",
+    "member": "Implemented interface io.micronaut.inject.BeanConfiguration",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Field $ANNOTATION_METADATA",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Constructor io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference()",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationSource",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.inject.BeanContextConditional",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.core.annotation.AnnotationMetadataProvider",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.inject.BeanType",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
+  },
+  {
+    "type": "io.micronaut.mqtt.v5.intercept.$MqttIntroductionAdvice$Definition$Reference",
+    "member": "Implemented interface io.micronaut.inject.BeanDefinitionReference",
+    "reason": "Micronaut 4.0.0 Bean Definition changes"
   }
 ]
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ projectGroup=io.micronaut.mqtt
 
 micronautDocsVersion=2.0.0
 micronautVersion=4.0.0-SNAPSHOT
-micronautTestVersion=3.7.0
+micronautTestVersion=4.0.0-SNAPSHOT
 
 groovyVersion=4.0.6
 spockVersion=2.3-groovy-4.0

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,17 +4,21 @@ managed-mqttv5 = "1.2.5"
 
 awaitility = "4.2.0"
 bcpkix-jdk15on = "1.70"
-caffeine =  '3.1.2'
 kotlin = "1.7.21"
 testcontainers = "1.17.6"
 
+micronaut-serde = "2.0.0-SNAPSHOT"
+micronaut-test = "4.0.0-SNAPSHOT"
+
 [libraries]
 managed-paho-mqttv3-client = { module = "org.eclipse.paho:org.eclipse.paho.client.mqttv3", version.ref = "managed-mqttv3" }
 managed-paho-mqttv5-client = { module = "org.eclipse.paho:org.eclipse.paho.mqttv5.client", version.ref = "managed-mqttv5" }
 
+micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
+micronaut-test = { module = "io.micronaut.test:micronaut-test-bom", version.ref = "micronaut-test" }
+
 awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
 bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkix-jdk15on" }
-caffeine = { module = 'com.github.ben-manes.caffeine:caffeine', version.ref = 'caffeine' }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
 reactor-core = { module = "io.projectreactor:reactor-core" }

diff --git a/mqtt-core/build.gradle b/mqtt-core/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api(mn.micronaut.aop)
     api(mn.micronaut.runtime)
     api(mn.micronaut.messaging)
-    implementation(libs.caffeine)
+    implementation(mnSerde.micronaut.serde.jackson)
     implementation(libs.reactor.core)
     compileOnly(libs.kotlin.stdlib.jdk8)
 }
diff --git a/mqtt-core/src/main/java/io/micronaut/mqtt/bind/DefaultMqttBinderRegistry.java b/mqtt-core/src/main/java/io/micronaut/mqtt/bind/DefaultMqttBinderRegistry.java
@@ -54,15 +54,13 @@ public DefaultMqttBinderRegistry(FallbackMqttBinder<?> fallbackMqttBinder,
                                      MqttBinder<?, ?>... binders) {
         this.fallbackMqttBinder = fallbackMqttBinder;
         if (ArrayUtils.isNotEmpty(binders)) {
-            for (MqttBinder binder : binders) {
-                if (binder instanceof AnnotatedMqttBinder) {
-                    AnnotatedMqttBinder<?, ?> annotatedBinder = (AnnotatedMqttBinder<?, ?>) binder;
+            for (MqttBinder<?, ?> binder : binders) {
+                if (binder instanceof AnnotatedMqttBinder<?, ?> annotatedBinder) {
                     byAnnotation.put(
                             annotatedBinder.getAnnotationType(),
                             binder
                     );
-                } else if (binder instanceof TypedMqttBinder) {
-                    TypedMqttBinder<?, ?> typedBinder = (TypedMqttBinder<?, ?>) binder;
+                } else if (binder instanceof TypedMqttBinder<?, ?> typedBinder) {
                     byType.put(
                             typedBinder.getArgumentType().typeHashCode(),
                             typedBinder

diff --git a/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/IdMqttBinder.java b/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/IdMqttBinder.java
@@ -35,9 +35,9 @@
 @Singleton
 public class IdMqttBinder implements AnnotatedMqttBinder<MqttBindingContext<?>, Id> {
 
-    private final ConversionService<?> conversionService;
+    private final ConversionService conversionService;
 
-    public IdMqttBinder(ConversionService<?> conversionService) {
+    public IdMqttBinder(ConversionService conversionService) {
         this.conversionService = conversionService;
     }
 

diff --git a/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/QosMqttBinder.java b/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/QosMqttBinder.java
@@ -34,9 +34,9 @@
 @Singleton
 public class QosMqttBinder implements AnnotatedMqttBinder<MqttBindingContext<?>, Qos> {
 
-    private final ConversionService<?> conversionService;
+    private final ConversionService conversionService;
 
-    public QosMqttBinder(ConversionService<?> conversionService) {
+    public QosMqttBinder(ConversionService conversionService) {
         this.conversionService = conversionService;
     }
 

diff --git a/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/RetainedMqttBinder.java b/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/RetainedMqttBinder.java
@@ -34,9 +34,9 @@
 @Singleton
 public class RetainedMqttBinder implements AnnotatedMqttBinder<MqttBindingContext<?>, Retained> {
 
-    private final ConversionService<?> conversionService;
+    private final ConversionService conversionService;
 
-    public RetainedMqttBinder(ConversionService<?> conversionService) {
+    public RetainedMqttBinder(ConversionService conversionService) {
         this.conversionService = conversionService;
     }
 

diff --git a/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/TopicMqttBinder.java b/mqtt-core/src/main/java/io/micronaut/mqtt/bind/impl/TopicMqttBinder.java
@@ -34,9 +34,9 @@
 @Singleton
 public class TopicMqttBinder implements AnnotatedMqttBinder<MqttBindingContext<?>, Topic> {
 
-    private final ConversionService<?> conversionService;
+    private final ConversionService conversionService;
 
-    public TopicMqttBinder(ConversionService<?> conversionService) {
+    public TopicMqttBinder(ConversionService conversionService) {
         this.conversionService = conversionService;
     }
 

diff --git a/mqtt-core/src/main/java/io/micronaut/mqtt/intercept/AbstractMqttIntroductionAdvice.java b/mqtt-core/src/main/java/io/micronaut/mqtt/intercept/AbstractMqttIntroductionAdvice.java
@@ -18,8 +18,6 @@
 import io.micronaut.aop.InterceptedMethod;
 import io.micronaut.aop.MethodInterceptor;
 import io.micronaut.aop.MethodInvocationContext;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.type.Argument;
 import io.micronaut.inject.ExecutableMethod;
@@ -37,6 +35,8 @@
 
 import java.lang.annotation.Annotation;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -53,7 +53,7 @@ public abstract class AbstractMqttIntroductionAdvice<L, M> implements MethodInte
 
     private static final Logger LOG = LoggerFactory.getLogger(AbstractMqttIntroductionAdvice.class);
 
-    private final Cache<ExecutableMethod<?, ?>, MqttPublisherState> publisherCache = Caffeine.newBuilder().build();
+    private final ConcurrentMap<ExecutableMethod<?, ?>, MqttPublisherState> publisherCache = new ConcurrentHashMap<>();
     private final MqttBinderRegistry binderRegistry;
 
     public AbstractMqttIntroductionAdvice(MqttBinderRegistry binderRegistry) {
@@ -71,17 +71,17 @@ public Object intercept(MethodInvocationContext<Object, Object> context) {
 
                 switch (interceptedMethod.resultType()) {
                     case PUBLISHER:
-                        return interceptedMethod.handleResult(Flux.create(emitter -> {
-                            publish(publisherState, context, createListener(emitter::complete, emitter::error));
-                        }, FluxSink.OverflowStrategy.ERROR));
+                        return interceptedMethod.handleResult(Flux.create(emitter ->
+                            publish(publisherState, context, createListener(emitter::complete, emitter::error)), FluxSink.OverflowStrategy.ERROR)
+                        );
                     case COMPLETION_STAGE:
                         CompletableFuture<Void> future = new CompletableFuture<>();
                         publish(publisherState, context, createListener(() -> future.complete(null), future::completeExceptionally));
                         return interceptedMethod.handleResult(future);
                     case SYNCHRONOUS:
                         CountDownLatch countDownLatch = new CountDownLatch(1);
                         AtomicReference<Throwable> error = new AtomicReference<>();
-                        Object token = publish(publisherState, context, createListener(countDownLatch::countDown, (t) -> {
+                        Object token = publish(publisherState, context, createListener(countDownLatch::countDown, t -> {
                             error.set(t);
                             countDownLatch.countDown();
                         }));
@@ -137,7 +137,7 @@ public Object intercept(MethodInvocationContext<Object, Object> context) {
     public abstract Class<? extends Annotation> getRequiredAnnotation();
 
     private MqttPublisherState getPublisherState(MethodInvocationContext<Object, Object> context) {
-        return publisherCache.get(context.getExecutableMethod(), (method) -> {
+        return publisherCache.computeIfAbsent(context.getExecutableMethod(), method -> {
             MqttPublisherState state = new MqttPublisherState();
 
             method.findAnnotation(Topic.class)
@@ -146,7 +146,7 @@ private MqttPublisherState getPublisherState(MethodInvocationContext<Object, Obj
                         topicAnn.intValue("qos").ifPresent(state::setQos);
                     });
             method.findAnnotation(Qos.class)
-                    .ifPresent((av) -> av.intValue().ifPresent(state::setQos));
+                    .ifPresent(av -> av.intValue().ifPresent(state::setQos));
             method.findAnnotation(Retained.class)
                     .flatMap(AnnotationValue::booleanValue)
                     .ifPresent(state::setRetained);

diff --git a/mqtt-ssl/src/test/groovy/io/micronaut/mqtt/ssl/SslAuthenticationSpec.groovy b/mqtt-ssl/src/test/groovy/io/micronaut/mqtt/ssl/SslAuthenticationSpec.groovy
@@ -1,19 +1,17 @@
 package io.micronaut.mqtt.ssl
 
 import io.micronaut.context.ApplicationContext
-import spock.lang.PendingFeature
 import spock.util.concurrent.PollingConditions
 
 class SslAuthenticationSpec extends AbstractMQTTTest {
 
-    @PendingFeature
     void "test product client and listener"() {
         ApplicationContext applicationContext = startContext()
         PollingConditions conditions = new PollingConditions(timeout: 5)
 
         when:
         def productClient = applicationContext.getBean(ProductClient)
-        productClient.send("quickstart".getBytes())
+        productClient.send("quickstart".bytes)
 
         ProductListener productListener = applicationContext.getBean(ProductListener)
 

diff --git a/mqttv5/src/main/java/io/micronaut/mqtt/v5/bind/MqttPropertyBinder.java b/mqttv5/src/main/java/io/micronaut/mqtt/v5/bind/MqttPropertyBinder.java
@@ -41,13 +41,13 @@
 @Singleton
 public class MqttPropertyBinder implements AnnotatedMqttBinder<MqttV5BindingContext, MqttProperty> {
 
-    private final ConversionService<?> conversionService;
+    private final ConversionService conversionService;
     private final BeanIntrospection<MqttProperties> introspection;
 
     /**
      * @param conversionService The conversion service
      */
-    public MqttPropertyBinder(ConversionService<?> conversionService) {
+    public MqttPropertyBinder(ConversionService conversionService) {
         this.conversionService = conversionService;
         this.introspection = BeanIntrospection.getIntrospection(MqttProperties.class);
     }

diff --git a/settings.gradle b/settings.gradle
@@ -31,5 +31,8 @@ dependencyResolutionManagement {
 }
 
 micronautBuild {
+    addSnapshotRepository()
     importMicronautCatalog()
+    importMicronautCatalog("micronaut-serde")
+    importMicronautCatalog("micronaut-test")
 }
diff --git a/test-suite-groovy/build.gradle b/test-suite-groovy/build.gradle
@@ -8,7 +8,6 @@ dependencies {
     testImplementation(mn.micronaut.validation)
     testImplementation projects.testSuiteUtils
     testImplementation projects.mqttv5
-    testImplementation mn.spock
 }
 
 tasks.named('test') {