Replacing custom json content types by default

sdavtaker · sdavtaker · commit 96efe227593d · 2021-10-21T10:15:09.000-04:00
diff --git a/aws-cpp-sdk-core/include/aws/core/AmazonSerializableWebServiceRequest.h b/aws-cpp-sdk-core/include/aws/core/AmazonSerializableWebServiceRequest.h
@@ -15,8 +15,6 @@
 namespace Aws
 {
     static const char JSON_CONTENT_TYPE[]                  = "application/json";
-    static const char AMZN_JSON_CONTENT_TYPE_1_0[]         = "application/x-amz-json-1.0";
-    static const char AMZN_JSON_CONTENT_TYPE_1_1[]         = "application/x-amz-json-1.1";
     static const char FORM_CONTENT_TYPE[]                  = "application/x-www-form-urlencoded";
     static const char AMZN_XML_CONTENT_TYPE[]              = "application/xml";
     static const char AMZN_EVENTSTREAM_CONTENT_TYPE[]      = "application/vnd.amazon.eventstream";
@@ -33,8 +31,6 @@ namespace Aws
             //prevent unreferenced var warnings
             //for these values.
             AWS_UNREFERENCED_PARAM(JSON_CONTENT_TYPE);
-            AWS_UNREFERENCED_PARAM(AMZN_JSON_CONTENT_TYPE_1_0);
-            AWS_UNREFERENCED_PARAM(AMZN_JSON_CONTENT_TYPE_1_1);
             AWS_UNREFERENCED_PARAM(FORM_CONTENT_TYPE);
             AWS_UNREFERENCED_PARAM(AMZN_XML_CONTENT_TYPE);
         }
diff --git a/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java b/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java
@@ -67,12 +67,12 @@ public class CppViewHelper {
         CORAL_TYPE_TO_DEFAULT_VALUES.put("double", "0.0");
         CORAL_TYPE_TO_DEFAULT_VALUES.put("float", "0.0");
 
-        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("json", "Aws::AMZN_JSON_CONTENT_TYPE_1_1");
-        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("json1.0", "Aws::AMZN_JSON_CONTENT_TYPE_1_0");
-        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("json1.1", "Aws::AMZN_JSON_CONTENT_TYPE_1_1");
-        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-json", "Aws::AMZN_JSON_CONTENT_TYPE_1_1");
-        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-json1.0", "Aws::AMZN_JSON_CONTENT_TYPE_1_0");
-        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-json1.1", "Aws::AMZN_JSON_CONTENT_TYPE_1_1");
+        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("json", "Aws::JSON_CONTENT_TYPE");
+        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("json1.0", "Aws::JSON_CONTENT_TYPE");
+        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("json1.1", "Aws::JSON_CONTENT_TYPE");
+        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-json", "Aws::JSON_CONTENT_TYPE");
+        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-json1.0", "Aws::JSON_CONTENT_TYPE");
+        CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-json1.1", "Aws::JSON_CONTENT_TYPE");
         CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("rest-xml", "Aws::AMZN_XML_CONTENT_TYPE");
         CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("query", "Aws::FORM_CONTENT_TYPE");
         CORAL_PROTOCOL_TO_CONTENT_TYPE_MAPPING.put("ec2", "Aws::FORM_CONTENT_TYPE");
