Changed static method AMQMethodBody.createAMQFrame() to createMessageBody() for all generated classes so that it can be used with the new Request and Response handlers. (Don't forget to update the gentools dir.) Created new methods AMQMinaProtocolSession.writeRequest() and writeResponse() as new entry points for Request and Response framing.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@496439 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 11 insertions, 11 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index 2ead0a03e6..996ac23b09 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
@@ -21,7 +21,7 @@
 package org.apache.qpid;
 
 import org.apache.qpid.framing.ChannelCloseBody;
-import org.apache.qpid.framing.AMQFrame;
+import org.apache.qpid.framing.AMQMethodBody;
 
 public class AMQChannelException extends AMQException
 {
@@ -49,8 +49,8 @@ public class AMQChannelException extends AMQException
         this.minor = minor;
     }
 
-    public AMQFrame getCloseFrame(int channel)
+    public AMQMethodBody getCloseMethodBody()
     {
-        return ChannelCloseBody.createAMQFrame(channel, major, minor, _classId, _methodId, getErrorCode(), getMessage());
+        return ChannelCloseBody.createMethodBody(major, minor, _classId, _methodId, getErrorCode(), getMessage());
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java
index da7479af8c..900d068c13 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/RequestManager.java
@@ -27,7 +27,7 @@ import org.apache.qpid.protocol.AMQProtocolWriter;
 public class RequestManager
 {
     private int channel;
-    AMQProtocolWriter protocolSession;
+    AMQProtocolWriter protocolWriter;
 
     /**
      * Request and response frames must have a requestID and responseID which
@@ -43,10 +43,10 @@ public class RequestManager
 
     private Hashtable<Long, AMQResponseCallback> requestSentMap;
 
-    public RequestManager(int channel, AMQProtocolWriter protocolSession)
+    public RequestManager(int channel, AMQProtocolWriter protocolWriter)
     {
         this.channel = channel;
-        this.protocolSession = protocolSession;
+        this.protocolWriter = protocolWriter;
         requestIdCount = 1L;
         lastProcessedResponseId = 0L;
         requestSentMap = new Hashtable<Long, AMQResponseCallback>();
@@ -60,7 +60,7 @@ public class RequestManager
         long requestId = getNextRequestId(); // Get new request ID
         AMQFrame requestFrame = AMQRequestBody.createAMQFrame(channel, requestId,
             lastProcessedResponseId, requestMethodBody);
-        protocolSession.writeFrame(requestFrame);
+        protocolWriter.writeFrame(requestFrame);
         requestSentMap.put(requestId, responseCallback);
         return requestId;
     }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java
index 9174675ded..bfc0eb84de 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ResponseManager.java
@@ -32,7 +32,7 @@ public class ResponseManager
 {
     private int channel;
     AMQMethodListener methodListener;
-    AMQProtocolWriter protocolSession;
+    AMQProtocolWriter protocolWriter;
 
     /**
      * Determines the batch behaviour of the manager.
@@ -91,11 +91,11 @@ public class ResponseManager
     private Hashtable<Long, ResponseStatus> responseMap;
 
     public ResponseManager(int channel, AMQMethodListener methodListener,
-        AMQProtocolWriter protocolSession)
+        AMQProtocolWriter protocolWriter)
     {
         this.channel = channel;
         this.methodListener = methodListener;
-        this.protocolSession = protocolSession;
+        this.protocolWriter = protocolWriter;
         responseIdCount = 1L;
         lastReceivedRequestId = 0L;
         responseMap = new Hashtable<Long, ResponseStatus>();
@@ -221,6 +221,6 @@ public class ResponseManager
         long responseId = getNextResponseId(); // Get new request ID
         AMQFrame responseFrame = AMQResponseBody.createAMQFrame(channel, responseId,
             firstRequestId, numAdditionalRequests, responseMethodBody);
-        protocolSession.writeFrame(responseFrame);
+        protocolWriter.writeFrame(responseFrame);
     }
 }