Skip to content

Commit ebcee11

Browse files
committed
refactored ReactiveSocketImpl to DefaultReactiveSocket
1 parent 9e2471e commit ebcee11

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/main/java/io/reactivesocket/ReactiveSocketImpl.java renamed to src/main/java/io/reactivesocket/DefaultReactiveSocket.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/**
3838
* An implementation of {@link ReactiveSocket}
3939
*/
40-
public class ReactiveSocketImpl implements ReactiveSocket {
40+
public class DefaultReactiveSocket implements ReactiveSocket {
4141
private static final RequestHandler EMPTY_HANDLER = new RequestHandler.Builder().build();
4242

4343
private static final Consumer<Throwable> DEFAULT_ERROR_STREAM = t -> {
@@ -56,7 +56,7 @@ public class ReactiveSocketImpl implements ReactiveSocket {
5656
private final ConnectionSetupHandler responderConnectionHandler;
5757
private final LeaseGovernor leaseGovernor;
5858

59-
private ReactiveSocketImpl(
59+
private DefaultReactiveSocket(
6060
DuplexConnection connection,
6161
boolean isServer,
6262
ConnectionSetupPayload serverRequestorSetupPayload,
@@ -112,7 +112,7 @@ public static ReactiveSocket fromClientConnection(
112112
}
113113
final RequestHandler h = handler != null ? handler : EMPTY_HANDLER;
114114
Consumer<Throwable> es = errorStream != null ? errorStream : DEFAULT_ERROR_STREAM;
115-
return new ReactiveSocketImpl(connection, false, setup, h, null, NULL_LEASE_GOVERNOR, es);
115+
return new DefaultReactiveSocket(connection, false, setup, h, null, NULL_LEASE_GOVERNOR, es);
116116
}
117117

118118
/**
@@ -172,7 +172,7 @@ public static ReactiveSocket fromServerConnection(
172172
LeaseGovernor leaseGovernor,
173173
Consumer<Throwable> errorConsumer
174174
) {
175-
return new ReactiveSocketImpl(connection, true, null, null, connectionHandler,
175+
return new DefaultReactiveSocket(connection, true, null, null, connectionHandler,
176176
leaseGovernor, errorConsumer);
177177
}
178178

src/perf/java/io/reactivesocket/ReactiveSocketPerf.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ public Publisher<Void> handleMetadataPush(Payload payload)
132132
}
133133
};
134134

135-
final static ReactiveSocket serverSocket = ReactiveSocketImpl.fromServerConnection(serverConnection, setupFrame -> handler);
135+
final static ReactiveSocket serverSocket = DefaultReactiveSocket.fromServerConnection(serverConnection, setupFrame -> handler);
136136

137137
final static ReactiveSocket client =
138-
ReactiveSocketImpl.fromClientConnection(
138+
DefaultReactiveSocket.fromClientConnection(
139139
clientConnection, ConnectionSetupPayload.create("UTF-8", "UTF-8", ConnectionSetupPayload.NO_FLAGS), t -> {});
140140

141141
static {

src/test/java/io/reactivesocket/LeaseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void setup() throws InterruptedException {
8080
clientConnection.connectToServerConnection(serverConnection);
8181
leaseGovernor = new TestingLeaseGovernor();
8282

83-
socketServer = ReactiveSocketImpl.fromServerConnection(
83+
socketServer = DefaultReactiveSocket.fromServerConnection(
8484
serverConnection, setup -> new RequestHandler() {
8585

8686
@Override
@@ -127,7 +127,7 @@ public Publisher<Void> handleMetadataPush(Payload payload) {
127127
}
128128
}, leaseGovernor, t -> {});
129129

130-
socketClient = ReactiveSocketImpl.fromClientConnection(
130+
socketClient = DefaultReactiveSocket.fromClientConnection(
131131
clientConnection,
132132
ConnectionSetupPayload.create("UTF-8", "UTF-8", HONOR_LEASE)
133133
);

src/test/java/io/reactivesocket/ReactiveSocketTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void setup() {
6464
fireAndForgetOrMetadataPush = new CountDownLatch(1);
6565
lastServerErrorCountDown = new CountDownLatch(1);
6666

67-
socketServer = ReactiveSocketImpl.fromServerConnection(serverConnection, setup -> new RequestHandler() {
67+
socketServer = DefaultReactiveSocket.fromServerConnection(serverConnection, setup -> new RequestHandler() {
6868

6969
@Override
7070
public Publisher<Payload> handleRequestResponse(Payload payload) {
@@ -205,7 +205,7 @@ private void startSockets(int setupFlag, RequestHandler handler) throws Interrup
205205
} else if (setupFlag == HONOR_LEASE) {
206206
System.out.println("Reactivesocket configured with: HONOR_LEASE");
207207
}
208-
socketClient = ReactiveSocketImpl.fromClientConnection(
208+
socketClient = DefaultReactiveSocket.fromClientConnection(
209209
clientConnection,
210210
ConnectionSetupPayload.create("UTF-8", "UTF-8", setupFlag),
211211
handler,
@@ -264,7 +264,7 @@ public void testRequestResponse(int setupFlag) throws InterruptedException {
264264

265265
@Test(timeout=2000, expected=IllegalStateException.class)
266266
public void testRequestResponsePremature() throws InterruptedException {
267-
socketClient = ReactiveSocketImpl.fromClientConnection(
267+
socketClient = DefaultReactiveSocket.fromClientConnection(
268268
clientConnection,
269269
ConnectionSetupPayload.create("UTF-8", "UTF-8", NO_FLAGS),
270270
err -> err.printStackTrace()

src/test/java/io/reactivesocket/TestFlowControlRequestN.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public static void setup() throws InterruptedException {
315315
clientConnection.connectToServerConnection(serverConnection, false);
316316

317317

318-
socketServer = ReactiveSocketImpl.fromServerConnection(serverConnection, setup -> new RequestHandler() {
318+
socketServer = DefaultReactiveSocket.fromServerConnection(serverConnection, setup -> new RequestHandler() {
319319

320320
@Override
321321
public Publisher<Payload> handleRequestStream(Payload payload) {
@@ -440,7 +440,7 @@ public Publisher<Void> handleMetadataPush(Payload payload)
440440
}
441441
}, LeaseGovernor.UNLIMITED_LEASE_GOVERNOR, Throwable::printStackTrace);
442442

443-
socketClient = ReactiveSocketImpl.fromClientConnection(
443+
socketClient = DefaultReactiveSocket.fromClientConnection(
444444
clientConnection,
445445
ConnectionSetupPayload.create("UTF-8", "UTF-8", NO_FLAGS),
446446
Throwable::printStackTrace

src/test/java/io/reactivesocket/TestTransportRequestN.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void setup(TestConnectionWithControlledRequestN clientConnection, TestCon
172172
clientConnection.connectToServerConnection(serverConnection, false);
173173
lastServerErrorCountDown = new CountDownLatch(1);
174174

175-
socketServer = ReactiveSocketImpl.fromServerConnection(serverConnection, setup -> new RequestHandler() {
175+
socketServer = DefaultReactiveSocket.fromServerConnection(serverConnection, setup -> new RequestHandler() {
176176

177177
@Override
178178
public Publisher<Payload> handleRequestResponse(Payload payload) {
@@ -218,7 +218,7 @@ public Publisher<Void> handleMetadataPush(Payload payload) {
218218
lastServerErrorCountDown.countDown();
219219
});
220220

221-
socketClient = ReactiveSocketImpl.fromClientConnection(
221+
socketClient = DefaultReactiveSocket.fromClientConnection(
222222
clientConnection,
223223
ConnectionSetupPayload.create("UTF-8", "UTF-8", ConnectionSetupPayload.NO_FLAGS),
224224
err -> err.printStackTrace());

0 commit comments

Comments
 (0)