From 547167e8b440feea5a71cd31df28224b171cf9d3 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 10 Jun 2013 13:59:19 -0400 Subject: [PATCH] Remove remaining Reactor event wrapping --- .../web/messaging/service/PubSubMessageService.java | 4 +--- .../web/messaging/stomp/support/RelayStompService.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/messaging/service/PubSubMessageService.java b/spring-websocket/src/main/java/org/springframework/web/messaging/service/PubSubMessageService.java index 51baa638c2..a1a96c0a9c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/messaging/service/PubSubMessageService.java +++ b/spring-websocket/src/main/java/org/springframework/web/messaging/service/PubSubMessageService.java @@ -31,8 +31,6 @@ import org.springframework.web.messaging.event.EventBus; import org.springframework.web.messaging.event.EventConsumer; import org.springframework.web.messaging.event.EventRegistration; -import reactor.fn.Event; - /** * @author Rossen Stoyanchev @@ -74,7 +72,7 @@ public class PubSubMessageService extends AbstractMessageService { byte[] payload = payloadConverter.convertToPayload(message.getPayload(), contentType); message = new GenericMessage(payload, headers); - getEventBus().send(getPublishKey(message), Event.wrap(message)); + getEventBus().send(getPublishKey(message), message); } catch (Exception ex) { logger.error("Failed to publish " + message, ex); diff --git a/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/RelayStompService.java b/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/RelayStompService.java index 60b4fc0b53..33bbb274a5 100644 --- a/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/RelayStompService.java +++ b/spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/RelayStompService.java @@ -40,7 +40,6 @@ import org.springframework.web.messaging.stomp.StompCommand; import org.springframework.web.messaging.stomp.StompHeaders; import org.springframework.web.messaging.stomp.StompMessage; -import reactor.fn.Event; import reactor.util.Assert; @@ -243,7 +242,7 @@ public class RelayStompService extends AbstractMessageService { StompHeaders headers = new StompHeaders(); headers.setMessage(message); StompMessage errorMessage = new StompMessage(StompCommand.ERROR, headers); - getEventBus().send(this.replyTo, Event.wrap(errorMessage)); + getEventBus().send(this.replyTo, errorMessage); } }