aws · peterrsongg · Jun 30, 2025 · Jun 30, 2025 · Jun 30, 2025 · Jun 30, 2025
diff --git a/generator/.DevConfigs/08424ec7-251c-4c0e-afbe-dda1f0ae7757.json b/generator/.DevConfigs/08424ec7-251c-4c0e-afbe-dda1f0ae7757.json
@@ -0,0 +1,9 @@
+{
+  "core": {
+    "updateMinimum": true,
+    "type": "patch",
+    "changeLogMessages": [
+      "Add new protocol tests. Update JSON response unmarshallers to return safely if the service returns an empty string as a response instead of an empty json body"
+    ]
+  }
+}
diff --git a/generator/ProtocolTestsGenerator/settings.gradle.kts b/generator/ProtocolTestsGenerator/settings.gradle.kts
@@ -12,7 +12,7 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("codegen") {
-            version("smithy", "1.54.0")
+            version("smithy", "1.60.3")
             library("protocol-tests", "software.amazon.smithy", "smithy-aws-protocol-tests").versionRef("smithy")
             library("codegen-core", "software.amazon.smithy", "smithy-codegen-core").versionRef("smithy")
             library("protocol-tests-traits", "software.amazon.smithy", "smithy-protocol-test-traits").versionRef("smithy")

diff --git a/...odegen/src/main/java/software/amazon/smithy/dotnet/codegen/HttpProtocolTestGenerator.java b/...odegen/src/main/java/software/amazon/smithy/dotnet/codegen/HttpProtocolTestGenerator.java
@@ -94,7 +94,9 @@ private void generateErrorResponseTests(OperationShape operation, OperationIndex
         for (StructureShape error : index.getErrors(operation, service)) {
             error.getTrait(HttpResponseTestsTrait.class).ifPresent(trait -> {
                 for (HttpResponseTestCase httpResponseTestCase : trait.getTestCasesFor(AppliesTo.CLIENT)) {
-                    generateErrorResponseTest(operation, error, httpResponseTestCase);
+                    if (!ProtocolTestCustomizations.TestsToSkip.contains(httpResponseTestCase.getId())){
+                        generateErrorResponseTest(operation, error, httpResponseTestCase);
+                    }
                 }
             });
         }

diff --git a/...java/software/amazon/smithy/dotnet/codegen/customizations/ProtocolTestCustomizations.java b/...java/software/amazon/smithy/dotnet/codegen/customizations/ProtocolTestCustomizations.java
@@ -96,7 +96,12 @@ private ProtocolTestCustomizations() {
             // to use exceptions and control flow.
             "QueryEmptyInputAndEmptyOutput",
             "QueryNoInputAndNoOutput",
-            "QueryNoInputAndOutput"
+            "QueryNoInputAndOutput",
+            // this test is skipped because in the C2J Ruby added a hook which adds the "code" json key which can NEVER exist in a
+            // non-query protocol. this causes our code generation to check on this code instead of what is modeled and our protocol
+            // test passes. As this can never happen in a real service, we can skip this to avoid unnecessary customizations in the generator
+            // for a scenario that will never happen.
+            "QueryCompatibleAwsJson10CustomCodeError"
     );
     public static final List<String> VNextTests = Arrays.asList(
             //These are the tests that are failing in v4 after updating to 1.54.0 and artifacts 1.0.3004.0. Each one needs to be investigated.

diff --git a/generator/ProtocolTestsGenerator/smithy-dotnet-protocol-test/smithy-build.json b/generator/ProtocolTestsGenerator/smithy-dotnet-protocol-test/smithy-build.json
@@ -127,6 +127,24 @@
           "packageVersion": "0.0.1"
         }
       }
+    },
+    "QueryCompatibleJSONRPC10": {
+      "transforms": [
+        {
+          "name": "includeServices",
+          "args": {
+            "services": [
+              "aws.protocoltests.json10#QueryCompatibleJsonRpc10"
+            ]
+          }
+        }
+      ],
+      "plugins": {
+        "dotnet-protocol-test-codegen": {
+          "service": "aws.protocoltests.json10#QueryCompatibleJsonRpc10",
+          "packageVersion": "0.0.1"
+        }
+      }
     }
   }
 }
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.cs
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCResponseUnmarshaller.tt
@@ -91,6 +91,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
         {
 #>
             StreamingUtf8JsonReader reader = new StreamingUtf8JsonReader(context.Stream);
+            if (reader.Reader.IsFinalBlock) return response;
             var unmarshaller = <#= payload.DetermineTypeUnmarshallerInstantiate() #>;
             response.<#=payload.PropertyName#> = unmarshaller.Unmarshall(context, ref reader);
 <#

diff --git a/generator/TestServiceModels/json10-tests-client/json-rpc-10-2020-07-14.normal.json b/generator/TestServiceModels/json10-tests-client/json-rpc-10-2020-07-14.normal.json
@@ -114,6 +114,14 @@
       "input":{"shape":"PutWithContentEncodingInput"},
       "requestcompression":{"encodings":["gzip"]}
     },
