Skip to content

Commit 08f0395

Browse files
rstoyanchevrstoyanchev
committed
Rename Reactor support classes
This change modifies the names of the Reactor support classes in order to align with the same changes in the 4.0.x line which now supports both Reactor 1.1 and 1.0. Issue: SPR-11636
1 parent 9353332 commit 08f0395

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCodec.java‎ renamed to ‎spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/Reactor11StompCodec.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Rossen Stoyanchev
3434
* @since 4.0
3535
*/
36-
public class StompCodec implements Codec<Buffer, Message<byte[]>, Message<byte[]>> {
36+
public class Reactor11StompCodec implements Codec<Buffer, Message<byte[]>, Message<byte[]>> {
3737

3838
private final StompDecoder stompDecoder;
3939

@@ -42,11 +42,11 @@ public class StompCodec implements Codec<Buffer, Message<byte[]>, Message<byte[]
4242
private final Function<Message<byte[]>, Buffer> encodingFunction;
4343

4444

45-
public StompCodec() {
45+
public Reactor11StompCodec() {
4646
this(new StompEncoder(), new StompDecoder());
4747
}
4848

49-
public StompCodec(StompEncoder encoder, StompDecoder decoder) {
49+
public Reactor11StompCodec(StompEncoder encoder, StompDecoder decoder) {
5050
Assert.notNull(encoder, "'encoder' is required");
5151
Assert.notNull(decoder, "'decoder' is required");
5252
this.stompEncoder = encoder;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.messaging.tcp.TcpConnection;
3636
import org.springframework.messaging.tcp.TcpConnectionHandler;
3737
import org.springframework.messaging.tcp.TcpOperations;
38-
import org.springframework.messaging.tcp.reactor.ReactorTcpClient;
38+
import org.springframework.messaging.tcp.reactor.Reactor11TcpClient;
3939
import org.springframework.util.Assert;
4040
import org.springframework.util.concurrent.ListenableFuture;
4141
import org.springframework.util.concurrent.ListenableFutureCallback;
@@ -311,7 +311,7 @@ public String getVirtualHost() {
311311

312312
/**
313313
* Configure a TCP client for managing TCP connections to the STOMP broker.
314-
* By default {@link org.springframework.messaging.tcp.reactor.ReactorTcpClient} is used.
314+
* By default {@link org.springframework.messaging.tcp.reactor.Reactor11TcpClient} is used.
315315
*/
316316
public void setTcpClient(TcpOperations<byte[]> tcpClient) {
317317
this.tcpClient = tcpClient;
@@ -354,7 +354,7 @@ protected void startInternal() {
354354
if (this.tcpClient == null) {
355355
StompDecoder decoder = new StompDecoder();
356356
decoder.setHeaderInitializer(getHeaderInitializer());
357-
StompCodec codec = new StompCodec(new StompEncoder(), decoder);
357+
Reactor11StompCodec codec = new Reactor11StompCodec(new StompEncoder(), decoder);
358358
this.tcpClient = new StompTcpClientFactory().create(this.relayHost, this.relayPort, codec);
359359
}
360360

@@ -838,8 +838,8 @@ public ListenableFuture<Void> forward(Message<?> message, StompHeaderAccessor he
838838

839839
private static class StompTcpClientFactory {
840840

841-
public TcpOperations<byte[]> create(String relayHost, int relayPort, StompCodec codec) {
842-
return new ReactorTcpClient<byte[]>(relayHost, relayPort, codec);
841+
public TcpOperations<byte[]> create(String relayHost, int relayPort, Reactor11StompCodec codec) {
842+
return new Reactor11TcpClient<byte[]>(relayHost, relayPort, codec);
843843
}
844844
}
845845

‎spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorTcpClient.java‎ renamed to ‎spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
* @author Rossen Stoyanchev
5656
* @since 4.0
5757
*/
58-
public class ReactorTcpClient<P> implements TcpOperations<P> {
58+
public class Reactor11TcpClient<P> implements TcpOperations<P> {
5959

6060
public static final Class<NettyTcpClient> REACTOR_TCP_CLIENT_TYPE = NettyTcpClient.class;
6161

@@ -77,7 +77,7 @@ public class ReactorTcpClient<P> implements TcpOperations<P> {
7777
* @param port the port to connect to
7878
* @param codec the codec to use for encoding and decoding the TCP stream
7979
*/
80-
public ReactorTcpClient(String host, int port, Codec<Buffer, Message<P>, Message<P>> codec) {
80+
public Reactor11TcpClient(String host, int port, Codec<Buffer, Message<P>, Message<P>> codec) {
8181

8282
// Revisit in 1.1: is Environment still required w/ sync dispatcher?
8383
this.environment = new Environment(new SynchronousDispatcherConfigReader());
@@ -98,7 +98,7 @@ public ReactorTcpClient(String host, int port, Codec<Buffer, Message<P>, Message
9898
*
9999
* @param tcpClient the TcpClient to use
100100
*/
101-
public ReactorTcpClient(TcpClient<Message<P>, Message<P>> tcpClient) {
101+
public Reactor11TcpClient(TcpClient<Message<P>, Message<P>> tcpClient) {
102102
Assert.notNull(tcpClient, "'tcpClient' must not be null");
103103
this.tcpClient = tcpClient;
104104
this.environment = null;
@@ -178,7 +178,7 @@ public void run() {
178178
connectionHandler.afterConnectionClosed();
179179
}
180180
});
181-
connectionHandler.afterConnected(new ReactorTcpConnection<P>(connection));
181+
connectionHandler.afterConnected(new Reactor11TcpConnection<P>(connection));
182182
}
183183
});
184184
}

‎spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorTcpConnection.java‎ renamed to ‎spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpConnection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
*
3434
* @author Rossen Stoyanchev
3535
*/
36-
public class ReactorTcpConnection<P> implements TcpConnection<P> {
36+
public class Reactor11TcpConnection<P> implements TcpConnection<P> {
3737

3838
private final NetChannel<Message<P>, Message<P>> channel;
3939

4040

41-
public ReactorTcpConnection(NetChannel<Message<P>, Message<P>> connection) {
41+
public Reactor11TcpConnection(NetChannel<Message<P>, Message<P>> connection) {
4242
this.channel = connection;
4343
}
4444

‎spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
import static org.junit.Assert.*;
3434

3535
/**
36-
* Test fixture for {@link StompCodec}.
36+
* Test fixture for {@link Reactor11StompCodec}.
3737
*
3838
* @author Andy Wilkinson
3939
*/
4040
public class StompCodecTests {
4141

4242
private final ArgumentCapturingConsumer<Message<byte[]>> consumer = new ArgumentCapturingConsumer<Message<byte[]>>();
4343

44-
private final Function<Buffer, Message<byte[]>> decoder = new StompCodec().decoder(consumer);
44+
private final Function<Buffer, Message<byte[]>> decoder = new Reactor11StompCodec().decoder(consumer);
4545

4646
@Test
4747
public void decodeFrameWithCrLfEols() {
@@ -176,7 +176,7 @@ public void decodeMultipleFramesFromSameBuffer() {
176176
Buffer buffer = Buffer.wrap(frame1 + frame2);
177177

178178
final List<Message<byte[]>> messages = new ArrayList<Message<byte[]>>();
179-
new StompCodec().decoder(new Consumer<Message<byte[]>>() {
179+
new Reactor11StompCodec().decoder(new Consumer<Message<byte[]>>() {
180180
@Override
181181
public void accept(Message<byte[]> message) {
182182
messages.add(message);
@@ -234,7 +234,7 @@ public void decodeHeartbeat() {
234234
Buffer buffer = Buffer.wrap(frame);
235235

236236
final List<Message<byte[]>> messages = new ArrayList<Message<byte[]>>();
237-
new StompCodec().decoder(new Consumer<Message<byte[]>>() {
237+
new Reactor11StompCodec().decoder(new Consumer<Message<byte[]>>() {
238238
@Override
239239
public void accept(Message<byte[]> message) {
240240
messages.add(message);
@@ -251,7 +251,7 @@ public void encodeFrameWithNoHeadersAndNoBody() {
251251

252252
Message<byte[]> frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders());
253253

254-
assertEquals("DISCONNECT\n\n\0", new StompCodec().encoder().apply(frame).asString());
254+
assertEquals("DISCONNECT\n\n\0", new Reactor11StompCodec().encoder().apply(frame).asString());
255255
}
256256

257257
@Test
@@ -262,7 +262,7 @@ public void encodeFrameWithHeaders() {
262262

263263
Message<byte[]> frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders());
264264

265-
String frameString = new StompCodec().encoder().apply(frame).asString();
265+
String frameString = new Reactor11StompCodec().encoder().apply(frame).asString();
266266

267267
assertTrue(frameString.equals("CONNECT\naccept-version:1.2\nhost:github.org\n\n\0") ||
268268
frameString.equals("CONNECT\nhost:github.org\naccept-version:1.2\n\n\0"));
@@ -276,7 +276,7 @@ public void encodeFrameWithHeadersThatShouldBeEscaped() {
276276
Message<byte[]> frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders());
277277

278278
assertEquals("DISCONNECT\na\\c\\r\\n\\\\b:alpha\\cbravo\\r\\n\\\\\n\n\0",
279-
new StompCodec().encoder().apply(frame).asString());
279+
new Reactor11StompCodec().encoder().apply(frame).asString());
280280
}
281281

282282
@Test
@@ -287,7 +287,7 @@ public void encodeFrameWithHeadersBody() {
287287
Message<byte[]> frame = MessageBuilder.createMessage("Message body".getBytes(), headers.getMessageHeaders());
288288

289289
assertEquals("SEND\na:alpha\ncontent-length:12\n\nMessage body\0",
290-
new StompCodec().encoder().apply(frame).asString());
290+
new Reactor11StompCodec().encoder().apply(frame).asString());
291291
}
292292

293293
private void assertIncompleteDecode(String partialFrame) {

0 commit comments

Comments
 (0)