Move to a different directory

Author: yourslab

CMakeLists.txt

@@ -62,8 +62,8 @@ add_subdirectory(jobs)
 add_subdirectory(shadow)
 add_subdirectory(discovery)
 add_subdirectory(identity)
-add_subdirectory(eventstreamrpc)
-add_subdirectory(ipc)
+add_subdirectory(eventstream_rpc)
+add_subdirectory(greengrass_ipc)
 if (NOT BYO_CRYPTO)
     # TODO: get these working with BYO_CRYPTO
     add_subdirectory(iotdevicecommon)

eventstreamrpc/CMakeLists.txt renamed to eventstream_rpc/CMakeLists.txt

@@ -251,6 +251,7 @@ namespace Aws
             EVENT_STREAM_RPC_SUCCESS = 0,
             EVENT_STREAM_RPC_NULL_PARAMETER,
             EVENT_STREAM_RPC_INITIALIZATION_ERROR,
+            EVENT_STREAM_RPC_ALLOCATION_ERROR,
             EVENT_STREAM_RPC_CONNECTION_CLOSED,
             EVENT_STREAM_RPC_CONNECTION_ACCESS_DENIED,
             EVENT_STREAM_RPC_CONTINUATION_CLOSED,
@@ -439,21 +440,6 @@ namespace Aws
             Crt::Allocator *m_allocator;
         };
 
-        class AWS_EVENTSTREAMRPC_API OperationResponse : public AbstractShapeBase
-        {
-          public:
-            OperationResponse() noexcept;
-            static void s_customDeleter(OperationResponse *shape) noexcept;
-            /* A response does not necessarily have to be serialized so provide a default implementation. */
-            virtual void SerializeToJsonObject(Crt::JsonObject &payloadObject) const override;
-        };
-
-        class AWS_EVENTSTREAMRPC_API OperationRequest : public AbstractShapeBase
-        {
-          public:
-            OperationRequest() noexcept;
-        };
-
         class AWS_EVENTSTREAMRPC_API OperationError : public AbstractShapeBase
         {
           public:
@@ -481,7 +467,7 @@ namespace Aws
             /**
              * Invoked when a message is received on this continuation.
              */
-            virtual void OnStreamEvent(Crt::ScopedResource<OperationResponse> response);
+            virtual void OnStreamEvent(Crt::ScopedResource<AbstractShapeBase> response);
             /**
              * Invoked when a message is received on this continuation but results in an error.
              *
@@ -501,7 +487,7 @@ namespace Aws
         {
           public:
             TaggedResult() noexcept;
-            explicit TaggedResult(Crt::ScopedResource<OperationResponse> response) noexcept;
+            explicit TaggedResult(Crt::ScopedResource<AbstractShapeBase> response) noexcept;
             explicit TaggedResult(Crt::ScopedResource<OperationError> error) noexcept;
             explicit TaggedResult(RpcError rpcError) noexcept;
             TaggedResult(TaggedResult &&rhs) noexcept;
@@ -512,22 +498,22 @@ namespace Aws
              */
             operator bool() const noexcept;
 
-            OperationResponse *GetOperationResponse() const noexcept;
+            AbstractShapeBase *GetOperationResponse() const noexcept;
             OperationError *GetOperationError() const noexcept;
             RpcError GetRpcError() const noexcept;
             ResultType GetResultType() const noexcept { return m_responseType; }
 
           private:
             union AWS_EVENTSTREAMRPC_API OperationResult
             {
-                OperationResult(Crt::ScopedResource<OperationResponse> &&response) noexcept
+                OperationResult(Crt::ScopedResource<AbstractShapeBase> &&response) noexcept
                     : m_response(std::move(response))
                 {
                 }
                 OperationResult(Crt::ScopedResource<OperationError> &&error) noexcept : m_error(std::move(error)) {}
                 OperationResult() noexcept : m_response(nullptr) {}
                 ~OperationResult() noexcept {};
-                Crt::ScopedResource<OperationResponse> m_response;
+                Crt::ScopedResource<AbstractShapeBase> m_response;
                 Crt::ScopedResource<OperationError> m_error;
             };
             ResultType m_responseType;
@@ -536,7 +522,7 @@ namespace Aws
         };
 
         using ExpectedResponseFactory = std::function<
-            Crt::ScopedResource<OperationResponse>(const Crt::StringView &payload, Crt::Allocator *allocator)>;
+            Crt::ScopedResource<AbstractShapeBase>(const Crt::StringView &payload, Crt::Allocator *allocator)>;
         using ErrorResponseFactory = std::function<
             Crt::ScopedResource<OperationError>(const Crt::StringView &payload, Crt::Allocator *allocator)>;
 
