Polish 'Simplify some code'

See gh-18438

Author: philwebb

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java

@@ -56,7 +56,7 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
 
 		@Override
 		public boolean equals(Object obj) {
-			return (obj != null && obj.getClass() == getClass());
+			return (obj != null) && (obj.getClass() == getClass());
 		}
 
 		@Override

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java

@@ -71,8 +71,8 @@ private TypeExcludeFilter instantiateTypeExcludeFilter(Class<?> testClass, Class
 
 	@Override
 	public boolean equals(Object obj) {
-		return (obj != null && getClass() == obj.getClass()
-				&& this.filters.equals(((TypeExcludeFiltersContextCustomizer) obj).filters));
+		return (obj != null) && (getClass() == obj.getClass())
+				&& this.filters.equals(((TypeExcludeFiltersContextCustomizer) obj).filters);
 	}
 
 	@Override

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java

@@ -57,8 +57,8 @@ public void customizeContext(ConfigurableApplicationContext context,
 
 	@Override
 	public boolean equals(Object obj) {
-		return (obj != null && getClass() == obj.getClass()
-				&& this.propertySource.equals(((PropertyMappingContextCustomizer) obj).propertySource));
+		return (obj != null) && (getClass() == obj.getClass())
+				&& this.propertySource.equals(((PropertyMappingContextCustomizer) obj).propertySource);
 	}
 
 	@Override

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java

@@ -37,10 +37,7 @@ public void customizeContext(ConfigurableApplicationContext context,
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-		return obj != null && getClass() == obj.getClass();
+		return (obj != null) && (getClass() == obj.getClass());
 	}
 
 	@Override

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java

@@ -80,7 +80,7 @@ private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) {
 
 		@Override
 		public boolean equals(Object obj) {
-			return obj != null && obj.getClass() == getClass();
+			return (obj != null) && (getClass() == obj.getClass());
 		}
 
 		@Override

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java

@@ -208,8 +208,8 @@ PrintStream getParent() {
 		}
 
 		private static PrintStream getSystemStream(PrintStream printStream) {
-			if (printStream instanceof PrintStreamCapture) {
-				return ((PrintStreamCapture) printStream).getParent();
+			while (printStream instanceof PrintStreamCapture) {
+				printStream = ((PrintStreamCapture) printStream).getParent();
 			}
 			return printStream;
 		}

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java

@@ -78,7 +78,7 @@ private void registerTestRestTemplate(BeanDefinitionRegistry registry) {
 
 	@Override
 	public boolean equals(Object obj) {
-		return obj != null && obj.getClass() == getClass();
+		return (obj != null) && (obj.getClass() == getClass());
 	}
 
 	@Override

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizer.java

@@ -79,7 +79,7 @@ private void registerWebTestClient(BeanDefinitionRegistry registry) {
 
 	@Override
 	public boolean equals(Object obj) {
-		return (obj != null && obj.getClass() == getClass());
+		return (obj != null) && (obj.getClass() == getClass());
 	}
 
 	@Override