Make AsyncIOAcceptor multi-protocol:

 - ConnectionCodec interface replaces ConnectionInputHandle, moves encoding/decoding out of AsyncIOAcceptor.
 - ConnectionCodec::Factory replaces ConnectionInputHandlerFactory
 - Acceptor creates version-specific ConnectionCodec based on protocol header.


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

1 files changed, 1 insertions, 14 deletions

diff --git a/qpid/cpp/src/tests/MockConnectionInputHandler.h b/qpid/cpp/src/tests/MockConnectionInputHandler.h
index d104e7d934..89b6155355 100644
--- a/qpid/cpp/src/tests/MockConnectionInputHandler.h
+++ b/qpid/cpp/src/tests/MockConnectionInputHandler.h
@@ -22,7 +22,6 @@
 #include "qpid/sys/ConnectionInputHandler.h"
 #include "qpid/sys/ConnectionInputHandlerFactory.h"
 #include "qpid/sys/Monitor.h"
-#include "qpid/framing/ProtocolInitiation.h"
 
 struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 
@@ -30,23 +29,12 @@ struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 
     ~MockConnectionInputHandler() {}
     
-    void initiated(const qpid::framing::ProtocolInitiation& pi) {
-        qpid::sys::Monitor::ScopedLock l(monitor);
-        init = pi;
-        setState(GOT_INIT);
-    }
-
     void received(qpid::framing::AMQFrame* framep) {
         qpid::sys::Monitor::ScopedLock l(monitor);
         frame = *framep;
         setState(GOT_FRAME);
     }
 
-    qpid::framing::ProtocolInitiation waitForProtocolInit() {        
-        waitFor(GOT_INIT);
-        return init;
-    }
-
     qpid::framing::AMQFrame waitForFrame() {        
         waitFor(GOT_FRAME);
         return frame;
@@ -65,7 +53,7 @@ struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
     void idleIn() {}
 
   private:
-    typedef enum { START, GOT_INIT, GOT_FRAME, CLOSED } State;
+    typedef enum { START, GOT_FRAME, CLOSED } State;
 
     void setState(State s) {
         state = s;
@@ -81,7 +69,6 @@ struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 
     qpid::sys::Monitor  monitor;
     State state;
-    qpid::framing::ProtocolInitiation init;
     qpid::framing::AMQFrame frame;
 };