pending merge conflict

Author: sbera87

generated/src/aws-cpp-sdk-appconfig/include/aws/appconfig/AppConfigClient.h

@@ -6,15 +6,19 @@
 #pragma once
 #include <aws/appconfig/AppConfig_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/appconfig/AppConfigServiceClientModel.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/appconfig/AppConfigErrorMarshaller.h>
 
 namespace Aws
 {
 namespace AppConfig
 {
+  AWS_APPCONFIG_API extern const char SERVICE_NAME[];
   /**
    * <p>AppConfig feature flags and dynamic configurations help software builders
    * quickly and securely adjust application behavior in production environments
@@ -111,12 +115,20 @@ namespace AppConfig
    * href="http://docs.aws.amazon.com/appconfig/latest/userguide/what-is-appconfig.html">AppConfig
    * User Guide</a>.</p>
    */
-  class AWS_APPCONFIG_API AppConfigClient : public Aws::Client::AWSJsonClient, public Aws::Client::ClientWithAsyncTemplateMethods<AppConfigClient>
+  class AWS_APPCONFIG_API AppConfigClient : smithy::client::AwsSmithyClientT<Aws::AppConfig::SERVICE_NAME,
+      Aws::AppConfig::AppConfigClientConfiguration,
+      smithy::SigV4AuthSchemeResolver<>,
+      Aws::Crt::Variant<smithy::SigV4AuthScheme>,
+      AppConfigEndpointProviderBase,
+      smithy::client::JsonOutcomeSerializer,
+      smithy::client::JsonOutcome,
+      Aws::Client::AppConfigErrorMarshaller>,
+    Aws::Client::ClientWithAsyncTemplateMethods<AppConfigClient>
   {
     public:
-      typedef Aws::Client::AWSJsonClient BASECLASS;
       static const char* GetServiceName();
       static const char* GetAllocationTag();
+      inline const char* GetServiceClientName() const override { return "AppConfig"; }
 
       typedef AppConfigClientConfiguration ClientConfigurationType;
       typedef AppConfigEndpointProvider EndpointProviderType;
@@ -1395,10 +1407,7 @@ namespace AppConfig
       std::shared_ptr<AppConfigEndpointProviderBase>& accessEndpointProvider();
     private:
       friend class Aws::Client::ClientWithAsyncTemplateMethods<AppConfigClient>;
-      void init(const AppConfigClientConfiguration& clientConfiguration);
 
-      AppConfigClientConfiguration m_clientConfiguration;
-      std::shared_ptr<AppConfigEndpointProviderBase> m_endpointProvider;
   };
 
 } // namespace AppConfig

generated/src/aws-cpp-sdk-appconfig/source/AppConfigClient.cpp

@@ -6,15 +6,19 @@
 #pragma once
 #include <aws/appconfigdata/AppConfigData_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/appconfigdata/AppConfigDataServiceClientModel.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/appconfigdata/AppConfigDataErrorMarshaller.h>
 
 namespace Aws
 {
 namespace AppConfigData
 {
+  AWS_APPCONFIGDATA_API extern const char SERVICE_NAME[];
   /**
    * <p>AppConfig Data provides the data plane APIs your application uses to retrieve
    * configuration data. Here's how it works:</p> <p>Your application retrieves
@@ -57,12 +61,20 @@ namespace AppConfigData
    * href="http://docs.aws.amazon.com/appconfig/latest/userguide/appconfig-retrieving-the-configuration">Retrieving
    * the configuration</a> in the <i>AppConfig User Guide</i>.</p>
    */
-  class AWS_APPCONFIGDATA_API AppConfigDataClient : public Aws::Client::AWSJsonClient, public Aws::Client::ClientWithAsyncTemplateMethods<AppConfigDataClient>
+  class AWS_APPCONFIGDATA_API AppConfigDataClient : smithy::client::AwsSmithyClientT<Aws::AppConfigData::SERVICE_NAME,
+      Aws::AppConfigData::AppConfigDataClientConfiguration,
+      smithy::SigV4AuthSchemeResolver<>,
+      Aws::Crt::Variant<smithy::SigV4AuthScheme>,
+      AppConfigDataEndpointProviderBase,
+      smithy::client::JsonOutcomeSerializer,
+      smithy::client::JsonOutcome,
+      Aws::Client::AppConfigDataErrorMarshaller>,
+    Aws::Client::ClientWithAsyncTemplateMethods<AppConfigDataClient>
   {
     public:
-      typedef Aws::Client::AWSJsonClient BASECLASS;
       static const char* GetServiceName();
       static const char* GetAllocationTag();
+      inline const char* GetServiceClientName() const override { return "AppConfigData"; }
 
       typedef AppConfigDataClientConfiguration ClientConfigurationType;
       typedef AppConfigDataEndpointProvider EndpointProviderType;
@@ -189,10 +201,7 @@ namespace AppConfigData
       std::shared_ptr<AppConfigDataEndpointProviderBase>& accessEndpointProvider();
     private:
       friend class Aws::Client::ClientWithAsyncTemplateMethods<AppConfigDataClient>;
-      void init(const AppConfigDataClientConfiguration& clientConfiguration);
 
-      AppConfigDataClientConfiguration m_clientConfiguration;
-      std::shared_ptr<AppConfigDataEndpointProviderBase> m_endpointProvider;
   };
 
 } // namespace AppConfigData