Harmonize code format

Closes gh-1496

Author: snicoll

spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java

@@ -218,12 +218,12 @@ public CloseableHttpClient getObject() throws Exception {
 
 		applyMaxConnectionsPerHost(this.connectionManager);
 
-		RequestConfig.Builder requestConfigBuilder = RequestConfig.custom() //
-			.setConnectTimeout(Timeout.of(this.connectionTimeout)) //
+		RequestConfig.Builder requestConfigBuilder = RequestConfig.custom()
+			.setConnectTimeout(Timeout.of(this.connectionTimeout))
 			.setResponseTimeout(Timeout.of(this.readTimeout));
 
-		HttpClientBuilder httpClientBuilder = HttpClientBuilder.create() //
-			.setDefaultRequestConfig(requestConfigBuilder.build()) //
+		HttpClientBuilder httpClientBuilder = HttpClientBuilder.create()
+			.setDefaultRequestConfig(requestConfigBuilder.build())
 			.setConnectionManager(this.connectionManager);
 
 		if (this.credentials != null && this.authScope != null) {

spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5Connection.java

@@ -181,17 +181,13 @@ protected InputStream getRawResponseInputStream() throws IOException {
 	@Override
 	public Iterator<String> 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<String> 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();
 	}
 
 }

spring-ws-core/src/main/java/org/springframework/ws/transport/http/JdkHttpClientConnection.java

@@ -126,9 +126,7 @@ protected long getResponseContentLength() throws IOException {
 
 		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;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java

@@ -40,8 +40,7 @@ protected AbstractPayloadSourceMethodProcessor createProcessor() {
 	@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 @@ protected MethodParameter[] createSupportedParameters() throws NoSuchMethodExcep
 	@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),

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java

@@ -205,12 +205,9 @@ public void resolveNamespacesClass() throws Exception {
 	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) {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java

@@ -156,8 +156,7 @@ public void doIt(@RequestPayload Source payload) {
 			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() {
 		}

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java

@@ -58,9 +58,9 @@ protected void assertXMLSimilar(SaajSoapMessage expected, SaajSoapMessage result
 		Document resultDocument = result.getSaajMessage().getSOAPPart();
 
 		XmlAssert.assertThat(resultDocument)
-			.and(expectedDocument) //
-			.ignoreWhitespace() //
-			.ignoreChildNodesOrder() //
+			.and(expectedDocument)
+			.ignoreWhitespace()
+			.ignoreChildNodesOrder()
 			.areSimilar();
 	}
 
@@ -69,10 +69,7 @@ protected void assertXMLNotSimilar(SaajSoapMessage expected, SaajSoapMessage res
 		Document expectedDocument = expected.getSaajMessage().getSOAPPart();
 		Document resultDocument = result.getSaajMessage().getSOAPPart();
 
-		XmlAssert.assertThat(resultDocument)
-			.and(expectedDocument) //
-			.ignoreWhitespace() //
-			.areNotSimilar();
+		XmlAssert.assertThat(resultDocument).and(expectedDocument).ignoreWhitespace().areNotSimilar();
 	}
 
 }

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java

@@ -33,9 +33,9 @@ protected HttpComponents5MessageSender createMessageSender() {
 			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);

spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcher.java

@@ -67,12 +67,12 @@ protected Diff createDiff(Source payload) {
 		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();
 	}
 

spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java

@@ -85,21 +85,15 @@ public void testInlineComplex() throws Exception {
 		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);
 		expected = this.documentBuilder.parse(SaxUtils.createInputSource(cd));
 		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