Skip to content

Commit 2961426

Browse files
committed
Fix checkstyle issues and test failures
See gh-27955 See gh-28442
1 parent 83063a7 commit 2961426

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

spring-core/spring-core.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jar {
111111
test {
112112
// Make sure the classes dir is used on the test classpath (required by ResourceTests).
113113
// When test fixtures are involved, the JAR is used by default.
114-
classpath = sourceSets.main.output.classesDirs + classpath - files(jar.archiveFile)
114+
classpath = sourceSets.main.output.classesDirs + files(sourceSets.main.output.resourcesDir) + classpath - files(jar.archiveFile)
115115

116116
// Ensure that BlockHound tests run on JDK 13+. For details, see:
117117
// https://github.com/reactor/BlockHound/issues/33

spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ private Class<?> resolveClassName(ClassLoader classLoader, String factoryClassNa
9595
}
9696
}
9797

98-
}
98+
}

spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ void setup() {
4848
@Test
4949
void aliasForHasHints() {
5050
assertThat(this.hints.reflection().getTypeHint(TypeReference.of(AliasFor.class)))
51-
.satisfies((hint) -> assertThat(hint.getMemberCategories())
51+
.satisfies(hint -> assertThat(hint.getMemberCategories())
5252
.containsExactly(MemberCategory.INVOKE_DECLARED_METHODS));
5353
}
5454

5555
@Test
5656
void orderAnnotationHasHints() {
5757
assertThat(this.hints.reflection().getTypeHint(TypeReference.of(Order.class)))
58-
.satisfies((hint) -> assertThat(hint.getMemberCategories())
58+
.satisfies(hint -> assertThat(hint.getMemberCategories())
5959
.containsExactly(MemberCategory.INVOKE_DECLARED_METHODS));
6060
}
6161

0 commit comments

Comments
 (0)