From 79570af7d608a0c6363fe8e58f2ce9b46f2edb89 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Wed, 4 Jun 2025 12:11:08 +0200 Subject: [PATCH] Move off deprecated API in AOT support. Closes: #4990 --- .../data/mongodb/aot/MongoAotReflectionHelper.java | 2 +- .../data/mongodb/aot/MongoRuntimeHints.java | 8 +++----- .../data/mongodb/aot/MongoRuntimeHintsUnitTests.java | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java index ff8d04b38..bc46701f4 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java @@ -26,6 +26,6 @@ public final class MongoAotReflectionHelper { public static void cglibProxyReflectionMemberAccess(Builder builder) { builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS, - MemberCategory.DECLARED_FIELDS); + MemberCategory.ACCESS_DECLARED_FIELDS); } } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java index f2442960e..38addb43c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java @@ -97,11 +97,9 @@ class MongoRuntimeHints implements RuntimeHintsRegistrar { .registerType(IndexOptions.class, MemberCategory.INVOKE_PUBLIC_METHODS) .registerType(ServerAddress.class, MemberCategory.INVOKE_PUBLIC_METHODS) .registerType(UnixServerAddress.class, MemberCategory.INVOKE_PUBLIC_METHODS) // - .registerType(TypeReference.of("com.mongodb.connection.StreamFactoryFactory"), - MemberCategory.INTROSPECT_PUBLIC_METHODS) - .registerType(TypeReference.of("com.mongodb.internal.connection.StreamFactoryFactory"), - MemberCategory.INTROSPECT_PUBLIC_METHODS) - .registerType(TypeReference.of("com.mongodb.internal.build.MongoDriverVersion"), MemberCategory.PUBLIC_FIELDS); + .registerType(TypeReference.of("com.mongodb.connection.StreamFactoryFactory")) + .registerType(TypeReference.of("com.mongodb.internal.connection.StreamFactoryFactory")) + .registerType(TypeReference.of("com.mongodb.internal.build.MongoDriverVersion"), MemberCategory.ACCESS_PUBLIC_FIELDS); if (MongoAotPredicates.isSyncClientPresent(classLoader)) { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java index 0f9ecb911..6aea565c4 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java @@ -55,8 +55,7 @@ class MongoRuntimeHintsUnitTests { .and(reflection().onType(IndexOptions.class).withMemberCategory(INVOKE_PUBLIC_METHODS)) .and(reflection().onType(ServerAddress.class).withMemberCategory(INVOKE_PUBLIC_METHODS)) .and(reflection().onType(UnixServerAddress.class).withMemberCategory(INVOKE_PUBLIC_METHODS)) - .and(reflection().onType(TypeReference.of("com.mongodb.connection.StreamFactoryFactory")) - .withMemberCategory(INTROSPECT_PUBLIC_METHODS)); + .and(reflection().onType(TypeReference.of("com.mongodb.connection.StreamFactoryFactory"))); assertThat(runtimeHints).matches(expected); }