diff --git a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/serde/cbor/CborDeserializerGenerator.java b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/serde/cbor/CborDeserializerGenerator.java index ed6443768..2aefa9903 100644 --- a/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/serde/cbor/CborDeserializerGenerator.java +++ b/codegen/smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/serde/cbor/CborDeserializerGenerator.java @@ -317,10 +317,9 @@ private Writable deserializeField(MemberShape member) { return emptyGoTemplate(); // event stream, not an actual field } - var memberSymbol = symbolProvider.toSymbol(member); return goTemplate(""" if key == $field:S { - $nilable:W + $skipNull:W dv, err := $deserialize:L(sv) if err != nil { return nil, err @@ -333,11 +332,11 @@ private Writable deserializeField(MemberShape member) { "fieldName", symbolProvider.toMemberName(member), "deserialize", getDeserializerName(normalize(target)), "deref", generateStructFieldDeref(member, "dv"), - "nilable", isNilable(memberSymbol) ? handleSparseField() : emptyGoTemplate() + "skipNull", handleNullField() )); } - private Writable handleSparseField() { + private Writable handleNullField() { return goTemplate(""" if _, ok := sv.($P); ok { continue