From 2d48371c6d90a1858565e479042719f8cb6a0283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 12 Jun 2024 08:05:35 +0200 Subject: [PATCH] Revert polish on Bean Override support This commit revers the removal of the `private` keyword in the examples of the reference documentation and the tests for consistency. While the default visibility makes the example more concise, it could imply to the reader that the field (or the factory method) cannot be private. Also, there is no need to multiply anything returned from `Objects.hash` as its very distinct on its own already. --- .../integration-spring/annotation-mockitobean.adoc | 8 ++++---- .../integration-spring/annotation-testbean.adoc | 8 ++++---- .../context/bean/override/OverrideMetadata.java | 8 ++++---- .../bean/override/OverrideMetadataTests.java | 14 +++++++------- .../TestBeanContextCustomizerEqualityTests.java | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-mockitobean.adoc b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-mockitobean.adoc index b70f2415bed..fc604d0f0ed 100644 --- a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-mockitobean.adoc +++ b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-mockitobean.adoc @@ -43,7 +43,7 @@ Java:: ---- class OverrideBeanTests { @MockitoBean // <1> - CustomService customService; + private CustomService customService; // test case body... } @@ -67,7 +67,7 @@ Java:: ---- class OverrideBeanTests { @MockitoBean(name = "service") // <1> - CustomService customService; + private CustomService customService; // test case body... @@ -88,7 +88,7 @@ Java:: ---- class OverrideBeanTests { @MockitoSpyBean // <1> - CustomService customService; + private CustomService customService; // test case body... } @@ -111,7 +111,7 @@ Java:: ---- class OverrideBeanTests { @MockitoSpyBean(name = "service") // <1> - CustomService customService; + private CustomService customService; // test case body... diff --git a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-testbean.adoc b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-testbean.adoc index 8d4ea481aa2..3712daa068e 100644 --- a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-testbean.adoc +++ b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-testbean.adoc @@ -36,11 +36,11 @@ Java:: ---- class OverrideBeanTests { @TestBean // <1> - CustomService customService; + private CustomService customService; // test case body... - static CustomService customService() { // <2> + private static CustomService customService() { // <2> return new MyFakeCustomService(); } } @@ -64,11 +64,11 @@ Java:: ---- class OverrideBeanTests { @TestBean(name = "service", methodName = "createCustomService") // <1> - CustomService customService; + private CustomService customService; // test case body... - static CustomService createCustomService() { // <2> + private static CustomService createCustomService() { // <2> return new MyFakeCustomService(); } } diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java index 666eba9e799..8e94a242175 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java @@ -80,9 +80,9 @@ public abstract class OverrideMetadata { * @return a list of {@code OverrideMetadata} */ public static List forTestClass(Class testClass) { - List metadataList = new LinkedList<>(); - ReflectionUtils.doWithFields(testClass, field -> parseField(field, testClass, metadataList)); - return metadataList; + List metadata = new LinkedList<>(); + ReflectionUtils.doWithFields(testClass, field -> parseField(field, testClass, metadata)); + return metadata; } private static void parseField(Field field, Class testClass, List metadataList) { @@ -185,7 +185,7 @@ public abstract class OverrideMetadata { public int hashCode() { int hash = Objects.hash(getClass(), this.beanType.getType(), this.beanName, this.strategy); return (this.beanName != null ? hash : hash + - 31 * Objects.hash(this.field.getName(), Arrays.hashCode(this.field.getAnnotations()))); + Objects.hash(this.field.getName(), Arrays.hashCode(this.field.getAnnotations()))); } @Override diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java index 54836b7592b..8f84af1ab1c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java @@ -231,27 +231,27 @@ public class OverrideMetadataTests { public static class ConfigA { - ExampleService noQualifier; + private ExampleService noQualifier; @Qualifier("test") - ExampleService directQualifier; + private ExampleService directQualifier; @Qualifier("different") - ExampleService differentDirectQualifier; + private ExampleService differentDirectQualifier; @CustomQualifier - ExampleService customQualifier; + private ExampleService customQualifier; } public static class ConfigB { - ExampleService noQualifier; + private ExampleService noQualifier; - ExampleService example; + private ExampleService example; @Qualifier("test") - ExampleService directQualifier; + private ExampleService directQualifier; } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanContextCustomizerEqualityTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanContextCustomizerEqualityTests.java index 22ddb34c806..0030f074565 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanContextCustomizerEqualityTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanContextCustomizerEqualityTests.java @@ -89,7 +89,7 @@ class TestBeanContextCustomizerEqualityTests { @TestBean private String description; - static String description() { + private static String description() { return "overridden"; } } @@ -99,7 +99,7 @@ class TestBeanContextCustomizerEqualityTests { @TestBean(name = "descriptionBean") private String description; - static String description() { + private static String description() { return "overridden"; } }