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.

Author: snicoll

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...
 

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();
 		}
 	}

spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java

@@ -80,9 +80,9 @@ protected OverrideMetadata(Field field, ResolvableType beanType, @Nullable Strin
 	 * @return a list of {@code OverrideMetadata}
 	 */
 	public static List<OverrideMetadata> forTestClass(Class<?> testClass) {
-		List<OverrideMetadata> metadataList = new LinkedList<>();
-		ReflectionUtils.doWithFields(testClass, field -> parseField(field, testClass, metadataList));
-		return metadataList;
+		List<OverrideMetadata> metadata = new LinkedList<>();
+		ReflectionUtils.doWithFields(testClass, field -> parseField(field, testClass, metadata));
+		return metadata;
 	}
 
 	private static void parseField(Field field, Class<?> testClass, List<OverrideMetadata> metadataList) {
@@ -185,7 +185,7 @@ public boolean equals(Object other) {
 	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

spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java

@@ -231,27 +231,27 @@ static String foo() {
 
 	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;
 
 	}
 

spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanContextCustomizerEqualityTests.java

@@ -89,7 +89,7 @@ static class Case4 {
 		@TestBean
 		private String description;
 
-		static String description() {
+		private static String description() {
 			return "overridden";
 		}
 	}
@@ -99,7 +99,7 @@ static class Case5 {
 		@TestBean(name = "descriptionBean")
 		private String description;
 
-		static String description() {
+		private static String description() {
 			return "overridden";
 		}
 	}