codegen: fix union serialization cases (#979)

Fixes the cases of generated union serializer functions to use the correct types for union members. Fixes #978
aws · Dec 15, 2020 · 4806b72 · 4806b72
1 parent d45c35f
commit 4806b72
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/...-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/QueryShapeSerVisitor.java b/...-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/QueryShapeSerVisitor.java
@@ -12,6 +12,7 @@
 import software.amazon.smithy.go.codegen.GoValueAccessUtils;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
+import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.DocumentShapeSerVisitor;
 import software.amazon.smithy.go.codegen.integration.ProtocolGenerator.GenerationContext;
 import software.amazon.smithy.go.codegen.integration.ProtocolUtils;
@@ -211,21 +212,23 @@ protected void serializeUnion(GenerationContext context, UnionShape shape) {
             Set<MemberShape> members = new TreeSet<>(shape.getAllMembers().values());
             for (MemberShape member : members) {
                 Shape target = context.getModel().expectShape(member.getTarget());
-                String exportedMemberName = symbol.getName() + symbolProvider.toMemberName(member);
+                Symbol memberSymbol = SymbolUtils.createValueSymbolBuilder(
+                        symbolProvider.toMemberName(member),
+                        symbol.getNamespace()
+                ).build();
 
-                writer.openBlock("case *$L:", "", exportedMemberName, () -> {
+                writer.openBlock("case *$T:", "", memberSymbol, () -> {
                     String locationName = getSerializedLocationName(member, member.getMemberName());
                     if (isFlattened(context, member)) {
                         writer.write("objectKey := object.FlatKey($S)", locationName);
                     } else {
                         writer.write("objectKey := object.Key($S)", locationName);
                     }
-                    target.accept(getMemberSerVisitor(member, "uv.Value()", "objectKey"));
+                    target.accept(getMemberSerVisitor(member, "uv.Value", "objectKey"));
                 });
             }
 
             // Handle unknown union values
-            writer.openBlock("case *$LUnknown:", "", symbol.getName(), () -> writer.write("fallthrough"));
             writer.openBlock("default:", "", () -> {
                 writer.write("return fmt.Errorf(\"attempted to serialize unknown member type %T"
                         + " for union %T\", uv, v)");

diff --git a/...ws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XmlShapeSerVisitor.java b/...ws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/XmlShapeSerVisitor.java
@@ -11,6 +11,7 @@
 import software.amazon.smithy.go.codegen.GoValueAccessUtils;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
+import software.amazon.smithy.go.codegen.SymbolUtils;
 import software.amazon.smithy.go.codegen.integration.DocumentShapeSerVisitor;
 import software.amazon.smithy.go.codegen.integration.ProtocolGenerator.GenerationContext;
 import software.amazon.smithy.go.codegen.trait.NoSerializeTrait;
@@ -183,17 +184,19 @@ protected void serializeUnion(GenerationContext context, UnionShape shape) {
             Set<MemberShape> members = new TreeSet<>(shape.getAllMembers().values());
             for (MemberShape member : members) {
                 Shape target = context.getModel().expectShape(member.getTarget());
-                Symbol memberSymbol = symbolProvider.toSymbol(member);
-                String exportedMemberName = symbol.getName() + symbolProvider.toMemberName(member);
-
-                writer.openBlock("case *$L:", "", exportedMemberName, () -> {
-                    writer.write("av := value.MemberElement($S)", memberSymbol.getName());
-                    target.accept(getMemberSerVisitor(member, "uv.Value()", "av"));
+                Symbol memberSymbol = SymbolUtils.createValueSymbolBuilder(
+                        symbolProvider.toMemberName(member),
+                        symbol.getNamespace()
+                ).build();
+
+                writer.openBlock("case *$T:", "", memberSymbol, () -> {
+                    XmlProtocolUtils.generateXMLStartElement(context, member, "customMemberName", "v");
+                    writer.write("av := value.MemberElement(customMemberName)");
+                    target.accept(getMemberSerVisitor(member, "uv.Value", "av"));
                 });
             }
 
             // Handle unknown union values
-            writer.openBlock("case *$LUnknown:", "", symbol.getName(), () -> writer.write("fallthrough"));
             writer.openBlock("default:", "", () -> {
                 writer.write("return fmt.Errorf(\"attempted to serialize unknown member type %T"
                         + " for union %T\", uv, v)");