Simplified some code

spring-projects · Sep 30, 2019 · 97fa2ad · 97fa2ad
1 parent 9b90861
commit 97fa2ad
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 17 deletions.
diff --git a/...rc/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java b/...rc/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
@@ -132,8 +132,7 @@ protected ContextLoader resolveContextLoader(Class<?> testClass,
 	}
 
 	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()));
 		}

diff --git a/...ain/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java b/...ain/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java
@@ -40,10 +40,7 @@ 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

diff --git a/.../java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java b/.../java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java
@@ -80,10 +80,7 @@ private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (obj == null || obj.getClass() != getClass()) {
-				return false;
-			}
-			return true;
+			return obj != null && obj.getClass() == getClass();
 		}
 
 		@Override

diff --git a/...ct/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java b/...ct/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java
@@ -208,7 +208,7 @@ PrintStream getParent() {
 		}
 
 		private static PrintStream getSystemStream(PrintStream printStream) {
-			while (printStream instanceof PrintStreamCapture) {
+			if (printStream instanceof PrintStreamCapture) {
 				return ((PrintStreamCapture) printStream).getParent();
 			}
 			return printStream;

diff --git a/...main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java b/...main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
@@ -78,10 +78,7 @@ private void registerTestRestTemplate(BeanDefinitionRegistry registry) {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj == null || obj.getClass() != getClass()) {
-			return false;
-		}
-		return true;
+		return obj != null && obj.getClass() == getClass();
 	}
 
 	@Override

diff --git a/...oot-test/src/main/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClient.java b/...oot-test/src/main/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClient.java
@@ -44,7 +44,7 @@ public LocalHostWebClient(Environment environment) {
 
 	@Override
 	public <P extends Page> P getPage(String url)
-			throws IOException, FailingHttpStatusCodeException, MalformedURLException {
+			throws IOException, FailingHttpStatusCodeException {
 		if (url.startsWith("/")) {
 			String port = this.environment.getProperty("local.server.port", "8080");
 			url = "http://localhost:" + port + url;

diff --git a/...st/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java b/...st/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java
@@ -92,7 +92,7 @@ void beforeTestMethodShouldInjectMockBeanWhenDirtiesContextAttributeIsSet() thro
 		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");
 	}