Remove unnecessary Protocol shared pointers

ProtocolFramePtr and ProtocolFrameHeaderPtr was used unnecessary
(no shared ownership required).

Change-Id: I71d4bf797450a46bc35e2321ff8d01a6508bcf88

diff --git a/src/common/protocol/ProtocolAdmin.cpp b/src/common/protocol/ProtocolAdmin.cpp
index 7d7d0f9..ca17e34 100644 (file)
--- a/src/common/protocol/ProtocolAdmin.cpp
+++ b/src/common/protocol/ProtocolAdmin.cpp
@@ -228,14 +228,14 @@ void ProtocolAdmin::execute(RequestContextPtr context, AdminCheckRequestPtr requ
          request->key().user().value().c_str(), request->key().privilege().value().c_str(),
          request->startBucket().c_str(), request->recursive());
 
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
 
-    ProtocolSerialization::serialize(*frame, OpAdminCheckRequest);
-    ProtocolSerialization::serialize(*frame, request->key().client().value());
-    ProtocolSerialization::serialize(*frame, request->key().user().value());
-    ProtocolSerialization::serialize(*frame, request->key().privilege().value());
-    ProtocolSerialization::serialize(*frame, request->startBucket());
-    ProtocolSerialization::serialize(*frame, request->recursive());
+    ProtocolSerialization::serialize(frame, OpAdminCheckRequest);
+    ProtocolSerialization::serialize(frame, request->key().client().value());
+    ProtocolSerialization::serialize(frame, request->key().user().value());
+    ProtocolSerialization::serialize(frame, request->key().privilege().value());
+    ProtocolSerialization::serialize(frame, request->startBucket());
+    ProtocolSerialization::serialize(frame, request->recursive());
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
@@ -246,12 +246,12 @@ void ProtocolAdmin::execute(RequestContextPtr context, InsertOrUpdateBucketReque
          request->bucketId().c_str(), request->result().policyType(),
          request->result().metadata().c_str());
 
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
 
