Fixing content-type header for JSON services

Author: spfink

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java

@@ -24,6 +24,8 @@
 @SdkProtectedApi
 public class DefaultJsonContentTypeResolver implements JsonContentTypeResolver {
 
+    private static final String REST_JSON_CONTENT_TYPE = "application/json";
+
     private final String prefix;
 
     public DefaultJsonContentTypeResolver(String prefix) {
@@ -32,6 +34,11 @@ public DefaultJsonContentTypeResolver(String prefix) {
 
     @Override
     public String resolveContentType(AwsJsonProtocolMetadata protocolMetadata) {
-        return prefix + protocolMetadata.protocolVersion();
+        switch (protocolMetadata.protocol()) {
+            case REST_JSON:
+                return REST_JSON_CONTENT_TYPE;
+            default:
+                return prefix + protocolMetadata.protocolVersion();
+        }
     }
 }

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonGenerator.java

@@ -32,8 +32,6 @@ public interface StructuredJsonGenerator {
      */
     StructuredJsonGenerator NO_OP = new StructuredJsonGenerator() {
 
-        private final byte[] emptyBytes = new byte[0];
-
         @Override
         public StructuredJsonGenerator writeStartArray() {
             return this;
@@ -126,7 +124,7 @@ public StructuredJsonGenerator writeNumber(String number) {
 
         @Override
         public byte[] getBytes() {
-            return emptyBytes;
+            return null;
         }
 
         @Override

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java

@@ -201,9 +201,12 @@ private SdkHttpFullRequest finishMarshalling() {
             }
 
             byte[] content = jsonGenerator.getBytes();
-            request.contentStreamProvider(() -> new ByteArrayInputStream(content));
-            if (content.length > 0) {
-                request.putHeader(CONTENT_LENGTH, Integer.toString(content.length));
+
+            if (content != null) {
+                request.contentStreamProvider(() -> new ByteArrayInputStream(content));
+                if (content.length > 0) {
+                    request.putHeader(CONTENT_LENGTH, Integer.toString(content.length));
+                }
             }
         }
 
@@ -214,7 +217,7 @@ private SdkHttpFullRequest finishMarshalling() {
         if (!request.headers().containsKey(CONTENT_TYPE) && !hasEvent) {
             if (hasEventStreamingInput) {
                 request.putHeader(CONTENT_TYPE, MIMETYPE_EVENT_STREAM);
-            } else if (contentType != null && !hasStreamingInput) {
+            } else if (contentType != null && !hasStreamingInput && request.contentStreamProvider() != null) {
                 request.putHeader(CONTENT_TYPE, contentType);
             }
         }

services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java

@@ -27,6 +27,7 @@
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
 import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
@@ -44,6 +45,7 @@ public class PutItemRequestMarshallerTest {
                                                         .option(SdkClientOption.ENDPOINT, URI.create("http://localhost"))
                                                         .build())
                               .protocolVersion("1.1")
+                              .protocol(AwsJsonProtocol.AWS_JSON)
                               .build());
 
     /**l

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-core-input.json

@@ -469,6 +469,24 @@
       }
     }
   },
+  {
+    "description": "GET operation does not have content-type header",
+    "given": {
+      "input": {
+      }
+    },
+    "when": {
+      "action": "marshall",
+      "operation": "MembersInQueryParams"
+    },
+    "then": {
+      "serializedAs": {
+        "headers": {
+          "doesNotContain": [ "content-type" ]
+        }
+      }
+    }
+  },
   {
       "description": "Input with greedy label in path",
       "given": {

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-input.json

@@ -37,6 +37,22 @@
       }
     }
   },
+  {
+    "description": "Content type header is set to application/json for a POST request",
+    "when": {
+      "action": "marshall",
+      "operation": "AllTypes"
+    },
+    "then": {
+      "serializedAs": {
+        "headers": {
+          "contains": {
+            "content-type": "application/json"
+          }
+        }
+      }
+    }
+  },
   {
     "description": "Operation with structure member explicitly marked as the payload is serialized as unwrapped JSON",
     "given": {

test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java

@@ -29,6 +29,7 @@
 import software.amazon.awssdk.http.AbortableInputStream;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
 import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
 import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
 import software.amazon.awssdk.services.protocolrestjson.model.InputEvent;
@@ -46,10 +47,12 @@ public class EventTransformTest {
     @BeforeClass
     public static void setup() {
         protocolFactory = AwsJsonProtocolFactory.builder()
-                .clientConfiguration(SdkClientConfiguration.builder()
-                        .option(SdkClientOption.ENDPOINT, URI.create("http://foo.amazonaws.com"))
-                        .build())
-                .build();
+                                                .clientConfiguration(
+                                                    SdkClientConfiguration.builder()
+                                                                          .option(SdkClientOption.ENDPOINT, URI.create("http://foo.amazonaws.com"))
+                                                                          .build())
+                                                .protocol(AwsJsonProtocol.AWS_JSON)
+                                                .build();
     }
 
     @Test