Skip to content

Commit efaee61

Browse files
snicollsnicoll
committed
Harmonize accessors of RuntimeHints API
Closes gh-29269
1 parent ffe2ba4 commit efaee61

19 files changed

+63
-63
lines changed

‎spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void applyToWhenHasImportAwareConfigurationRegistersBeanPostProcessorBeforeRegul
145145
void applyToWhenHasImportAwareConfigurationRegistersHints() {
146146
BeanFactoryInitializationAotContribution contribution = getContribution(ImportConfiguration.class);
147147
contribution.applyTo(generationContext, beanFactoryInitializationCode);
148-
assertThat(generationContext.getRuntimeHints().resources().resourcePatterns())
148+
assertThat(generationContext.getRuntimeHints().resources().resourcePatternHints())
149149
.singleElement()
150150
.satisfies(resourceHint -> assertThat(resourceHint.getIncludes())
151151
.map(ResourcePatternHint::getPattern)

‎spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnField() {
121121
ResourceLoader resourceLoader = bean.getResourceLoader();
122122
assertThat(resourceLoader).isNotInstanceOf(Proxy.class);
123123
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
124-
assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
125-
assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
124+
assertThat(runtimeHints.proxies().jdkProxyHints()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
125+
assertThat(runtimeHints.proxies().jdkProxyHints()).anySatisfy(proxyHint ->
126126
assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
127127
environment.getClass().getInterfaces())));
128128

@@ -137,8 +137,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnMethod() {
137137
ResourceLoader resourceLoader = bean.getResourceLoader();
138138
assertThat(resourceLoader).isInstanceOf(Proxy.class);
139139
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
140-
assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(Environment.class));
141-
assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
140+
assertThat(runtimeHints.proxies().jdkProxyHints()).satisfies(doesNotHaveProxyFor(Environment.class));
141+
assertThat(runtimeHints.proxies().jdkProxyHints()).anySatisfy(proxyHint ->
142142
assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
143143
resourceLoader.getClass().getInterfaces())));
144144
});
@@ -152,8 +152,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnConstructor() {
152152
ResourceLoader resourceLoader = bean.getResourceLoader();
153153
assertThat(resourceLoader).isNotInstanceOf(Proxy.class);
154154
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
155-
assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
156-
assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
155+
assertThat(runtimeHints.proxies().jdkProxyHints()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
156+
assertThat(runtimeHints.proxies().jdkProxyHints()).anySatisfy(proxyHint ->
157157
assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
158158
environment.getClass().getInterfaces())));
159159
});
@@ -169,8 +169,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnFactoryMethod() {
169169
ResourceLoader resourceLoader = bean.getResourceLoader();
170170
assertThat(resourceLoader).isNotInstanceOf(Proxy.class);
171171
RuntimeHints runtimeHints = generationContext.getRuntimeHints();
172-
assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
173-
assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
172+
assertThat(runtimeHints.proxies().jdkProxyHints()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
173+
assertThat(runtimeHints.proxies().jdkProxyHints()).anySatisfy(proxyHint ->
174174
assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
175175
environment.getClass().getInterfaces())));
176176
});