+    "QueryIncompatibleOperation":{
+      "name":"QueryIncompatibleOperation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "idempotent":true
+    },
     "SimpleScalarProperties":{
       "name":"SimpleScalarProperties",
       "http":{
@@ -153,22 +161,19 @@
     },
     "ContentTypeParametersOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "Double":{
       "type":"double",
       "box":true
     },
     "EmptyInputAndEmptyOutputInput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "EmptyInputAndEmptyOutputOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "EndpointWithHostLabelOperationInput":{
       "type":"structure",
@@ -196,8 +201,7 @@
     },
     "FooError":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>This error has test cases that test some of the dark corners of Amazon service framework history. It should only be implemented by clients.</p>",
       "exception":true,
       "fault":true
@@ -267,8 +271,7 @@
     },
     "NoInputAndOutputOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "PutWithContentEncodingInput":{
       "type":"structure",

diff --git a/generator/TestServiceModels/json11-tests-client/json-protocol-2018-01-01.normal.json b/generator/TestServiceModels/json11-tests-client/json-protocol-2018-01-01.normal.json
@@ -211,8 +211,7 @@
     },
     "ContentTypeParametersOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "DateTime":{
       "type":"timestamp",
@@ -226,8 +225,7 @@
     },
     "Document":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "document":true
     },
     "Double":{
@@ -236,8 +234,7 @@
     },
     "EmptyStruct":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "ErrorWithMembers":{
       "type":"structure",
@@ -257,8 +254,7 @@
     },
     "ErrorWithoutMembers":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "exception":true,
       "fault":true
     },
@@ -291,8 +287,7 @@
     },
     "FooError":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>This error has test cases that test some of the dark corners of Amazon service framework history. It should only be implemented by clients.</p>",
       "exception":true,
       "fault":true

diff --git a/generator/TestServiceModels/query-compatible-json-rpc10/metadata.json b/generator/TestServiceModels/query-compatible-json-rpc10/metadata.json
@@ -0,0 +1,5 @@
+{
+  "active": true,
+  "test-service": true,
+  "synopsis": "query-compatible test service"
+}
diff --git a/...iceModels/query-compatible-json-rpc10/query-compatible-json-rpc-10-2020-07-14.normal.json b/...iceModels/query-compatible-json-rpc10/query-compatible-json-rpc-10-2020-07-14.normal.json
@@ -0,0 +1,54 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2020-07-14",
+    "auth":["aws.auth#sigv4"],
+    "awsQueryCompatible":{},
+    "endpointPrefix":"query-compatible-jsonrpc10",
+    "jsonVersion":"1.0",
+    "protocol":"json",
+    "protocols":["json"],
+    "serviceFullName":"Query Compatible Json 1.0 Protocol Service",
+    "serviceId":"Query Compatible JSON RPC 10",
+    "signatureVersion":"v4",
+    "signingName":"query-compatible-jsonrpc10",
+    "targetPrefix":"QueryCompatibleJsonRpc10",
+    "uid":"query-compatible-json-rpc-10-2020-07-14"
+  },
+  "operations":{
+    "QueryCompatibleOperation":{
+      "name":"QueryCompatibleOperation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "errors":[
+        {"shape":"CustomCodeError"},
+        {"shape":"NoCustomCodeError"}
+      ],
+      "idempotent":true
+    }
+  },
+  "shapes":{
+    "CustomCodeError":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "error":{
+        "code":"Customized",
+        "httpStatusCode":402,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "NoCustomCodeError":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "exception":true
+    },
+    "String":{"type":"string"}
+  }
+}
diff --git a/generator/TestServiceModels/restjson-tests-client/rest-json-protocol-2019-12-16.normal.json b/generator/TestServiceModels/restjson-tests-client/rest-json-protocol-2019-12-16.normal.json
@@ -176,6 +176,17 @@
       "documentation":"<p>This example tests httpChecksumRequired trait</p>",
       "httpChecksumRequired":true
     },
