QPID-3789 : [Java] Remove duplication of BytesDataOutput inner class, and shared code in SessionAdapt[eo]rs

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1238868 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 155 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 187518fd7d..93954108fa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
@@ -63,11 +63,11 @@ import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 import org.apache.qpid.transport.Sender;
 import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.NetworkConnection;
+import org.apache.qpid.util.BytesDataOutput;
 
 import javax.management.JMException;
 import javax.security.auth.Subject;
 import javax.security.sasl.SaslServer;
-import java.io.DataOutput;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -1481,158 +1481,4 @@ public class AMQProtocolEngine implements ServerProtocolEngine, Managable, AMQPr
 
     }
 
-    private static class BytesDataOutput implements DataOutput
-    {
-        private int _pos = 0;
-        private byte[] _buf;
-
-        public BytesDataOutput(byte[] buf)
-        {
-            _buf = buf;
-        }
-
-        public void setBuffer(byte[] buf)
-        {
-            _buf = buf;
-            _pos = 0;
-        }
-
-        public void reset()
-        {
-            _pos = 0;
-        }
-
-        public int length()
-        {
-            return _pos;
-        }
-
-        public void write(int b)
-        {
-            _buf[_pos++] = (byte) b;
-        }
-
-        public void write(byte[] b)
-        {
-            System.arraycopy(b, 0, _buf, _pos, b.length);
-            _pos+=b.length;
-        }
-
-
-        public void write(byte[] b, int off, int len)
-        {
-            System.arraycopy(b, off, _buf, _pos, len);
-            _pos+=len;
-
-        }
-
-        public void writeBoolean(boolean v)
-        {
-            _buf[_pos++] = v ? (byte) 1 : (byte) 0;
-        }
-
-        public void writeByte(int v)
-        {
-            _buf[_pos++] = (byte) v;
-        }
-
-        public void writeShort(int v)
-        {
-            _buf[_pos++] = (byte) (v >>> 8);
-            _buf[_pos++] = (byte) v;
-        }
-
-        public void writeChar(int v)
-        {
-            _buf[_pos++] = (byte) (v >>> 8);
-            _buf[_pos++] = (byte) v;
-        }
-
-        public void writeInt(int v)
-        {
-            _buf[_pos++] = (byte) (v >>> 24);
-            _buf[_pos++] = (byte) (v >>> 16);
-            _buf[_pos++] = (byte) (v >>> 8);
-            _buf[_pos++] = (byte) v;
-        }
-
-        public void writeLong(long v)
-        {
-            _buf[_pos++] = (byte) (v >>> 56);
-            _buf[_pos++] = (byte) (v >>> 48);
-            _buf[_pos++] = (byte) (v >>> 40);
-            _buf[_pos++] = (byte) (v >>> 32);
-            _buf[_pos++] = (byte) (v >>> 24);
-            _buf[_pos++] = (byte) (v >>> 16);
-            _buf[_pos++] = (byte) (v >>> 8);
-            _buf[_pos++] = (byte)v;
-        }
-
-        public void writeFloat(float v)
-        {
-            writeInt(Float.floatToIntBits(v));
-        }
-
-        public void writeDouble(double v)
-        {
-            writeLong(Double.doubleToLongBits(v));
-        }
-
-        public void writeBytes(String s)
-        {
-            int len = s.length();
-            for (int i = 0 ; i < len ; i++)
-            {
-                _buf[_pos++] = ((byte)s.charAt(i));
-            }
-        }
-
-        public void writeChars(String s)
-        {
-            int len = s.length();
-            for (int i = 0 ; i < len ; i++)
-            {
-                int v = s.charAt(i);
-                _buf[_pos++] = (byte) (v >>> 8);
-                _buf[_pos++] = (byte) v;
-            }
-        }
-
-        public void writeUTF(String s)
-        {
-            int strlen = s.length();
-
-            int pos = _pos;
-            _pos+=2;
-
-
-            for (int i = 0; i < strlen; i++)
-            {
-                int c = s.charAt(i);
-                if ((c >= 0x0001) && (c <= 0x007F))
-                {
-                    c = s.charAt(i);
-                    _buf[_pos++] = (byte) c;
-
-                }
-                else if (c > 0x07FF)
-                {
-                    _buf[_pos++]  = (byte) (0xE0 | ((c >> 12) & 0x0F));
-                    _buf[_pos++]  = (byte) (0x80 | ((c >>  6) & 0x3F));
-                    _buf[_pos++]  = (byte) (0x80 | (c & 0x3F));
-                }
-                else
-                {
-                    _buf[_pos++] = (byte) (0xC0 | ((c >>  6) & 0x1F));
-                    _buf[_pos++]  = (byte) (0x80 | (c & 0x3F));
-                }
-            }
-
-            int len = _pos - (pos + 2);
-
-            _buf[pos++] = (byte) (len >>> 8);
-            _buf[pos] = (byte) len;
-        }
-
-    }
 }