first compiling version

aws · Dec 3, 2024 · b14a63f · b14a63f
1 parent d5f5486
commit b14a63f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 24 deletions.
diff --git a/generated/src/aws-cpp-sdk-qbusiness/include/aws/qbusiness/model/ChatInputStream.h b/generated/src/aws-cpp-sdk-qbusiness/include/aws/qbusiness/model/ChatInputStream.h
@@ -28,7 +28,7 @@ namespace Model
    * href="http://docs.aws.amazon.com/goto/WebAPI/qbusiness-2023-11-27/ChatInputStream">AWS
    * API Reference</a></p>
    */
-  class AWS_QBUSINESS_API ChatInputStream : public Aws::Utils::Event::SmithyEventEncoderStream
+  class AWS_QBUSINESS_API ChatInputStream : public Aws::Utils::Event::SmithyEventEncoderStream<smithy::AwsCredentialIdentityBase>
   {
   public:
     ChatInputStream& WriteConfigurationEvent(const ConfigurationEvent& value)

diff --git a/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventEncoderStream.h b/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventEncoderStream.h
@@ -28,7 +28,6 @@ namespace Aws
             class AWS_CORE_API EventEncoderStream : public Aws::IOStream
             {
             public:
-                using SIGNER_TYPE = smithy::AwsSignerBase<smithy::AwsCredentialIdentityBase>;
                 /**
                  * Creates a stream for encoding events sent by the client.
                  * @param bufferSize The length of the underlying buffer.
@@ -52,8 +51,6 @@ namespace Aws
                  */
                 void SetSigner(Aws::Client::AWSAuthSigner* signer) { m_encoder.SetSigner(signer); }
 
-                void SetSigner(std::shared_ptr<SIGNER_TYPE> signer) { m_evtEncoder.SetSigner(signer); }
-
                 /**
                  * Allows a stream writer to communicate the end of the stream to a stream reader.
                  *
@@ -72,22 +69,26 @@ namespace Aws
                 virtual ~EventEncoderStream(){}
 
             protected:
-                SmithyEventStreamEncoder m_evtEncoder;
                 virtual Aws::Vector<unsigned char> EncodeAndSign(const Aws::Utils::Event::Message& msg) ;
             private:
                 Stream::ConcurrentStreamBuf m_streambuf;
                 EventStreamEncoder m_encoder;
             };
-
+
+            template <typename IdentityT>
             class AWS_CORE_API SmithyEventEncoderStream : public EventEncoderStream
             {
                 public:
                 explicit SmithyEventEncoderStream(size_t bufferSize = DEFAULT_BUF_SIZE):EventEncoderStream(bufferSize){}
                 virtual ~SmithyEventEncoderStream() {}
-                protected:
-                Aws::Vector<unsigned char> EncodeAndSign(const Aws::Utils::Event::Message& msg) override ;
-
+                void SetSigner(std::shared_ptr<smithy::AwsSignerBase<IdentityT> > signer) { m_evtEncoder.SetSigner(signer); }
 
+                protected:
+                Aws::Vector<unsigned char> EncodeAndSign(const Aws::Utils::Event::Message& msg) override
+                {
+                    return m_evtEncoder.EncodeAndSign(msg);
+                }
+                SmithyEventStreamEncoder<IdentityT> m_evtEncoder;
             };
         }
     }

diff --git a/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventStreamEncoder.h b/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventStreamEncoder.h
@@ -64,16 +64,20 @@ namespace Aws
                 Aws::Client::AWSAuthSigner* m_signer;
             };
 
+            template <typename IdentityT>
             class AWS_CORE_API SmithyEventStreamEncoder : public EventStreamEncoder
             {
-                using SIGNER_TYPE = smithy::AwsSignerBase<smithy::AwsCredentialIdentityBase>;
+                using SIGNER_TYPE = smithy::AwsSignerBase<IdentityT>;
             public:
                 SmithyEventStreamEncoder(std::shared_ptr<SIGNER_TYPE> signer): EventStreamEncoder(), m_smithySigner(signer){};
                 SmithyEventStreamEncoder(): EventStreamEncoder(){};
 
                 void SetSigner(std::shared_ptr<SIGNER_TYPE> signer) { m_smithySigner = signer; }
             protected:
-                bool SignEventMessage(Event::Message& msg) override;
+                bool SignEventMessage(Event::Message& signedMessage) override
+                {
+                    return (m_smithySigner->SignEventMessage(signedMessage, m_signatureSeed));
+                }
 
             private:
                 std::shared_ptr<SIGNER_TYPE> m_smithySigner;

diff --git a/src/aws-cpp-sdk-core/include/smithy/client/common/AwsSmithyRequestSigning.h b/src/aws-cpp-sdk-core/include/smithy/client/common/AwsSmithyRequestSigning.h
@@ -259,8 +259,8 @@ namespace smithy
                     AWS_LOGSTREAM_ERROR(AWS_SMITHY_CLIENT_SIGNING_TAG, "Failed to adjust signing clock skew. Signer is null.");
                     return;
                 }
-
-                m_eventEncoderStreamSp->SetSigner(signer);
+                //typecast to streaming type
+                (std::dynamic_pointer_cast<Aws::Utils::Event::SmithyEventEncoderStream<IdentityT>>(m_eventEncoderStreamSp))->SetSigner(signer);
             }
         };
 

diff --git a/src/aws-cpp-sdk-core/source/utils/event/EventEncoderStream.cpp b/src/aws-cpp-sdk-core/source/utils/event/EventEncoderStream.cpp
@@ -45,12 +45,6 @@ namespace Aws
             {
                 return m_encoder.EncodeAndSign(msg);
             }
-
-
-            Aws::Vector<unsigned char> SmithyEventEncoderStream::EncodeAndSign(const Aws::Utils::Event::Message& msg)
-            {
-                return m_evtEncoder.EncodeAndSign(msg);
-            }
         }
     }
 }
diff --git a/src/aws-cpp-sdk-core/source/utils/event/EventStreamEncoder.cpp b/src/aws-cpp-sdk-core/source/utils/event/EventStreamEncoder.cpp
@@ -179,10 +179,7 @@ namespace Aws
                 return (m_signer->SignEventMessage(signedMessage, m_signatureSeed));
             }
 
-            bool SmithyEventStreamEncoder::SignEventMessage(Event::Message& signedMessage)
-            {
-                return (m_smithySigner->SignEventMessage(signedMessage, m_signatureSeed));
-            }
+
 
         } // namespace Event
     } // namespace Utils

diff --git a/...rces/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyEventStreamHeader.vm b/...rces/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyEventStreamHeader.vm
@@ -40,7 +40,7 @@ namespace Model
    * $shape.documentation
    */
 #end
-  class $typeInfo.exportValue $typeInfo.className : public Aws::Utils::Event::SmithyEventEncoderStream
+  class $typeInfo.exportValue $typeInfo.className : public Aws::Utils::Event::SmithyEventEncoderStream<smithy::AwsCredentialIdentityBase>
   {
   public:
 #foreach($entry in $shape.members.entrySet())