Client API change: Centralize access to subscription status, better control of acquire/accept.

client/AckPolicy: removed, functionality moved to Subscription and SubscriptionSettings
client/SubscriptionSettings: struct aggregates flow control & accept-acquire parameters for subscribe.
client/Subscription: represents active subscription. Query settings, unacked messages, manual accept/acquire
client/SubscriptionManager: use AcceptMode, AcquireMode enums rather than confusing bools.

Issues addressed by the change:
 - old use of bool for acceptMode was inverted wrt AMQP enum values, bools are confusing.
 - old AckPolicy was broken - not possible to access the instance associated with an active subscription
 - old AckPolicy did not provide a way to do manual acquire, only accept.
 - setting values on SubscriptionManager to apply to subsequent subscriptions is awkward & error-prone, now can use SubscriptionSettings to control on each subscribe individually.
 - a subscription is a central concept in AMQP, it deserves to be a class. Subscription and SubscriptionSettings provides a single point for future expansion of interactions with a a Subscription.


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

1 files changed, 1 insertions, 25 deletions

diff --git a/qpid/cpp/src/tests/XmlClientSessionTest.cpp b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
index 534ecf70f2..98558f0a76 100644
--- a/qpid/cpp/src/tests/XmlClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
@@ -29,7 +29,7 @@
 #include "qpid/framing/TransferContent.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/Dispatcher.h"
+#include "qpid/client/SubscriptionManager.h"
 #include "qpid/client/LocalQueue.h"
 #include "qpid/client/Session.h"
 #include "qpid/client/SubscriptionManager.h"
@@ -54,30 +54,6 @@ using std::endl;
 
 Shlib shlib("../.libs/xml.so");
 
-struct DummyListener : public sys::Runnable, public MessageListener {
-    std::vector<Message> messages;
-    string name;
-    uint expected;
-    Dispatcher dispatcher;
-
-    DummyListener(Session& session, const string& n, uint ex) :
-        name(n), expected(ex), dispatcher(session) {}
-
-    void run()
-    {
-        dispatcher.listen(name, this);
-        dispatcher.run();
-    }
-
-    void received(Message& msg)
-    {
-        messages.push_back(msg);
-        if (--expected == 0)
-            dispatcher.stop();
-    }
-};
-
-
 class SubscribedLocalQueue : public LocalQueue {
   private:
     SubscriptionManager& subscriptions;