From 8cea9ca96213aaa1c35bd755cb82b6265cda79ad Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 13 Jun 2013 11:21:01 +0100 Subject: [PATCH] Correct the Assert imports Import org.springframework.util.Assert rather than reactor.util.Assert --- .../service/method/MessageChannelArgumentResolver.java | 3 +-- .../messaging/service/method/MessageReturnValueHandler.java | 3 +-- .../org/springframework/web/messaging/stomp/StompHeaders.java | 3 +-- .../stomp/support/StompRelayPubSubMessageHandler.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java b/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java index eef9075eee4..33518f33431 100644 --- a/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java +++ b/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java @@ -20,10 +20,9 @@ import org.springframework.core.MethodParameter; import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import org.springframework.util.Assert; import org.springframework.web.messaging.PubSubHeaders; -import reactor.util.Assert; - /** * @author Rossen Stoyanchev diff --git a/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java b/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java index 73143687712..6e607040ddb 100644 --- a/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java @@ -20,10 +20,9 @@ import org.springframework.core.MethodParameter; import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import org.springframework.util.Assert; import org.springframework.web.messaging.PubSubHeaders; -import reactor.util.Assert; - /** * @author Rossen Stoyanchev diff --git a/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java b/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java index 138981b9fab..3adcc1318bb 100644 --- a/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java +++ b/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java @@ -26,14 +26,13 @@ import java.util.concurrent.atomic.AtomicLong; import org.springframework.http.MediaType; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; +import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; import org.springframework.web.messaging.PubSubHeaders; -import reactor.util.Assert; - /** * Can be used to prepare headers for a new STOMP message, or to access and/or modify diff --git a/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java b/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java index 4bc925d3df4..4807fbc2192 100644 --- a/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java @@ -36,6 +36,7 @@ import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; +import org.springframework.util.Assert; import org.springframework.web.messaging.MessageType; import org.springframework.web.messaging.converter.CompositeMessageConverter; import org.springframework.web.messaging.converter.MessageConverter; @@ -43,8 +44,6 @@ import org.springframework.web.messaging.service.AbstractPubSubMessageHandler; import org.springframework.web.messaging.stomp.StompCommand; import org.springframework.web.messaging.stomp.StompHeaders; -import reactor.util.Assert; - /** * @author Rossen Stoyanchev