Skip to content

Commit 973640c

Browse files
steveguryrobertroeser
authored andcommitted
Split reactivesocket-transport-netty into 2 projects. (#91)
* Split reactivesocket-transport-netty into 2 projects. **Problem** `reactivesocket-transport-netty` isn't an implementation of a transport but two "tcp" and "websocket". Furthermore, Netty is an implementation details rather than a transport. **Solution** Split `reactivesocket-transport-netty` into two transport libraries: - `reactivesocket-transport-tcp` - `reactivesocket-transport-websocket` Introduce a common library `reactivesocket-netty` which only contains two classes `MutableDirectByteBuf` and `NettyDuplexConnection` that are used in both transport libraries. **Note** I didn't touch `ReactiveSocketServerHandler` which is discussed in a PR on the old repo. * Get rid of reactivesocket-netty * Move the tests into the right module * Get rid of any common classes
1 parent 3e1e03e commit 973640c

File tree

25 files changed

+45
-40
lines changed

25 files changed

+45
-40
lines changed

reactivesocket-transport-local/src/main/java/io/reactivesocket/local/LocalClientDuplexConnection.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public Observable<Frame> getInput() {
4747

4848
@Override
4949
public void addOutput(Publisher<Frame> o, Completable callback) {
50-
5150
o
5251
.subscribe(new Subscriber<Frame>() {
5352

reactivesocket-transport-netty/src/examples/java/io/reactivesocket/netty/EchoServer.java renamed to reactivesocket-transport-tcp/src/examples/java/io/reactivesocket/transport/tcp/EchoServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.reactivesocket.netty;
1+
package io.reactivesocket.transport.tcp;
22

33
import io.netty.bootstrap.ServerBootstrap;
44
import io.netty.channel.Channel;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.reactivesocket.netty;
1+
package io.reactivesocket.transport.tcp;
22

33
import io.netty.buffer.ByteBuf;
44
import io.netty.channel.ChannelHandlerContext;
@@ -9,7 +9,7 @@
99
import io.netty.handler.codec.http.HttpObjectAggregator;
1010
import io.netty.handler.codec.http.HttpServerCodec;
1111
import io.reactivesocket.RequestHandler;
12-
import io.reactivesocket.netty.tcp.server.ReactiveSocketServerHandler;
12+
import io.reactivesocket.transport.tcp.server.ReactiveSocketServerHandler;
1313

1414
import java.util.List;
1515

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.reactivesocket.netty;
1+
package io.reactivesocket.transport.tcp;
22

33
import io.netty.channel.ChannelFutureListener;
44
import io.netty.channel.ChannelHandler;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.reactivesocket.netty;
16+
package io.reactivesocket.transport.tcp;
1717

1818
import io.netty.buffer.ByteBuf;
1919
import org.agrona.BitUtil;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.reactivesocket.netty.tcp.client;
16+
package io.reactivesocket.transport.tcp.client;
1717

1818
import io.netty.bootstrap.Bootstrap;
1919
import io.netty.buffer.ByteBuf;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.reactivesocket.netty.tcp.client;
16+
package io.reactivesocket.transport.tcp.client;
1717

1818
import io.netty.buffer.ByteBuf;
1919
import io.netty.channel.ChannelHandler;
2020
import io.netty.channel.ChannelHandlerContext;
2121
import io.netty.channel.ChannelInboundHandlerAdapter;
2222
import io.reactivesocket.Frame;
23-
import io.reactivesocket.netty.MutableDirectByteBuf;
23+
import io.reactivesocket.transport.tcp.MutableDirectByteBuf;
2424
import io.reactivesocket.rx.Observer;
2525

2626
import java.util.concurrent.CopyOnWriteArrayList;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.reactivesocket.netty.tcp.client;
16+
package io.reactivesocket.transport.tcp.client;
1717

1818
import io.netty.channel.EventLoopGroup;
1919
import io.reactivesocket.*;
@@ -26,7 +26,7 @@
2626
import java.util.function.Consumer;
2727

2828
/**
29-
* An implementation of {@link ReactiveSocketConnecot} that creates Netty TCP ReactiveSockets.
29+
* An implementation of {@link ReactiveSocketConnector} that creates Netty TCP ReactiveSockets.
3030
*/
3131
public class TcpReactiveSocketConnector implements ReactiveSocketConnector<SocketAddress> {
3232
private final ConnectionSetupPayload connectionSetupPayload;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.reactivesocket.netty.tcp.server;
16+
package io.reactivesocket.transport.tcp.server;
1717

1818
import io.netty.buffer.ByteBuf;
1919
import io.netty.channel.ChannelHandler;
@@ -27,7 +27,7 @@
2727
import io.reactivesocket.Frame;
2828
import io.reactivesocket.LeaseGovernor;
2929
import io.reactivesocket.ReactiveSocket;
30-
import io.reactivesocket.netty.MutableDirectByteBuf;
30+
import io.reactivesocket.transport.tcp.MutableDirectByteBuf;
3131
import org.agrona.BitUtil;
3232
import org.slf4j.Logger;
3333
import org.slf4j.LoggerFactory;

0 commit comments

Comments
 (0)