From 847ee577e23fbdd2175709a08a7160e8b2c1f464 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 27 Mar 2007 15:36:39 +0000 Subject: Refactored client::Message to be independent of all Basic class concepts and client::IncomingMessage to handle 0-9 style references and appends. * cpp/lib/client/ClientMessage.cpp: Made independent of Basic class. * cpp/lib/client/IncomingMessage.cpp: Refactored to handle references/appends. * cpp/lib/client/BasicMessageChannel.cpp: Refactored to use new IncomingMessage Thread safety fixes: * cpp/lib/client/ResponseHandler.h: Remove stateful functions. * cpp/lib/client/ClientChannel.cpp: use new ResponseHandler interface. Minor cleanup: * cpp/lib/common/framing/BasicHeaderProperties.cpp: use DeliveryMode enum. * cpp/tests/HeaderTest.cpp: use DeliveryMode enum. * cpp/tests/MessageTest.cpp: use DeliveryMode enum. * cpp/lib/common/shared_ptr.h: #include for convenience. * cpp/lib/common/sys/ThreadSafeQueue.h: Changed "stop" "shutdown" * cpp/lib/common/sys/ProducerConsumer.h: Changed "stop" "shutdown" * cpp/tests/ClientChannelTest.cpp (TestCase): Removed debug couts. * cpp/tests/setup: valgrind --demangle=yes by default. * cpp/tests/topictest: sleep to hack around startup race. * cpp/lib/broker/BrokerQueue.cpp (configure): Fixed memory leak. Removed/updated FIXME comments in: * cpp/lib/broker/BrokerMessage.cpp: * cpp/lib/broker/BrokerMessageBase.h: * cpp/lib/broker/InMemoryContent.cpp: * cpp/lib/common/framing/MethodContext.h: git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@522956 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/client/ClientMessage.h | 75 ++++++++++-------------------------------- 1 file changed, 17 insertions(+), 58 deletions(-) (limited to 'cpp/lib/client/ClientMessage.h') diff --git a/cpp/lib/client/ClientMessage.h b/cpp/lib/client/ClientMessage.h index c89eeb1a0d..a326c24aed 100644 --- a/cpp/lib/client/ClientMessage.h +++ b/cpp/lib/client/ClientMessage.h @@ -22,12 +22,10 @@ * */ #include -#include +#include "framing/BasicHeaderProperties.h" namespace qpid { - namespace client { -class IncomingMessage; /** * A representation of messages for sent or recived through the @@ -35,67 +33,28 @@ class IncomingMessage; * * \ingroup clientapi */ -class Message { - framing::AMQMethodBody::shared_ptr method; - framing::AMQHeaderBody::shared_ptr header; - std::string data; - bool redelivered; - - // FIXME aconway 2007-02-20: const incorrect, needs const return type. - framing::BasicHeaderProperties* getHeaderProperties() const; - Message(qpid::framing::AMQHeaderBody::shared_ptr& header); - +class Message : public framing::BasicHeaderProperties { public: - enum DeliveryMode { DURABLE=1, NON_DURABLE=2 }; - Message(const std::string& data=std::string()); - ~Message(); + Message(const std::string& data_=std::string()) : data(data_) {} std::string getData() const { return data; } - bool isRedelivered() const { return redelivered; } - uint64_t getDeliveryTag() const; - std::string getContentType() const; - std::string getContentEncoding() const; - qpid::framing::FieldTable& getHeaders() const; - uint8_t getDeliveryMode() const; - uint8_t getPriority() const; - std::string getCorrelationId() const; - std::string getReplyTo() const; - std::string getExpiration() const; - std::string getMessageId() const; - uint64_t getTimestamp() const; - std::string getType() const; - std::string getUserId() const; - std::string getAppId() const; - std::string getClusterId() const; + void setData(const std::string& _data) { data = _data; } - void setData(const std::string& _data); - void setRedelivered(bool _redelivered){ redelivered = _redelivered; } - void setContentType(const std::string& type); - void setContentEncoding(const std::string& encoding); - void setHeaders(const qpid::framing::FieldTable& headers); - void setDeliveryMode(DeliveryMode mode); - void setPriority(uint8_t priority); - void setCorrelationId(const std::string& correlationId); - void setReplyTo(const std::string& replyTo); - void setExpiration(const std::string& expiration); - void setMessageId(const std::string& messageId); - void setTimestamp(uint64_t timestamp); - void setType(const std::string& type); - void setUserId(const std::string& userId); - void setAppId(const std::string& appId); - void setClusterId(const std::string& clusterId); + std::string getDestination() const { return destination; } + void setDestination(const std::string& dest) { destination = dest; } - /** Get the method used to deliver this message */ - boost::shared_ptr getMethod() const - { return method; } - - void setMethod(framing::AMQMethodBody::shared_ptr m) { method=m; } - boost::shared_ptr getHeader() const - { return header; } + // TODO aconway 2007-03-22: only needed for Basic.deliver support. + uint64_t getDeliveryTag() const { return deliveryTag; } + void setDeliveryTag(uint64_t dt) { deliveryTag = dt; } - // TODO aconway 2007-02-15: remove friendships. - friend class IncomingMessage; - friend class Channel; + bool isRedelivered() const { return redelivered; } + void setRedelivered(bool _redelivered){ redelivered = _redelivered; } + + private: + std::string data; + std::string destination; + bool redelivered; + uint64_t deliveryTag; }; }} -- cgit v1.2.1