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 index 579df59f..8e92299f 100644 --- 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 index 262bb80f..76bc04ea 100644 --- 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 index aa6cab43..3ec47581 100644 --- 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 index 90eb9d9d..516ca236 100644 --- 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 index 5f6fe8bd..d683d335 100644 --- 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 index 8d7dbc33..86b6000a 100644 --- 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 index 3161cf0a..acc1fc07 100644 --- 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, 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 index 7bfd9758..32f20089 100644 --- 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, 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 index 52acb870..9abe60b5 100644 --- 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, 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 index 3997b697..46de926e 100644 --- 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, 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 index 06d1cb36..5db7adac 100644 --- 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 implements MethodInte private static final Logger LOG = LoggerFactory.getLogger(AbstractMqttIntroductionAdvice.class); - private final Cache, MqttPublisherState> publisherCache = Caffeine.newBuilder().build(); + private final ConcurrentMap, MqttPublisherState> publisherCache = new ConcurrentHashMap<>(); private final MqttBinderRegistry binderRegistry; public AbstractMqttIntroductionAdvice(MqttBinderRegistry binderRegistry) { @@ -71,9 +71,9 @@ public Object intercept(MethodInvocationContext 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 future = new CompletableFuture<>(); publish(publisherState, context, createListener(() -> future.complete(null), future::completeExceptionally)); @@ -81,7 +81,7 @@ public Object intercept(MethodInvocationContext context) { case SYNCHRONOUS: CountDownLatch countDownLatch = new CountDownLatch(1); AtomicReference 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 context) { public abstract Class getRequiredAnnotation(); private MqttPublisherState getPublisherState(MethodInvocationContext 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 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 index 63b2f504..5e515be8 100644 --- 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 index 368e62f6..6e969cf5 100644 --- 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 { - private final ConversionService conversionService; + private final ConversionService conversionService; private final BeanIntrospection 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 index b360dbfe..a0448507 100644 --- 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 index c0eece26..f10f2348 100644 --- 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') { diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle index 4fcf91f0..67174919 100644 --- a/test-suite-kotlin/build.gradle +++ b/test-suite-kotlin/build.gradle @@ -5,14 +5,13 @@ plugins { } dependencies { - runtimeOnly mn.logback + runtimeOnly mn.logback.classic api(mn.micronaut.inject) testAnnotationProcessor(mn.micronaut.inject.java) - testImplementation(mn.micronaut.test.kotest) + testImplementation(mnTest.micronaut.test.kotest5) kaptTest(mn.micronaut.inject.java) - testImplementation projects.testSuiteUtils testImplementation projects.mqttv5 } diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.kt index 82f1049c..f2879bf7 100644 --- a/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.kt +++ b/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.kt @@ -16,7 +16,7 @@ import io.micronaut.context.annotation.Requires @Requires(property = "spec.name", value = "CorrelationSpec") // tag::clazz[] @Singleton // <1> -class CorrelationAnnotationBinder(private val conversionService: ConversionService<*>)// <3> +class CorrelationAnnotationBinder(private val conversionService: ConversionService)// <3> : AnnotatedMqttBinder { // <2> override fun getAnnotationType(): Class { diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.kt index c8150e8e..d82d1d08 100644 --- a/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.kt +++ b/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.kt @@ -18,7 +18,7 @@ import io.micronaut.context.annotation.Requires @Requires(property = "spec.name", value = "ProductInfoSpec") // tag::clazz[] @Singleton // <1> -class ProductInfoTypeBinder constructor(private val conversionService: ConversionService<*>) //<3> +class ProductInfoTypeBinder constructor(private val conversionService: ConversionService) //<3> : TypedMqttBinder { // <2> override fun bindTo(context: MqttV5BindingContext, value: ProductInfo, argument: Argument) { diff --git a/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.kt b/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.kt index 2e3d6e79..b97bcea8 100644 --- a/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.kt +++ b/test-suite-kotlin/src/test/kotlin/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.kt @@ -14,7 +14,7 @@ import io.micronaut.context.annotation.Requires @Requires(property = "spec.name", value = "ProductInfoSerDesSpec") // tag::clazz[] @Singleton // <1> -class ProductInfoSerDes(private val conversionService: ConversionService<*>)// <3> +class ProductInfoSerDes(private val conversionService: ConversionService)// <3> : MqttPayloadSerDes { // <2> override fun deserialize(payload: ByteArray, argument: Argument): ProductInfo? { diff --git a/test-suite-utils/build.gradle b/test-suite-utils/build.gradle index fb9007d9..d6a49154 100644 --- a/test-suite-utils/build.gradle +++ b/test-suite-utils/build.gradle @@ -6,10 +6,9 @@ plugins { dependencies { compileOnly(mn.micronaut.inject.groovy) - implementation mn.spock api(mn.micronaut.runtime) - api(mn.micronaut.test.spock) + api(mnTest.micronaut.test.spock) api projects.mqttCore api(libs.testcontainers.spock) } diff --git a/test-suite/build.gradle b/test-suite/build.gradle index 8ba62891..44a6b762 100644 --- a/test-suite/build.gradle +++ b/test-suite/build.gradle @@ -5,15 +5,13 @@ plugins { } dependencies { - implementation mn.spock - testAnnotationProcessor(mn.micronaut.inject.java) testAnnotationProcessor(mn.micronaut.validation) testImplementation(mn.micronaut.validation) testImplementation(libs.junit.jupiter.api) - testImplementation(mn.micronaut.test.junit5) + testImplementation(mnTest.micronaut.test.junit5) testRuntimeOnly(libs.junit.jupiter.engine) testImplementation(libs.awaitility) diff --git a/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.java b/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.java index f469bf77..b79c6bb4 100644 --- a/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.java +++ b/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/annotation/CorrelationAnnotationBinder.java @@ -17,9 +17,9 @@ @Singleton // <1> public class CorrelationAnnotationBinder implements AnnotatedMqttBinder { // <2> - private final ConversionService conversionService; + private final ConversionService conversionService; - public CorrelationAnnotationBinder(ConversionService conversionService) { // <3> + public CorrelationAnnotationBinder(ConversionService conversionService) { // <3> this.conversionService = conversionService; } diff --git a/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.java b/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.java index 75367c97..a67adfa4 100644 --- a/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.java +++ b/test-suite/src/test/java/io/micronaut/mqtt/docs/custom/type/ProductInfoTypeBinder.java @@ -22,9 +22,9 @@ @Singleton // <1> public class ProductInfoTypeBinder implements TypedMqttBinder { //<2> - private final ConversionService conversionService; + private final ConversionService conversionService; - ProductInfoTypeBinder(ConversionService conversionService) { //<3> + ProductInfoTypeBinder(ConversionService conversionService) { //<3> this.conversionService = conversionService; } diff --git a/test-suite/src/test/java/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.java b/test-suite/src/test/java/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.java index 8c07cb14..1c67fc14 100644 --- a/test-suite/src/test/java/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.java +++ b/test-suite/src/test/java/io/micronaut/mqtt/docs/serdes/ProductInfoSerDes.java @@ -21,9 +21,9 @@ public class ProductInfoSerDes implements MqttPayloadSerDes { // <2 private static final Charset CHARSET = StandardCharsets.UTF_8; - private final ConversionService conversionService; + private final ConversionService conversionService; - public ProductInfoSerDes(ConversionService conversionService) { // <3> + public ProductInfoSerDes(ConversionService conversionService) { // <3> this.conversionService = conversionService; }