Skip to content

fix: handle explicit null member defaults for enums and intEnums #752

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.

Sign up for GitHub

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

Merged
jonathan343 merged 2 commits into from
Jul 24, 2026
+18 −1
Merged

fix: handle explicit null member defaults for enums and intEnums #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcb993f
fix: handle explicit null member defaults for enums and intEnums
jonathan343 Jul 24, 2026
1195d5b
simplify code comment
jonathan343 Jul 24, 2026
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
12 changes: 12 additions & 0 deletions codegen/core/src/it/resources/META-INF/smithy/main.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@ structure Defaults {
@required
requiredDefaultBlob: Blob = "c3BhbQ=="

defaultNullBlob: Blob = null

// timestamp
@required
requiredTimestamp: Timestamp
Expand All @@ -400,6 +402,8 @@ structure Defaults {
@required
requiredDefaultTimestamp: Timestamp = 4.2

defaultNullTimestamp: Timestamp = null

@required
requiredList: StringList

Expand All @@ -420,6 +424,14 @@ structure Defaults {
@required
requiredDefaultMap: StringMap = {}

defaultEnum: StringYesNo = "YES"

defaultNullEnum: StringYesNo = null

defaultIntEnum: IntYesNo = 1

defaultNullIntEnum: IntYesNo = null

@required
requiredDocument: Document

Expand Down
7 changes: 6 additions & 1 deletion ...re/src/main/java/software/amazon/smithy/python/codegen/generators/StructureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,11 @@ private String getDefaultValue(PythonWriter writer, MemberShape member) {
// see: https://smithy.io/2.0/spec/type-refinement-traits.html#smithy-api-default-trait
var defaultNode = member.expectTrait(DefaultTrait.class).toNode();
var target = model.expectShape(member.getTarget());
// A null default marks the member nullable and resolves to None. Documents are
// excluded since their null default is a non-None Document(None) (see the branch below).
if (!target.isDocumentShape() && defaultNode.isNullNode()) {
return "None";
}
if (target.isTimestampShape()) {
ZonedDateTime value = CodegenUtils.parseTimestampNode(model, member, defaultNode);
return CodegenUtils.getDatetimeConstructor(writer, value);
Expand Down Expand Up @@ -318,8 +323,8 @@ private String getDefaultValue(PythonWriter writer, MemberShape member) {
});
}

// A null default is handled by the guard above, so it can't reach here.
return switch (defaultNode.getType()) {
case NULL -> "None";
case BOOLEAN -> defaultNode.expectBooleanNode().getValue() ? "True" : "False";
// These will be given to a default_factory in field. They're inherently empty, so no need to
// worry about any potential values.
Expand Down
Loading