Get rid of BasicHeaderProperties, dead code from 0-8 protocol.

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

4 files changed, 4 insertions, 42 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 4e075e73a3..0065ed397c 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -34,7 +34,6 @@ using namespace qpid::framing;
 using std::string;
 
 TransferAdapter Message::TRANSFER;
-PublishAdapter Message::PUBLISH;
 
 Message::Message(const SequenceNumber& id) : frames(id), persistenceId(0), redelivered(false), loaded(false), publisher(0), adapter(0) {}
 
@@ -190,12 +189,12 @@ void Message::sendHeader(framing::FrameHandler& out, uint16_t /*maxFrameSize*/)
     frames.map_if(f, TypeFilter(HEADER_BODY));    
 }
 
+// FIXME aconway 2007-11-09: Obsolete, remove. Was used to cover over
+// 0-8/0-9 message differences.
 MessageAdapter& Message::getAdapter() const
 {
     if (!adapter) {
-        if (frames.isA<BasicPublishBody>()) {
-            adapter = &PUBLISH;
-        } else if(frames.isA<MessageTransferBody>()) {
+        if(frames.isA<MessageTransferBody>()) {
             adapter = &TRANSFER;
         } else {
             const AMQMethodBody* method = frames.getMethod();
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/src/qpid/broker/Message.h
index f706a65e52..913cc759bc 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/cpp/src/qpid/broker/Message.h
@@ -130,7 +130,6 @@ public:
     mutable MessageAdapter* adapter;
 
     static TransferAdapter TRANSFER;
-    static PublishAdapter PUBLISH;
 
     MessageAdapter& getAdapter() const;
 };
diff --git a/cpp/src/qpid/broker/MessageAdapter.cpp b/cpp/src/qpid/broker/MessageAdapter.cpp
index 764bf02cf4..2c29aa5444 100644
--- a/cpp/src/qpid/broker/MessageAdapter.cpp
+++ b/cpp/src/qpid/broker/MessageAdapter.cpp
@@ -28,33 +28,6 @@ namespace {
 namespace qpid {
 namespace broker{
 
-    std::string PublishAdapter::getRoutingKey(const framing::FrameSet& f)
-    {
-        return f.as<framing::BasicPublishBody>()->getRoutingKey();
-    }
-
-    std::string PublishAdapter::getExchange(const framing::FrameSet& f)
-    {
-        return f.as<framing::BasicPublishBody>()->getExchange();
-    }
-
-    bool PublishAdapter::isImmediate(const framing::FrameSet& f)
-    {
-        return f.as<framing::BasicPublishBody>()->getImmediate();
-    }
-
-    const framing::FieldTable* PublishAdapter::getApplicationHeaders(const framing::FrameSet& f)
-    {
-        const framing::BasicHeaderProperties* p = f.getHeaders()->get<framing::BasicHeaderProperties>();
-        return p ? &(p->getHeaders()) : 0;
-    }
-
-    bool PublishAdapter::isPersistent(const framing::FrameSet& f)
-    {
-        const framing::BasicHeaderProperties* p = f.getHeaders()->get<framing::BasicHeaderProperties>();
-        return p && p->getDeliveryMode() == 2;
-    }
-
     std::string TransferAdapter::getRoutingKey(const framing::FrameSet& f)
     {
         const framing::DeliveryProperties* p = f.getHeaders()->get<framing::DeliveryProperties>();
diff --git a/cpp/src/qpid/broker/MessageAdapter.h b/cpp/src/qpid/broker/MessageAdapter.h
index e8337ec649..ef316edacb 100644
--- a/cpp/src/qpid/broker/MessageAdapter.h
+++ b/cpp/src/qpid/broker/MessageAdapter.h
@@ -24,7 +24,6 @@
 
 #include <string>
 #include "qpid/framing/BasicPublishBody.h"
-#include "qpid/framing/BasicHeaderProperties.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/framing/FrameSet.h"
 #include "qpid/framing/DeliveryProperties.h"
@@ -34,6 +33,7 @@
 namespace qpid {	
 namespace broker {
 
+// FIXME aconway 2007-11-09: No longer needed, we only have one type of message.
 struct MessageAdapter
 {
     virtual ~MessageAdapter() {}
@@ -45,15 +45,6 @@ struct MessageAdapter
     virtual bool isPersistent(const framing::FrameSet& f) = 0;
 };
 
-struct PublishAdapter : MessageAdapter
-{
-    std::string getRoutingKey(const framing::FrameSet& f);
-    std::string getExchange(const framing::FrameSet& f);
-    bool isImmediate(const framing::FrameSet& f);
-    const framing::FieldTable* getApplicationHeaders(const framing::FrameSet& f);
-    bool isPersistent(const framing::FrameSet& f);
-};
-
 struct TransferAdapter : MessageAdapter
 {
     std::string getRoutingKey(const framing::FrameSet& f);