[ProtocolTests] query sub object serialization refactor (#3331)

* [ProtocolTests] query sub object serialization refactor

* [ProtocolTests] query nested element serialization

* Codegen for #3331

Author: SergeyRyabinin

generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/QueryTimestampsRequest.cpp

@@ -28,12 +28,12 @@ Aws::String QueryTimestampsRequest::SerializePayload() const
 
   if(m_epochMemberHasBeenSet)
   {
-    ss << "epochMember=" << StringUtils::URLEncode(m_epochMember.ToGmtString(Aws::Utils::DateFormat::$CppViewHelper.computeTimestampFormatInQueryString($member.value.shape)).c_str()) << "&";
+    ss << "epochMember=" << StringUtils::to_string(m_epochMember.Seconds()) << "&";
   }
 
   if(m_epochTargetHasBeenSet)
   {
-    ss << "epochTarget=" << StringUtils::URLEncode(m_epochTarget.ToGmtString(Aws::Utils::DateFormat::$CppViewHelper.computeTimestampFormatInQueryString($member.value.shape)).c_str()) << "&";
+    ss << "epochTarget=" << StringUtils::to_string(m_epochTarget.Seconds()) << "&";
   }
 
   ss << "Version=2020-01-08";

generated/protocol-tests/test-clients/aws-cpp-sdk-ec2-protocol/source/model/SimpleInputParamsRequest.cpp

@@ -67,12 +67,12 @@ Aws::String SimpleInputParamsRequest::SerializePayload() const
 
   if(m_quxHasBeenSet)
   {
-    ss << "Qux=" << HashingUtils::Base64Encode(m_qux) << "&";
+    ss << "Qux=" << StringUtils::URLEncode(HashingUtils::Base64Encode(m_qux).c_str()) << "&";
   }
 
   if(m_fooEnumHasBeenSet)
   {
-    ss << "FooEnum=" << FooEnumMapper::GetNameForFooEnum(m_fooEnum) << "&";
+    ss << "FooEnum=" << StringUtils::URLEncode(FooEnumMapper::GetNameForFooEnum(m_fooEnum)) << "&";
   }
 
   if(m_hasQueryNameHasBeenSet)

generated/protocol-tests/test-clients/aws-cpp-sdk-json-protocol/include/aws/json-protocol/JsonProtocolClient.h

@@ -6,33 +6,21 @@
 #pragma once
 #include <aws/json-protocol/JsonProtocol_EXPORTS.h>
 #include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/client/AWSClient.h>
 #include <aws/core/client/AWSClientAsyncCRTP.h>
+#include <aws/core/utils/json/JsonSerializer.h>
 #include <aws/json-protocol/JsonProtocolServiceClientModel.h>
-#include <smithy/client/AwsSmithyClient.h>
-#include <smithy/identity/auth/built-in/SigV4AuthSchemeResolver.h>
-#include <smithy/identity/auth/built-in/SigV4AuthScheme.h>
-#include <smithy/client/serializer/JsonOutcomeSerializer.h>
-#include <aws/json-protocol/JsonProtocolErrorMarshaller.h>
 
 namespace Aws
 {
 namespace JsonProtocol
 {
-  AWS_JSONPROTOCOL_API extern const char SERVICE_NAME[];
-  class AWS_JSONPROTOCOL_API JsonProtocolClient : smithy::client::AwsSmithyClientT<Aws::JsonProtocol::SERVICE_NAME,
-      Aws::JsonProtocol::JsonProtocolClientConfiguration,
-      smithy::SigV4AuthSchemeResolver<>,
-      Aws::Crt::Variant<smithy::SigV4AuthScheme>,
-      JsonProtocolEndpointProviderBase,
-      smithy::client::JsonOutcomeSerializer,
-      smithy::client::JsonOutcome,
-      Aws::Client::JsonProtocolErrorMarshaller>,
-    Aws::Client::ClientWithAsyncTemplateMethods<JsonProtocolClient>
+  class AWS_JSONPROTOCOL_API JsonProtocolClient : public Aws::Client::AWSJsonClient, public Aws::Client::ClientWithAsyncTemplateMethods<JsonProtocolClient>
   {
     public:
+      typedef Aws::Client::AWSJsonClient BASECLASS;
       static const char* GetServiceName();
       static const char* GetAllocationTag();
-      inline const char* GetServiceClientName() const override { return "Json Protocol"; }
 
       typedef JsonProtocolClientConfiguration ClientConfigurationType;
       typedef JsonProtocolEndpointProvider EndpointProviderType;
@@ -502,7 +490,10 @@ namespace JsonProtocol
       std::shared_ptr<JsonProtocolEndpointProviderBase>& accessEndpointProvider();
     private:
       friend class Aws::Client::ClientWithAsyncTemplateMethods<JsonProtocolClient>;
+      void init(const JsonProtocolClientConfiguration& clientConfiguration);
 
+      JsonProtocolClientConfiguration m_clientConfiguration;
+      std::shared_ptr<JsonProtocolEndpointProviderBase> m_endpointProvider;
   };
 
 } // namespace JsonProtocol

generated/protocol-tests/test-clients/aws-cpp-sdk-json-protocol/source/JsonProtocolClient.cpp

@@ -6,33 +6,21 @@
 #pragma once
 #include <aws/json-rpc-10/JSONRPC10_EXPORTS.h>
 #include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/client/AWSClient.h>
 #include <aws/core/client/AWSClientAsyncCRTP.h>
+#include <aws/core/utils/json/JsonSerializer.h>
 #include <aws/json-rpc-10/JSONRPC10ServiceClientModel.h>
-#include <smithy/client/AwsSmithyClient.h>
-#include <smithy/identity/auth/built-in/SigV4AuthSchemeResolver.h>
-#include <smithy/identity/auth/built-in/SigV4AuthScheme.h>
-#include <smithy/client/serializer/JsonOutcomeSerializer.h>
-#include <aws/json-rpc-10/JSONRPC10ErrorMarshaller.h>
 
 namespace Aws
 {
 namespace JSONRPC10
 {
-  AWS_JSONRPC10_API extern const char SERVICE_NAME[];
-  class AWS_JSONRPC10_API JSONRPC10Client : smithy::client::AwsSmithyClientT<Aws::JSONRPC10::SERVICE_NAME,
-      Aws::JSONRPC10::JSONRPC10ClientConfiguration,
-      smithy::SigV4AuthSchemeResolver<>,
-      Aws::Crt::Variant<smithy::SigV4AuthScheme>,
-      JSONRPC10EndpointProviderBase,
-      smithy::client::JsonOutcomeSerializer,
-      smithy::client::JsonOutcome,
-      Aws::Client::JSONRPC10ErrorMarshaller>,
-    Aws::Client::ClientWithAsyncTemplateMethods<JSONRPC10Client>
+  class AWS_JSONRPC10_API JSONRPC10Client : public Aws::Client::AWSJsonClient, public Aws::Client::ClientWithAsyncTemplateMethods<JSONRPC10Client>
   {
     public:
+      typedef Aws::Client::AWSJsonClient BASECLASS;
       static const char* GetServiceName();
       static const char* GetAllocationTag();
-      inline const char* GetServiceClientName() const override { return "JSON RPC 10"; }
 
       typedef JSONRPC10ClientConfiguration ClientConfigurationType;
       typedef JSONRPC10EndpointProvider EndpointProviderType;
@@ -370,7 +358,10 @@ namespace JSONRPC10
       std::shared_ptr<JSONRPC10EndpointProviderBase>& accessEndpointProvider();
     private:
       friend class Aws::Client::ClientWithAsyncTemplateMethods<JSONRPC10Client>;
+      void init(const JSONRPC10ClientConfiguration& clientConfiguration);
 
+      JSONRPC10ClientConfiguration m_clientConfiguration;
+      std::shared_ptr<JSONRPC10EndpointProviderBase> m_endpointProvider;
   };
 
 } // namespace JSONRPC10