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.

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

generate resource shape 'properties' with Smithy IDL serialization #1996

Merged
merged 4 commits into from
Oct 11, 2023
Merged

generate resource shape 'properties' with Smithy IDL serialization #1996

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2c61ad
generate resource shape 'properties' with Smithy IDL serialization
zourzouvillys Sep 30, 2023
bdf37a4
properties serialization round trip test
zourzouvillys Oct 3, 2023
20c11b3
order the new operations correctly to match output format
zourzouvillys Oct 3, 2023
428b4b7
keep EmptyResource
zourzouvillys Oct 11, 2023
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
6 changes: 5 additions & 1 deletion smithy-model/src/main/java/software/amazon/smithy/model/shapes/SmithyIdlModelSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,11 @@ public Void resourceShape(ResourceShape shape) {
codeWriter.writeOptionalIdList("operations", shape.getIntroducedOperations());
codeWriter.writeOptionalIdList("collectionOperations", shape.getCollectionOperations());
codeWriter.writeOptionalIdList("resources", shape.getIntroducedResources());

if (shape.hasProperties()) {
codeWriter.openBlock("properties: {");
shape.getProperties().forEach((name, shapeId) -> codeWriter.write("$L: $I", name, shapeId));
codeWriter.closeBlock("}");
}
codeWriter.closeBlock("}");
codeWriter.write("");
return null;
Expand Down
31 changes: 23 additions & 8 deletions ...sources/software/amazon/smithy/model/shapes/idl-serialization/cases/service-shapes.smithy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,29 @@ service MyService {
]
}

resource EmptyResource {
zourzouvillys marked this conversation as resolved.
Show resolved Hide resolved
}

resource MyResource {
identifiers: {
id: String
}
put: ResourceOperation
create: ResourceOperation
create: EmptyOperation
read: ReadonlyResourceOperation
update: ResourceOperation
delete: ResourceOperation
list: ReadonlyResourceOperation
list: CollectionResourceOperation
operations: [
ResourceOperation
CollectionResourceOperation
]
collectionOperations: [
ResourceOperation
CollectionResourceOperation
]
resources: [
SubResource
]
properties: {
value: String
other: String
}
}

resource SubResource {
Expand All @@ -46,6 +47,15 @@ resource SubResource {
}
}

@readonly
operation CollectionResourceOperation {
input := {}
output := {}
errors: [
Error
]
}

operation EmptyOperation {
input: Unit
output: Unit
Expand All @@ -62,6 +72,7 @@ operation MyOperation {
@readonly
operation ReadonlyResourceOperation {
input := {
@required
id: String
}
output: Unit
Expand All @@ -70,9 +81,13 @@ operation ReadonlyResourceOperation {
@idempotent
operation ResourceOperation {
input := {
@required
id: String
}
output: Unit
output := {
value: String
other: String
}
}

@error("client")
Expand Down