Upgrade to Micronaut 3.5

gradle.properties

@@ -1,7 +1,7 @@
-projectVersion=1.1.1-SNAPSHOT
+projectVersion=1.2.0-SNAPSHOT
 projectGroup=io.micronaut.serde
 micronautDocsVersion=2.0.0
-micronautVersion=3.4.4
+micronautVersion=3.5.3
 micronautTestVersion=3.0.5
 groovyVersion=3.0.9
 spockVersion=2.0-groovy-3.0
@@ -14,7 +14,7 @@ githubSlug=micronaut-projects/micronaut-serialization
 developers=Graeme Rocher
 
 # Micronaut core branch for BOM pull requests
-githubCoreBranch=3.5.x
+githubCoreBranch=3.6.x
 bomProperty=micronautSerializationVersion
 org.gradle.caching=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g

gradle/libs.versions.toml

@@ -5,6 +5,7 @@ managed-jakarta-json-bindApi = "2.0.0"
 managed-glassfish-jakarta-json = "2.0.1"
 
 oracle-jdbc-driver = "21.6.0.0.1"
+jetbrains-annotations = "23.0.0"
 
 [libraries]
 managed-bson = { module = "org.mongodb:bson", version.ref = "managed-bson" }
@@ -14,3 +15,4 @@ managed-jakarta-json-api = { module = "jakarta.json:jakarta.json-api", version.r
 managed-jakarta-json-bindApi = { module = "jakarta.json.bind:jakarta.json.bind-api", version.ref = "managed-jakarta-json-bindApi" }
 
 oracle-jdbc-driver = { module = "com.oracle.database.jdbc:ojdbc8", version.ref = "oracle-jdbc-driver" }
+jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }

serde-bson/src/test/groovy/io/micronaut/serde/bson/BsonMappingSpec.groovy

@@ -273,7 +273,7 @@ class BsonMappingSpec extends Specification implements BsonJsonSpec, BsonBinaryS
         when:
             def json = bsonJsonMapper.writeValueAsString(e)
         then:
-            json == """{"rename-compile-time": "val1", "bar yes": "val2", "notRenamedProperty": "test", "_xyz": null, "rename-compile-time": "val1"}"""
+            json == """{"rename-compile-time": "val1", "bar yes": "val2", "notRenamedProperty": "test", "_xyz": null}"""
         when:
             def value = bsonJsonMapper.readValue("""{"_xyz": "abc"}""", NamingStrategiesEntity)
         then:
@@ -564,4 +564,4 @@ class MappedCodec<T> implements Codec<T> {
     Class<T> getEncoderClass() {
         return type
     }
-}
+}

serde-bson/src/test/resources/logback.xml

@@ -11,4 +11,6 @@
     <root level="info">
         <appender-ref ref="STDOUT" />
     </root>
-</configuration>
+
+    <logger name="io.micronaut.context.condition" level="trace" />
+</configuration>

serde-jackson/src/test/groovy/io/micronaut/serde/jackson/JsonCompileSpec.groovy

@@ -61,7 +61,6 @@ class JsonCompileSpec extends AbstractTypeElementSpec implements JsonSpec {
         ApplicationContext context =
                 buildContext(className, source, true)
 
-        setupSerdeRegistry(context)
         jsonMapper = context.getBean(ObjectMapper)
 
         def t = context.classLoader
@@ -89,82 +88,24 @@ class JsonCompileSpec extends AbstractTypeElementSpec implements JsonSpec {
                 buildContext("test.Source" + System.currentTimeMillis(), source, true)
 
 
-        setupSerdeRegistry(context)
         jsonMapper = context.getBean(JsonMapper)
         return context
     }
 
     @Override
     ApplicationContext buildContext(String className, @Language("java") String cls, boolean includeAllBeans) {
         def context = super.buildContext(className, cls, true)
-        setupSerdeRegistry(context)
         jsonMapper = context.getBean(JsonMapper)
         return context
     }
 
     @Override
     ApplicationContext buildContext(String className, @Language("java") String cls) {
         def context = super.buildContext(className, cls, true)
-        setupSerdeRegistry(context)
         def t = context.classLoader
                 .loadClass(className)
         typeUnderTest = Argument.of(t)
         jsonMapper = context.getBean(JsonMapper)
         return context
     }
-
-    protected void setupSerdeRegistry(ApplicationContext context) {
-        def classLoader = context.classLoader
-        // horrible hack this
-        def f = ReflectionUtils.getRequiredField(classLoader.getClass(), "files")
-        f.setAccessible(true)
-        def files = f.get(classLoader)
-        def resolvedTypes = files.findAll({ JavaFileObject jfo ->
-            jfo.name.contains('$IntrospectionRef')
-        }).collect( { JavaFileObject jfo ->
-            String className = jfo.name.substring(14, jfo.name.length() - 6).replace('/', '.')
-            classLoader.loadClass(className)
-        })
-
-
-        def references = resolvedTypes
-                .collect() {
-                    (BeanIntrospectionReference) InstantiationUtils.instantiate(it)
-                }
-
-        context.registerSingleton(SerdeIntrospections, new DefaultSerdeIntrospections() {
-
-            @Override
-            BeanIntrospector getBeanIntrospector() {
-                return new BeanIntrospector() {
-                    @Override
-                    Collection<BeanIntrospection<Object>> findIntrospections(@NonNull Predicate<? super BeanIntrospectionReference<?>> filter) {
-                        return references.stream()
-                            .filter(filter)
-                            .filter(BeanIntrospectionReference::isPresent)
-                            .map(BeanIntrospectionReference::load)
-                            .collect(Collectors.toList()) + SHARED.findIntrospections(filter)
-                    }
-
-                    @Override
-                    Collection<Class<?>> findIntrospectedTypes(@NonNull Predicate<? super BeanIntrospectionReference<?>> filter) {
-                        return Collections.emptySet()
-                    }
-
-                    @Override
-                    def <T> Optional<BeanIntrospection<T>> findIntrospection(@NonNull Class<T> beanType) {
-                        def result = findIntrospections({ ref ->
-                            ref.isPresent() && ref.beanType == beanType
-                        }).stream().findFirst()
-                        if (result.isPresent()) {
-                            return result
-                        } else {
-                            return SHARED.findIntrospection(beanType)
-                        }
-                    }
-                }
-            }
-
-        })
-    }
 }