You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/06/29 09:37:07 UTC

qpid-broker-j git commit: QPID-7531: Remove unused payload for AMQP 1.0 performatives

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 2dbad8f73 -> 498ba2cfb


QPID-7531: Remove unused payload for AMQP 1.0 performatives


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/498ba2cf
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/498ba2cf
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/498ba2cf

Branch: refs/heads/master
Commit: 498ba2cfb3db9b3cdaca17d34cf80edc8cd0d588
Parents: 2dbad8f
Author: Keith Wall <kw...@apache.org>
Authored: Thu Jun 29 10:34:59 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Jun 29 10:34:59 2017 +0100

----------------------------------------------------------------------
 .../server/protocol/v1_0/type/transport/Attach.java  | 14 +-------------
 .../server/protocol/v1_0/type/transport/Begin.java   | 14 +-------------
 .../server/protocol/v1_0/type/transport/Close.java   | 15 +--------------
 .../server/protocol/v1_0/type/transport/Detach.java  | 15 +--------------
 .../protocol/v1_0/type/transport/Disposition.java    | 13 -------------
 .../server/protocol/v1_0/type/transport/End.java     | 15 +--------------
 .../server/protocol/v1_0/type/transport/Flow.java    | 12 ------------
 .../server/protocol/v1_0/type/transport/Open.java    | 14 +-------------
 8 files changed, 6 insertions(+), 106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
index e8b404a..e87952c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
@@ -23,7 +23,6 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -31,16 +30,15 @@ import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
 import org.apache.qpid.server.protocol.v1_0.type.BaseSource;
 import org.apache.qpid.server.protocol.v1_0.type.BaseTarget;
 import org.apache.qpid.server.protocol.v1_0.type.Binary;
+import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
 import org.apache.qpid.server.protocol.v1_0.type.DeliveryState;
 import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
-import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedLong;
 
 public class Attach implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField(mandatory = true)
     private String _name;
@@ -364,14 +362,4 @@ public class Attach implements FrameBody
     {
         conn.receiveAttach(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
index 001b5fe..d713524 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
@@ -23,20 +23,18 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
-import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort;
 
 public class Begin implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField
     private UnsignedShort _remoteChannel;
@@ -228,14 +226,4 @@ public class Begin implements FrameBody
     {
         conn.receiveBegin(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
index a7cfe2a..55f700c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
@@ -23,15 +23,12 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
-
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
-import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 
 public class Close implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField
     private Error _error;
@@ -69,14 +66,4 @@ public class Close implements FrameBody
     {
         conn.receiveClose(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
index e1d1da8..02fb1d8 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
@@ -23,16 +23,13 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
-
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
-import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 
 public class Detach implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField(mandatory = true)
     private UnsignedInteger _handle;
@@ -114,14 +111,4 @@ public class Detach implements FrameBody
     {
         conn.receiveDetach(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
index 8b13cf3..a0a0f15 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
@@ -23,8 +23,6 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
-
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
 import org.apache.qpid.server.protocol.v1_0.type.DeliveryState;
@@ -33,7 +31,6 @@ import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 
 public class Disposition implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField(mandatory = true)
     private Role _role;
@@ -181,14 +178,4 @@ public class Disposition implements FrameBody
     {
         conn.receiveDisposition(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
index 75392c9..ca8b375 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
@@ -23,15 +23,12 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
-
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
-import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 
 public class End implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField
     private Error _error;
@@ -69,14 +66,4 @@ public class End implements FrameBody
     {
         conn.receiveEnd(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
index 8c87c7b..14f5be0 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
@@ -23,7 +23,6 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
@@ -34,7 +33,6 @@ import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 
 public class Flow implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField
     private UnsignedInteger _nextIncomingId;
@@ -292,14 +290,4 @@ public class Flow implements FrameBody
     {
         conn.receiveFlow(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/498ba2cf/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java
index f8527d3..7ea1a2b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java
@@ -23,20 +23,18 @@
 package org.apache.qpid.server.protocol.v1_0.type.transport;
 
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.ConnectionHandler;
-import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
+import org.apache.qpid.server.protocol.v1_0.type.FrameBody;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort;
 
 public class Open implements FrameBody
 {
-    private ByteBuffer _payload;
 
     @CompositeTypeField(mandatory = true)
     private String _containerId;
@@ -273,14 +271,4 @@ public class Open implements FrameBody
     {
         conn.receiveOpen(channel, this);
     }
-
-    public ByteBuffer getPayload()
-    {
-        return _payload;
-    }
-
-    public void setPayload(ByteBuffer payload)
-    {
-        _payload = payload;
-    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org