Separate Byte and ProtocolEvent sender/receivers, add server specific 0-10 encoder

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1656248 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 18 insertions, 23 deletions

diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
index 865a3603f5..3da2a03f42 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.transport.network;
 
 
-import java.nio.ByteBuffer;
 import java.util.Set;
 
 import javax.net.ssl.SSLContext;
@@ -29,9 +28,9 @@ import javax.net.ssl.SSLContext;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.protocol.ProtocolEngineFactory;
 import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.transport.ByteBufferReceiver;
 import org.apache.qpid.transport.ConnectionSettings;
 import org.apache.qpid.transport.NetworkTransportConfiguration;
-import org.apache.qpid.transport.Receiver;
 import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.io.IoNetworkTransport;
 
@@ -130,7 +129,7 @@ public class TransportTest extends QpidTestCase
         }
 
         public NetworkConnection connect(ConnectionSettings settings,
-                                         Receiver<ByteBuffer> delegate,
+                                         ByteBufferReceiver delegate,
                                          TransportActivity transportActivity)
         {
             throw new UnsupportedOperationException();
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
index a445cff0a7..69724438ec 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
@@ -21,14 +21,12 @@
 
 package org.apache.qpid.transport.network.io;
 
-import junit.framework.TestCase;
-
 import java.net.SocketAddress;
-import java.nio.ByteBuffer;
 import java.security.Principal;
 
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.Sender;
+import junit.framework.TestCase;
+
+import org.apache.qpid.transport.ByteBufferSender;
 import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.transport.network.TransportActivity;
 
@@ -193,7 +191,7 @@ public class IdleTimeoutTickerTest extends TestCase implements TransportActivity
     //-------------------------------------------------------------------------
 
     @Override
-    public Sender<ByteBuffer> getSender()
+    public ByteBufferSender getSender()
     {
         return null;
     }
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
index bb864cd434..67d360fa9e 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
@@ -20,16 +20,15 @@
  */
 package org.apache.qpid.transport.network.io;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.transport.Binding;
-import org.apache.qpid.transport.TransportException;
-
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketAddress;
-import java.nio.ByteBuffer;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.transport.Binding;
 
 
 /**
@@ -44,9 +43,9 @@ public class IoAcceptor<E> extends Thread
     private volatile boolean _closed = false;
 
     private ServerSocket socket;
-    private Binding<E,ByteBuffer> binding;
+    private Binding<E> binding;
 
-    public IoAcceptor(SocketAddress address, Binding<E,ByteBuffer> binding)
+    public IoAcceptor(SocketAddress address, Binding<E> binding)
         throws IOException
     {
         socket = new ServerSocket();
@@ -70,7 +69,7 @@ public class IoAcceptor<E> extends Thread
         }
     }
 
-    public IoAcceptor(String host, int port, Binding<E,ByteBuffer> binding)
+    public IoAcceptor(String host, int port, Binding<E> binding)
         throws IOException
     {
         this(new InetSocketAddress(host, port), binding);
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
index f74051aa32..4b5b4448ee 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
@@ -20,10 +20,9 @@
 package org.apache.qpid.transport.network.io;
 
 import java.net.Socket;
-import java.nio.ByteBuffer;
 
 import org.apache.qpid.transport.Binding;
-import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.ByteBufferSender;
 import org.apache.qpid.transport.util.Logger;
 
 /**
@@ -48,18 +47,18 @@ public final class IoTransport<E>
         ("amqj.sendBufferSize", DEFAULT_READ_WRITE_BUFFER_SIZE);
 
     private Socket socket;
-    private Sender<ByteBuffer> sender;
+    private ByteBufferSender sender;
     private E endpoint;
     private IoReceiver receiver;
     private long timeout = 60000;
 
-    IoTransport(Socket socket, Binding<E,ByteBuffer> binding)
+    IoTransport(Socket socket, Binding<E> binding)
     {
         this.socket = socket;
         setupTransport(socket, binding);
     }
 
-    private void setupTransport(Socket socket, Binding<E, ByteBuffer> binding)
+    private void setupTransport(Socket socket, Binding<E> binding)
     {
         IoSender ios = new IoSender(socket, 2*writeBufferSize, timeout);
         ios.initiate();
@@ -73,7 +72,7 @@ public final class IoTransport<E>
         ios.setReceiver(this.receiver);
     }
 
-    public Sender<ByteBuffer> getSender()
+    public ByteBufferSender getSender()
     {
         return sender;
     }