chore: update rest-json abstract methods

Author: JordonPhillips

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsRestXml.java

@@ -136,16 +136,19 @@ private boolean usesWrappedErrorResponse(GenerationContext context) {
     }
 
     @Override
-    protected void writeDefaultHeaders(GenerationContext context, OperationShape operation) {
-        super.writeDefaultHeaders(context, operation);
-        AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
+    protected void writeDefaultHeaders(GenerationContext context, Shape operationOrError, boolean isInput) {
+        super.writeDefaultHeaders(context, operationOrError, isInput);
+        if (isInput && operationOrError.isOperationShape()) {
+            AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operationOrError.asOperationShape().get());
+        }
     }
 
     @Override
-    protected void serializeInputDocument(
+    protected void serializeDocumentBody(
             GenerationContext context,
             OperationShape operation,
-            List<HttpBinding> documentBindings
+            List<HttpBinding> documentBindings,
+            boolean isInput
     ) {
         // Short circuit when we have no bindings.
         TypeScriptWriter writer = context.getWriter();
@@ -193,10 +196,11 @@ protected void serializeInputDocument(
     }
 
     @Override
-    protected void serializeInputPayload(
+    protected void serializePayload(
             GenerationContext context,
             OperationShape operation,
-            HttpBinding payloadBinding
+            HttpBinding payloadBinding,
+            boolean isInput
     ) {
         SymbolProvider symbolProvider = context.getSymbolProvider();
         TypeScriptWriter writer = context.getWriter();
@@ -244,10 +248,11 @@ protected void writeErrorCodeParser(GenerationContext context) {
     }
 
     @Override
-    protected void deserializeOutputDocument(
+    protected void deserializeDocumentBody(
             GenerationContext context,
             Shape operationOrError,
-            List<HttpBinding> documentBindings
+            List<HttpBinding> documentBindings,
+            boolean isInput
     ) {
         SymbolProvider symbolProvider = context.getSymbolProvider();
         XmlShapeDeserVisitor shapeVisitor = new XmlShapeDeserVisitor(context);

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java

@@ -85,22 +85,21 @@ public void generateSharedComponents(GenerationContext context) {
     }
 
     @Override
-    protected void writeDefaultHeaders(GenerationContext context, OperationShape operation) {
-        super.writeDefaultHeaders(context, operation);
-        AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operation);
-    }
-
-    @Override
-    protected void writeDefaultErrorHeaders(GenerationContext context, StructureShape error) {
-        super.writeDefaultErrorHeaders(context, error);
-        context.getWriter().write("'x-amzn-errortype': $S,", error.getId().getName());
+    protected void writeDefaultHeaders(GenerationContext context, Shape operationOrError, boolean isInput) {
+        super.writeDefaultHeaders(context, operationOrError, isInput);
+        if (isInput && operationOrError.isOperationShape()) {
+            AwsProtocolUtils.generateUnsignedPayloadSigV4Header(context, operationOrError.asOperationShape().get());
+        } else if (operationOrError.isStructureShape()) {
+            context.getWriter().write("'x-amzn-errortype': $S,", operationOrError.getId().getName());
+        }
     }
 
     @Override
-    public void serializeInputDocument(
+    public void serializeDocumentBody(
             GenerationContext context,
             OperationShape operation,
-            List<HttpBinding> documentBindings
+            List<HttpBinding> documentBindings,
+            boolean isInput
     ) {
         // Short circuit when we have no bindings.
         TypeScriptWriter writer = context.getWriter();
@@ -140,13 +139,14 @@ public void serializeInputDocument(
     }
 
     @Override
-    protected void serializeInputPayload(
+    protected void serializePayload(
             GenerationContext context,
             OperationShape operation,
-            HttpBinding payloadBinding
+            HttpBinding payloadBinding,
+            boolean isInput
     ) {
         // We want the standard serialization, but need to alter it to JSON.
-        super.serializeInputPayload(context, operation, payloadBinding);
+        super.serializePayload(context, operation, payloadBinding, isInput);
 
         TypeScriptWriter writer = context.getWriter();
         MemberShape payloadMember = payloadBinding.getMember();
@@ -179,10 +179,11 @@ protected void writeErrorCodeParser(GenerationContext context) {
     }
 
     @Override
-    public void deserializeOutputDocument(
+    public void deserializeDocumentBody(
             GenerationContext context,
             Shape operationOrError,
-            List<HttpBinding> documentBindings
+            List<HttpBinding> documentBindings,
+            boolean isInput
     ) {
         TypeScriptWriter writer = context.getWriter();
         SymbolProvider symbolProvider = context.getSymbolProvider();