+    "HttpEmptyPrefixHeaders":{
+      "name":"HttpEmptyPrefixHeaders",
+      "http":{
+        "method":"GET",
+        "requestUri":"/HttpEmptyPrefixHeaders",
+        "responseCode":200
+      },
+      "input":{"shape":"HttpEmptyPrefixHeadersInput"},
+      "output":{"shape":"HttpEmptyPrefixHeadersOutput"},
+      "documentation":"<p>Clients that perform this test extract all headers from the response.</p>"
+    },
     "HttpEnumPayload":{
       "name":"HttpEnumPayload",
       "http":{
@@ -854,8 +865,7 @@
     },
     "ContentTypeParametersOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "DateTime":{
       "type":"timestamp",
@@ -894,8 +904,7 @@
     },
     "Document":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "document":true
     },
     "DocumentTypeAsMapValueInputOutput":{
@@ -933,13 +942,11 @@
     },
     "EmptyInputAndEmptyOutputInput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "EmptyInputAndEmptyOutputOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "EnumPayloadInput":{
       "type":"structure",
@@ -981,8 +988,7 @@
     },
     "FooError":{
       "type":"structure",
-      "members":{
-      },
+      "members":{},
       "documentation":"<p>This error has test cases that test some of the dark corners of Amazon service framework history. It should only be implemented by clients.</p>",
       "error":{"httpStatusCode":500},
       "exception":true,
@@ -1030,6 +1036,36 @@
       "type":"timestamp",
       "timestampFormat":"rfc822"
     },
+    "HttpEmptyPrefixHeadersInput":{
+      "type":"structure",
+      "members":{
+        "prefixHeaders":{
+          "shape":"StringMap",
+          "location":"headers",
+          "locationName":""
+        },
+        "specificHeader":{
+          "shape":"String",
+          "location":"header",
+          "locationName":"hello"
+        }
+      }
+    },
+    "HttpEmptyPrefixHeadersOutput":{
+      "type":"structure",
+      "members":{
+        "prefixHeaders":{
+          "shape":"StringMap",
+          "location":"headers",
+          "locationName":""
+        },
+        "specificHeader":{
+          "shape":"String",
+          "location":"header",
+          "locationName":"hello"
+        }
+      }
+    },
     "HttpPayloadTraitsInputOutput":{
       "type":"structure",
       "members":{
@@ -1058,8 +1094,7 @@
     },
     "HttpPrefixHeadersInResponseInput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "HttpPrefixHeadersInResponseOutput":{
       "type":"structure",
@@ -1536,8 +1571,7 @@
     },
     "NoInputAndOutputOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "NullAndEmptyHeadersIO":{
       "type":"structure",
@@ -1711,8 +1745,7 @@
     },
     "ResponseCodeHttpFallbackInputOutput":{
       "type":"structure",
-      "members":{
-      }
+      "members":{}
     },
     "ResponseCodeRequiredOutput":{
       "type":"structure",