Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

codegen: Add support for REST-XML Union responses #993

Merged
merged 1 commit into from
Dec 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,6 @@ protected void deserializeUnion(GenerationContext context, UnionShape shape) {
symbol.getNamespace()
).build();
writer.write("uv = &$T{Tag: key}", unknownMemberSymbol);
writer.writeDocs("TODO: FIX ME");
writer.write("_ = value");
writer.write("break loop");
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import software.amazon.smithy.codegen.core.SymbolProvider;
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.UnionGenerator;
import software.amazon.smithy.go.codegen.integration.DocumentShapeDeserVisitor;
import software.amazon.smithy.go.codegen.integration.ProtocolGenerator;
import software.amazon.smithy.go.codegen.integration.ProtocolGenerator.GenerationContext;
Expand Down Expand Up @@ -404,10 +406,67 @@ protected void deserializeDocument(GenerationContext context, DocumentShape shap
@Override
protected void deserializeUnion(GenerationContext context, UnionShape shape) {
GoWriter writer = context.getWriter();
// TODO: implement union deserialization
// The tricky part is going to be accumulating bytes for unknown members.
LOGGER.warning("Union type is currently unsupported for XML deserialization.");
context.getWriter().writeDocs("TODO: implement union serialization.");
SymbolProvider symbolProvider = context.getSymbolProvider();
Symbol symbol = symbolProvider.toSymbol(shape);
Model model = context.getModel();

writer.write("var uv $P", symbol);
writer.write("var memberFound bool");

// Iterate through the decoder. The member visitor will handle popping
// xml tokens enclosed within a xml start and end element.
writer.openBlock("for {", "}", () -> {
writer.write("t, done, err := decoder.Token()");
writer.write("if err != nil { return err }");
writer.write("if done { break }");
writer.openBlock("if memberFound {", "}", () -> {
writer.write("if err = decoder.Decoder.Skip(); err != nil { return err }");
});

// Create a new decoder for each member
writer.write("originalDecoder := decoder");
writer.write("decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t)");
writer.insertTrailingNewline();

writer.openBlock("switch {", "}", () -> {
Set<MemberShape> members = new TreeSet<>(shape.members());
for (MemberShape member : members) {
// check if member is not a document binding or has a xmlAttribute trait
if (!memberFilter.test(member) || member.hasTrait(XmlAttributeTrait.ID)) {
continue;
}
Symbol targetSymbol = symbolProvider.toSymbol(member);
Symbol memberSymbol = SymbolUtils.createValueSymbolBuilder(
symbolProvider.toMemberName(member),
symbol.getNamespace()
).build();

writer.addUseImports(SmithyGoDependency.STRINGS);

String serializedMemberName = getSerializedMemberName(member);
writer.openBlock("case strings.EqualFold($S, t.Name.Local):", "", serializedMemberName, () -> {
writer.write("var mv $P", targetSymbol);
model.expectShape(member.getTarget()).accept(getMemberDeserVisitor(member, "mv", false));
writer.write("uv = &$T{Value: mv}", memberSymbol);
writer.write("memberFound = true");
});
}

writer.openBlock("default:", "", () -> {
// This is the function to take a value and convert it to the union type.
Symbol unknownMemberSymbol = SymbolUtils.createValueSymbolBuilder(
UnionGenerator.UNKNOWN_MEMBER_NAME,
symbol.getNamespace()
).build();
writer.write("uv = &$T{Tag: t.Name.Local}", unknownMemberSymbol);
writer.write("memberFound = true");
});
});
// re-assign the original decoder
writer.write("decoder = originalDecoder");
});

writer.write("*v = uv");
writer.write("return nil");
}
}