init

Author: aws-sdk-cpp-automation

generated/src/aws-cpp-sdk-test-new-service-sdk-testing/include/aws/test-new-service-sdk-testing/model/PublishEvents.h

@@ -5,10 +5,12 @@
 
 #pragma once
 #include <aws/core/utils/event/EventStream.h>
+#include <aws/core/utils/event/EventStreamHandler.h>
 #include <aws/test-new-service-sdk-testing/TestNewServiceSDKTesting_EXPORTS.h>
 #include <aws/test-new-service-sdk-testing/model/LeaveEvent.h>
 #include <aws/test-new-service-sdk-testing/model/Message.h>
 
+#include <functional>
 #include <utility>
 
 namespace Aws {
@@ -34,6 +36,17 @@ class AWS_TESTNEWSERVICESDKTESTING_API PublishEvents : public Aws::Utils::Event:
     WriteEvent(msg);
     return *this;
   }
+
+  std::function<void(const Aws::Utils::Event::Message&, const Aws::Utils::Event::InitialResponseType&)>& GetInitialResponseCallbackEx() {
+    return m_initialResponseCallback;
+  }
+  void SetInitialResponseCallbackEx(
+      std::function<void(const Aws::Utils::Event::Message&, const Aws::Utils::Event::InitialResponseType&)> callback) {
+    m_initialResponseCallback = std::move(callback);
+  }
+
+ private:
+  std::function<void(const Aws::Utils::Event::Message&, const Aws::Utils::Event::InitialResponseType&)> m_initialResponseCallback;
 };
 
 }  // namespace Model

generated/src/aws-cpp-sdk-test-new-service-sdk-testing/include/aws/test-new-service-sdk-testing/model/PublishFoosRequest.h

@@ -4,6 +4,7 @@
  */
 
 #pragma once
+#include <aws/core/utils/event/EventStreamDecoder.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/test-new-service-sdk-testing/TestNewServiceSDKTestingRequest.h>
 #include <aws/test-new-service-sdk-testing/TestNewServiceSDKTesting_EXPORTS.h>
