Consistent formatting and related polishing

spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 package org.springframework.messaging;
 
 /**
- * Contract for handling a {@link Message}.
+ * Simple contract for handling a {@link Message}.
  *
  * @author Mark Fisher
  * @author Iwein Fuld
  * @since 4.0
+ * @see ReactiveMessageHandler
  */
 @FunctionalInterface
 public interface MessageHandler {

spring-messaging/src/main/java/org/springframework/messaging/ReactiveMessageHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging;
 
 import reactor.core.publisher.Mono;
@@ -22,6 +23,7 @@ import reactor.core.publisher.Mono;
  *
  * @author Rossen Stoyanchev
  * @since 5.2
+ * @see MessageHandler
  */
 @FunctionalInterface
 public interface ReactiveMessageHandler {

spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler;
 
 import java.util.ArrayList;

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java

@@ -39,7 +39,6 @@ import org.springframework.util.Assert;
  *
  * @author Rossen Stoyanchev
  * @since 5.2
- *
  * @see HeadersMethodArgumentResolver
  * @see NativeMessageHeaderAccessor
  */

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation.support.reactive;
 
 import java.lang.reflect.AnnotatedElement;

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.annotation.support.reactive;
 
 import java.lang.annotation.Annotation;
@@ -90,7 +91,7 @@ public class PayloadMethodArgumentResolver implements HandlerMethodArgumentResol
 	public PayloadMethodArgumentResolver(List<? extends Decoder<?>> decoders, @Nullable Validator validator,
 			@Nullable ReactiveAdapterRegistry registry, boolean useDefaultResolution) {
 
-		Assert.isTrue(!CollectionUtils.isEmpty(decoders), "At least one Decoder is required.");
+		Assert.isTrue(!CollectionUtils.isEmpty(decoders), "At least one Decoder is required");
 		this.decoders = Collections.unmodifiableList(new ArrayList<>(decoders));
 		this.validator = validator;
 		this.adapterRegistry = registry != null ? registry : ReactiveAdapterRegistry.getSharedInstance();

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractEncoderMethodReturnValueHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.Collections;

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.lang.reflect.Method;
@@ -102,7 +103,7 @@ public abstract class AbstractMethodMessageHandler<T>
 	 * Configure custom resolvers for handler method arguments.
 	 */
 	public void setArgumentResolverConfigurer(ArgumentResolverConfigurer configurer) {
-		Assert.notNull(configurer, "HandlerMethodArgumentResolver is required.");
+		Assert.notNull(configurer, "HandlerMethodArgumentResolver is required");
 		this.argumentResolverConfigurer = configurer;
 	}
 
@@ -117,7 +118,7 @@ public abstract class AbstractMethodMessageHandler<T>
 	 * Configure custom return value handlers for handler metohds.
 	 */
 	public void setReturnValueHandlerConfigurer(ReturnValueHandlerConfigurer configurer) {
-		Assert.notNull(configurer, "ReturnValueHandlerConfigurer is required.");
+		Assert.notNull(configurer, "ReturnValueHandlerConfigurer is required");
 		this.returnValueHandlerConfigurer = configurer;
 	}
 
@@ -450,7 +451,6 @@ public abstract class AbstractMethodMessageHandler<T>
 	 * @param destination the destination
 	 * @param message the message
 	 */
-	@Nullable
 	protected void handleNoMatch(@Nullable String destination, Message<?> message) {
 		logger.debug("No handlers for destination '" + destination + "'");
 	}

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ArgumentResolverConfigurer.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.ArrayList;

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import reactor.core.publisher.Mono;

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.lang.reflect.Method;

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ReturnValueHandlerConfigurer.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import java.util.ArrayList;

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/SyncHandlerMethodArgumentResolver.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.handler.invocation.reactive;
 
 import reactor.core.publisher.Mono;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.nio.charset.StandardCharsets;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketStrategies.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.ArrayList;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.function.Function;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.concurrent.atomic.AtomicBoolean;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/PayloadUtils.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import io.netty.buffer.ByteBuf;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.ArrayList;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketPayloadReturnValueHandler.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.List;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import io.rsocket.RSocket;

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequesterMethodArgumentResolver.java

@@ -43,16 +43,15 @@ public class RSocketRequesterMethodArgumentResolver implements HandlerMethodArgu
 	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		Class<?> type = parameter.getParameterType();
-		return RSocketRequester.class.equals(type) || RSocket.class.isAssignableFrom(type);
+		return (RSocketRequester.class.equals(type) || RSocket.class.isAssignableFrom(type));
 	}
 
 	@Override
 	public Mono<Object> resolveArgument(MethodParameter parameter, Message<?> message) {
-
 		Object headerValue = message.getHeaders().get(RSOCKET_REQUESTER_HEADER);
 		Assert.notNull(headerValue, "Missing '" + RSOCKET_REQUESTER_HEADER + "'");
-		Assert.isInstanceOf(RSocketRequester.class, headerValue, "Expected header value of type RSocketRequester");
 
+		Assert.isInstanceOf(RSocketRequester.class, headerValue, "Expected header value of type RSocketRequester");
 		RSocketRequester requester = (RSocketRequester) headerValue;
 
 		Class<?> type = parameter.getParameterType();

spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketStrategies.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.List;

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.nio.charset.StandardCharsets;
@@ -212,7 +213,6 @@ public class DefaultRSocketRequesterTests {
 		@Nullable private volatile Payload savedPayload;
 		@Nullable private volatile Flux<Payload> savedPayloadFlux;
 
-
 		void setPayloadMonoToReturn(Mono<Payload> payloadMonoToReturn) {
 			this.payloadMonoToReturn = payloadMonoToReturn;
 		}

spring-messaging/src/test/java/org/springframework/messaging/rsocket/FireAndForgetCountingInterceptor.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.util.List;
@@ -59,12 +60,10 @@ class FireAndForgetCountingInterceptor extends AbstractRSocket implements RSocke
 
 		private final AtomicInteger fireAndForget = new AtomicInteger(0);
 
-
 		CountingDecorator(RSocket delegate) {
 			super(delegate);
 		}
 
-
 		public int getFireAndForgetCount() {
 			return this.fireAndForget.get();
 		}

spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;
@@ -85,7 +86,6 @@ public class RSocketBufferLeakTests {
 	@BeforeClass
 	@SuppressWarnings("ConstantConditions")
 	public static void setupOnce() {
-
 		context = new AnnotationConfigApplicationContext(ServerConfig.class);
 
 		server = RSocketFactory.receive()
@@ -246,12 +246,10 @@ public class RSocketBufferLeakTests {
 
 		private final List<DataBufferLeakInfo> created = new ArrayList<>();
 
-
 		LeakAwareNettyDataBufferFactory(ByteBufAllocator byteBufAllocator) {
 			super(byteBufAllocator);
 		}
 
-
 		void checkForLeaks(Duration duration) throws InterruptedException {
 			Instant start = Instant.now();
 			while (true) {
@@ -316,7 +314,6 @@ public class RSocketBufferLeakTests {
 
 		private final AssertionError error;
 
-
 		DataBufferLeakInfo(DataBuffer dataBuffer, AssertionError error) {
 			this.dataBuffer = dataBuffer;
 			this.error = error;
@@ -340,7 +337,6 @@ public class RSocketBufferLeakTests {
 
 		private final List<PayloadSavingDecorator> rsockets = new CopyOnWriteArrayList<>();
 
-
 		void checkForLeaks() {
 			this.rsockets.stream().map(PayloadSavingDecorator::getPayloads)
 					.forEach(payloadInfoProcessor -> {
@@ -377,7 +373,6 @@ public class RSocketBufferLeakTests {
 			this.rsockets.forEach(PayloadSavingDecorator::reset);
 		}
 
-
 		@Override
 		public RSocket apply(RSocket rsocket) {
 			PayloadSavingDecorator decorator = new PayloadSavingDecorator(rsocket);
@@ -392,12 +387,10 @@ public class RSocketBufferLeakTests {
 
 			private ReplayProcessor<PayloadLeakInfo> payloads = ReplayProcessor.create();
 
-
 			PayloadSavingDecorator(RSocket delegate) {
 				this.delegate = delegate;
 			}
 
-
 			ReplayProcessor<PayloadLeakInfo> getPayloads() {
 				return this.payloads;
 			}
@@ -447,13 +440,11 @@ public class RSocketBufferLeakTests {
 
 		private final ReferenceCounted referenceCounted;
 
-
 		PayloadLeakInfo(io.rsocket.Payload payload) {
 			this.description = payload.toString();
 			this.referenceCounted = payload;
 		}
 
-
 		int getReferenceCount() {
 			return this.referenceCounted.refCnt();
 		}
@@ -463,4 +454,5 @@ public class RSocketBufferLeakTests {
 			return this.description;
 		}
 	}
+
 }

spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;
@@ -66,7 +67,6 @@ public class RSocketClientToServerIntegrationTests {
 	@BeforeClass
 	@SuppressWarnings("ConstantConditions")
 	public static void setupOnce() {
-
 		context = new AnnotationConfigApplicationContext(ServerConfig.class);
 
 		server = RSocketFactory.receive()
@@ -97,7 +97,6 @@ public class RSocketClientToServerIntegrationTests {
 
 	@Test
 	public void fireAndForget() {
-
 		Flux.range(1, 3)
 				.concatMap(i -> requester.route("receive").data("Hello " + i).send())
 				.blockLast();
@@ -191,7 +190,6 @@ public class RSocketClientToServerIntegrationTests {
 
 		final ReplayProcessor<String> fireForgetPayloads = ReplayProcessor.create();
 
-
 		@MessageMapping("receive")
 		void receive(String payload) {
 			this.fireForgetPayloads.onNext(payload);

spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.messaging.rsocket;
 
 import java.time.Duration;
@@ -60,7 +61,6 @@ public class RSocketServerToClientIntegrationTests {
 	@BeforeClass
 	@SuppressWarnings("ConstantConditions")
 	public static void setupOnce() {
-
 		context = new AnnotationConfigApplicationContext(RSocketConfig.class);
 
 		server = RSocketFactory.receive()
@@ -215,7 +215,6 @@ public class RSocketServerToClientIntegrationTests {
 
 		final ReplayProcessor<String> fireForgetPayloads = ReplayProcessor.create();
 
-
 		@MessageMapping("receive")
 		void receive(String payload) {
 			this.fireForgetPayloads.onNext(payload);

spring-web/src/main/java/org/springframework/http/HttpHeaders.java

@@ -34,7 +34,6 @@ import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;