Merge branch 'master' of github.com:ReactiveSocket/reactivesocket-java-impl into exception_handler

Author: robertroeser

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories { jcenter() }
-    dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.4' }
+    dependencies { classpath 'io.reactivesocket:gradle-nebula-plugin-reactivesocket:1.0.5' }
 }
 
 apply plugin: 'reactivesocket-project'

reactivesocket-netty/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile 'io.netty:netty-all:4.1.0.CR4'
+    compile 'io.netty:netty-all:4.1.0.CR5'
 }

reactivesocket-netty/src/test/java/io/reactivesocket/netty/websocket/ClientServerTest.java

@@ -27,10 +27,7 @@
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.reactivesocket.ConnectionSetupPayload;
-import io.reactivesocket.Payload;
-import io.reactivesocket.ReactiveSocket;
-import io.reactivesocket.RequestHandler;
+import io.reactivesocket.*;
 import io.reactivesocket.netty.websocket.client.ClientWebSocketDuplexConnection;
 import io.reactivesocket.netty.websocket.server.ReactiveSocketServerHandler;
 import org.junit.AfterClass;
@@ -126,7 +123,7 @@ protected void initChannel(Channel ch) throws Exception {
             ClientWebSocketDuplexConnection.create(InetSocketAddress.createUnresolved("localhost", 8025), "/rs", new NioEventLoopGroup())
         ).toBlocking().single();
 
-        client = ReactiveSocket
+        client = DefaultReactiveSocket
             .fromClientConnection(duplexConnection, ConnectionSetupPayload.create("UTF-8", "UTF-8"), t -> t.printStackTrace());
 
         client.startAndWait();

reactivesocket-netty/src/test/java/io/reactivesocket/netty/websocket/Ping.java

@@ -17,6 +17,7 @@
 
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.reactivesocket.ConnectionSetupPayload;
+import io.reactivesocket.DefaultReactiveSocket;
 import io.reactivesocket.Payload;
 import io.reactivesocket.ReactiveSocket;
 import io.reactivesocket.netty.websocket.client.ClientWebSocketDuplexConnection;
@@ -37,7 +38,7 @@ public static void main(String... args) throws Exception {
         Publisher<ClientWebSocketDuplexConnection> publisher = ClientWebSocketDuplexConnection.create(InetSocketAddress.createUnresolved("localhost", 8025), "/rs", new NioEventLoopGroup(1));
 
         ClientWebSocketDuplexConnection duplexConnection = RxReactiveStreams.toObservable(publisher).toBlocking().last();
-        ReactiveSocket reactiveSocket = ReactiveSocket.fromClientConnection(duplexConnection, ConnectionSetupPayload.create("UTF-8", "UTF-8"), t -> t.printStackTrace());
+        ReactiveSocket reactiveSocket = DefaultReactiveSocket.fromClientConnection(duplexConnection, ConnectionSetupPayload.create("UTF-8", "UTF-8"), t -> t.printStackTrace());
 
         reactiveSocket.startAndWait();
 

reactivesocket-netty/src/test/java/io/reactivesocket/netty/websocket/TestUtil.java

@@ -19,7 +19,7 @@
 import io.reactivesocket.Frame;
 import io.reactivesocket.FrameType;
 import io.reactivesocket.Payload;
-import uk.co.real_logic.agrona.MutableDirectBuffer;
+import org.agrona.MutableDirectBuffer;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;