Merge pull request #18438 from 785172550

* pr/18438:
  Polish 'Simplify some code'
  Simplify some code

Closes gh-18438

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

@@ -56,7 +56,7 @@ class OverrideAutoConfigurationContextCustomizerFactory implements ContextCustom
 
 		@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 @@ class TypeExcludeFiltersContextCustomizer implements ContextCustomizer {
 
 	@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 @@ class PropertyMappingContextCustomizer implements ContextCustomizer {
 
 	@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/SpringBootTestContextBootstrapper.java

@@ -132,8 +132,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
 	}
 
 	private void addConfigAttributesClasses(ContextConfigurationAttributes configAttributes, Class<?>[] classes) {
-		List<Class<?>> combined = new ArrayList<>();
-		combined.addAll(Arrays.asList(classes));
+		List<Class<?>> combined = new ArrayList<>(Arrays.asList(classes));
 		if (configAttributes.getClasses() != null) {
 			combined.addAll(Arrays.asList(configAttributes.getClasses()));
 		}

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

@@ -37,13 +37,7 @@ class ExcludeFilterContextCustomizer implements ContextCustomizer {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-		if (obj == null || getClass() != obj.getClass()) {
-			return false;
-		}
-		return true;
+		return (obj != null) && (getClass() == obj.getClass());
 	}
 
 	@Override

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

@@ -80,10 +80,7 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
 
 		@Override
 		public boolean equals(Object obj) {
-			if (obj == null || obj.getClass() != getClass()) {
-				return false;
-			}
-			return true;
+			return (obj != null) && (getClass() == obj.getClass());
 		}
 
 		@Override

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

@@ -209,7 +209,7 @@ class OutputCapture implements CapturedOutput {
 
 		private static PrintStream getSystemStream(PrintStream printStream) {
 			while (printStream instanceof PrintStreamCapture) {
-				return ((PrintStreamCapture) printStream).getParent();
+				printStream = ((PrintStreamCapture) printStream).getParent();
 			}
 			return printStream;
 		}

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

@@ -78,10 +78,7 @@ class TestRestTemplateContextCustomizer implements ContextCustomizer {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj == null || obj.getClass() != getClass()) {
-			return false;
-		}
-		return true;
+		return (obj != null) && (obj.getClass() == getClass());
 	}
 
 	@Override

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClient.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.test.web.htmlunit;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.Page;
@@ -43,8 +42,7 @@ public class LocalHostWebClient extends WebClient {
 	}
 
 	@Override
-	public <P extends Page> P getPage(String url)
-			throws IOException, FailingHttpStatusCodeException, MalformedURLException {
+	public <P extends Page> P getPage(String url) throws IOException, FailingHttpStatusCodeException {
 		if (url.startsWith("/")) {
 			String port = this.environment.getProperty("local.server.port", "8080");
 			url = "http://localhost:" + port + url;

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

@@ -79,7 +79,7 @@ class WebTestClientContextCustomizer implements ContextCustomizer {
 
 	@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/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java

@@ -92,7 +92,7 @@ class MockitoTestExecutionListenerTests {
 		given(mockTestContext.getAttribute(DependencyInjectionTestExecutionListener.REINJECT_DEPENDENCIES_ATTRIBUTE))
 				.willReturn(Boolean.TRUE);
 		this.listener.beforeTestMethod(mockTestContext);
-		verify(this.postProcessor).inject(this.fieldCaptor.capture(), eq(instance), (MockDefinition) any());
+		verify(this.postProcessor).inject(this.fieldCaptor.capture(), eq(instance), any(MockDefinition.class));
 		assertThat(this.fieldCaptor.getValue().getName()).isEqualTo("mockBean");
 	}