removed unused fields

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

9 files changed, 20 insertions, 51 deletions

diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
index 0e06b9e88c..e7c1e9b65a 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractDecoder.java
@@ -42,14 +42,10 @@ import static org.apache.qpidity.transport.util.Functions.*;
 abstract class AbstractDecoder implements Decoder
 {
 
-    private final byte major;
-    private final byte minor;
     private int count;
 
-    protected AbstractDecoder(byte major, byte minor)
+    protected AbstractDecoder()
     {
-        this.major = major;
-        this.minor = minor;
         this.count = 0;
     }
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
index e2b5cd41b8..2c16b28e51 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/codec/AbstractEncoder.java
@@ -61,19 +61,9 @@ abstract class AbstractEncoder implements Encoder
         ENCODINGS.put(byte[].class, Type.LONG_BINARY);
     }
 
-    // XXX: no longer need major/minor
-    private final byte major;
-    private final byte minor;
-
-    protected AbstractEncoder(byte major, byte minor)
-    {
-        this.major = major;
-        this.minor = minor;
-    }
-
     protected Sizer sizer()
     {
-        return new SizeEncoder(major, minor);
+        return new SizeEncoder();
     }
 
     protected abstract void doPut(byte b);
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
index b3ee1080f9..270ae668af 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/codec/BBDecoder.java
@@ -34,9 +34,8 @@ public class BBDecoder extends AbstractDecoder
 
     private final ByteBuffer in;
 
-    public BBDecoder(byte major, byte minor, ByteBuffer in)
+    public BBDecoder(ByteBuffer in)
     {
-        super(major, minor);
         this.in = in;
     }
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
index e40ba6ae4d..f97baeafbd 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/codec/BBEncoder.java
@@ -34,8 +34,7 @@ public class BBEncoder extends AbstractEncoder
 
     private final ByteBuffer out;
 
-    public BBEncoder(byte major, byte minor, ByteBuffer out) {
-        super(major, minor);
+    public BBEncoder(ByteBuffer out) {
         this.out = out;
     }
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
index 74c83001ce..76229a7ddd 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/codec/FragmentDecoder.java
@@ -40,9 +40,8 @@ public class FragmentDecoder extends AbstractDecoder
     private final Iterator<ByteBuffer> fragments;
     private ByteBuffer current;
 
-    public FragmentDecoder(byte major, byte minor, Iterator<ByteBuffer> fragments)
+    public FragmentDecoder(Iterator<ByteBuffer> fragments)
     {
-        super(major, minor);
         this.fragments = fragments;
         this.current = null;
     }
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java b/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
index aba269ef08..2c501a0746 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/codec/SizeEncoder.java
@@ -36,12 +36,11 @@ public class SizeEncoder extends AbstractEncoder implements Sizer
 
     private int size;
 
-    public SizeEncoder(byte major, byte minor) {
-        this(major, minor, 0);
+    public SizeEncoder() {
+        this(0);
     }
 
-    public SizeEncoder(byte major, byte minor, int size) {
-        super(major, minor);
+    public SizeEncoder(int size) {
         this.size = size;
     }
 
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
index 8375e3f845..f816ef4eff 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
@@ -49,15 +49,11 @@ public class Assembler implements Receiver<NetworkEvent>, NetworkDelegate
 {
 
     private final Receiver<ConnectionEvent> receiver;
-    private final byte major;
-    private final byte minor;
     private final Map<Integer,List<ByteBuffer>> segments;
 
-    public Assembler(Receiver<ConnectionEvent> receiver, byte major, byte minor)
+    public Assembler(Receiver<ConnectionEvent> receiver)
     {
         this.receiver = receiver;
-        this.major = major;
-        this.minor = minor;
         segments = new HashMap<Integer,List<ByteBuffer>>();
     }
 
@@ -159,8 +155,7 @@ public class Assembler implements Receiver<NetworkEvent>, NetworkDelegate
 
     private ProtocolEvent decode(byte type, List<ByteBuffer> segment)
     {
-        FragmentDecoder dec =
-            new FragmentDecoder(major, minor, segment.iterator());
+        FragmentDecoder dec = new FragmentDecoder(segment.iterator());
 
         switch (type)
         {
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
index 8f95dc0234..266cbe4842 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
@@ -53,11 +53,8 @@ public class Disassembler implements Sender<ConnectionEvent>,
 
     private final Sender<NetworkEvent> sender;
     private final int maxPayload;
-    private final byte major;
-    private final byte minor;
 
-    public Disassembler(Sender<NetworkEvent> sender, byte major, byte minor,
-                        int maxFrame)
+    public Disassembler(Sender<NetworkEvent> sender, int maxFrame)
     {
         if (maxFrame <= HEADER_SIZE || maxFrame >= 64*1024)
         {
@@ -65,8 +62,6 @@ public class Disassembler implements Sender<ConnectionEvent>,
                 ("maxFrame must be > HEADER_SIZE and < 64K: " + maxFrame);
         }
         this.sender = sender;
-        this.major = major;
-        this.minor = minor;
         this.maxPayload  = maxFrame - HEADER_SIZE;
 
     }
@@ -116,14 +111,12 @@ public class Disassembler implements Sender<ConnectionEvent>,
 
     public void method(ConnectionEvent event, Method method)
     {
-        SizeEncoder sizer = new SizeEncoder(major, minor);
+        SizeEncoder sizer = new SizeEncoder();
         sizer.writeShort(method.getEncodedType());
         method.write(sizer);
-        sizer.flush();
-        int size = sizer.getSize();
 
-        ByteBuffer buf = ByteBuffer.allocate(size);
-        BBEncoder enc = new BBEncoder(major, minor, buf);
+        ByteBuffer buf = ByteBuffer.allocate(sizer.size());
+        BBEncoder enc = new BBEncoder(buf);
         enc.writeShort(method.getEncodedType());
         method.write(enc);
         enc.flush();
@@ -141,14 +134,14 @@ public class Disassembler implements Sender<ConnectionEvent>,
 
     public void header(ConnectionEvent event, Header header)
     {
-        SizeEncoder sizer = new SizeEncoder(major, minor);
+        SizeEncoder sizer = new SizeEncoder();
         for (Struct st : header.getStructs())
         {
             sizer.writeLongStruct(st);
         }
 
-        ByteBuffer buf = ByteBuffer.allocate(sizer.getSize());
-        BBEncoder enc = new BBEncoder(major, minor, buf);
+        ByteBuffer buf = ByteBuffer.allocate(sizer.size());
+        BBEncoder enc = new BBEncoder(buf);
         for (Struct st : header.getStructs())
         {
             enc.writeLongStruct(st);
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
index f25b720380..30d931663e 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
@@ -98,14 +98,13 @@ public class MinaHandler implements IoHandler
     public void sessionOpened(final IoSession ssn)
     {
         log.debug("opened: %s", this);
-        // XXX: hardcoded version + max-frame
+        // XXX: hardcoded max-frame
         Connection conn = new Connection
             (new Disassembler(new OutputHandler(new MinaSender(ssn)),
-                              (byte)0, (byte)10, 64*1024 - 1),
+                              64*1024 - 1),
              delegate);
-        // XXX: hardcoded version
         Receiver<java.nio.ByteBuffer> receiver =
-            new InputHandler(new Assembler(conn, (byte)0, (byte)10), state);
+            new InputHandler(new Assembler(conn), state);
         ssn.setAttachment(new Attachment(conn, receiver));
         // XXX
         synchronized (ssn)