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/qpid@707808 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 14 deletions

diff --git a/cpp/src/qpid/client/LocalQueue.h b/cpp/src/qpid/client/LocalQueue.h
index f81065ef3c..9fe72762c3 100644
--- a/cpp/src/qpid/client/LocalQueue.h
+++ b/cpp/src/qpid/client/LocalQueue.h
@@ -23,8 +23,8 @@
  */
 
 #include "qpid/client/Message.h"
+#include "qpid/client/Subscription.h"
 #include "qpid/client/Demux.h"
-#include "qpid/client/AckPolicy.h"
 #include "qpid/sys/Time.h"
 
 namespace qpid {
@@ -38,17 +38,14 @@ namespace client {
  *
  * \ingroup clientapi
  */
-class LocalQueue
-{
+class LocalQueue {
   public:
     /** Create a local queue. Subscribe the local queue to a remote broker
      * queue with a SubscriptionManager.
      *
      * LocalQueue is an alternative to implementing a MessageListener.
-     * 
-     *@param ackPolicy Policy for acknowledging messages. @see AckPolicy.
      */
-    LocalQueue(AckPolicy ackPolicy=AckPolicy());
+    LocalQueue();
 
     ~LocalQueue();
 
@@ -74,16 +71,9 @@ class LocalQueue
     /** Number of messages on the local queue */
     size_t size() const;
 
-    /** Set the message acknowledgement policy. @see AckPolicy. */
-    void setAckPolicy(AckPolicy);
-
-    /** Get the message acknowledgement policy. @see AckPolicy. */
-    AckPolicy& getAckPolicy();
-
   private:
-    Session session;
     Demux::QueuePtr queue;
-    AckPolicy autoAck;
+    Subscription subscription;
 
   friend class SubscriptionManager;
 };