Skip to content

Commit 54a3f66

Browse files
committed
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
1 parent 40c8b7c commit 54a3f66

File tree

19 files changed

+67
-20
lines changed

19 files changed

+67
-20
lines changed

spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.aot.generate.InMemoryGeneratedFiles;
2929
import org.springframework.aot.generate.MethodReference;
3030
import org.springframework.aot.hint.RuntimeHints;
31-
import org.springframework.aot.hint.RuntimeHintsPredicates;
31+
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3232
import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess;
3333
import org.springframework.aot.test.generator.compile.Compiled;
3434
import org.springframework.aot.test.generator.compile.TestCompiler;

spring-beans/src/test/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHintsRegistrarTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
import org.springframework.aot.hint.MemberCategory;
2626
import org.springframework.aot.hint.RuntimeHints;
27-
import org.springframework.aot.hint.RuntimeHintsPredicates;
2827
import org.springframework.aot.hint.RuntimeHintsRegistrar;
28+
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
2929
import org.springframework.beans.factory.aot.AotFactoriesLoader;
3030
import org.springframework.core.io.support.SpringFactoriesLoader;
3131
import org.springframework.util.ClassUtils;

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import org.springframework.aot.generate.GeneratedMethods;
3131
import org.springframework.aot.hint.RuntimeHints;
32-
import org.springframework.aot.hint.RuntimeHintsPredicates;
32+
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3333
import org.springframework.aot.test.generator.compile.Compiled;
3434
import org.springframework.aot.test.generator.compile.TestCompiler;
3535
import org.springframework.beans.factory.config.BeanDefinition;

spring-context/src/test/java/org/springframework/context/aot/ReflectiveProcessorBeanRegistrationAotProcessorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.springframework.aot.generate.GenerationContext;
2828
import org.springframework.aot.hint.MemberCategory;
2929
import org.springframework.aot.hint.RuntimeHints;
30-
import org.springframework.aot.hint.RuntimeHintsPredicates;
3130
import org.springframework.aot.hint.TypeReference;
3231
import org.springframework.aot.hint.annotation.Reflective;
32+
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3333
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
3434
import org.springframework.beans.factory.aot.BeanRegistrationCode;
3535
import org.springframework.beans.factory.support.DefaultListableBeanFactory;

spring-core-test/src/main/java/org/springframework/aot/agent/InstrumentedMethod.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
import org.springframework.aot.hint.MemberCategory;
3030
import org.springframework.aot.hint.RuntimeHints;
31-
import org.springframework.aot.hint.RuntimeHintsPredicates;
3231
import org.springframework.aot.hint.TypeReference;
32+
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3333

3434
/**
3535
* Java method that is instrumented by the {@link RuntimeHintsAgent}.
@@ -38,7 +38,7 @@
3838
* {@link #matcher(RecordedInvocation) is matching} the runtime behavior of the codebase.
3939
*
4040
* @author Brian Clozel
41-
* @see org.springframework.aot.hint.RuntimeHintsPredicates
41+
* @see RuntimeHintsPredicates
4242
*/
4343
enum InstrumentedMethod {
4444

spring-core/src/main/java/org/springframework/aot/hint/ProxyHintsPredicates.java renamed to spring-core/src/main/java/org/springframework/aot/hint/predicate/ProxyHintsPredicates.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.hint;
17+
package org.springframework.aot.hint.predicate;
1818

1919
import java.util.Arrays;
2020
import java.util.function.Predicate;
2121

22+
import org.springframework.aot.hint.ProxyHints;
23+
import org.springframework.aot.hint.RuntimeHints;
24+
import org.springframework.aot.hint.TypeReference;
2225
import org.springframework.util.Assert;
2326

2427
/**

spring-core/src/main/java/org/springframework/aot/hint/ReflectionHintsPredicates.java renamed to spring-core/src/main/java/org/springframework/aot/hint/predicate/ReflectionHintsPredicates.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.hint;
17+
package org.springframework.aot.hint.predicate;
1818

1919
import java.lang.reflect.Constructor;
2020
import java.lang.reflect.Executable;
@@ -26,6 +26,14 @@
2626
import java.util.Set;
2727
import java.util.function.Predicate;
2828

29+
import org.springframework.aot.hint.ExecutableHint;
30+
import org.springframework.aot.hint.ExecutableMode;
31+
import org.springframework.aot.hint.FieldHint;
32+
import org.springframework.aot.hint.MemberCategory;
33+
import org.springframework.aot.hint.ReflectionHints;
34+
import org.springframework.aot.hint.RuntimeHints;
35+
import org.springframework.aot.hint.TypeHint;
36+
import org.springframework.aot.hint.TypeReference;
2937
import org.springframework.core.MethodIntrospector;
3038
import org.springframework.lang.Nullable;
3139
import org.springframework.util.Assert;

spring-core/src/main/java/org/springframework/aot/hint/ResourceHintsPredicates.java renamed to spring-core/src/main/java/org/springframework/aot/hint/predicate/ResourceHintsPredicates.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.hint;
17+
package org.springframework.aot.hint.predicate;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
2121
import java.util.function.Predicate;
2222
import java.util.regex.Pattern;
2323

24+
import org.springframework.aot.hint.ResourceHints;
25+
import org.springframework.aot.hint.ResourcePatternHint;
26+
import org.springframework.aot.hint.RuntimeHints;
27+
import org.springframework.aot.hint.TypeReference;
2428
import org.springframework.util.Assert;
2529
import org.springframework.util.ConcurrentLruCache;
2630

spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsPredicates.java renamed to spring-core/src/main/java/org/springframework/aot/hint/predicate/RuntimeHintsPredicates.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.hint;
17+
package org.springframework.aot.hint.predicate;
18+
19+
import org.springframework.aot.hint.ProxyHints;
20+
import org.springframework.aot.hint.ReflectionHints;
21+
import org.springframework.aot.hint.ResourceHints;
22+
import org.springframework.aot.hint.RuntimeHints;
23+
import org.springframework.aot.hint.RuntimeHintsRegistrar;
24+
import org.springframework.aot.hint.SerializationHints;
1825

1926
/**
2027
* Static generator of predicates that test whether the given {@link RuntimeHints}

spring-core/src/main/java/org/springframework/aot/hint/SerializationHintsPredicates.java renamed to spring-core/src/main/java/org/springframework/aot/hint/predicate/SerializationHintsPredicates.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.hint;
17+
package org.springframework.aot.hint.predicate;
1818

1919
import java.util.function.Predicate;
2020

21+
import org.springframework.aot.hint.RuntimeHints;
22+
import org.springframework.aot.hint.SerializationHints;
23+
import org.springframework.aot.hint.TypeReference;
2124
import org.springframework.util.Assert;
2225

2326
/**

0 commit comments

Comments
 (0)