Revert "Include serdeable metadata to internal JSON objects (#10526)"

discovery-core/build.gradle

@@ -5,19 +5,9 @@ plugins {
 dependencies {
     annotationProcessor project(":inject-java")
     annotationProcessor project(":graal")
-
-    annotationProcessor(platform(libs.test.boms.micronaut.serde))
-    annotationProcessor(libs.micronaut.serde.processor) {
-        exclude group: "io.micronaut", module: "json-core"
-    }
-
     api project(':context')
     implementation libs.managed.reactor
-
     compileOnly project(":jackson-databind")
-    compileOnly(platform(libs.test.boms.micronaut.serde))
-    compileOnly(libs.micronaut.serde.api) {
-        exclude group: "io.micronaut", module: "json-core"
-    }
-
+    testImplementation project(":jackson-databind")
+//    api project(":http")
 }

discovery-core/src/main/java/io/micronaut/health/HealthStatus.java

@@ -16,9 +16,9 @@
 package io.micronaut.health;
 
 import com.fasterxml.jackson.annotation.JsonValue;
+import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.ReflectiveAccess;
-import io.micronaut.serde.annotation.Serdeable;
 
 import java.util.Optional;
 
@@ -29,7 +29,7 @@
  * @author Graeme Rocher
  * @since 1.0
  */
-@Serdeable
+@Introspected
 @ReflectiveAccess
 public class HealthStatus implements Comparable<HealthStatus> {
 

gradle/libs.versions.toml

@@ -77,7 +77,6 @@ managed-snakeyaml = "2.2"
 managed-java-parser-core = "3.25.9"
 managed-ksp = "1.9.23-1.0.19"
 micronaut-docs = "2.0.0"
-micronaut-serde = "2.8.1"
 
 [libraries]
 # Libraries prefixed with bom- are BOM files
@@ -87,7 +86,6 @@ test-boms-micronaut-validation = { module = "io.micronaut.validation:micronaut-v
 test-boms-micronaut-rxjava2 = { module = "io.micronaut.rxjava2:micronaut-rxjava2-bom", version.ref = "micronaut-rxjava2" }
 test-boms-micronaut-rxjava3 = { module = "io.micronaut.rxjava3:micronaut-rxjava3-bom", version.ref = "micronaut-rxjava3" }
 test-boms-micronaut-reactor = { module = "io.micronaut.reactor:micronaut-reactor-bom", version.ref = "micronaut-reactor" }
-test-boms-micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
 
 boms-groovy = { module = "org.apache.groovy:groovy-bom", version.ref = "managed-groovy" }
 boms-kotlin = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "managed-kotlin" }
@@ -264,10 +262,6 @@ micronaut-tracing-brave = { module = "io.micronaut.tracing:micronaut-tracing-bra
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation" }
 micronaut-validation-processor = { module = "io.micronaut.validation:micronaut-validation-processor" }
 
-micronaut-serde-api = { module = "io.micronaut.serde:micronaut-serde-api" }
-micronaut-serde-processor = { module = "io.micronaut.serde:micronaut-serde-processor" }
-micronaut-serde-jackson = { module = "io.micronaut.serde:micronaut-serde-jackson" }
-
 testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }
 
 vertx = { module = "io.vertx:vertx-core", version.ref = "vertx" }

http/build.gradle

@@ -6,24 +6,13 @@ plugins {
 dependencies {
     annotationProcessor project(":inject-java")
     annotationProcessor project(":graal")
-
-    annotationProcessor(platform(libs.test.boms.micronaut.serde))
-    annotationProcessor(libs.micronaut.serde.processor) {
-        exclude group: "io.micronaut", module: "json-core"
-    }
-
     api project(":context")
     api project(":core-reactive")
     implementation project(":context-propagation")
     implementation libs.managed.reactor
     compileOnly libs.managed.kotlinx.coroutines.core
     compileOnly libs.managed.kotlinx.coroutines.reactor
 
-    compileOnly(platform(libs.test.boms.micronaut.serde))
-    compileOnly(libs.micronaut.serde.api) {
-        exclude group: "io.micronaut", module: "json-core"
-    }
-
     compileOnly libs.managed.jackson.annotations
 
     testCompileOnly project(":inject-groovy")

http/src/main/java/io/micronaut/http/hateoas/AbstractResource.java

@@ -17,22 +17,16 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.annotation.ReflectiveAccess;
 import io.micronaut.core.convert.value.ConvertibleValues;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.core.value.OptionalMultiValues;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.annotation.Produces;
-import io.micronaut.serde.annotation.Serdeable;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * An abstract implementation of {@link Resource}.
@@ -42,10 +36,9 @@
  * @since 1.1
  */
 @Produces(MediaType.APPLICATION_HAL_JSON)
-@Serdeable
+@Introspected
 @SuppressWarnings("java:S119") // Impl is a better name than T
 public abstract class AbstractResource<Impl extends AbstractResource<Impl>> implements Resource {
-
     private final Map<CharSequence, List<Link>> linkMap = new LinkedHashMap<>(1);
     private final Map<CharSequence, List<Resource>> embeddedMap = new LinkedHashMap<>(1);
 

http/src/main/java/io/micronaut/http/hateoas/GenericResource.java

@@ -18,8 +18,8 @@
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.util.ObjectUtils;
-import io.micronaut.serde.annotation.Serdeable;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -31,7 +31,7 @@
  * @since 3.4.0
  * @author yawkat
  */
-@Serdeable
+@Introspected
 public final class GenericResource extends AbstractResource<GenericResource> {
     private final Map<String, Object> additionalProperties = new LinkedHashMap<>();
 

http/src/main/java/io/micronaut/http/hateoas/JsonError.java

@@ -22,8 +22,6 @@
 import io.micronaut.http.annotation.Produces;
 
 import io.micronaut.core.annotation.Nullable;
-import io.micronaut.serde.annotation.Serdeable;
-
 import java.util.Optional;
 
 /**
@@ -32,7 +30,6 @@
  * @author Graeme Rocher
  * @since 1.1
  */
-@Serdeable
 @Produces(MediaType.APPLICATION_JSON)
 public class JsonError extends AbstractResource<JsonError> {
 

http/src/main/java/io/micronaut/http/hateoas/Resource.java

@@ -20,15 +20,13 @@
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.value.OptionalMultiValues;
-import io.micronaut.serde.annotation.Serdeable;
 
 /**
  * Represents a REST resource in a hateoas architecture.
  *
  * @author Graeme Rocher
  * @since 1.1
  */
-@Serdeable
 @Introspected
 public interface Resource {
 

http/src/main/java/io/micronaut/http/hateoas/VndError.java

@@ -19,7 +19,6 @@
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.annotation.Produces;
-import io.micronaut.serde.annotation.Serdeable;
 
 import java.util.List;
 
@@ -30,7 +29,6 @@
  * @since 1.1
  */
 @Produces(MediaType.APPLICATION_VND_ERROR)
-@Serdeable
 public class VndError extends JsonError {
 
     /**

management/build.gradle

@@ -6,11 +6,6 @@ dependencies {
     annotationProcessor project(":inject-java")
     annotationProcessor project(":graal")
 
-    annotationProcessor(platform(libs.test.boms.micronaut.serde))
-    annotationProcessor(libs.micronaut.serde.processor) {
-        exclude group: "io.micronaut", module: "json-core"
-    }
-
     api project(":router")
     api project(":discovery-core")
     compileOnly project(":jackson-databind")
@@ -44,9 +39,4 @@ dependencies {
     compileOnly libs.logback.classic
     compileOnly libs.log4j
 
-    compileOnly(platform(libs.test.boms.micronaut.serde))
-    compileOnly(libs.micronaut.serde.api) {
-        exclude group: "io.micronaut", module: "json-core"
-    }
-
 }

management/src/main/java/io/micronaut/management/health/indicator/HealthResult.java

@@ -16,9 +16,9 @@
 package io.micronaut.management.health.indicator;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.micronaut.core.annotation.Introspected;
 import io.micronaut.core.annotation.ReflectiveAccess;
 import io.micronaut.health.HealthStatus;
-import io.micronaut.serde.annotation.Serdeable;
 import jakarta.validation.constraints.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,9 +32,9 @@
  * @author James Kleeh
  * @since 1.0
  */
-@Serdeable
-@JsonDeserialize(as = DefaultHealthResult.class)
+@Introspected
 @ReflectiveAccess
+@JsonDeserialize(as = DefaultHealthResult.class)
 public interface HealthResult {
 
     /**

settings.gradle

@@ -77,7 +77,6 @@ include "test-suite-logback"
 include "test-suite-logback-external-configuration"
 include "test-suite-logback-graalvm"
 include "test-suite-netty-ssl-graalvm"
-include "test-suite-serde"
 include "test-utils"
 
 // benchmarks