diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractBrokerRegistration.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractBrokerRegistration.java index 0a3e765c6b..666c5fd0a7 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractBrokerRegistration.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractBrokerRegistration.java @@ -22,9 +22,7 @@ import java.util.Collections; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.simp.handler.AbstractBrokerMessageHandler; - -import reactor.util.Assert; - +import org.springframework.util.Assert; /** * Base class for message broker registration classes. diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java index 04cee592e0..51c5bfe681 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java @@ -21,9 +21,7 @@ import java.util.Collection; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.simp.handler.AbstractBrokerMessageHandler; - -import reactor.util.Assert; - +import org.springframework.util.Assert; /** * A helper class for configuring message broker options. diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistry.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistry.java index 17f242d9b2..70940105ea 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistry.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultSubscriptionRegistry.java @@ -26,12 +26,10 @@ import java.util.concurrent.CopyOnWriteArraySet; import org.springframework.messaging.Message; import org.springframework.util.AntPathMatcher; +import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import reactor.util.Assert; - - /** * @author Rossen Stoyanchev * @since 4.0 diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java index 60d5e045e6..8793d1950d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java @@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; + import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.messaging.Message; @@ -38,13 +39,11 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.simp.BrokerAvailabilityEvent; import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.channel.ExecutorSubscribableChannel; +import org.springframework.util.Assert; import org.springframework.util.SocketUtils; -import reactor.util.Assert; - import static org.junit.Assert.*; - /** * @author Rossen Stoyanchev */