@@ -569,10 +555,10 @@ namespace Aws
         {
           public:
             OperationModelContext(const ServiceModel &serviceModel) noexcept;
-            virtual Crt::ScopedResource<OperationResponse> AllocateInitialResponseFromPayload(
+            virtual Crt::ScopedResource<AbstractShapeBase> AllocateInitialResponseFromPayload(
                 Crt::StringView stringView,
                 Crt::Allocator *allocator) const noexcept = 0;
-            virtual Crt::ScopedResource<OperationResponse> AllocateStreamingResponseFromPayload(
+            virtual Crt::ScopedResource<AbstractShapeBase> AllocateStreamingResponseFromPayload(
                 Crt::StringView stringView,
                 Crt::Allocator *allocator) const noexcept = 0;
             virtual Crt::String GetInitialResponseModelName() const noexcept = 0;
@@ -607,10 +593,10 @@ namespace Aws
 
           protected:
             std::future<RpcError> Activate(
-                const OperationRequest *shape,
+                const AbstractShapeBase *shape,
                 OnMessageFlushCallback onMessageFlushCallback) noexcept;
             std::future<RpcError> SendStreamEvent(
-                OperationRequest *shape,
+                AbstractShapeBase *shape,
                 OnMessageFlushCallback onMessageFlushCallback) noexcept;
             virtual Crt::String GetModelName() const noexcept = 0;
             const OperationModelContext &m_operationModelContext;

eventstreamrpc/cmake/eventstreamrpc-cpp-config.cmake renamed to eventstream_rpc/cmake/eventstreamrpc-cpp-config.cmake

@@ -956,10 +956,6 @@ namespace Aws
 
         AbstractShapeBase::~AbstractShapeBase() noexcept {}
 
-        OperationResponse::OperationResponse() noexcept {}
-
-        OperationRequest::OperationRequest() noexcept {}
-
         ClientOperation::ClientOperation(
             ClientConnection &connection,
             StreamResponseHandler *streamHandler,
@@ -982,7 +978,7 @@ namespace Aws
 
         ClientOperation::~ClientOperation() noexcept { Close().wait(); }
 
-        TaggedResult::TaggedResult(Crt::ScopedResource<OperationResponse> operationResponse) noexcept
+        TaggedResult::TaggedResult(Crt::ScopedResource<AbstractShapeBase> operationResponse) noexcept
             : m_responseType(OPERATION_RESPONSE)
         {
             m_operationResult.m_response = std::move(operationResponse);
@@ -1041,7 +1037,7 @@ namespace Aws
             }
         }
 
-        OperationResponse *TaggedResult::GetOperationResponse() const noexcept
+        AbstractShapeBase *TaggedResult::GetOperationResponse() const noexcept
         {
             if (m_responseType == OPERATION_RESPONSE)
             {
@@ -1110,7 +1106,7 @@ namespace Aws
             /* The value of this hashmap contains the function that allocates the response object from the
              * payload. */
             /* Responses after the first message don't necessarily have the same shape as the first. */
-            Crt::ScopedResource<OperationResponse> response;
+            Crt::ScopedResource<AbstractShapeBase> response;
             if (m_messageCount == 1)
             {
                 response = m_operationModelContext.AllocateInitialResponseFromPayload(payloadStringView, m_allocator);
@@ -1120,11 +1116,16 @@ namespace Aws
                 response = m_operationModelContext.AllocateStreamingResponseFromPayload(payloadStringView, m_allocator);
             }
 
-            if (response.get() == nullptr || modelName != response->GetModelName())
+            if (response.get() == nullptr)
             {
                 /* TODO: Log an error */
+                return EVENT_STREAM_RPC_ALLOCATION_ERROR;
+            }
+            else if (modelName != response->GetModelName())
+            {
                 return EVENT_STREAM_RPC_UNMAPPED_DATA;
             }
+
             if (m_messageCount == 1)
             {
                 m_initialResponsePromise.SetValue(TaggedResult(std::move(response)));
@@ -1192,7 +1193,7 @@ namespace Aws
             return true;
         }
 
-        void StreamResponseHandler::OnStreamEvent(Crt::ScopedResource<OperationResponse> response) {}
+        void StreamResponseHandler::OnStreamEvent(Crt::ScopedResource<AbstractShapeBase> response) {}
 
         void StreamResponseHandler::OnStreamClosed() {}
 
@@ -1265,7 +1266,7 @@ namespace Aws
         }
 
         std::future<RpcError> ClientOperation::Activate(
-            const OperationRequest *shape,
+            const AbstractShapeBase *shape,
             OnMessageFlushCallback onMessageFlushCallback) noexcept
         {
             /* Promises must be reset in case the client would like to send a subsequent request with the same
@@ -1329,12 +1330,5 @@ namespace Aws
             AbstractShapeBase::s_customDeleter(shape);
         }
 
-        void OperationResponse::s_customDeleter(OperationResponse *shape) noexcept
-        {
-            AbstractShapeBase::s_customDeleter(shape);
-        }
-
-        void OperationResponse::SerializeToJsonObject(Crt::JsonObject &payloadObject) const {}
-
     } /* namespace Eventstreamrpc */
 } // namespace Aws

eventstreamrpc/include/aws/eventstreamrpc/EventStreamClient.h renamed to eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h

@@ -41,7 +41,7 @@ file(GLOB TESTS ${TEST_HDRS} ${TEST_SRC})
 set(TEST_BINARY_NAME ${PROJECT_NAME}-tests)
 
 aws_use_package(aws-crt-cpp)
-aws_use_package(GreengrassIpc-cpp)
+aws_use_package(EventstreamRpc-cpp)
 
 add_test_case(EventStreamConnect)
 generate_cpp_test_driver(${TEST_BINARY_NAME})