depend on json core not serde (#512)

* use kotlin DSL * no need to import micronaut-logging catalogue * depend on json.core not serde * annotate with @requires(JsonMapper.class)
micronaut-projects · Aug 2, 2023 · 4b6016c · 4b6016c
1 parent 3edcd93
commit 4b6016c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 38 deletions.
diff --git a/rabbitmq/build.gradle b/rabbitmq/build.gradle
diff --git a/rabbitmq/build.gradle.kts b/rabbitmq/build.gradle.kts
@@ -0,0 +1,40 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
+plugins {
+    id("io.micronaut.build.internal.rabbitmq-module")
+}
+
+dependencies {
+    compileOnly(libs.jsr305)
+
+    api(mn.micronaut.messaging)
+    api(mn.micronaut.inject)
+    api(libs.managed.amqp.client)
+
+    implementation(mn.micronaut.json.core)
+
+    implementation(mn.micronaut.retry)
+    implementation(mn.reactor)
+    implementation(libs.caffeine)
+
+    compileOnly(mn.micronaut.management)
+    compileOnly(mnMicrometer.micronaut.micrometer.core)
+
+    testImplementation(mnSerde.micronaut.serde.jackson)
+    testImplementation(libs.testcontainers.spock)
+    testImplementation(mn.micronaut.inject.groovy)
+    testImplementation(mn.micronaut.inject.java)
+    testImplementation(mn.micronaut.management)
+    testImplementation(mnTest.micronaut.test.spock)
+    testImplementation(mnMicrometer.micronaut.micrometer.core) {
+      exclude("io.micronaut.reactor", "micronaut-reactor")
+    }
+    testRuntimeOnly(mnLogging.logback.classic)
+}
+
+tasks {
+    named<Test>("test") {
+        testLogging.showStandardStreams = true
+        testLogging.exceptionFormat = TestExceptionFormat.FULL
+    }
+}
diff --git a/rabbitmq/src/main/java/io/micronaut/rabbitmq/serdes/JsonRabbitMessageSerDes.java b/rabbitmq/src/main/java/io/micronaut/rabbitmq/serdes/JsonRabbitMessageSerDes.java
@@ -15,6 +15,7 @@
  */
 package io.micronaut.rabbitmq.serdes;
 
+import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.reflect.ClassUtils;
 import io.micronaut.core.serialize.exceptions.SerializationException;
 import io.micronaut.core.type.Argument;
@@ -32,6 +33,7 @@
  * @author James Kleeh
  * @since 1.1.0
  */
+@Requires(bean = JsonMapper.class)
 @Singleton
 public class JsonRabbitMessageSerDes implements RabbitMessageSerDes<Object> {
 

diff --git a/settings.gradle b/settings.gradle
@@ -21,7 +21,6 @@ include 'docs-examples:example-kotlin'
 enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
 
 micronautBuild {
-    importMicronautCatalog("micronaut-logging")
     useStandardizedProjectNames=true
     importMicronautCatalog()
     importMicronautCatalog("micronaut-micrometer")