From 2961426d8ad256983ffe1445acd4cbfaab4fd5db Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 10 May 2022 18:32:41 -0700 Subject: [PATCH] Fix checkstyle issues and test failures See gh-27955 See gh-28442 --- spring-core/spring-core.gradle | 2 +- .../support/SpringFactoriesLoaderRuntimeHintsRegistrar.java | 2 +- .../annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 2a4f18258e..d9ce7201e8 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -111,7 +111,7 @@ jar { test { // 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. - 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: // https://github.com/reactor/BlockHound/issues/33 diff --git a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java index 17edcf087d..56c62667ed 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/SpringFactoriesLoaderRuntimeHintsRegistrar.java @@ -95,4 +95,4 @@ class SpringFactoriesLoaderRuntimeHintsRegistrar implements RuntimeHintsRegistra } } -} \ No newline at end of file +} diff --git a/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java index 84873b10ed..683837f6f0 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java @@ -48,14 +48,14 @@ class CoreAnnotationsRuntimeHintsRegistrarTests { @Test void aliasForHasHints() { assertThat(this.hints.reflection().getTypeHint(TypeReference.of(AliasFor.class))) - .satisfies((hint) -> assertThat(hint.getMemberCategories()) + .satisfies(hint -> assertThat(hint.getMemberCategories()) .containsExactly(MemberCategory.INVOKE_DECLARED_METHODS)); } @Test void orderAnnotationHasHints() { assertThat(this.hints.reflection().getTypeHint(TypeReference.of(Order.class))) - .satisfies((hint) -> assertThat(hint.getMemberCategories()) + .satisfies(hint -> assertThat(hint.getMemberCategories()) .containsExactly(MemberCategory.INVOKE_DECLARED_METHODS)); }