From e6b45de41e71ff28471f8cd5391a275febbf00bc Mon Sep 17 00:00:00 2001 From: kenneth <785172550@qq.com> Date: Mon, 30 Sep 2019 14:54:18 +0800 Subject: [PATCH 1/2] Simplify some code See gh-18438 --- .../boot/test/context/SpringBootTestContextBootstrapper.java | 3 +-- .../test/context/filter/ExcludeFilterContextCustomizer.java | 5 +---- .../json/DuplicateJsonObjectContextCustomizerFactory.java | 5 +---- .../org/springframework/boot/test/system/OutputCapture.java | 2 +- .../test/web/client/TestRestTemplateContextCustomizer.java | 5 +---- .../boot/test/web/htmlunit/LocalHostWebClient.java | 4 +--- .../test/mock/mockito/MockitoTestExecutionListenerTests.java | 2 +- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java index 5f3dbf7179..9301f86496 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java +++ b/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> combined = new ArrayList<>(); - combined.addAll(Arrays.asList(classes)); + List> combined = new ArrayList<>(Arrays.asList(classes)); if (configAttributes.getClasses() != null) { combined.addAll(Arrays.asList(configAttributes.getClasses())); } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java index 4f7a626031..fb9fa3110f 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java @@ -40,10 +40,7 @@ class ExcludeFilterContextCustomizer implements ContextCustomizer { 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/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java index 6fcc2cf23b..b6245fd04e 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java +++ b/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 && obj.getClass() == getClass(); } @Override diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java index a1a6e65918..8af6dcd647 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java @@ -208,7 +208,7 @@ class OutputCapture implements CapturedOutput { } private static PrintStream getSystemStream(PrintStream printStream) { - while (printStream instanceof PrintStreamCapture) { + if (printStream instanceof PrintStreamCapture) { return ((PrintStreamCapture) printStream).getParent(); } return printStream; diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java index bdd796624f..f8edb210e8 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java +++ b/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 diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClient.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClient.java index 5fafafda74..23ba2b19ea 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/htmlunit/LocalHostWebClient.java +++ b/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 getPage(String url) - throws IOException, FailingHttpStatusCodeException, MalformedURLException { + public

P getPage(String url) throws IOException, FailingHttpStatusCodeException { if (url.startsWith("/")) { String port = this.environment.getProperty("local.server.port", "8080"); url = "http://localhost:" + port + url; diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java index 70677b568d..3c1b94152a 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListenerTests.java +++ b/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"); } From b65ba6098019c5dc0526472f42bd2780471d5113 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 1 Oct 2019 22:07:36 -0700 Subject: [PATCH 2/2] Polish 'Simplify some code' See gh-18438 --- .../OverrideAutoConfigurationContextCustomizerFactory.java | 2 +- .../filter/TypeExcludeFiltersContextCustomizer.java | 4 ++-- .../properties/PropertyMappingContextCustomizer.java | 4 ++-- .../test/context/filter/ExcludeFilterContextCustomizer.java | 5 +---- .../json/DuplicateJsonObjectContextCustomizerFactory.java | 2 +- .../org/springframework/boot/test/system/OutputCapture.java | 4 ++-- .../test/web/client/TestRestTemplateContextCustomizer.java | 2 +- .../web/reactive/server/WebTestClientContextCustomizer.java | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java index 30ffb63b7e..ab9652cbfb 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java +++ b/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 diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java index 5872a7b912..09f9d1987d 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFiltersContextCustomizer.java +++ b/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 diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java index ac62c80a80..03a5911fb0 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/PropertyMappingContextCustomizer.java +++ b/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 diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java index fb9fa3110f..6b1139ac30 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/filter/ExcludeFilterContextCustomizer.java @@ -37,10 +37,7 @@ class ExcludeFilterContextCustomizer implements ContextCustomizer { @Override public boolean equals(Object obj) { - if (obj == this) { - return true; - } - return obj != null && getClass() == obj.getClass(); + return (obj != null) && (getClass() == obj.getClass()); } @Override diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java index b6245fd04e..785d24f401 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java @@ -80,7 +80,7 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa @Override public boolean equals(Object obj) { - return obj != null && obj.getClass() == getClass(); + return (obj != null) && (getClass() == obj.getClass()); } @Override diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java index 8af6dcd647..f35a610df8 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCapture.java @@ -208,8 +208,8 @@ class OutputCapture implements CapturedOutput { } private static PrintStream getSystemStream(PrintStream printStream) { - if (printStream instanceof PrintStreamCapture) { - return ((PrintStreamCapture) printStream).getParent(); + while (printStream instanceof PrintStreamCapture) { + printStream = ((PrintStreamCapture) printStream).getParent(); } return printStream; } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java index f8edb210e8..5d7c7b1a05 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java @@ -78,7 +78,7 @@ class TestRestTemplateContextCustomizer implements ContextCustomizer { @Override public boolean equals(Object obj) { - return obj != null && obj.getClass() == getClass(); + return (obj != null) && (obj.getClass() == getClass()); } @Override diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizer.java index 9d63e0973b..c2ab1dde7f 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/server/WebTestClientContextCustomizer.java +++ b/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