Skip to content
Snippets Groups Projects
Unverified Commit 42f9ad98 authored by david-perez's avatar david-perez Committed by GitHub
Browse files

Simplify calculation of error shapes in `EventStreamTestTools.kt` (#2130)

parent 6211a914
Branches
Tags
No related merge requests found
...@@ -34,7 +34,6 @@ import software.amazon.smithy.rust.codegen.core.testutil.EventStreamUnmarshallTe ...@@ -34,7 +34,6 @@ import software.amazon.smithy.rust.codegen.core.testutil.EventStreamUnmarshallTe
import software.amazon.smithy.rust.codegen.core.util.hasTrait import software.amazon.smithy.rust.codegen.core.util.hasTrait
import software.amazon.smithy.rust.codegen.core.util.lookup import software.amazon.smithy.rust.codegen.core.util.lookup
import software.amazon.smithy.rust.codegen.core.util.outputShape import software.amazon.smithy.rust.codegen.core.util.outputShape
import kotlin.streams.toList
data class TestEventStreamProject( data class TestEventStreamProject(
val model: Model, val model: Model,
...@@ -115,16 +114,13 @@ object EventStreamTestTools { ...@@ -115,16 +114,13 @@ object EventStreamTestTools {
val project = TestWorkspace.testProject(symbolProvider) val project = TestWorkspace.testProject(symbolProvider)
val operationSymbol = symbolProvider.toSymbol(operationShape) val operationSymbol = symbolProvider.toSymbol(operationShape)
project.withModule(ErrorsModule) { project.withModule(ErrorsModule) {
val errors = model.shapes() val errors = model.structureShapes.filter { shape -> shape.hasTrait<ErrorTrait>() }
.filter { shape -> shape.isStructureShape && shape.hasTrait<ErrorTrait>() }
.map { it.asStructureShape().get() }
.toList()
when (codegenTarget) { when (codegenTarget) {
CodegenTarget.CLIENT -> CombinedErrorGenerator(model, symbolProvider, operationSymbol, errors).render(this) CodegenTarget.CLIENT -> CombinedErrorGenerator(model, symbolProvider, operationSymbol, errors).render(this)
CodegenTarget.SERVER -> ServerCombinedErrorGenerator(model, symbolProvider, operationSymbol, errors).render(this) CodegenTarget.SERVER -> ServerCombinedErrorGenerator(model, symbolProvider, operationSymbol, errors).render(this)
} }
for (shape in model.shapes().filter { shape -> shape is StructureShape && shape.hasTrait<ErrorTrait>() }) { for (shape in model.structureShapes.filter { shape -> shape.hasTrait<ErrorTrait>() }) {
StructureGenerator(model, symbolProvider, this, shape as StructureShape).render(codegenTarget) StructureGenerator(model, symbolProvider, this, shape).render(codegenTarget)
requirements.renderBuilderForShape(this, codegenContext, shape) requirements.renderBuilderForShape(this, codegenContext, shape)
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment