diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java index 4d1af9d217..2748e5e267 100644 --- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java @@ -719,8 +719,7 @@ public abstract class ReflectionUtils { // Keep backing up the inheritance hierarchy. Class targetClass = clazz; do { - Field[] fields = getDeclaredFields(targetClass); - for (Field field : fields) { + for (Field field : getDeclaredFields(targetClass)) { if (ff != null && !ff.matches(field)) { continue; } diff --git a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java index 842ceb7a7f..8f580df3c8 100644 --- a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java +++ b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java @@ -17,13 +17,11 @@ package org.springframework.util; import java.util.Properties; -import java.util.stream.Stream; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.CsvSource; import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver; @@ -44,6 +42,7 @@ class PropertyPlaceholderHelperTests { private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}"); + @Test void withProperties() { String text = "foo=${foo}"; @@ -116,8 +115,8 @@ class PropertyPlaceholderHelperTests { props.setProperty("foo", "bar"); PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", null, null, false); - assertThatExceptionOfType(PlaceholderResolutionException.class).isThrownBy(() -> - helper.replacePlaceholders(text, props)); + assertThatExceptionOfType(PlaceholderResolutionException.class) + .isThrownBy(() -> helper.replacePlaceholders(text, props)); } @Nested @@ -126,7 +125,14 @@ class PropertyPlaceholderHelperTests { private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", ":", null, true); @ParameterizedTest(name = "{0} -> {1}") - @MethodSource("defaultValues") + @CsvSource(delimiterString = "->", textBlock = """ + ${invalid:test} -> test + ${invalid:${one}} -> 1 + ${invalid:${one}${two}} -> 12 + ${invalid:${one}:${two}} -> 1:2 + ${invalid:${also_invalid:test}} -> test + ${invalid:${also_invalid:${one}}} -> 1 + """) void defaultValueIsApplied(String text, String value) { Properties properties = new Properties(); properties.setProperty("one", "1"); @@ -142,19 +148,11 @@ class PropertyPlaceholderHelperTests { verify(resolver, never()).resolvePlaceholder("two"); } - static Stream defaultValues() { - return Stream.of( - Arguments.of("${invalid:test}", "test"), - Arguments.of("${invalid:${one}}", "1"), - Arguments.of("${invalid:${one}${two}}", "12"), - Arguments.of("${invalid:${one}:${two}}", "1:2"), - Arguments.of("${invalid:${also_invalid:test}}", "test"), - Arguments.of("${invalid:${also_invalid:${one}}}", "1") - ); - } - @ParameterizedTest(name = "{0} -> {1}") - @MethodSource("exactMatchPlaceholders") + @CsvSource(delimiterString = "->", textBlock = """ + ${prefix://my-service} -> example-service + ${p1} -> example-service + """) void placeholdersWithExactMatchAreConsidered(String text, String expected) { Properties properties = new Properties(); properties.setProperty("prefix://my-service", "example-service"); @@ -162,21 +160,14 @@ class PropertyPlaceholderHelperTests { properties.setProperty("p1", "${prefix://my-service}"); assertThat(this.helper.replacePlaceholders(text, properties)).isEqualTo(expected); } - - static Stream exactMatchPlaceholders() { - return Stream.of( - Arguments.of("${prefix://my-service}", "example-service"), - Arguments.of("${p1}", "example-service") - ); - } - } - PlaceholderResolver mockPlaceholderResolver(String... pairs) { + + private static PlaceholderResolver mockPlaceholderResolver(String... pairs) { if (pairs.length % 2 == 1) { throw new IllegalArgumentException("size must be even, it is a set of key=value pairs"); } - PlaceholderResolver resolver = mock(PlaceholderResolver.class); + PlaceholderResolver resolver = mock(); for (int i = 0; i < pairs.length; i += 2) { String key = pairs[i]; String value = pairs[i + 1]; @@ -185,5 +176,4 @@ class PropertyPlaceholderHelperTests { return resolver; } - } diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideHandler.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideHandler.java index 64ddd2f1b0..2f871c40da 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideHandler.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideHandler.java @@ -64,13 +64,13 @@ class MockitoBeanOverrideHandler extends AbstractMockitoBeanOverrideHandler { } private MockitoBeanOverrideHandler(Field field, ResolvableType typeToMock, @Nullable String beanName, - BeanOverrideStrategy strategy, MockReset reset, Class[] extraInterfaces, @Nullable Answers answers, + BeanOverrideStrategy strategy, MockReset reset, Class[] extraInterfaces, Answers answers, boolean serializable) { super(field, typeToMock, beanName, strategy, reset); Assert.notNull(typeToMock, "'typeToMock' must not be null"); this.extraInterfaces = asClassSet(extraInterfaces); - this.answers = (answers != null ? answers : Answers.RETURNS_DEFAULTS); + this.answers = answers; this.serializable = serializable; } diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java index fd4e3d389b..21e2bd4297 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java @@ -35,8 +35,8 @@ class MockitoBeanOverrideProcessor implements BeanOverrideProcessor { @Override public AbstractMockitoBeanOverrideHandler createHandler(Annotation overrideAnnotation, Class testClass, Field field) { - if (overrideAnnotation instanceof MockitoBean mockBean) { - return new MockitoBeanOverrideHandler(field, ResolvableType.forField(field, testClass), mockBean); + if (overrideAnnotation instanceof MockitoBean mockitoBean) { + return new MockitoBeanOverrideHandler(field, ResolvableType.forField(field, testClass), mockitoBean); } else if (overrideAnnotation instanceof MockitoSpyBean spyBean) { return new MockitoSpyBeanOverrideHandler(field, ResolvableType.forField(field, testClass), spyBean); diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java index ce929171e9..e02d59b455 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanOverrideHandler.java @@ -48,15 +48,9 @@ class MockitoSpyBeanOverrideHandler extends AbstractMockitoBeanOverrideHandler { new SpringAopBypassingVerificationStartedListener(); - MockitoSpyBeanOverrideHandler(Field field, ResolvableType typeToSpy, MockitoSpyBean spyAnnotation) { - this(field, typeToSpy, (StringUtils.hasText(spyAnnotation.name()) ? spyAnnotation.name() : null), - spyAnnotation.reset()); - } - - MockitoSpyBeanOverrideHandler(Field field, ResolvableType typeToSpy, @Nullable String beanName, - MockReset reset) { - - super(field, typeToSpy, beanName, BeanOverrideStrategy.WRAP, reset); + MockitoSpyBeanOverrideHandler(Field field, ResolvableType typeToSpy, MockitoSpyBean spyBean) { + super(field, typeToSpy, (StringUtils.hasText(spyBean.name()) ? spyBean.name() : null), + BeanOverrideStrategy.WRAP, spyBean.reset()); Assert.notNull(typeToSpy, "typeToSpy must not be null"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java index 9685ed0717..8dfbbba78e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanTests.java @@ -113,7 +113,7 @@ public class TestBeanTests { } @Test - void contextCustomizerCannotBeCreatedWitCompetingOverrideMethods() { + void contextCustomizerCannotBeCreatedWithCompetingOverrideMethods() { GenericApplicationContext context = new GenericApplicationContext(); context.registerBean("bean", String.class, () -> "example"); assertThatIllegalStateException()