Use standardized REST-JSON behavior

.changes/next-release/bugfix-AWSSDKforJavav2-47e105f.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Update the REST-JSON marshalling logic to conform to the standard expected behavior WRT to the `Content-Type` of the request."
+}

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java

@@ -187,11 +187,17 @@ public List<MemberModel> getUnboundMembers() {
         List<MemberModel> unboundMembers = new ArrayList<>();
         if (members != null) {
             for (MemberModel member : members) {
-                if (member.getHttp().getLocation() == null) {
+                if (member.getHttp().getLocation() == null && !member.getHttp().getIsPayload()) {
                     if (hasPayloadMember) {
+                        // There is an explicit payload, but this unbound
+                        // member isn't it.
+                        // Note: Somewhat unintuitive, explicit payloads don't
+                        // have an explicit location; they're identified by
+                        // the payload HTTP trait being true.
                         throw new IllegalStateException(String.format(
-                                "C2J Shape %s has both an explicit payload member and unbound (no explicit location) members. "
-                                + "This is undefined behavior, verify the correctness of the C2J model", c2jName));
+                                "C2J Shape %s has both an explicit payload member and unbound (no explicit location) member, %s."
+                                + " This is undefined behavior, verify the correctness of the C2J model.",
+                                c2jName, member.getName()));
                     }
                     unboundMembers.add(member);
                 }
@@ -221,7 +227,12 @@ public List<MemberModel> getUnboundEventMembers() {
     public boolean hasPayloadMembers() {
         return hasPayloadMember ||
                getExplicitEventPayloadMember() != null ||
-               !getUnboundMembers().isEmpty() ||
+               hasImplicitPayloadMembers();
+
+    }
+
+    public boolean hasImplicitPayloadMembers() {
+        return !getUnboundMembers().isEmpty() ||
                (isEvent() && !getUnboundEventMembers().isEmpty());
     }
 

codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java

@@ -95,6 +95,7 @@ protected FieldSpec operationInfoField() {
                                       .add(".httpMethod($T.$L)", SdkHttpMethod.class, shapeModel.getMarshaller().getVerb())
                                       .add(".hasExplicitPayloadMember($L)", shapeModel.isHasPayloadMember() ||
                                                                             shapeModel.getExplicitEventPayloadMember() != null)
+                                      .add(".hasImplicitPayloadMembers($L)", shapeModel.hasImplicitPayloadMembers())
                                       .add(".hasPayloadMembers($L)", shapeModel.hasPayloadMembers());
 
         if (StringUtils.isNotBlank(shapeModel.getMarshaller().getTarget())) {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/alltypesrequestmarshaller.java

@@ -19,7 +19,8 @@
 @SdkInternalApi
 public class AllTypesRequestMarshaller implements Marshaller<AllTypesRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
-                                                                            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build();
+            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true)
+            .hasPayloadMembers(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -32,11 +33,10 @@ public SdkHttpFullRequest marshall(AllTypesRequest allTypesRequest) {
         Validate.paramNotNull(allTypesRequest, "allTypesRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(allTypesRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
-

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationrequestmarshaller.java

@@ -19,8 +19,8 @@
 @SdkInternalApi
 public class EventStreamOperationRequestMarshaller implements Marshaller<EventStreamOperationRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-                                                                            .requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
-                                                                            .hasPayloadMembers(true).hasEventStreamingInput(true).build();
+            .requestUri("/2016-03-11/eventStreamOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
+            .hasImplicitPayloadMembers(false).hasPayloadMembers(true).hasEventStreamingInput(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,7 +33,7 @@ public SdkHttpFullRequest marshall(EventStreamOperationRequest eventStreamOperat
         Validate.paramNotNull(eventStreamOperationRequest, "eventStreamOperationRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(eventStreamOperationRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/eventstreamoperationwithonlyinputrequestmarshaller.java

@@ -17,11 +17,11 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 @SdkInternalApi
-public class EventStreamOperationWithOnlyInputRequestMarshaller implements
-                                                                Marshaller<EventStreamOperationWithOnlyInputRequest> {
+public class EventStreamOperationWithOnlyInputRequestMarshaller implements Marshaller<EventStreamOperationWithOnlyInputRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-                                                                            .requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST)
-                                                                            .hasExplicitPayloadMember(false).hasPayloadMembers(true).hasEventStreamingInput(true).build();
+            .requestUri("/2016-03-11/EventStreamOperationWithOnlyInput").httpMethod(SdkHttpMethod.POST)
+            .hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true).hasPayloadMembers(true).hasEventStreamingInput(true)
+            .build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -34,11 +34,10 @@ public SdkHttpFullRequest marshall(EventStreamOperationWithOnlyInputRequest even
         Validate.paramNotNull(eventStreamOperationWithOnlyInputRequest, "eventStreamOperationWithOnlyInputRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(eventStreamOperationWithOnlyInputRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
-

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/nestedcontainersrequestmarshaller.java

@@ -19,7 +19,8 @@
 @SdkInternalApi
 public class NestedContainersRequestMarshaller implements Marshaller<NestedContainersRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
-                                                                            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).build();
+            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(true)
+            .hasPayloadMembers(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -32,11 +33,10 @@ public SdkHttpFullRequest marshall(NestedContainersRequest nestedContainersReque
         Validate.paramNotNull(nestedContainersRequest, "nestedContainersRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(nestedContainersRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
-

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/operationwithnoinputoroutputrequestmarshaller.java

@@ -17,10 +17,10 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 @SdkInternalApi
-public class OperationWithNoInputOrOutputRequestMarshaller implements
-                                                           Marshaller<OperationWithNoInputOrOutputRequest> {
+public class OperationWithNoInputOrOutputRequestMarshaller implements Marshaller<OperationWithNoInputOrOutputRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().requestUri("/")
-                                                                            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasPayloadMembers(false).build();
+            .httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false).hasImplicitPayloadMembers(false)
+            .hasPayloadMembers(false).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,11 +33,10 @@ public SdkHttpFullRequest marshall(OperationWithNoInputOrOutputRequest operation
         Validate.paramNotNull(operationWithNoInputOrOutputRequest, "operationWithNoInputOrOutputRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(operationWithNoInputOrOutputRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
-

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streaminginputoperationrequestmarshaller.java

@@ -19,8 +19,8 @@
 @SdkInternalApi
 public class StreamingInputOperationRequestMarshaller implements Marshaller<StreamingInputOperationRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-                                                                            .requestUri("/2016-03-11/streamingInputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
-                                                                            .hasPayloadMembers(true).hasStreamingInput(true).build();
+            .requestUri("/2016-03-11/streamingInputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(true)
+            .hasImplicitPayloadMembers(false).hasPayloadMembers(true).hasStreamingInput(true).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,11 +33,10 @@ public SdkHttpFullRequest marshall(StreamingInputOperationRequest streamingInput
         Validate.paramNotNull(streamingInputOperationRequest, "streamingInputOperationRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(streamingInputOperationRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
-

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/transform/streamingoutputoperationrequestmarshaller.java

@@ -19,8 +19,8 @@
 @SdkInternalApi
 public class StreamingOutputOperationRequestMarshaller implements Marshaller<StreamingOutputOperationRequest> {
     private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder()
-                                                                            .requestUri("/2016-03-11/streamingOutputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false)
-                                                                            .hasPayloadMembers(false).build();
+            .requestUri("/2016-03-11/streamingOutputOperation").httpMethod(SdkHttpMethod.POST).hasExplicitPayloadMember(false)
+            .hasImplicitPayloadMembers(false).hasPayloadMembers(false).build();
 
     private final BaseAwsJsonProtocolFactory protocolFactory;
 
@@ -33,11 +33,10 @@ public SdkHttpFullRequest marshall(StreamingOutputOperationRequest streamingOutp
         Validate.paramNotNull(streamingOutputOperationRequest, "streamingOutputOperationRequest");
         try {
             ProtocolMarshaller<SdkHttpFullRequest> protocolMarshaller = protocolFactory
-                .createProtocolMarshaller(SDK_OPERATION_BINDING);
+                    .createProtocolMarshaller(SDK_OPERATION_BINDING);
             return protocolMarshaller.marshall(streamingOutputOperationRequest);
         } catch (Exception e) {
             throw SdkClientException.builder().message("Unable to marshall request to JSON: " + e.getMessage()).cause(e).build();
         }
     }
 }
-

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

@@ -23,6 +23,7 @@
  */
 @SdkProtectedApi
 public class DefaultJsonContentTypeResolver implements JsonContentTypeResolver {
+    private static final String REST_JSON_CONTENT_TYPE = "application/json";
 
     private final String prefix;
 
@@ -32,7 +33,9 @@ public DefaultJsonContentTypeResolver(String prefix) {
 
     @Override
     public String resolveContentType(AwsJsonProtocolMetadata protocolMetadata) {
-        //Changing this to 'application/json' may break clients expecting 'application/x-amz-json-1.1'
+        if (AwsJsonProtocol.REST_JSON.equals(protocolMetadata.protocol())) {
+            return REST_JSON_CONTENT_TYPE;
+        }
         return prefix + protocolMetadata.protocolVersion();
     }
 }