simplify Message interface

Author: BewareMyPower

include/pulsar/Message.h

@@ -31,12 +31,6 @@
 #include "MessageId.h"
 
 namespace pulsar {
-namespace proto {
-class CommandMessage;
-class BrokerEntryMetadata;
-class MessageMetadata;
-class SingleMessageMetadata;
-}  // namespace proto
 
 class SharedBuffer;
 class MessageBuilder;
@@ -216,10 +210,7 @@ class PULSAR_PUBLIC Message {
     typedef std::shared_ptr<MessageImpl> MessageImplPtr;
     MessageImplPtr impl_;
 
-    Message(MessageImplPtr& impl);
-    Message(const MessageId& messageId, proto::BrokerEntryMetadata& brokerEntryMetadata,
-            proto::MessageMetadata& metadata, SharedBuffer& payload,
-            proto::SingleMessageMetadata& singleMetadata, const std::shared_ptr<std::string>& topicName);
+    Message(const MessageImplPtr& impl);
     friend class PartitionedProducerImpl;
     friend class MultiTopicsConsumerImpl;
     friend class MessageBuilder;

lib/Message.cc

@@ -25,10 +25,7 @@
 #include <iostream>
 
 #include "Int64SerDes.h"
-#include "KeyValueImpl.h"
 #include "MessageImpl.h"
-#include "PulsarApi.pb.h"
-#include "SharedBuffer.h"
 
 using namespace pulsar;
 
@@ -69,53 +66,7 @@ std::string Message::getDataAsString() const { return std::string((const char*)g
 
 Message::Message() : impl_() {}
 
-Message::Message(MessageImplPtr& impl) : impl_(impl) {}
-
-Message::Message(const MessageId& messageID, proto::BrokerEntryMetadata& brokerEntryMetadata,
-                 proto::MessageMetadata& metadata, SharedBuffer& payload,
-                 proto::SingleMessageMetadata& singleMetadata, const std::shared_ptr<std::string>& topicName)
-    : impl_(std::make_shared<MessageImpl>()) {
-    impl_->messageId = messageID;
-    impl_->brokerEntryMetadata = brokerEntryMetadata;
-    impl_->metadata = metadata;
-    impl_->payload = payload;
-    impl_->metadata.mutable_properties()->CopyFrom(singleMetadata.properties());
-    impl_->topicName_ = topicName;
-
-    impl_->metadata.clear_properties();
-    if (singleMetadata.properties_size() > 0) {
-        impl_->metadata.mutable_properties()->Reserve(singleMetadata.properties_size());
-        for (int i = 0; i < singleMetadata.properties_size(); i++) {
-            auto keyValue = proto::KeyValue().New();
-            *keyValue = singleMetadata.properties(i);
-            impl_->metadata.mutable_properties()->AddAllocated(keyValue);
-        }
-    }
-
-    if (singleMetadata.has_partition_key()) {
-        impl_->metadata.set_partition_key(singleMetadata.partition_key());
-    } else {
-        impl_->metadata.clear_partition_key();
-    }
-
-    if (singleMetadata.has_ordering_key()) {
-        impl_->metadata.set_ordering_key(singleMetadata.ordering_key());
-    } else {
-        impl_->metadata.clear_ordering_key();
-    }
-
-    if (singleMetadata.has_event_time()) {
-        impl_->metadata.set_event_time(singleMetadata.event_time());
-    } else {
-        impl_->metadata.clear_event_time();
-    }
-
-    if (singleMetadata.has_sequence_id()) {
-        impl_->metadata.set_sequence_id(singleMetadata.sequence_id());
-    } else {
-        impl_->metadata.clear_sequence_id();
-    }
-}
+Message::Message(const MessageImplPtr& impl) : impl_(impl) {}
 
 const MessageId& Message::getMessageId() const {
     if (!impl_) {