‎spring-context/src/test/java/org/springframework/context/aot/RuntimeHintsBeanFactoryInitializationAotProcessorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void shouldProcessDuplicatedRegistrarsOnlyOnce() {
100100
this.generator.processAheadOfTime(applicationContext,
101101
this.generationContext);
102102
RuntimeHints runtimeHints = this.generationContext.getRuntimeHints();
103-
assertThat(runtimeHints.resources().resourceBundles().map(ResourceBundleHint::getBaseName))
103+
assertThat(runtimeHints.resources().resourceBundleHints().map(ResourceBundleHint::getBaseName))
104104
.containsOnly("com.example.example0", "sample");
105105
assertThat(IncrementalRuntimeHintsRegistrar.counter.get()).isEqualTo(1);
106106
}
@@ -116,7 +116,7 @@ void shouldRejectRuntimeHintsRegistrarWithoutDefaultConstructor() {
116116

117117
private void assertThatSampleRegistrarContributed() {
118118
Stream<ResourceBundleHint> bundleHints = this.generationContext.getRuntimeHints()
119-
.resources().resourceBundles();
119+
.resources().resourceBundleHints();
120120
assertThat(bundleHints)
121121
.anyMatch(bundleHint -> "sample".equals(bundleHint.getBaseName()));
122122
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public enum HintType {
4040
REFLECTION(ReflectionHints.class),
4141

4242
/**
43-
* Resource pattern hint, as described by {@link org.springframework.aot.hint.ResourceHints#resourcePatterns()}.
43+
* Resource pattern hint, as described by {@link org.springframework.aot.hint.ResourceHints#resourcePatternHints()}.
4444
*/
4545
RESOURCE_PATTERN(ResourcePatternHint.class),
4646

4747
/**
48-
* Resource bundle hint, as described by {@link org.springframework.aot.hint.ResourceHints#resourceBundles()}.
48+
* Resource bundle hint, as described by {@link org.springframework.aot.hint.ResourceHints#resourceBundleHints()}.
4949
*/
5050
RESOURCE_BUNDLE(ResourceBundleHint.class),
5151

@@ -55,7 +55,7 @@ public enum HintType {
5555
JAVA_SERIALIZATION(JavaSerializationHint.class),
5656

5757
/**
58-
* JDK proxies hint, as described by {@link org.springframework.aot.hint.ProxyHints#jdkProxies()}.
58+
* JDK proxies hint, as described by {@link org.springframework.aot.hint.ProxyHints#jdkProxyHints()}.
5959
*/
6060
JDK_PROXIES(JdkProxyHint.class);
6161

‎spring-core/src/main/java/org/springframework/aot/hint/ProxyHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class ProxyHints {
3636
* Return the interface-based proxies that are required.
3737
* @return a stream of {@link JdkProxyHint}
3838
*/
39-
public Stream<JdkProxyHint> jdkProxies() {
39+
public Stream<JdkProxyHint> jdkProxyHints() {
4040
return this.jdkProxies.stream();
4141
}
4242

‎spring-core/src/main/java/org/springframework/aot/hint/ResourceHints.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public ResourceHints() {
5454
* Return the resources that should be made available at runtime.
5555
* @return a stream of {@link ResourcePatternHints}
5656
*/
57-
public Stream<ResourcePatternHints> resourcePatterns() {
57+
public Stream<ResourcePatternHints> resourcePatternHints() {
5858
Stream<ResourcePatternHints> patterns = this.resourcePatternHints.stream();
5959
return (this.types.isEmpty() ? patterns
6060
: Stream.concat(Stream.of(typesPatternResourceHint()), patterns));
@@ -64,7 +64,7 @@ public Stream<ResourcePatternHints> resourcePatterns() {
6464
* Return the resource bundles that should be made available at runtime.
6565
* @return a stream of {@link ResourceBundleHint}
6666
*/
67-
public Stream<ResourceBundleHint> resourceBundles() {
67+
public Stream<ResourceBundleHint> resourceBundleHints() {
6868
return this.resourceBundleHints.stream();
6969
}
7070

‎spring-core/src/main/java/org/springframework/aot/hint/SerializationHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public SerializationHints() {
4545
* that need to be serialized using Java serialization at runtime.
4646
* @return a stream of {@link JavaSerializationHint java serialization hints}
4747
*/
48-
public Stream<JavaSerializationHint> javaSerialization() {
48+
public Stream<JavaSerializationHint> javaSerializationHints() {
4949
return this.javaSerializationHints.stream();
5050
}
5151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public Predicate<RuntimeHints> forInterfaces(Class<?>... interfaces) {
6161
public Predicate<RuntimeHints> forInterfaces(TypeReference... interfaces) {
6262
Assert.notEmpty(interfaces, "'interfaces' should not be empty");
6363
List<TypeReference> interfaceList = Arrays.asList(interfaces);
64-
return hints -> hints.proxies().jdkProxies().anyMatch(proxyHint ->
64+
return hints -> hints.proxies().jdkProxyHints().anyMatch(proxyHint ->
6565
proxyHint.getProxiedInterfaces().equals(interfaceList));
6666
}
6767

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class ResourceHintsPredicates {
5151
*/
5252
public Predicate<RuntimeHints> forBundle(String bundleName) {
5353
Assert.hasText(bundleName, "resource bundle name should not be empty");
54-
return runtimeHints -> runtimeHints.resources().resourceBundles()
54+
return runtimeHints -> runtimeHints.resources().resourceBundleHints()
5555
.anyMatch(bundleHint -> bundleName.equals(bundleHint.getBaseName()));
5656
}
5757

@@ -115,7 +115,7 @@ private record AggregatedResourcePatternHints(List<ResourcePatternHint> includes
115115
static AggregatedResourcePatternHints of(ResourceHints resourceHints) {
116116
List<ResourcePatternHint> includes = new ArrayList<>();
117117
List<ResourcePatternHint> excludes = new ArrayList<>();
118-
resourceHints.resourcePatterns().forEach(resourcePatternHint -> {
118+
resourceHints.resourcePatternHints().forEach(resourcePatternHint -> {
119119
includes.addAll(resourcePatternHint.getIncludes());
120120
excludes.addAll(resourcePatternHint.getExcludes());
121121
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Predicate<RuntimeHints> onType(Class<?> type) {
5656
*/
5757
public Predicate<RuntimeHints> onType(TypeReference typeReference) {
5858
Assert.notNull(typeReference, "'typeReference' should not be null");
59-
return hints -> hints.serialization().javaSerialization().anyMatch(
59+
return hints -> hints.serialization().javaSerializationHints().anyMatch(
6060
hint -> hint.getType().equals(typeReference));
6161
}
6262

‎spring-core/src/main/java/org/springframework/aot/nativex/NativeConfigurationWriter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ public abstract class NativeConfigurationWriter {
4040
* @param hints the hints to handle
4141
*/
4242
public void write(RuntimeHints hints) {
43-
if (hints.serialization().javaSerialization().findAny().isPresent()) {
44-
writeJavaSerializationHints(hints.serialization());
43+
if (hints.serialization().javaSerializationHints().findAny().isPresent()) {
44+
writeSerializationHints(hints.serialization());
4545
}
46-
if (hints.proxies().jdkProxies().findAny().isPresent()) {
46+
if (hints.proxies().jdkProxyHints().findAny().isPresent()) {
4747
writeProxyHints(hints.proxies());
4848
}
4949
if (hints.reflection().typeHints().findAny().isPresent()) {
5050
writeReflectionHints(hints.reflection());
5151
}
52-
if (hints.resources().resourcePatterns().findAny().isPresent() ||
53-
hints.resources().resourceBundles().findAny().isPresent()) {
52+
if (hints.resources().resourcePatternHints().findAny().isPresent() ||
53+
hints.resources().resourceBundleHints().findAny().isPresent()) {
5454
writeResourceHints(hints.resources());
5555
}
5656
if (hints.jni().typeHints().findAny().isPresent()) {
@@ -66,7 +66,7 @@ public void write(RuntimeHints hints) {
6666
*/
6767
protected abstract void writeTo(String fileName, Consumer<BasicJsonWriter> writer);
6868

69-
private void writeJavaSerializationHints(SerializationHints hints) {
69+
private void writeSerializationHints(SerializationHints hints) {
7070
writeTo("serialization-config.json", writer ->
7171
SerializationHintsWriter.INSTANCE.write(writer, hints));
7272
}

‎spring-core/src/main/java/org/springframework/aot/nativex/ProxyHintsWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ProxyHintsWriter {
3939
public static final ProxyHintsWriter INSTANCE = new ProxyHintsWriter();
4040

4141
public void write(BasicJsonWriter writer, ProxyHints hints) {
42-
writer.writeArray(hints.jdkProxies().map(this::toAttributes).toList());
42+
writer.writeArray(hints.jdkProxyHints().map(this::toAttributes).toList());
4343
}
4444

4545
private Map<String, Object> toAttributes(JdkProxyHint hint) {

‎spring-core/src/main/java/org/springframework/aot/nativex/ResourceHintsWriter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ class ResourceHintsWriter {
4747
public void write(BasicJsonWriter writer, ResourceHints hints) {
4848
Map<String, Object> attributes = new LinkedHashMap<>();
4949
addIfNotEmpty(attributes, "resources", toAttributes(hints));
50-
handleResourceBundles(attributes, hints.resourceBundles());
50+
handleResourceBundles(attributes, hints.resourceBundleHints());
5151
writer.writeObject(attributes);
5252
}
5353

5454
private Map<String, Object> toAttributes(ResourceHints hint) {
5555
Map<String, Object> attributes = new LinkedHashMap<>();
56-
addIfNotEmpty(attributes, "includes", hint.resourcePatterns().map(ResourcePatternHints::getIncludes)
56+
addIfNotEmpty(attributes, "includes", hint.resourcePatternHints().map(ResourcePatternHints::getIncludes)
5757
.flatMap(List::stream).distinct().map(this::toAttributes).toList());
58-
addIfNotEmpty(attributes, "excludes", hint.resourcePatterns().map(ResourcePatternHints::getExcludes)
58+
addIfNotEmpty(attributes, "excludes", hint.resourcePatternHints().map(ResourcePatternHints::getExcludes)
5959
.flatMap(List::stream).distinct().map(this::toAttributes).toList());
6060
return attributes;
6161
}

‎spring-core/src/main/java/org/springframework/aot/nativex/SerializationHintsWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SerializationHintsWriter {
3939
public static final SerializationHintsWriter INSTANCE = new SerializationHintsWriter();
4040

4141
public void write(BasicJsonWriter writer, SerializationHints hints) {
42-
writer.writeArray(hints.javaSerialization().map(this::toAttributes).toList());
42+
writer.writeArray(hints.javaSerializationHints().map(this::toAttributes).toList());
4343
}
4444

4545
private Map<String, Object> toAttributes(JavaSerializationHint serializationHint) {

‎spring-core/src/test/java/org/springframework/aot/hint/ProxyHintsTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ void registerJdkProxyWithConcreteClass() {
5353
@Test
5454
void registerJdkProxyWithInterface() {
5555
this.proxyHints.registerJdkProxy(Function.class);
56-
assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(Function.class));
56+
assertThat(this.proxyHints.jdkProxyHints()).singleElement().satisfies(proxiedInterfaces(Function.class));
5757
}
5858

5959
@Test
6060
void registerJdkProxyWithTypeReferences() {
6161
this.proxyHints.registerJdkProxy(TypeReference.of(Function.class), TypeReference.of("com.example.Advised"));
62-
assertThat(this.proxyHints.jdkProxies()).singleElement()
62+
assertThat(this.proxyHints.jdkProxyHints()).singleElement()
6363
.satisfies(proxiedInterfaces(Function.class.getName(), "com.example.Advised"));
6464
}
6565

6666
@Test
6767
void registerJdkProxyWithConsumer() {
6868
this.proxyHints.registerJdkProxy(springProxy("com.example.Test"));
69-
assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(
69+
assertThat(this.proxyHints.jdkProxyHints()).singleElement().satisfies(proxiedInterfaces(
7070
"com.example.Test",
7171
"org.springframework.aop.SpringProxy",
7272
"org.springframework.aop.framework.Advised",
@@ -77,7 +77,7 @@ void registerJdkProxyWithConsumer() {
7777
void registerJdkProxyTwiceExposesOneHint() {
7878
this.proxyHints.registerJdkProxy(Function.class);
7979
this.proxyHints.registerJdkProxy(TypeReference.of(Function.class.getName()));
80-
assertThat(this.proxyHints.jdkProxies()).singleElement().satisfies(proxiedInterfaces(Function.class));
80+
assertThat(this.proxyHints.jdkProxyHints()).singleElement().satisfies(proxiedInterfaces(Function.class));
8181
}
8282

8383

‎spring-core/src/test/java/org/springframework/aot/hint/ResourceHintsTests.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,37 @@ class ResourceHintsTests {
4545
@Test
4646
void registerType() {
4747
this.resourceHints.registerType(String.class);
48-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
48+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(
4949
patternOf("java/lang/String.class"));
5050
}
5151

5252
@Test
5353
void registerTypeWithNestedType() {
5454
this.resourceHints.registerType(TypeReference.of(Nested.class));
55-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
55+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(
5656
patternOf("org/springframework/aot/hint/ResourceHintsTests$Nested.class"));
5757
}
5858

5959
@Test
6060
void registerTypeWithInnerNestedType() {
6161
this.resourceHints.registerType(TypeReference.of(Inner.class));
62-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
62+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(
6363
patternOf("org/springframework/aot/hint/ResourceHintsTests$Nested$Inner.class"));
6464
}
6565

6666
@Test
6767
void registerTypeSeveralTimesAddsOnlyOneEntry() {
6868
this.resourceHints.registerType(String.class);
6969
this.resourceHints.registerType(TypeReference.of(String.class));
70-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
70+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(
7171
patternOf("java/lang/String.class"));
7272
}
7373

7474
@Test
7575
void registerExactMatch() {
7676
this.resourceHints.registerPattern("com/example/test.properties");
7777
this.resourceHints.registerPattern("com/example/another.properties");
78-
assertThat(this.resourceHints.resourcePatterns())
78+
assertThat(this.resourceHints.resourcePatternHints())
7979
.anySatisfy(patternOf("com/example/test.properties"))
8080
.anySatisfy(patternOf("com/example/another.properties"))
8181
.hasSize(2);
@@ -84,15 +84,15 @@ void registerExactMatch() {
8484
@Test
8585
void registerPattern() {
8686
this.resourceHints.registerPattern("com/example/*.properties");
87-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
87+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(
8888
patternOf("com/example/*.properties"));
8989
}
9090

9191
@Test
9292
void registerPatternWithIncludesAndExcludes() {
9393
this.resourceHints.registerPattern(resourceHint ->
9494
resourceHint.includes("com/example/*.properties").excludes("com/example/to-ignore.properties"));
95-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(patternOf(
95+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(patternOf(
9696
List.of("com/example/*.properties"),
9797
List.of("com/example/to-ignore.properties")));
9898
}
@@ -101,7 +101,7 @@ void registerPatternWithIncludesAndExcludes() {
101101
void registerIfPresentRegisterExistingLocation() {
102102
this.resourceHints.registerPatternIfPresent(null, "META-INF/",
103103
resourceHint -> resourceHint.includes("com/example/*.properties"));
104-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(
104+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(
105105
patternOf("com/example/*.properties"));
106106
}
107107

@@ -110,7 +110,7 @@ void registerIfPresentRegisterExistingLocation() {
110110
void registerIfPresentIgnoreMissingLocation() {
111111
Consumer<ResourcePatternHints.Builder> hintBuilder = mock(Consumer.class);
112112
this.resourceHints.registerPatternIfPresent(null, "location/does-not-exist/", hintBuilder);
113-
assertThat(this.resourceHints.resourcePatterns()).isEmpty();
113+
assertThat(this.resourceHints.resourcePatternHints()).isEmpty();
114114
verifyNoInteractions(hintBuilder);
115115
}
116116

@@ -135,29 +135,29 @@ void registerResourceWithExistingClassPathResource() {
135135
String path = "org/springframework/aot/hint/support";
136136
ClassPathResource resource = new ClassPathResource(path);
137137
this.resourceHints.registerResource(resource);
138-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(patternOf(path));
138+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(patternOf(path));
139139
}
140140

141141
@Test
142142
void registerResourceWithExistingRelativeClassPathResource() {
143143
String path = "org/springframework/aot/hint/support";
144144
ClassPathResource resource = new ClassPathResource("support", RuntimeHints.class);
145145
this.resourceHints.registerResource(resource);
146-
assertThat(this.resourceHints.resourcePatterns()).singleElement().satisfies(patternOf(path));
146+
assertThat(this.resourceHints.resourcePatternHints()).singleElement().satisfies(patternOf(path));
147147
}
148148

149149
@Test
150150
void registerResourceBundle() {
151151
this.resourceHints.registerResourceBundle("com.example.message");
152-
assertThat(this.resourceHints.resourceBundles()).singleElement()
152+
assertThat(this.resourceHints.resourceBundleHints()).singleElement()
153153
.satisfies(resourceBundle("com.example.message"));
154154
}
155155

156156
@Test
157157
void registerResourceBundleSeveralTimesAddsOneEntry() {
158158
this.resourceHints.registerResourceBundle("com.example.message")
159159
.registerResourceBundle("com.example.message");
160-
assertThat(this.resourceHints.resourceBundles()).singleElement()
160+
assertThat(this.resourceHints.resourceBundleHints()).singleElement()
161161
.satisfies(resourceBundle("com.example.message"));
162162
}
163163

0 commit comments

Comments
 (0)