@@ -20,7 +21,7 @@ namespace Model {
  */
 class PublishFoosRequest : public TestNewServiceSDKTestingRequest {
  public:
-  AWS_TESTNEWSERVICESDKTESTING_API PublishFoosRequest() = default;
+  AWS_TESTNEWSERVICESDKTESTING_API PublishFoosRequest() : m_eventStreamDecoder(nullptr) {}
 
   // Service request name is the Operation name which will send this request out,
   // each operation should has unique request name, so that we can get operation's name from this request.
@@ -35,6 +36,17 @@ class PublishFoosRequest : public TestNewServiceSDKTestingRequest {
   AWS_TESTNEWSERVICESDKTESTING_API std::shared_ptr<Aws::IOStream> GetBody() const override;
   AWS_TESTNEWSERVICESDKTESTING_API Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
 
+  /**
+   * Underlying Event Stream Handler which is used to define the handlers to process the underlying event-stream
+   */
+  inline std::shared_ptr<PublishEvents> GetEventStreamHandler() const { return m_messages; }
+  inline void SetEventStreamHandler(std::shared_ptr<PublishEvents> value) { m_messages = std::move(value); }
+
+  /**
+   * Event Stream Decoder for processing incoming event stream messages
+   */
+  inline Aws::Utils::Event::EventStreamDecoder& GetEventStreamDecoder() const { return m_eventStreamDecoder; }
+
   ///@{
 
   inline const Aws::String& GetRoom() const { return m_room; }
@@ -68,6 +80,8 @@ class PublishFoosRequest : public TestNewServiceSDKTestingRequest {
   Aws::String m_room;
 
   std::shared_ptr<PublishEvents> m_messages;
+  mutable Aws::Utils::Event::EventStreamDecoder m_eventStreamDecoder{nullptr};
+
   bool m_roomHasBeenSet = false;
   bool m_messagesHasBeenSet = false;
 };

generated/src/aws-cpp-sdk-test-new-service-sdk-testing/source/TestNewServiceSDKTestingClient.cpp

@@ -5,6 +5,7 @@
 
 #include <aws/core/auth/AWSAuthSigner.h>
 #include <aws/core/auth/AWSCredentialsProviderChain.h>
+#include <aws/core/client/AWSClientEventStreamingAsyncTask.h>
 #include <aws/core/client/CoreErrors.h>
 #include <aws/core/client/RetryStrategy.h>
 #include <aws/core/http/HttpClient.h>

src/aws-cpp-sdk-core/include/aws/core/client/AWSClientEventStreamingAsyncTask.h

@@ -61,9 +61,13 @@ class AWS_CORE_LOCAL BidirectionalEventStreamingTask final {
         AWS_CHECK_PTR(ClientT::GetAllocationTag(), request);
         AWS_CHECK_PTR(ClientT::GetAllocationTag(), response);
 
-        auto& initialResponseHandler = request->GetEventStreamHandler().GetInitialResponseCallbackEx();
+        auto& initialResponseHandler = request->GetEventStreamHandler()->GetInitialResponseCallbackEx();
         if (initialResponseHandler) {
-          initialResponseHandler({response->GetHeaders()}, Utils::Event::InitialResponseType::ON_RESPONSE);
+          Utils::Event::Message msg;
+          for (const auto& header : response->GetHeaders()) {
+            msg.InsertEventHeader(header.first, header.second);
+          }
+          initialResponseHandler(msg, Utils::Event::InitialResponseType::ON_RESPONSE);
         }
       });
     }

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassMembersAndInlines.vm

@@ -153,6 +153,10 @@
     ${operation.name}Handler m_handler;
     Aws::Utils::Event::EventStreamDecoder m_decoder{Utils::Event::EventStreamDecoder(&m_handler)};
 
+#end
+#if($operation.request.shape.hasEventStreamMembers())
+    mutable Aws::Utils::Event::EventStreamDecoder m_eventStreamDecoder{nullptr};
+
 #end
 #end##if($shape.members.size() > 0)
 #foreach($member in $shape.members.entrySet())

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/RequestHeader.vm

@@ -13,6 +13,7 @@
 #end
 #if($operation.request.shape.hasEventStreamMembers())
 \#include <memory>
+\#include <aws/core/utils/event/EventStreamDecoder.h>
 #end
 #foreach($header in $typeInfo.headerIncludes)
 \#include $header
@@ -46,7 +47,11 @@ namespace Model
   class ${typeInfo.className} : public ${typeInfo.baseClass}
   {
   public:
+#if($operation.request.shape.hasEventStreamMembers())
+    ${exportMacro} ${typeInfo.className}() : m_eventStreamDecoder(nullptr) {}
+#else
     ${exportMacro} ${typeInfo.className}() = default;
+#end
 
     // Service request name is the Operation name which will send this request out,
     // each operation should has unique request name, so that we can get operation's name from this request.
@@ -140,6 +145,29 @@ namespace Model
      */
     inline ${operation.request.shape.name}& WithEventStreamHandler(const ${operation.name}Handler& value) { SetEventStreamHandler(value); return *this; }
 
+#end
+#if($operation.request.shape.hasEventStreamMembers())
+#set($streamMemberName = "")
+#set($streamMemberType = "")
+#foreach($memberEntry in $operation.request.shape.members.entrySet())
+#if($memberEntry.value.shape.isEventStream())
+#set($streamMemberName = $memberEntry.key)
+#set($streamMemberType = $memberEntry.value.shape.name)
+#break
+#end
+#end
+#set($streamMemberNameCap = $CppViewHelper.capitalizeFirstChar($streamMemberName))
+    /**
+     * Underlying Event Stream Handler which is used to define the handlers to process the underlying event-stream
+     */
+    inline std::shared_ptr<${streamMemberType}> GetEventStreamHandler() const { return m_${streamMemberName}; }
+    inline void SetEventStreamHandler(std::shared_ptr<${streamMemberType}> value) { m_${streamMemberName} = std::move(value); }
+    
+    /**
+     * Event Stream Decoder for processing incoming event stream messages
+     */
+    inline Aws::Utils::Event::EventStreamDecoder& GetEventStreamDecoder() const { return m_eventStreamDecoder; }
+
 #end
 #if($operation.requestCompressionRequired)
 #if($operation.requestCompressionRequiredGzip)

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceHeaders.vm

@@ -8,10 +8,10 @@
 #set($hasEventStreamRequest = true)
 #end
 #end
-#if($hasEventStreamResult)
 #if($hasEventStreamRequest)
 \#include <aws/core/client/AWSClientEventStreamingAsyncTask.h>
 #end
+#if($hasEventStreamResult)
 \#include <aws/core/utils/event/EventStream.h>
 #end
 #if($arnEndpointSupported || $metadata.hasEndpointDiscoveryTrait)

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/EventStreamHeader.vm

@@ -9,6 +9,8 @@
 \#include $header
 #end
 \#include <aws/core/utils/event/EventStream.h>
+\#include <aws/core/utils/event/EventStreamHandler.h>
+\#include <functional>
 #foreach($entry in $shape.members.entrySet())
 #if($entry.value.shape.isEvent())
 #foreach($eventMemberEntry in $entry.value.shape.members.entrySet())
@@ -75,6 +77,11 @@ namespace Model
 #end
 #end
 
+    std::function<void(const Aws::Utils::Event::Message&, const Aws::Utils::Event::InitialResponseType&)>& GetInitialResponseCallbackEx() { return m_initialResponseCallback; }
+    void SetInitialResponseCallbackEx(std::function<void(const Aws::Utils::Event::Message&, const Aws::Utils::Event::InitialResponseType&)> callback) { m_initialResponseCallback = std::move(callback); }
+
+  private:
+    std::function<void(const Aws::Utils::Event::Message&, const Aws::Utils::Event::InitialResponseType&)> m_initialResponseCallback;
   };
 
 } // namespace Model