-    ProtocolSerialization::serialize(*frame, OpInsertOrUpdateBucket);
-    ProtocolSerialization::serialize(*frame, request->bucketId());
-    ProtocolSerialization::serialize(*frame, request->result().policyType());
-    ProtocolSerialization::serialize(*frame, request->result().metadata());
+    ProtocolSerialization::serialize(frame, OpInsertOrUpdateBucket);
+    ProtocolSerialization::serialize(frame, request->bucketId());
+    ProtocolSerialization::serialize(frame, request->result().policyType());
+    ProtocolSerialization::serialize(frame, request->result().metadata());
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
@@ -260,10 +260,10 @@ void ProtocolAdmin::execute(RequestContextPtr context, RemoveBucketRequestPtr re
     LOGD("Serializing RemoveBucketRequest: sequenceNumber [%" PRIu16 "], bucketId <%s>",
          request->sequenceNumber(), request->bucketId().c_str());
 
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
 
-    ProtocolSerialization::serialize(*frame, OpRemoveBucket);
-    ProtocolSerialization::serialize(*frame, request->bucketId());
+    ProtocolSerialization::serialize(frame, OpRemoveBucket);
+    ProtocolSerialization::serialize(frame, request->bucketId());
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
@@ -273,39 +273,39 @@ void ProtocolAdmin::execute(RequestContextPtr context, SetPoliciesRequestPtr req
          "insertOrUpdate count [%zu], remove count [%zu]", request->sequenceNumber(),
          request->policiesToBeInsertedOrUpdated().size(), request->policiesToBeRemoved().size());
 
-    ProtocolFramePtr frame =
+    ProtocolFrame frame =
             ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
 
-    ProtocolSerialization::serialize(*frame, OpSetPolicies);
+    ProtocolSerialization::serialize(frame, OpSetPolicies);
 
-    ProtocolSerialization::serialize(*frame,
+    ProtocolSerialization::serialize(frame,
             static_cast<ProtocolFrameFieldsCount>(request->policiesToBeInsertedOrUpdated().size()));
     for (auto policyBucket : request->policiesToBeInsertedOrUpdated()) {
-        ProtocolSerialization::serialize(*frame, policyBucket.first);
-        ProtocolSerialization::serialize(*frame,
+        ProtocolSerialization::serialize(frame, policyBucket.first);
+        ProtocolSerialization::serialize(frame,
                     static_cast<ProtocolFrameFieldsCount>(policyBucket.second.size()));
         for (auto policy : policyBucket.second) {
             // PolicyKey
-            ProtocolSerialization::serialize(*frame, policy.key().client().value());
-            ProtocolSerialization::serialize(*frame, policy.key().user().value());
-            ProtocolSerialization::serialize(*frame, policy.key().privilege().value());
+            ProtocolSerialization::serialize(frame, policy.key().client().value());
+            ProtocolSerialization::serialize(frame, policy.key().user().value());
+            ProtocolSerialization::serialize(frame, policy.key().privilege().value());
             // PolicyResult
-            ProtocolSerialization::serialize(*frame, policy.result().policyType());
-            ProtocolSerialization::serialize(*frame, policy.result().metadata());
+            ProtocolSerialization::serialize(frame, policy.result().policyType());
+            ProtocolSerialization::serialize(frame, policy.result().metadata());
         }
     }
 
-    ProtocolSerialization::serialize(*frame,
+    ProtocolSerialization::serialize(frame,
             static_cast<ProtocolFrameFieldsCount>(request->policiesToBeRemoved().size()));
     for (auto policyBucket : request->policiesToBeRemoved()) {
-        ProtocolSerialization::serialize(*frame, policyBucket.first);
-        ProtocolSerialization::serialize(*frame,
+        ProtocolSerialization::serialize(frame, policyBucket.first);
+        ProtocolSerialization::serialize(frame,
                     static_cast<ProtocolFrameFieldsCount>(policyBucket.second.size()));
         for (auto policyKey : policyBucket.second) {
             // PolicyKey
-            ProtocolSerialization::serialize(*frame, policyKey.client().value());
-            ProtocolSerialization::serialize(*frame, policyKey.user().value());
-            ProtocolSerialization::serialize(*frame, policyKey.privilege().value());
+            ProtocolSerialization::serialize(frame, policyKey.client().value());
+            ProtocolSerialization::serialize(frame, policyKey.user().value());
+            ProtocolSerialization::serialize(frame, policyKey.privilege().value());
         }
     }
 
@@ -318,12 +318,12 @@ void ProtocolAdmin::execute(RequestContextPtr context, CheckResponsePtr response
          response->sequenceNumber(), response->m_resultRef.policyType(),
          response->m_resultRef.metadata().c_str());
 
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(
             response->sequenceNumber());
 
-    ProtocolSerialization::serialize(*frame, OpCheckPolicyResponse);
-    ProtocolSerialization::serialize(*frame, response->m_resultRef.policyType());
-    ProtocolSerialization::serialize(*frame, response->m_resultRef.metadata());
+    ProtocolSerialization::serialize(frame, OpCheckPolicyResponse);
+    ProtocolSerialization::serialize(frame, response->m_resultRef.policyType());
+    ProtocolSerialization::serialize(frame, response->m_resultRef.metadata());
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
@@ -332,11 +332,11 @@ void ProtocolAdmin::execute(RequestContextPtr context, CodeResponsePtr response)
     LOGD("Serializing CodeResponse: op [%" PRIu8 "], sequenceNumber [%" PRIu16 "], "
          "code [%" PRIu16 "]", OpCodeResponse, response->sequenceNumber(), response->m_code);
 
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(
             response->sequenceNumber());
 
-    ProtocolSerialization::serialize(*frame, OpCodeResponse);
-    ProtocolSerialization::serialize(*frame, static_cast<ProtocolResponseCode>(response->m_code));
+    ProtocolSerialization::serialize(frame, OpCodeResponse);
+    ProtocolSerialization::serialize(frame, static_cast<ProtocolResponseCode>(response->m_code));
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }

diff --git a/src/common/protocol/ProtocolClient.cpp b/src/common/protocol/ProtocolClient.cpp
index 94811dd..c643789 100644 (file)
--- a/src/common/protocol/ProtocolClient.cpp
+++ b/src/common/protocol/ProtocolClient.cpp
@@ -141,52 +141,52 @@ ResponsePtr ProtocolClient::extractResponseFromBuffer(BinaryQueue &bufferQueue)
 }
 
 void ProtocolClient::execute(RequestContextPtr context, CancelRequestPtr request) {
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
 
     LOGD("Serializing CancelRequest op [%" PRIu8 "]", OpCancelRequest);
 
-    ProtocolSerialization::serialize(*frame, OpCancelRequest);
+    ProtocolSerialization::serialize(frame, OpCancelRequest);
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
 
 void ProtocolClient::execute(RequestContextPtr context, CheckRequestPtr request) {
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(request->sequenceNumber());
 
     LOGD("Serializing CheckRequest: client <%s>, user <%s>, privilege <%s>",
          request->key().client().value().c_str(), request->key().user().value().c_str(),
          request->key().privilege().value().c_str());
 
-    ProtocolSerialization::serialize(*frame, OpCheckPolicyRequest);
-    ProtocolSerialization::serialize(*frame, request->key().client().value());
-    ProtocolSerialization::serialize(*frame, request->key().user().value());
-    ProtocolSerialization::serialize(*frame, request->key().privilege().value());
+    ProtocolSerialization::serialize(frame, OpCheckPolicyRequest);
+    ProtocolSerialization::serialize(frame, request->key().client().value());
+    ProtocolSerialization::serialize(frame, request->key().user().value());
+    ProtocolSerialization::serialize(frame, request->key().privilege().value());
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
 
 void ProtocolClient::execute(RequestContextPtr context, CancelResponsePtr response) {
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(
             response->sequenceNumber());
 
     LOGD("Serializing CancelResponse: op [%" PRIu8 "]", OpCancelResponse);
 
-    ProtocolSerialization::serialize(*frame, OpCancelResponse);
+    ProtocolSerialization::serialize(frame, OpCancelResponse);
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }
 
 void ProtocolClient::execute(RequestContextPtr context, CheckResponsePtr response) {
-    ProtocolFramePtr frame = ProtocolFrameSerializer::startSerialization(
+    ProtocolFrame frame = ProtocolFrameSerializer::startSerialization(
             response->sequenceNumber());
 
     LOGD("Serializing CheckResponse: op [%" PRIu8 "], policyType [%" PRIu16 "], metadata <%s>",
          OpCheckPolicyResponse, response->m_resultRef.policyType(),
          response->m_resultRef.metadata().c_str());
 
-    ProtocolSerialization::serialize(*frame, OpCheckPolicyResponse);
-    ProtocolSerialization::serialize(*frame, response->m_resultRef.policyType());
-    ProtocolSerialization::serialize(*frame, response->m_resultRef.metadata());
+    ProtocolSerialization::serialize(frame, OpCheckPolicyResponse);
+    ProtocolSerialization::serialize(frame, response->m_resultRef.policyType());
+    ProtocolSerialization::serialize(frame, response->m_resultRef.metadata());
 
     ProtocolFrameSerializer::finishSerialization(frame, context->responseQueue());
 }

diff --git a/src/common/protocol/ProtocolFrame.cpp b/src/common/protocol/ProtocolFrame.cpp
index 560217e..736be30 100644 (file)
--- a/src/common/protocol/ProtocolFrame.cpp
+++ b/src/common/protocol/ProtocolFrame.cpp
@@ -28,7 +28,7 @@
 
 namespace Cynara {
 
-ProtocolFrame::ProtocolFrame(ProtocolFrameHeaderPtr frameHeader, BinaryQueuePtr data) :
+ProtocolFrame::ProtocolFrame(ProtocolFrameHeader frameHeader, BinaryQueuePtr data) :
         m_frameHeader(frameHeader), m_frameBodyContent(data) {
 }
 
@@ -38,7 +38,7 @@ void ProtocolFrame::read(size_t num, void *bytes) {
 
 void ProtocolFrame::write(size_t num, const void *bytes) {
     m_frameBodyContent->appendCopy(bytes, num);
-    m_frameHeader->increaseFrameLength(num);
+    m_frameHeader.increaseFrameLength(num);
 }
 
 } /* namespace Cynara */

diff --git a/src/common/protocol/ProtocolFrame.h b/src/common/protocol/ProtocolFrame.h
index 3d85cc0..73f22e9 100644 (file)
--- a/src/common/protocol/ProtocolFrame.h
+++ b/src/common/protocol/ProtocolFrame.h
@@ -39,10 +39,10 @@ class ProtocolFrameSerializer;
 class ProtocolFrame: public IStream {
 
 public:
-    ProtocolFrame(ProtocolFrameHeaderPtr frameHeader, BinaryQueuePtr headerContent);
+    ProtocolFrame(ProtocolFrameHeader frameHeader, BinaryQueuePtr headerContent);
     virtual ~ProtocolFrame() {};
 
-    ProtocolFrameHeaderPtr frameHeader(void) {
+    ProtocolFrameHeader &frameHeader(void) {
         return m_frameHeader;
     }
 
@@ -50,7 +50,7 @@ public:
     virtual void write(size_t num, const void *bytes);
 
 private:
-    ProtocolFrameHeaderPtr m_frameHeader;
+    ProtocolFrameHeader m_frameHeader;
     BinaryQueuePtr m_frameBodyContent;
 
     BinaryQueue &bodyContent(void) {
@@ -60,8 +60,6 @@ private:
     friend class ProtocolFrameSerializer;
 };
 
-typedef std::shared_ptr<ProtocolFrame> ProtocolFramePtr;
-
 } /* namespace Cynara */
 
 #endif /* SRC_COMMON_PROTOCOL_PROTOCOLFRAME_H_ */

diff --git a/src/common/protocol/ProtocolFrameHeader.h b/src/common/protocol/ProtocolFrameHeader.h
index ff92bf9..7b85465 100644 (file)
--- a/src/common/protocol/ProtocolFrameHeader.h
+++ b/src/common/protocol/ProtocolFrameHeader.h
@@ -107,8 +107,6 @@ private:
     friend class ProtocolFrameSerializer;
 };
 
-typedef std::shared_ptr<ProtocolFrameHeader> ProtocolFrameHeaderPtr;
-
 } /* namespace Cynara */
 
 #endif /* SRC_COMMON_PROTOCOL_PROTOCOLFRAMEHEADER_H_ */

diff --git a/src/common/protocol/ProtocolFrameSerializer.cpp b/src/common/protocol/ProtocolFrameSerializer.cpp
index 88a07d3..0599f02 100644 (file)
--- a/src/common/protocol/ProtocolFrameSerializer.cpp
+++ b/src/common/protocol/ProtocolFrameSerializer.cpp
@@ -65,19 +65,19 @@ void ProtocolFrameSerializer::deserializeHeader(ProtocolFrameHeader &frameHeader
     }
 }
 
-ProtocolFramePtr ProtocolFrameSerializer::startSerialization(ProtocolFrameSequenceNumber sequenceNumber) {
+ProtocolFrame ProtocolFrameSerializer::startSerialization(ProtocolFrameSequenceNumber sequenceNumber) {
     LOGD("Serialization started");
 
     BinaryQueuePtr headerQueue = std::make_shared<BinaryQueue>();
     BinaryQueuePtr bodyQueue = std::make_shared<BinaryQueue>();
-    ProtocolFrameHeaderPtr header = std::make_shared<ProtocolFrameHeader>(headerQueue);
-    header->setSequenceNumber(sequenceNumber);
-    header->increaseFrameLength(ProtocolFrameHeader::frameHeaderLength());
-    return std::make_shared<ProtocolFrame>(header, bodyQueue);
+    ProtocolFrameHeader header(headerQueue);
+    header.setSequenceNumber(sequenceNumber);
+    header.increaseFrameLength(ProtocolFrameHeader::frameHeaderLength());
+    return ProtocolFrame(header, bodyQueue);
 }
 
-void ProtocolFrameSerializer::finishSerialization(ProtocolFramePtr frame, BinaryQueue &data) {
-    ProtocolFrameHeader &frameHeader = *frame->frameHeader();
+void ProtocolFrameSerializer::finishSerialization(ProtocolFrame &frame, BinaryQueue &data) {
+    ProtocolFrameHeader &frameHeader = frame.frameHeader();
     ProtocolSerialization::serializeNoSize(frameHeader, ProtocolFrameHeader::m_signature);
     ProtocolSerialization::serialize(frameHeader, frameHeader.m_frameLength);
     ProtocolSerialization::serialize(frameHeader, frameHeader.m_sequenceNumber);
@@ -87,7 +87,7 @@ void ProtocolFrameSerializer::finishSerialization(ProtocolFramePtr frame, Binary
          (int)frameHeader.m_sequenceNumber);
 
     data.appendMoveFrom(frameHeader.headerContent());
-    data.appendMoveFrom(frame->bodyContent());
+    data.appendMoveFrom(frame.bodyContent());
 }
 
 } /* namespace Cynara */

diff --git a/src/common/protocol/ProtocolFrameSerializer.h b/src/common/protocol/ProtocolFrameSerializer.h
index 8961e14..f2e201e 100644 (file)
--- a/src/common/protocol/ProtocolFrameSerializer.h
+++ b/src/common/protocol/ProtocolFrameSerializer.h
@@ -34,8 +34,8 @@ class ProtocolFrameSerializer {
 
 public:
     static void deserializeHeader(ProtocolFrameHeader &frameHeader, BinaryQueue &data);
-    static ProtocolFramePtr startSerialization(ProtocolFrameSequenceNumber sequenceNumber);
-    static void finishSerialization(ProtocolFramePtr frame, BinaryQueue &data);
+    static ProtocolFrame startSerialization(ProtocolFrameSequenceNumber sequenceNumber);
+    static void finishSerialization(ProtocolFrame &frame, BinaryQueue &data);
 };
 
 } /* namespace Cynara */