From 54a3f66d1d8ed97cf7d8449f70f579712b27afb9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 12 Jul 2022 16:10:03 +0200 Subject: [PATCH] Move RuntimeHints predicate support to a dedicated package This commit moves `RuntimeHintsPredicate` and its support classes that form a cohesive concept in a dedicated `.predicate` package. Closes gh-28799 --- ...AnnotationBeanRegistrationAotContributionTests.java | 2 +- .../JakartaAnnotationsRuntimeHintsRegistrarTests.java | 2 +- .../BeanDefinitionPropertiesCodeGeneratorTests.java | 2 +- ...tiveProcessorBeanRegistrationAotProcessorTests.java | 2 +- .../springframework/aot/agent/InstrumentedMethod.java | 4 ++-- .../aot/hint/{ => predicate}/ProxyHintsPredicates.java | 5 ++++- .../{ => predicate}/ReflectionHintsPredicates.java | 10 +++++++++- .../hint/{ => predicate}/ResourceHintsPredicates.java | 6 +++++- .../hint/{ => predicate}/RuntimeHintsPredicates.java | 9 ++++++++- .../{ => predicate}/SerializationHintsPredicates.java | 5 ++++- .../aot/hint/predicate/package-info.java | 9 +++++++++ .../{ => predicate}/ProxyHintsPredicatesTests.java | 4 +++- .../ReflectionHintsPredicatesTests.java | 7 ++++++- .../{ => predicate}/ResourceHintsPredicatesTests.java | 7 +++++-- .../SerializationHintsPredicatesTests.java | 5 ++++- .../CoreAnnotationsRuntimeHintsRegistrarTests.java | 2 +- ...pringFactoriesLoaderRuntimeHintsRegistrarTests.java | 2 +- .../orm/jpa/support/InjectionCodeGeneratorTests.java | 2 +- .../TransactionBeanRegistrationAotProcessorTests.java | 2 +- 19 files changed, 67 insertions(+), 20 deletions(-) rename spring-core/src/main/java/org/springframework/aot/hint/{ => predicate}/ProxyHintsPredicates.java (91%) rename spring-core/src/main/java/org/springframework/aot/hint/{ => predicate}/ReflectionHintsPredicates.java (97%) rename spring-core/src/main/java/org/springframework/aot/hint/{ => predicate}/ResourceHintsPredicates.java (94%) rename spring-core/src/main/java/org/springframework/aot/hint/{ => predicate}/RuntimeHintsPredicates.java (87%) rename spring-core/src/main/java/org/springframework/aot/hint/{ => predicate}/SerializationHintsPredicates.java (90%) create mode 100644 spring-core/src/main/java/org/springframework/aot/hint/predicate/package-info.java rename spring-core/src/test/java/org/springframework/aot/hint/{ => predicate}/ProxyHintsPredicatesTests.java (95%) rename spring-core/src/test/java/org/springframework/aot/hint/{ => predicate}/ReflectionHintsPredicatesTests.java (98%) rename spring-core/src/test/java/org/springframework/aot/hint/{ => predicate}/ResourceHintsPredicatesTests.java (93%) rename spring-core/src/test/java/org/springframework/aot/hint/{ => predicate}/SerializationHintsPredicatesTests.java (91%) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java index 4237c126bf3..a42f26d46bd 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java @@ -28,7 +28,7 @@ import org.springframework.aot.generate.DefaultGenerationContext; import org.springframework.aot.generate.InMemoryGeneratedFiles; import org.springframework.aot.generate.MethodReference; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; import org.springframework.aot.test.generator.compile.Compiled; import org.springframework.aot.test.generator.compile.TestCompiler; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsRegistrarTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsRegistrarTests.java index 2816b9f2d48..a76e4d27346 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsRegistrarTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsRegistrarTests.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.beans.factory.aot.AotFactoriesLoader; import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.util.ClassUtils; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java index 9b53915eb58..5b6f9e69d6b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.generate.GeneratedMethods; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generator.compile.Compiled; import org.springframework.aot.test.generator.compile.TestCompiler; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanRegistrationAotProcessorTests.java b/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanRegistrationAotProcessorTests.java index 06a58298505..5f2dd666c91 100644 --- a/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanRegistrationAotProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanRegistrationAotProcessorTests.java @@ -27,9 +27,9 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.generate.GenerationContext; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; import org.springframework.aot.hint.TypeReference; import org.springframework.aot.hint.annotation.Reflective; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.aot.BeanRegistrationCode; import org.springframework.beans.factory.support.DefaultListableBeanFactory; diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedMethod.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedMethod.java index f61ef5286f9..ecded5755de 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedMethod.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedMethod.java @@ -28,8 +28,8 @@ import java.util.function.Predicate; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; import org.springframework.aot.hint.TypeReference; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; /** * Java method that is instrumented by the {@link RuntimeHintsAgent}. @@ -38,7 +38,7 @@ import org.springframework.aot.hint.TypeReference; * {@link #matcher(RecordedInvocation) is matching} the runtime behavior of the codebase. * * @author Brian Clozel - * @see org.springframework.aot.hint.RuntimeHintsPredicates + * @see RuntimeHintsPredicates */ enum InstrumentedMethod { diff --git a/spring-core/src/main/java/org/springframework/aot/hint/ProxyHintsPredicates.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ProxyHintsPredicates.java similarity index 91% rename from spring-core/src/main/java/org/springframework/aot/hint/ProxyHintsPredicates.java rename to spring-core/src/main/java/org/springframework/aot/hint/predicate/ProxyHintsPredicates.java index cc82d8ea5a2..f01fb15f996 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/ProxyHintsPredicates.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ProxyHintsPredicates.java @@ -14,11 +14,14 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.util.Arrays; import java.util.function.Predicate; +import org.springframework.aot.hint.ProxyHints; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.TypeReference; import org.springframework.util.Assert; /** diff --git a/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHintsPredicates.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java similarity index 97% rename from spring-core/src/main/java/org/springframework/aot/hint/ReflectionHintsPredicates.java rename to spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java index 36648680dc1..cd4c902a848 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/ReflectionHintsPredicates.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; @@ -26,6 +26,14 @@ import java.util.List; import java.util.Set; import java.util.function.Predicate; +import org.springframework.aot.hint.ExecutableHint; +import org.springframework.aot.hint.ExecutableMode; +import org.springframework.aot.hint.FieldHint; +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.ReflectionHints; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.TypeHint; +import org.springframework.aot.hint.TypeReference; import org.springframework.core.MethodIntrospector; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/spring-core/src/main/java/org/springframework/aot/hint/ResourceHintsPredicates.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ResourceHintsPredicates.java similarity index 94% rename from spring-core/src/main/java/org/springframework/aot/hint/ResourceHintsPredicates.java rename to spring-core/src/main/java/org/springframework/aot/hint/predicate/ResourceHintsPredicates.java index 3c65bb2e9d0..df93b6a0587 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/ResourceHintsPredicates.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/ResourceHintsPredicates.java @@ -14,13 +14,17 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.regex.Pattern; +import org.springframework.aot.hint.ResourceHints; +import org.springframework.aot.hint.ResourcePatternHint; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.TypeReference; import org.springframework.util.Assert; import org.springframework.util.ConcurrentLruCache; diff --git a/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsPredicates.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/RuntimeHintsPredicates.java similarity index 87% rename from spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsPredicates.java rename to spring-core/src/main/java/org/springframework/aot/hint/predicate/RuntimeHintsPredicates.java index 12b8b3fb315..c908eaea017 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsPredicates.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/RuntimeHintsPredicates.java @@ -14,7 +14,14 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; + +import org.springframework.aot.hint.ProxyHints; +import org.springframework.aot.hint.ReflectionHints; +import org.springframework.aot.hint.ResourceHints; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.SerializationHints; /** * Static generator of predicates that test whether the given {@link RuntimeHints} diff --git a/spring-core/src/main/java/org/springframework/aot/hint/SerializationHintsPredicates.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/SerializationHintsPredicates.java similarity index 90% rename from spring-core/src/main/java/org/springframework/aot/hint/SerializationHintsPredicates.java rename to spring-core/src/main/java/org/springframework/aot/hint/predicate/SerializationHintsPredicates.java index 4e87eaf1e82..e7d13d5931f 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/SerializationHintsPredicates.java +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/SerializationHintsPredicates.java @@ -14,10 +14,13 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.util.function.Predicate; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.SerializationHints; +import org.springframework.aot.hint.TypeReference; import org.springframework.util.Assert; /** diff --git a/spring-core/src/main/java/org/springframework/aot/hint/predicate/package-info.java b/spring-core/src/main/java/org/springframework/aot/hint/predicate/package-info.java new file mode 100644 index 00000000000..8d6d410e07a --- /dev/null +++ b/spring-core/src/main/java/org/springframework/aot/hint/predicate/package-info.java @@ -0,0 +1,9 @@ +/** + * Predicate support for runtime hints. + */ +@NonNullApi +@NonNullFields +package org.springframework.aot.hint.predicate; + +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsPredicatesTests.java b/spring-core/src/test/java/org/springframework/aot/hint/predicate/ProxyHintsPredicatesTests.java similarity index 95% rename from spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsPredicatesTests.java rename to spring-core/src/test/java/org/springframework/aot/hint/predicate/ProxyHintsPredicatesTests.java index d641e3fe205..83ce17721b0 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsPredicatesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/predicate/ProxyHintsPredicatesTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.util.function.Predicate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.aot.hint.RuntimeHints; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsPredicatesTests.java b/spring-core/src/test/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicatesTests.java similarity index 98% rename from spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsPredicatesTests.java rename to spring-core/src/test/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicatesTests.java index 2ef2c8f0177..9366438227a 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/ReflectionHintsPredicatesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicatesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.lang.reflect.Constructor; @@ -26,6 +26,11 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.springframework.aot.hint.ExecutableMode; +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.TypeReference; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; diff --git a/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsPredicatesTests.java b/spring-core/src/test/java/org/springframework/aot/hint/predicate/ResourceHintsPredicatesTests.java similarity index 93% rename from spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsPredicatesTests.java rename to spring-core/src/test/java/org/springframework/aot/hint/predicate/ResourceHintsPredicatesTests.java index ac3f607d5c6..20f98977ef0 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsPredicatesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/predicate/ResourceHintsPredicatesTests.java @@ -14,13 +14,16 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import java.util.function.Predicate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.TypeReference; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -54,7 +57,7 @@ class ResourceHintsPredicatesTests { @Test void resourcePatternMatchesTypeAndResourceName() { - this.runtimeHints.resources().registerPattern("/org/springframework/aot/hint/spring.*"); + this.runtimeHints.resources().registerPattern("/org/springframework/aot/hint/predicate/spring.*"); assertPredicateMatches(resources.forResource(TypeReference.of(getClass()), "spring.properties")); } diff --git a/spring-core/src/test/java/org/springframework/aot/hint/SerializationHintsPredicatesTests.java b/spring-core/src/test/java/org/springframework/aot/hint/predicate/SerializationHintsPredicatesTests.java similarity index 91% rename from spring-core/src/test/java/org/springframework/aot/hint/SerializationHintsPredicatesTests.java rename to spring-core/src/test/java/org/springframework/aot/hint/predicate/SerializationHintsPredicatesTests.java index 46e13bffdb6..fdba83c4812 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/SerializationHintsPredicatesTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/predicate/SerializationHintsPredicatesTests.java @@ -14,10 +14,13 @@ * limitations under the License. */ -package org.springframework.aot.hint; +package org.springframework.aot.hint.predicate; import org.junit.jupiter.api.Test; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.TypeReference; + import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsRegistrarTests.java index b3f6f67c78f..8df2ed55f88 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsRegistrarTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/support/CoreAnnotationsRuntimeHintsRegistrarTests.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.core.annotation.AliasFor; import org.springframework.core.annotation.Order; import org.springframework.core.io.support.SpringFactoriesLoader; diff --git a/spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsRegistrarTests.java index d6fb1c1eda4..9a7f5bbc9e9 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsRegistrarTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/support/SpringFactoriesLoaderRuntimeHintsRegistrarTests.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.core.io.support.DummyFactory; import org.springframework.core.io.support.MyDummyFactory1; import org.springframework.core.io.support.SpringFactoriesLoader; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java index e6b0c36ab22..e3ca3212868 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java @@ -26,7 +26,7 @@ import javax.lang.model.element.Modifier; import org.junit.jupiter.api.Test; import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsPredicates; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generator.compile.Compiled; import org.springframework.aot.test.generator.compile.TestCompiler; import org.springframework.beans.testfixture.beans.TestBean; diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java index 6bbbedd873a..81bcdaaa918 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/TransactionBeanRegistrationAotProcessorTests.java @@ -22,7 +22,7 @@ import org.springframework.aop.SpringProxy; import org.springframework.aop.framework.Advised; import org.springframework.aot.generate.GenerationContext; import org.springframework.aot.hint.MemberCategory; -import org.springframework.aot.hint.RuntimeHintsPredicates; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.aot.BeanRegistrationCode; import org.springframework.beans.factory.support.DefaultListableBeanFactory;