QPID-664: renamed headers as properties (to match python); added priority

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

6 files changed, 20 insertions, 9 deletions

diff --git a/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp b/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
index 8ef62e4d41..5e526a2ffc 100644
--- a/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
+++ b/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
@@ -56,7 +56,7 @@ struct FailoverUpdatesImpl : qpid::sys::Runnable
         try {
             Message message;
             while (!quit && receiver.fetch(message)) {
-                connection.setOption("urls", message.getHeaders()["amq.failover"]);
+                connection.setOption("urls", message.getProperties()["amq.failover"]);
                 session.acknowledge();
             }
         } catch (const qpid::TransportFailure& e) {
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index 3f5cccfedb..345ebfb66d 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
@@ -279,7 +279,8 @@ void populateHeaders(qpid::messaging::Message& message,
     if (deliveryProperties) {
         message.setTtl(qpid::messaging::Duration(deliveryProperties->getTtl()));
         message.setDurable(deliveryProperties->getDeliveryMode() == DELIVERY_MODE_PERSISTENT);
-        MessageImplAccess::get(message).redelivered = deliveryProperties->getRedelivered();
+        message.setPriority(deliveryProperties->getPriority());
+        message.setRedelivered(deliveryProperties->getRedelivered());
     }
     if (messageProperties) {
         message.setContentType(messageProperties->getContentType());
@@ -287,8 +288,8 @@ void populateHeaders(qpid::messaging::Message& message,
             message.setReplyTo(AddressResolution::convert(messageProperties->getReplyTo()));
         }
         message.setSubject(messageProperties->getApplicationHeaders().getAsString(SUBJECT));
-        message.getHeaders().clear();
-        translate(messageProperties->getApplicationHeaders(), message.getHeaders());
+        message.getProperties().clear();
+        translate(messageProperties->getApplicationHeaders(), message.getProperties());
         message.setCorrelationId(messageProperties->getCorrelationId());
         message.setUserId(messageProperties->getUserId());
     }
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index d0d945b934..b19b26f903 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
@@ -46,12 +46,15 @@ void OutgoingMessage::convert(const qpid::messaging::Message& from)
     if (address) {
         message.getMessageProperties().setReplyTo(AddressResolution::convert(address));
     }
-    translate(from.getHeaders(), message.getMessageProperties().getApplicationHeaders());
+    translate(from.getProperties(), message.getMessageProperties().getApplicationHeaders());
     message.getDeliveryProperties().setTtl(from.getTtl().getMilliseconds());
     if (from.getDurable()) {
         message.getDeliveryProperties().setDeliveryMode(DELIVERY_MODE_PERSISTENT);
     }
-
+    if (from.getRedelivered()) {
+        message.getDeliveryProperties().setRedelivered(true);
+    }
+    if (from.getPriority()) message.getDeliveryProperties().setPriority(from.getPriority());
 }
 
 namespace {
diff --git a/cpp/src/qpid/messaging/Message.cpp b/cpp/src/qpid/messaging/Message.cpp
index 822659f6ef..84245b7296 100644
--- a/cpp/src/qpid/messaging/Message.cpp
+++ b/cpp/src/qpid/messaging/Message.cpp
@@ -52,16 +52,20 @@ const std::string& Message::getUserId() const { return impl->userId; }
 void Message::setCorrelationId(const std::string& id) { impl->correlationId = id; }
 const std::string& Message::getCorrelationId() const { return impl->correlationId; }
 
+uint8_t Message::getPriority() const { return impl->priority; }
+void Message::setPriority(uint8_t priority) { impl->priority = priority; }
+
 void Message::setTtl(Duration ttl) { impl->ttl = ttl.getMilliseconds(); }
 Duration Message::getTtl() const { return Duration(impl->ttl); }
 
 void Message::setDurable(bool durable) { impl->durable = durable; }
 bool Message::getDurable() const { return impl->durable; }
 
-bool Message::isRedelivered() const { return impl->redelivered; }
+bool Message::getRedelivered() const { return impl->redelivered; }
+void Message::setRedelivered(bool redelivered) { impl->redelivered = redelivered; }
 
-const VariantMap& Message::getHeaders() const { return impl->getHeaders(); }
-VariantMap& Message::getHeaders() { return impl->getHeaders(); }
+const VariantMap& Message::getProperties() const { return impl->getHeaders(); }
+VariantMap& Message::getProperties() { return impl->getHeaders(); }
 
 void Message::setContent(const std::string& c) { impl->setBytes(c); }
 void Message::setContent(const char* chars, size_t count) { impl->setBytes(chars, count); }
diff --git a/cpp/src/qpid/messaging/MessageImpl.cpp b/cpp/src/qpid/messaging/MessageImpl.cpp
index 5f8ac20551..dea6681244 100644
--- a/cpp/src/qpid/messaging/MessageImpl.cpp
+++ b/cpp/src/qpid/messaging/MessageImpl.cpp
@@ -31,12 +31,14 @@ const std::string EMPTY_STRING = "";
 using namespace qpid::types;
 
 MessageImpl::MessageImpl(const std::string& c) : 
+    priority(0),
     ttl(0),
     durable(false),
     redelivered(false),
     bytes(c),
     internalId(0) {}
 MessageImpl::MessageImpl(const char* chars, size_t count) : 
+    priority(0),
     ttl(0),
     durable (false),
     redelivered(false),
diff --git a/cpp/src/qpid/messaging/MessageImpl.h b/cpp/src/qpid/messaging/MessageImpl.h
index 3898ff9f98..7793fc7943 100644
--- a/cpp/src/qpid/messaging/MessageImpl.h
+++ b/cpp/src/qpid/messaging/MessageImpl.h
@@ -36,6 +36,7 @@ struct MessageImpl
     std::string messageId;
     std::string userId;
     std::string correlationId;
+    uint8_t priority;
     uint64_t ttl;
     bool durable;
     bool redelivered;