From eeccbce5b8675a1ef404b286cb782926226d1717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 11 Mar 2025 14:31:03 +0100 Subject: [PATCH] Harmonize code format Closes gh-1496 --- .../transport/http/HttpComponents5ClientFactory.java | 8 ++++---- .../ws/transport/http/HttpComponents5Connection.java | 8 ++------ .../ws/transport/http/JdkHttpClientConnection.java | 4 +--- .../method/SourcePayloadMethodProcessorTest.java | 6 ++---- .../method/XPathParamMethodArgumentResolverTest.java | 9 +++------ ...ayloadRootAnnotationMethodEndpointMappingTest.java | 3 +-- .../ws/soap/addressing/AbstractWsAddressingTest.java | 11 ++++------- .../HttpComponents5ContentTypeIntegrationTest.java | 6 +++--- .../support/matcher/xmlunit2/PayloadDiffMatcher.java | 8 ++++---- .../xsd/commons/CommonsXsdSchemaCollectionTest.java | 10 ++-------- 10 files changed, 26 insertions(+), 47 deletions(-) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java index d156b53b..dd395ef6 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java @@ -218,12 +218,12 @@ public class HttpComponents5ClientFactory implements FactoryBean getResponseHeaderNames() throws IOException { - return Arrays.stream(this.httpResponse.getHeaders()) // - .map(NameValuePair::getName) // - .iterator(); + return Arrays.stream(this.httpResponse.getHeaders()).map(NameValuePair::getName).iterator(); } @Override public Iterator getResponseHeaders(String name) throws IOException { - return Arrays.stream(this.httpResponse.getHeaders(name)) // - .map(NameValuePair::getValue) // - .iterator(); + return Arrays.stream(this.httpResponse.getHeaders(name)).map(NameValuePair::getValue).iterator(); } } diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java index b66425c7..3e433303 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java @@ -126,9 +126,7 @@ public class JdkHttpClientConnection extends AbstractHttpSenderConnection { if (this.response != null) { - return this.response.headers() // - .firstValueAsLong(HttpTransportConstants.HEADER_CONTENT_LENGTH) // - .orElse(-1); + return this.response.headers().firstValueAsLong(HttpTransportConstants.HEADER_CONTENT_LENGTH).orElse(-1); } return 0; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java index 2e9d0f2a..1fb557f7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java @@ -40,8 +40,7 @@ public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProce @Override protected MethodParameter[] createSupportedParameters() throws NoSuchMethodException { - return new MethodParameter[] { // - new MethodParameter(getClass().getMethod("source", Source.class), 0), + return new MethodParameter[] { new MethodParameter(getClass().getMethod("source", Source.class), 0), new MethodParameter(getClass().getMethod("dom", DOMSource.class), 0), new MethodParameter(getClass().getMethod("sax", SAXSource.class), 0), new MethodParameter(getClass().getMethod("stream", StreamSource.class), 0), @@ -51,8 +50,7 @@ public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProce @Override protected MethodParameter[] createSupportedReturnTypes() throws NoSuchMethodException { - return new MethodParameter[] { // - new MethodParameter(getClass().getMethod("source", Source.class), -1), + return new MethodParameter[] { new MethodParameter(getClass().getMethod("source", Source.class), -1), new MethodParameter(getClass().getMethod("dom", DOMSource.class), -1), new MethodParameter(getClass().getMethod("sax", SAXSource.class), -1), new MethodParameter(getClass().getMethod("stream", StreamSource.class), -1), diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java index a755fbff..4f0dcc35 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java @@ -205,12 +205,9 @@ public class XPathParamMethodArgumentResolverTest { public void unsupported(String s) { } - public void supportedTypes( // - @XPathParam("/root/child") boolean param1, // - @XPathParam("/root/child/number") double param2, // - @XPathParam("/root/child") Node param3, // - @XPathParam("/root/*") NodeList param4, // - @XPathParam("/root/child/text") String param5) { + public void supportedTypes(@XPathParam("/root/child") boolean param1, + @XPathParam("/root/child/number") double param2, @XPathParam("/root/child") Node param3, + @XPathParam("/root/*") NodeList param4, @XPathParam("/root/child/text") String param5) { } public void convertedType(@XPathParam("/root/child/number") int param) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java index aa088830..fe7ac16d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java @@ -156,8 +156,7 @@ public class PayloadRootAnnotationMethodEndpointMappingTest { logger.info("In doIt()"); } - @PayloadRoots({ // - @PayloadRoot(localPart = "Request1", namespace = "http://springframework.org/spring-ws"), + @PayloadRoots({ @PayloadRoot(localPart = "Request1", namespace = "http://springframework.org/spring-ws"), @PayloadRoot(localPart = "Request2", namespace = "http://springframework.org/spring-ws") }) public void doItMultiple() { } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java index a71f6536..02aba499 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java @@ -58,9 +58,9 @@ public abstract class AbstractWsAddressingTest { Document resultDocument = result.getSaajMessage().getSOAPPart(); XmlAssert.assertThat(resultDocument) - .and(expectedDocument) // - .ignoreWhitespace() // - .ignoreChildNodesOrder() // + .and(expectedDocument) + .ignoreWhitespace() + .ignoreChildNodesOrder() .areSimilar(); } @@ -69,10 +69,7 @@ public abstract class AbstractWsAddressingTest { Document expectedDocument = expected.getSaajMessage().getSOAPPart(); Document resultDocument = result.getSaajMessage().getSOAPPart(); - XmlAssert.assertThat(resultDocument) - .and(expectedDocument) // - .ignoreWhitespace() // - .areNotSimilar(); + XmlAssert.assertThat(resultDocument).and(expectedDocument).ignoreWhitespace().areNotSimilar(); } } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java index 98fdd502..3e8d82e9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java @@ -33,9 +33,9 @@ class HttpComponents5ContentTypeIntegrationTest return chain.proceed(request, scope); }; - HttpClient client = HttpClientBuilder.create() // - .addRequestInterceptorFirst(new HttpComponents5MessageSender.RemoveSoapHeadersInterceptor()) // - .addExecInterceptorFirst("handler with assertion", testHandler) // + HttpClient client = HttpClientBuilder.create() + .addRequestInterceptorFirst(new HttpComponents5MessageSender.RemoveSoapHeadersInterceptor()) + .addExecInterceptorFirst("handler with assertion", testHandler) .build(); return new HttpComponents5MessageSender(client); diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java index 84e480b6..e3da596b 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java @@ -67,12 +67,12 @@ public class PayloadDiffMatcher extends DiffMatcher { Document expectedDocument = createDocumentFromSource(this.expected); Document actualDocument = createDocumentFromSource(payload); - return DiffBuilder.compare(expectedDocument) // - .withTest(actualDocument) // - .ignoreWhitespace() // + return DiffBuilder.compare(expectedDocument) + .withTest(actualDocument) + .ignoreWhitespace() .withDifferenceEvaluator( DifferenceEvaluators.chain(new PlaceholderDifferenceEvaluator(), DifferenceEvaluators.Default)) - .checkForSimilar() // + .checkForSimilar() .build(); } diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java index 60e4d273..e7141175 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java @@ -85,10 +85,7 @@ public class CommonsXsdSchemaCollectionTest { DOMResult domResult = new DOMResult(); this.transformer.transform(schemas[0].getSource(), domResult); - XmlAssert.assertThat(domResult.getNode()) - .and(expected) // - .ignoreWhitespace() // - .areIdentical(); + XmlAssert.assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areIdentical(); assertThat(schemas[1].getTargetNamespace()).isEqualTo("urn:2"); Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTest.class); @@ -96,10 +93,7 @@ public class CommonsXsdSchemaCollectionTest { domResult = new DOMResult(); this.transformer.transform(schemas[1].getSource(), domResult); - XmlAssert.assertThat(domResult.getNode()) - .and(expected) // - .ignoreWhitespace() // - .areIdentical(); + XmlAssert.assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areIdentical(); } @Test