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

Do not render empty event stream errors #2200

Merged
merged 5 commits into from
Jan 18, 2023
Merged

Do not render empty event stream errors #2200

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c55354
Do not render empty event stream errors
82marbag Jan 11, 2023
4801f14
Merge branch 'main' into fix-eventstream-errors
82marbag Jan 17, 2023
74e8f71
Merge branch 'main' into fix-eventstream-errors
82marbag Jan 17, 2023
56e0db0
Merge branch 'main' into fix-eventstream-errors
82marbag Jan 17, 2023
3018d9c
Merge branch 'main' into fix-eventstream-errors
82marbag Jan 18, 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
16 changes: 9 additions & 7 deletions ...src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerCodegenVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,13 +487,15 @@ open class ServerCodegenVisitor(
}

if (shape.isEventStream()) {
rustCrate.withModule(RustModule.Error) {
val symbol = codegenContext.symbolProvider.toSymbol(shape)
val errors = shape.eventStreamErrors()
.map { model.expectShape(it.asMemberShape().get().target, StructureShape::class.java) }
val errorSymbol = shape.eventStreamErrorSymbol(codegenContext.symbolProvider)
ServerOperationErrorGenerator(model, codegenContext.symbolProvider, symbol, errors)
.renderErrors(this, errorSymbol, symbol)
val errors = shape.eventStreamErrors()
.map { model.expectShape(it.asMemberShape().get().target, StructureShape::class.java) }
if (errors.isNotEmpty()) {
rustCrate.withModule(RustModule.Error) {
val symbol = codegenContext.symbolProvider.toSymbol(shape)
val errorSymbol = shape.eventStreamErrorSymbol(codegenContext.symbolProvider)
ServerOperationErrorGenerator(model, codegenContext.symbolProvider, symbol, errors)
.renderErrors(this, errorSymbol, symbol)
}
}
}
}
Expand Down