root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix checkstyle issues and test failures 

See gh-27955
See gh-28442
This commit is contained in:
Phillip Webb 2022-05-10 18:32:41 -07:00
parent 83063a7269
commit 2961426d8a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/spring-core.gradle
View File

@ -111,7 +111,7 @@ jar {
test { test {
// Make sure the classes dir is used on the test classpath (required by ResourceTests). // Make sure the classes dir is used on the test classpath (required by ResourceTests).
// When test fixtures are involved, the JAR is used by default. // When test fixtures are involved, the JAR is used by default.
classpath = sourceSets.main.output.classesDirs + classpath - files(jar.archiveFile) classpath = sourceSets.main.output.classesDirs + files(sourceSets.main.output.resourcesDir) + classpath - files(jar.archiveFile)
// Ensure that BlockHound tests run on JDK 13+. For details, see: // Ensure that BlockHound tests run on JDK 13+. For details, see:
// https://github.com/reactor/BlockHound/issues/33 // https://github.com/reactor/BlockHound/issues/33

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

@ -95,4 +95,4 @@ class SpringFactoriesLoaderRuntimeHintsRegistrar implements RuntimeHintsRegistra
} }
} }
} }

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

@ -48,14 +48,14 @@ class CoreAnnotationsRuntimeHintsRegistrarTests {
@Test @Test
void aliasForHasHints() { void aliasForHasHints() {
assertThat(this.hints.reflection().getTypeHint(TypeReference.of(AliasFor.class))) assertThat(this.hints.reflection().getTypeHint(TypeReference.of(AliasFor.class)))
.satisfies((hint) -> assertThat(hint.getMemberCategories()) .satisfies(hint -> assertThat(hint.getMemberCategories())
.containsExactly(MemberCategory.INVOKE_DECLARED_METHODS)); .containsExactly(MemberCategory.INVOKE_DECLARED_METHODS));
} }
@Test @Test
void orderAnnotationHasHints() { void orderAnnotationHasHints() {
assertThat(this.hints.reflection().getTypeHint(TypeReference.of(Order.class))) assertThat(this.hints.reflection().getTypeHint(TypeReference.of(Order.class)))
.satisfies((hint) -> assertThat(hint.getMemberCategories()) .satisfies(hint -> assertThat(hint.getMemberCategories())
.containsExactly(MemberCategory.INVOKE_DECLARED_METHODS)); .containsExactly(MemberCategory.INVOKE_DECLARED_METHODS));
} }