Skip to content

Support error serialization #341

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
merged 1 commit into from
Nov 27, 2024
Merged

Support error serialization #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 6 deletions ...ithy-python-codegen/src/main/java/software/amazon/smithy/python/codegen/CodegenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ public static Symbol getPluginSymbol(PythonSettings settings) {
public static Symbol getServiceError(PythonSettings settings) {
return Symbol.builder()
.name("ServiceError")
.namespace(format("%s.errors", settings.moduleName()), ".")
.definitionFile(format("./%s/errors.py", settings.moduleName()))
.namespace(format("%s.models", settings.moduleName()), ".")
.definitionFile(format("./%s/models.py", settings.moduleName()))
.build();
}

Expand All @@ -123,8 +123,8 @@ public static Symbol getServiceError(PythonSettings settings) {
public static Symbol getApiError(PythonSettings settings) {
return Symbol.builder()
.name("ApiError")
.namespace(format("%s.errors", settings.moduleName()), ".")
.definitionFile(format("./%s/errors.py", settings.moduleName()))
.namespace(format("%s.models", settings.moduleName()), ".")
.definitionFile(format("./%s/models.py", settings.moduleName()))
.build();
}

Expand All @@ -140,8 +140,8 @@ public static Symbol getApiError(PythonSettings settings) {
public static Symbol getUnknownApiError(PythonSettings settings) {
return Symbol.builder()
.name("UnknownApiError")
.namespace(format("%s.errors", settings.moduleName()), ".")
.definitionFile(format("./%s/errors.py", settings.moduleName()))
.namespace(format("%s.models", settings.moduleName()), ".")
.definitionFile(format("./%s/models.py", settings.moduleName()))
.build();
}

Expand Down
3 changes: 3 additions & 0 deletions ...ython-codegen/src/main/java/software/amazon/smithy/python/codegen/StructureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ class $1L($2T):

${7C|}

${8C|}

""", symbol.getName(), apiError, code, fault,
writer.consumer(w -> writeClassDocs(true)),
writer.consumer(w -> writeProperties()),
writer.consumer(w -> generateSerializeMethod()),
writer.consumer(w -> generateDeserializeMethod()));
}

Expand Down
3 changes: 1 addition & 2 deletions ...thy-python-codegen/src/main/java/software/amazon/smithy/python/codegen/SymbolVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,7 @@ private Symbol genericEnum(Shape shape) {
@Override
public Symbol structureShape(StructureShape shape) {
String name = getDefaultShapeName(shape);
var file = shape.hasTrait(ErrorTrait.class) ? "errors" : SHAPES_FILE;
return createGeneratedSymbolBuilder(shape, name, file).build();
return createGeneratedSymbolBuilder(shape, name, SHAPES_FILE).build();
}

@Override
Expand Down
Loading