* cpp/lib/client/Basic.*, ClientChannel.*: Extracted Basic functionality

  from Channel into separate Basic class.
* cpp/lib/client/*, cpp/test/*: Adjusted for new Channel::getBasic() API.


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

5 files changed, 51 insertions, 51 deletions

diff --git a/cpp/tests/ClientChannelTest.cpp b/cpp/tests/ClientChannelTest.cpp
index 9ba67ef04c..7b0bc363fe 100644
--- a/cpp/tests/ClientChannelTest.cpp
+++ b/cpp/tests/ClientChannelTest.cpp
@@ -76,21 +76,21 @@ class ClientChannelTest : public CppUnit::TestCase
     void testPublishGet() {
         Message pubMsg(data);
         pubMsg.getHeaders().setString("hello", "world");
-        channel.publish(pubMsg, exchange, qname);
+        channel.getBasic().publish(pubMsg, exchange, qname);
         Message getMsg;
-        CPPUNIT_ASSERT(channel.get(getMsg, queue));
+        CPPUNIT_ASSERT(channel.getBasic().get(getMsg, queue));
         CPPUNIT_ASSERT_EQUAL(data, getMsg.getData());
         CPPUNIT_ASSERT_EQUAL(string("world"),
                              getMsg.getHeaders().getString("hello"));
-        CPPUNIT_ASSERT(!channel.get(getMsg, queue)); // Empty queue
+        CPPUNIT_ASSERT(!channel.getBasic().get(getMsg, queue)); // Empty queue
     }
 
     void testGetNoContent() {
         Message pubMsg;
         pubMsg.getHeaders().setString("hello", "world");
-        channel.publish(pubMsg, exchange, qname);
+        channel.getBasic().publish(pubMsg, exchange, qname);
         Message getMsg;
-        CPPUNIT_ASSERT(channel.get(getMsg, queue));
+        CPPUNIT_ASSERT(channel.getBasic().get(getMsg, queue));
         CPPUNIT_ASSERT(getMsg.getData().empty());
         CPPUNIT_ASSERT_EQUAL(string("world"),
                              getMsg.getHeaders().getString("hello"));
@@ -98,10 +98,10 @@ class ClientChannelTest : public CppUnit::TestCase
 
     void testConsumeCancel() {
         string tag;             // Broker assigned
-        channel.consume(queue, tag, &listener);
+        channel.getBasic().consume(queue, tag, &listener);
         channel.start();
         CPPUNIT_ASSERT_EQUAL(size_t(0), listener.messages.size());
-        channel.publish(Message("a"), exchange, qname);
+        channel.getBasic().publish(Message("a"), exchange, qname);
         {
             Mutex::ScopedLock l(listener.monitor);
             Time deadline(now() + 1*TIME_SEC);
@@ -112,8 +112,8 @@ class ClientChannelTest : public CppUnit::TestCase
         CPPUNIT_ASSERT_EQUAL(size_t(1), listener.messages.size());
         CPPUNIT_ASSERT_EQUAL(string("a"), listener.messages[0].getData());
             
-        channel.publish(Message("b"), exchange, qname);
-        channel.publish(Message("c"), exchange, qname);
+        channel.getBasic().publish(Message("b"), exchange, qname);
+        channel.getBasic().publish(Message("c"), exchange, qname);
         {
             Mutex::ScopedLock l(listener.monitor);
             while (listener.messages.size() != 3) {
@@ -124,15 +124,15 @@ class ClientChannelTest : public CppUnit::TestCase
         CPPUNIT_ASSERT_EQUAL(string("b"), listener.messages[1].getData());
         CPPUNIT_ASSERT_EQUAL(string("c"), listener.messages[2].getData());
     
-        channel.cancel(tag);
-        channel.publish(Message("d"), exchange, qname);
+        channel.getBasic().cancel(tag);
+        channel.getBasic().publish(Message("d"), exchange, qname);
         CPPUNIT_ASSERT_EQUAL(size_t(3), listener.messages.size());
         {
             Mutex::ScopedLock l(listener.monitor);
             CPPUNIT_ASSERT(!listener.monitor.wait(TIME_SEC/2));
         }
         Message msg;
-        CPPUNIT_ASSERT(channel.get(msg, queue));
+        CPPUNIT_ASSERT(channel.getBasic().get(msg, queue));
         CPPUNIT_ASSERT_EQUAL(string("d"), msg.getData());
     }
 
@@ -140,9 +140,9 @@ class ClientChannelTest : public CppUnit::TestCase
     void testConsumePublished() {
         Message pubMsg("x");
         pubMsg.getHeaders().setString("y", "z");
-        channel.publish(pubMsg, exchange, qname);
+        channel.getBasic().publish(pubMsg, exchange, qname);
         string tag;
-        channel.consume(queue, tag, &listener);
+        channel.getBasic().consume(queue, tag, &listener);
         CPPUNIT_ASSERT_EQUAL(size_t(0), listener.messages.size());
         channel.start();
         {
diff --git a/cpp/tests/client_test.cpp b/cpp/tests/client_test.cpp
index bd8519db86..5fbacaae73 100644
--- a/cpp/tests/client_test.cpp
+++ b/cpp/tests/client_test.cpp
@@ -101,7 +101,7 @@ int main(int argc, char**)
 	Monitor monitor;
 	SimpleListener listener(&monitor);
 	string tag("MyTag");
-	channel.consume(queue, tag, &listener);
+	channel.getBasic().consume(queue, tag, &listener);
 	if (verbose) std::cout << "Registered consumer." << std::endl;
 
         //we need to enable the message dispatching for this channel
@@ -114,7 +114,7 @@ int main(int argc, char**)
 	Message msg;
 	string data("MyMessage");
 	msg.setData(data);
-	channel.publish(msg, exchange, "MyTopic");
+	channel.getBasic().publish(msg, exchange, "MyTopic");
 	if (verbose) std::cout << "Published message: " << data << std::endl;
 
 	{
diff --git a/cpp/tests/echo_service.cpp b/cpp/tests/echo_service.cpp
index ff11a336fe..412ffbeb58 100644
--- a/cpp/tests/echo_service.cpp
+++ b/cpp/tests/echo_service.cpp
@@ -116,7 +116,7 @@ int main(int argc, char** argv){
             //Consume from the response queue, logging all echoed message to console:
             LoggingListener listener;
             std::string tag;
-            channel.consume(response, tag, &listener);
+            channel.getBasic().consume(response, tag, &listener);
 
             //Process incoming requests on a new thread
             channel.start();
@@ -129,7 +129,7 @@ int main(int argc, char** argv){
                 Message msg;
                 msg.getHeaders().setString("RESPONSE_QUEUE", response.getName());
                 msg.setData(text);
-                channel.publish(msg, Exchange::STANDARD_DIRECT_EXCHANGE, echo_service);
+                channel.getBasic().publish(msg, Exchange::STANDARD_DIRECT_EXCHANGE, echo_service);
                 
                 std::cout << "Enter text to send:" << std::endl;
             }
@@ -158,10 +158,10 @@ int main(int argc, char** argv){
             //Consume from the request queue, echoing back all messages received to the client that sent them
             EchoServer server(&channel);
             std::string tag = "server_tag";
-            channel.consume(request, tag, &server);
+            channel.getBasic().consume(request, tag, &server);
 
             //Process incoming requests on the main thread
-            channel.run();
+            channel.getBasic().run();
             
             connection.close();
         } catch(qpid::QpidError error) {
@@ -184,7 +184,7 @@ void EchoServer::received(Message& message)
         std::cout << "Echoing " << message.getData() << " back to " << name << std::endl;
         
         //'echo' the message back:
-        channel->publish(message, Exchange::STANDARD_DIRECT_EXCHANGE, name);
+        channel->getBasic().publish(message, Exchange::STANDARD_DIRECT_EXCHANGE, name);
     }
 }
 
diff --git a/cpp/tests/topic_listener.cpp b/cpp/tests/topic_listener.cpp
index 621027c49d..0741571cd4 100644
--- a/cpp/tests/topic_listener.cpp
+++ b/cpp/tests/topic_listener.cpp
@@ -71,7 +71,7 @@ public:
 class Args{
     string host;
     int port;
-    int ackMode;
+    AckMode ackMode;
     bool transactional;
     int prefetch;
     bool trace;
@@ -81,13 +81,13 @@ public:
     void parse(int argc, char** argv);
     void usage();
 
-    inline const string& getHost() const { return host;}
-    inline int getPort() const { return port; }
-    inline int getAckMode(){ return ackMode; }
-    inline bool getTransactional() const { return transactional; }
-    inline int getPrefetch(){ return prefetch; }
-    inline bool getTrace() const { return trace; }
-    inline bool getHelp() const { return help; }
+    const string& getHost() const { return host;}
+    int getPort() const { return port; }
+    AckMode getAckMode(){ return ackMode; }
+    bool getTransactional() const { return transactional; }
+    int getPrefetch(){ return prefetch; }
+    bool getTrace() const { return trace; }
+    bool getHelp() const { return help; }
 };
 
 /**
@@ -119,9 +119,9 @@ int main(int argc, char** argv){
             //set up listener
             Listener listener(&channel, response.getName(), args.getTransactional());
             string tag;
-            channel.consume(control, tag, &listener, args.getAckMode());
+            channel.getBasic().consume(control, tag, &listener, args.getAckMode());
             cout << "topic_listener: Consuming." << endl;
-            channel.run();
+            channel.getBasic().run();
             connection.close();
             cout << "topic_listener: normal exit" << endl;
             return 0;
@@ -166,7 +166,7 @@ void Listener::report(){
               << time/TIME_MSEC << " ms.";
     Message msg(reportstr.str());
     msg.getHeaders().setString("TYPE", "REPORT");
-    channel->publish(msg, string(), responseQueue);
+    channel->getBasic().publish(msg, string(), responseQueue);
     if(transactional){
         channel->commit();
     }
@@ -184,7 +184,7 @@ void Args::parse(int argc, char** argv){
         }else if("-port" == name){
             port = atoi(argv[++i]);
         }else if("-ack_mode" == name){
-            ackMode = atoi(argv[++i]);
+            ackMode = AckMode(atoi(argv[++i]));
         }else if("-transactional" == name){
             transactional = true;
         }else if("-prefetch" == name){
diff --git a/cpp/tests/topic_publisher.cpp b/cpp/tests/topic_publisher.cpp
index 048ec47bb4..dedb88003a 100644
--- a/cpp/tests/topic_publisher.cpp
+++ b/cpp/tests/topic_publisher.cpp
@@ -80,7 +80,7 @@ class Args{
     int port;
     int messages;
     int subscribers;
-    int ackMode;
+    AckMode ackMode;
     bool transactional;
     int prefetch;
     int batches;
@@ -96,18 +96,18 @@ public:
     void parse(int argc, char** argv);
     void usage();
 
-    inline const string& getHost() const { return host;}
-    inline int getPort() const { return port; }
-    inline int getMessages() const { return messages; }
-    inline int getSubscribers() const { return subscribers; }
-    inline int getAckMode(){ return ackMode; }
-    inline bool getTransactional() const { return transactional; }
-    inline int getPrefetch(){ return prefetch; }
-    inline int getBatches(){ return batches; }
-    inline int getDelay(){ return delay; }
-    inline int getSize(){ return size; }
-    inline bool getTrace() const { return trace; }
-    inline bool getHelp() const { return help; }
+    const string& getHost() const { return host;}
+    int getPort() const { return port; }
+    int getMessages() const { return messages; }
+    int getSubscribers() const { return subscribers; }
+    AckMode getAckMode(){ return ackMode; }
+    bool getTransactional() const { return transactional; }
+    int getPrefetch(){ return prefetch; }
+    int getBatches(){ return batches; }
+    int getDelay(){ return delay; }
+    int getSize(){ return size; }
+    bool getTrace() const { return trace; }
+    bool getHelp() const { return help; }
 };
 
 int main(int argc, char** argv) {
@@ -129,7 +129,7 @@ int main(int argc, char** argv) {
             //set up listener
             Publisher publisher(&channel, "topic_control", args.getTransactional());
             std::string tag("mytag");
-            channel.consume(response, tag, &publisher, args.getAckMode());
+            channel.getBasic().consume(response, tag, &publisher, args.getAckMode());
             channel.start();
 
             int batchSize(args.getBatches());
@@ -187,12 +187,12 @@ int64_t Publisher::publish(int msgs, int listeners, int size){
     {
         Monitor::ScopedLock l(monitor);
         for(int i = 0; i < msgs; i++){
-            channel->publish(msg, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
+            channel->getBasic().publish(msg, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
         }
         //send report request
         Message reportRequest;
         reportRequest.getHeaders().setString("TYPE", "REPORT_REQUEST");
-        channel->publish(reportRequest, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
+        channel->getBasic().publish(reportRequest, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
         if(transactional){
             channel->commit();
         }
@@ -216,7 +216,7 @@ void Publisher::terminate(){
     //send termination request
     Message terminationRequest;
     terminationRequest.getHeaders().setString("TYPE", "TERMINATION_REQUEST");
-    channel->publish(terminationRequest, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
+    channel->getBasic().publish(terminationRequest, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
     if(transactional){
         channel->commit();
     }
@@ -237,7 +237,7 @@ void Args::parse(int argc, char** argv){
         }else if("-subscribers" == name){
             subscribers = atoi(argv[++i]);
         }else if("-ack_mode" == name){
-            ackMode = atoi(argv[++i]);
+            ackMode = AckMode(atoi(argv[++i]));
         }else if("-transactional" == name){
             transactional = true;
         }else if("-prefetch" == name){