define content- and view- classes separately from message class

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

9 files changed, 27 insertions, 33 deletions

diff --git a/cpp/examples/messaging/client.cpp b/cpp/examples/messaging/client.cpp
index 45c065880b..de6d7768df 100644
--- a/cpp/examples/messaging/client.cpp
+++ b/cpp/examples/messaging/client.cpp
@@ -63,7 +63,7 @@ int main(int argc, char** argv) {
             request.setContent(s[i]);
             sender.send(request);
             Message response = receiver.fetch();
-            std::cout << request.getContent().asString() << " -> " << response.getContent().asString() << std::endl;
+            std::cout << request.getContent() << " -> " << response.getContent() << std::endl;
 	}
         connection.close();
         return 0;
diff --git a/cpp/examples/messaging/map_receiver.cpp b/cpp/examples/messaging/map_receiver.cpp
index e6557b1560..f97c44eebd 100644
--- a/cpp/examples/messaging/map_receiver.cpp
+++ b/cpp/examples/messaging/map_receiver.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <qpid/messaging/Connection.h>
+#include <qpid/messaging/MapView.h>
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Receiver.h>
 #include <qpid/messaging/Session.h>
@@ -42,7 +43,8 @@ int main(int argc, char** argv) {
         Session session = connection.newSession();
         Receiver receiver = session.createReceiver("message_queue");
         Message message = receiver.fetch();
-        std::cout << message.getContent().asMap() << std::endl;
+        MapView content(message);
+        std::cout << content << std::endl;
         session.acknowledge();
         receiver.cancel();
         connection.close();
diff --git a/cpp/examples/messaging/map_sender.cpp b/cpp/examples/messaging/map_sender.cpp
index 9301c1fe1f..02c6433836 100644
--- a/cpp/examples/messaging/map_sender.cpp
+++ b/cpp/examples/messaging/map_sender.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <qpid/messaging/Connection.h>
+#include <qpid/messaging/MapContent.h>
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
@@ -43,14 +44,16 @@ int main(int argc, char** argv) {
         Sender sender = session.createSender("message_queue");
 
         Message message;
-        message.getContent()["id"] = 987654321;
-        message.getContent()["name"] = "Widget";
-        message.getContent()["price"] = 0.99;//bad use of floating point number, just an example!
+        MapContent content(message);
+        content["id"] = 987654321;
+        content["name"] = "Widget";
+        content["price"] = 0.99;//bad use of floating point number, just an example!
         Variant::List colours;
         colours.push_back(Variant("red"));
         colours.push_back(Variant("green"));
         colours.push_back(Variant("white"));
-        message.getContent()["colours"] = colours;
+        content["colours"] = colours;
+        content.encode();
 	
         sender.send(message);
         session.sync();
diff --git a/cpp/examples/messaging/queue_listener.cpp b/cpp/examples/messaging/queue_listener.cpp
index 099e8e145a..92a0eed5ed 100644
--- a/cpp/examples/messaging/queue_listener.cpp
+++ b/cpp/examples/messaging/queue_listener.cpp
@@ -47,8 +47,8 @@ bool Listener::isFinished() { return finished; }
 
 void Listener::received(Message& message) 
 {
-    std::cout << "Message: " << message.getContent().asString() << std::endl;
-    if (message.getContent().asString() == "That's all, folks!") {
+    std::cout << "Message: " << message.getContent() << std::endl;
+    if (message.getContent() == "That's all, folks!") {
         std::cout << "Shutting down listener" << std::endl;
         receiver.cancel();
         finished = true;
diff --git a/cpp/examples/messaging/queue_receiver.cpp b/cpp/examples/messaging/queue_receiver.cpp
index 83a44b2ca9..40f863eb30 100644
--- a/cpp/examples/messaging/queue_receiver.cpp
+++ b/cpp/examples/messaging/queue_receiver.cpp
@@ -24,16 +24,10 @@
 #include <qpid/messaging/Receiver.h>
 #include <qpid/messaging/Session.h>
 
-#include <cstdlib>
 #include <iostream>
 
-#include <sstream>
-
 using namespace qpid::messaging;
 
-using std::stringstream;
-using std::string;
-
 int main(int argc, char** argv) {
     const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
 
@@ -47,7 +41,7 @@ int main(int argc, char** argv) {
             Message message = receiver.fetch();
             std::cout << "Message: " << message.getContent() << std::endl;
             session.acknowledge();
-            if (message.getContent().asString() == "That's all, folks!") {
+            if (message.getContent() == "That's all, folks!") {
                 std::cout << "Cancelling receiver" << std::endl;
                 receiver.cancel();
                 break;
diff --git a/cpp/examples/messaging/queue_sender.cpp b/cpp/examples/messaging/queue_sender.cpp
index 637e7eb8e4..1396e26d5c 100644
--- a/cpp/examples/messaging/queue_sender.cpp
+++ b/cpp/examples/messaging/queue_sender.cpp
@@ -26,14 +26,10 @@
 
 #include <cstdlib>
 #include <iostream>
-
 #include <sstream>
 
 using namespace qpid::messaging;
 
-using std::stringstream;
-using std::string;
-
 int main(int argc, char** argv) {
     const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
     int count = argc>2 ? atoi(argv[2]) : 10;
@@ -45,14 +41,13 @@ int main(int argc, char** argv) {
 
 	// Now send some messages ...
 	for (int i=0; i<count; i++) {
-            Message message;
-            message.getContent() << "Message " << i;
-            sender.send(message);
+            std::stringstream content;
+            content << "Message " << i;
+            sender.send(Message(content.str()));
 	}
 	
-	// And send a final message to indicate termination.
-    	Message message("That's all, folks!");
-        sender.send(message);
+	// And send a final message to indicate termination.    	
+        sender.send(Message("That's all, folks!"));
         session.sync();
         connection.close();
         return 0;
diff --git a/cpp/examples/messaging/server.cpp b/cpp/examples/messaging/server.cpp
index 38f4601ff6..024832f914 100644
--- a/cpp/examples/messaging/server.cpp
+++ b/cpp/examples/messaging/server.cpp
@@ -51,17 +51,17 @@ int main(int argc, char** argv) {
             const Address& address = request.getReplyTo();
             if (address) {
                 Sender sender = session.createSender(address);
-                std::string s = request.getContent().asString();
+                std::string s = request.getContent();
                 std::transform(s.begin(), s.end(), s.begin(), toupper);
                 Message response(s);
                 sender.send(response);
                 std::cout << "Processed request: " 
-                          << request.getContent().asString() 
+                          << request.getContent() 
                           << " -> " 
-                          << response.getContent().asString() << std::endl;
+                          << response.getContent() << std::endl;
                 session.acknowledge();
             } else {
-                std::cerr << "Error: no reply address specified for request: " << request.getContent().asString() << std::endl;
+                std::cerr << "Error: no reply address specified for request: " << request.getContent() << std::endl;
                 session.reject(request);
             }
         }
diff --git a/cpp/examples/messaging/topic_listener.cpp b/cpp/examples/messaging/topic_listener.cpp
index 700e03cdf9..ba999c03a7 100644
--- a/cpp/examples/messaging/topic_listener.cpp
+++ b/cpp/examples/messaging/topic_listener.cpp
@@ -48,8 +48,8 @@ bool Listener::isFinished() { return finished; }
 
 void Listener::received(Message& message) 
 {
-    std::cout << "Message: " << message.getContent().asString() << std::endl;
-    if (message.getContent().asString() == "That's all, folks!") {
+    std::cout << "Message: " << message.getContent() << std::endl;
+    if (message.getContent() == "That's all, folks!") {
         std::cout << "Shutting down listener" << std::endl;
         receiver.cancel();
         finished = true;
diff --git a/cpp/examples/messaging/topic_receiver.cpp b/cpp/examples/messaging/topic_receiver.cpp
index 063f0d9cb0..7352a91b30 100644
--- a/cpp/examples/messaging/topic_receiver.cpp
+++ b/cpp/examples/messaging/topic_receiver.cpp
@@ -47,8 +47,8 @@ int main(int argc, char** argv) {
         Receiver receiver = session.createReceiver(Address("news_service", "topic"), filter);
         while (true) {
             Message message = receiver.fetch();
-            std::cout << "Message: " << message.getContent().asString() << std::endl;
-            if (message.getContent().asString() == "That's all, folks!") {
+            std::cout << "Message: " << message.getContent() << std::endl;
+            if (message.getContent() == "That's all, folks!") {
                 std::cout << "Cancelling receiver" << std::endl;
                 receiver.cancel();
                 break;