update codegen function

aws · Apr 30, 2021 · d8d74c9 · d8d74c9
1 parent 98b57a4
commit d8d74c9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 20 deletions.
diff --git a/...n/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsQuery.java b/...n/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsQuery.java
@@ -107,11 +107,14 @@ protected void deserializeError(GenerationContext context, StructureShape shape)
         writer.write("output := &$T{}", symbol);
         writer.insertTrailingNewline();
         if (isShapeWithResponseBindings(context.getModel(), shape, HttpBinding.Location.DOCUMENT)) {
-            String functionName = shape.hasTrait(SyntheticClone.class) ?
-                    ProtocolGenerator.getOperationDocumentDeserFuncName(
-                            shape, context.getProtocolName()) :
-                    ProtocolGenerator.getDocumentDeserializerFunctionName(
-                            shape, context.getService(), context.getProtocolName());
+            String functionName;
+            if (shape.hasTrait(SyntheticClone.class)) {
+                functionName = ProtocolGenerator.getOperationDocumentDeserFuncName(
+                        shape, context.getProtocolName());
+            } else {
+                functionName = ProtocolGenerator.getDocumentDeserializerFunctionName(
+                        shape, context.getService(), context.getProtocolName());
+            }
 
             writer.addUseImports(SmithyGoDependency.IO);
             initializeXmlDecoder(writer, "errorBody", "output");

diff --git a/...odegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestJsonProtocolGenerator.java b/...odegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestJsonProtocolGenerator.java
@@ -98,11 +98,14 @@ protected void writeMiddlewarePayloadAsDocumentSerializerDelegator(
         Model model = context.getModel();
         Shape payloadShape = model.expectShape(memberShape.getTarget());
 
-        String functionName = payloadShape.hasTrait(SyntheticClone.class) ?
-                ProtocolGenerator.getOperationDocumentSerFuncName(
-                        payloadShape, context.getProtocolName()) :
-                ProtocolGenerator.getDocumentSerializerFunctionName(
-                        payloadShape, context.getService(), context.getProtocolName());
+        String functionName;
+        if (payloadShape.hasTrait(SyntheticClone.class)) {
+            functionName = ProtocolGenerator.getOperationDocumentSerFuncName(
+                    payloadShape, context.getProtocolName());
+        } else {
+            functionName = ProtocolGenerator.getDocumentSerializerFunctionName(
+                    payloadShape, context.getService(), context.getProtocolName());
+        }
 
         writer.addUseImports(SmithyGoDependency.SMITHY_JSON);
         writer.write("jsonEncoder := smithyjson.NewEncoder()");
@@ -244,11 +247,15 @@ private void writeMiddlewareDocumentBindingDeserializerDelegator(
             Shape shape,
             String operand
     ) {
-        String functionName = shape.hasTrait(SyntheticClone.class) ?
-                ProtocolGenerator.getOperationDocumentDeserFuncName(
-                        shape, context.getProtocolName()) :
-                ProtocolGenerator.getDocumentDeserializerFunctionName(
-                        shape, context.getService(), context.getProtocolName());
+
+        String functionName;
+        if (shape.hasTrait(SyntheticClone.class)) {
+            functionName = ProtocolGenerator.getOperationDocumentDeserFuncName(
+                    shape, context.getProtocolName());
+        } else {
+            functionName = ProtocolGenerator.getDocumentDeserializerFunctionName(
+                    shape, context.getService(), context.getProtocolName());
+        }
 
         writer.write("err = $L(&$L, shape)", functionName, operand);
         writer.openBlock("if err != nil {", "}", () -> {

diff --git a/...codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestXmlProtocolGenerator.java b/...codegen/src/main/java/software/amazon/smithy/aws/go/codegen/RestXmlProtocolGenerator.java
@@ -388,11 +388,14 @@ private void writeMiddlewareDocumentBindingDeserializerDelegator(
         XmlProtocolUtils.initializeXmlDecoder(writer, "response.Body", "out, metadata,", "nil");
         writer.addUseImports(SmithyGoDependency.IO);
 
-        String functionName = shape.hasTrait(SyntheticClone.class) ?
-                ProtocolGenerator.getOperationDocumentDeserFuncName(
-                        shape, context.getProtocolName()) :
-                ProtocolGenerator.getDocumentDeserializerFunctionName(
-                        shape, context.getService(), context.getProtocolName());
+        String functionName;
+        if (shape.hasTrait(SyntheticClone.class)) {
+            functionName = ProtocolGenerator.getOperationDocumentDeserFuncName(
+                    shape, context.getProtocolName());
+        } else {
+            functionName = ProtocolGenerator.getDocumentDeserializerFunctionName(
+                    shape, context.getService(), context.getProtocolName());
+        }
 
         writer.write("err = $L(&$L, decoder)", functionName, operand);
         XmlProtocolUtils.handleDecodeError(writer, "out, metadata,");