diff --git a/spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java index 7eee45192e..d382f7bd40 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/MessageHandler.java +++ b/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 { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/ReactiveMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/ReactiveMessageHandler.java index 32c1d50e9e..13dbcaafc6 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/ReactiveMessageHandler.java +++ b/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 { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java index 23c61faaaa..7bd3e92b7c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/CompositeMessageCondition.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java index a50d38e377..313a8ba1f3 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/HeaderMethodArgumentResolver.java +++ b/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 */ diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java index 7bdad79d5a..529e0bf056 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/MessageMappingMessageHandler.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java index e6885e21ad..72f2900ee7 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/reactive/PayloadMethodArgumentResolver.java +++ b/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> 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(); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractEncoderMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractEncoderMethodReturnValueHandler.java index 28387c292d..bf6317054a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractEncoderMethodReturnValueHandler.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java index f4231151f0..c4059dfb72 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/AbstractMethodMessageHandler.java +++ b/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 * 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 * 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 * @param destination the destination * @param message the message */ - @Nullable protected void handleNoMatch(@Nullable String destination, Message message) { logger.debug("No handlers for destination '" + destination + "'"); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ArgumentResolverConfigurer.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ArgumentResolverConfigurer.java index 41c2fe77b9..313bffeb5c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ArgumentResolverConfigurer.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver.java index 8edf9be8a9..3e232e8ff0 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/HandlerMethodArgumentResolver.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java index 84e5e766e4..b98795dc25 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ReturnValueHandlerConfigurer.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ReturnValueHandlerConfigurer.java index c466162635..a152d09687 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/ReturnValueHandlerConfigurer.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/SyncHandlerMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/SyncHandlerMethodArgumentResolver.java index 01727c43de..4d7ab76a4a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/SyncHandlerMethodArgumentResolver.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java index c59e99386f..aea6b2c0d4 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequester.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketStrategies.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketStrategies.java index a2a12293e9..747f9ca279 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketStrategies.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java index 7ff4ec20ba..6abdd360e7 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessageHandlerAcceptor.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java index a941566904..c093a0e8d2 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/MessagingRSocket.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/PayloadUtils.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/PayloadUtils.java index ee25110161..25f69c0ff8 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/PayloadUtils.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java index 3e038598ac..d986192eba 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketMessageHandler.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketPayloadReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketPayloadReturnValueHandler.java index 4c671c4e13..d129aa6400 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketPayloadReturnValueHandler.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java index 968f0e693d..301f53bd76 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequesterMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequesterMethodArgumentResolver.java index 36fc075e46..3a16b94f12 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequesterMethodArgumentResolver.java +++ b/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 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(); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketStrategies.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketStrategies.java index 7d6f64f560..c24637938c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketStrategies.java +++ b/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; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java index 9bb80c8786..cabbf20d62 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java +++ b/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. diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java index 13c3693f72..4a3c3bdccd 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java +++ b/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 savedPayloadFlux; - void setPayloadMonoToReturn(Mono payloadMonoToReturn) { this.payloadMonoToReturn = payloadMonoToReturn; } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/FireAndForgetCountingInterceptor.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/FireAndForgetCountingInterceptor.java index 72a5d5906b..7524417214 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/FireAndForgetCountingInterceptor.java +++ b/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(); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java index f12656ed1b..86c12f754b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java +++ b/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 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 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 payloads = ReplayProcessor.create(); - PayloadSavingDecorator(RSocket delegate) { this.delegate = delegate; } - ReplayProcessor 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; } } + } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java index 0e3b65a15c..318335b43b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java +++ b/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 fireForgetPayloads = ReplayProcessor.create(); - @MessageMapping("receive") void receive(String payload) { this.fireForgetPayloads.onNext(payload); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java index e55ef09820..ed47f44d00 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java +++ b/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 fireForgetPayloads = ReplayProcessor.create(); - @MessageMapping("receive") void receive(String payload) { this.fireForgetPayloads.onNext(payload); diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java index e22f4457a3..a5a53391bc 100644 --- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java +++ b/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;