Some restructuring of the client code:

 * Introduced three separate 'handlers' for the connection, channel and execution 'layers'.
 * Support for asynchronous retrieval of response or completion status.
 * Channel methods no longer included in execution layers command id count.



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

1 files changed, 123 insertions, 0 deletions

diff --git a/cpp/src/qpid/client/ChannelHandler.cpp b/cpp/src/qpid/client/ChannelHandler.cpp
new file mode 100644
index 0000000000..a6aea438f0
--- /dev/null
+++ b/cpp/src/qpid/client/ChannelHandler.cpp
@@ -0,0 +1,123 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "ChannelHandler.h"
+#include "qpid/framing/amqp_framing.h"
+
+using namespace qpid::client;
+using namespace qpid::framing;
+using namespace boost;
+
+ChannelHandler::ChannelHandler() : StateManager(CLOSED), id(0) {}
+
+void ChannelHandler::incoming(AMQFrame& frame)
+{
+    AMQBody::shared_ptr body = frame.getBody();
+    if (getState() == OPEN) {
+        if (isA<ChannelCloseBody>(body)) {
+            ChannelCloseBody::shared_ptr method(shared_polymorphic_cast<ChannelCloseBody>(body));
+            setState(CLOSED);
+            if (onClose) {
+                onClose(method->getReplyCode(), method->getReplyText());
+            }
+        } else {
+            try {
+                in(frame);
+            }catch(ChannelException& e){
+                if (body->type() == METHOD_BODY) {
+                    AMQMethodBody::shared_ptr method(shared_polymorphic_cast<AMQMethodBody>(body));
+                    close(e.code, e.toString(), method->amqpClassId(), method->amqpMethodId());
+                } else {
+                    close(e.code, e.toString(), 0, 0);
+                }
+            }
+        }
+    } else {
+        if (body->type() == METHOD_BODY) {
+            handleMethod(shared_polymorphic_cast<AMQMethodBody>(body));
+        } else {
+            throw new ConnectionException(504, "Channel not open.");
+        }
+
+    }
+}
+
+void ChannelHandler::outgoing(AMQFrame& frame)
+{
+    if (getState() == OPEN) {
+        frame.channel = id;
+        out(frame);
+    } else {
+        throw Exception("Channel not open");
+    }
+}
+
+void ChannelHandler::open(uint16_t _id)
+{
+    id = _id;
+
+    setState(OPENING);
+    AMQFrame f(version, id, make_shared_ptr(new ChannelOpenBody(version)));
+    out(f);
+
+    std::set<int> states;
+    states.insert(OPEN);
+    states.insert(CLOSED);
+    waitFor(states);
+    if (getState() != OPEN) {
+        throw Exception("Failed to open channel.");
+    }
+}
+
+void ChannelHandler::close(uint16_t code, const std::string& message, uint16_t classId, uint16_t methodId)
+{
+    setState(CLOSING);
+    AMQFrame f(version, id, make_shared_ptr(new ChannelCloseBody(version, code, message, classId, methodId)));
+    out(f);
+}
+
+void ChannelHandler::close()
+{
+    close(200, "OK", 0, 0);
+    waitFor(CLOSED);
+}
+
+void ChannelHandler::handleMethod(AMQMethodBody::shared_ptr method)
+{
+    switch (getState()) {
+    case OPENING:
+        if (method->isA<ChannelOpenOkBody>()) {
+            setState(OPEN);
+        } else {
+            throw ConnectionException(504, "Channel not opened.");
+        }
+        break;
+    case CLOSING:
+        if (method->isA<ChannelCloseOkBody>()) {
+            setState(CLOSED);
+        } //else just ignore it
+        break;
+    case CLOSED:
+        throw ConnectionException(504, "Channel not opened.");
+    default:
+        throw Exception("Unexpected state encountered in ChannelHandler!");
+    }
+}