From 42f9ad988730bb5cb97bd131444b81e4ff8f65a1 Mon Sep 17 00:00:00 2001 From: david-perez Date: Thu, 22 Dec 2022 12:08:27 +0100 Subject: [PATCH] Simplify calculation of error shapes in `EventStreamTestTools.kt` (#2130) --- .../rust/codegen/core/testutil/EventStreamTestTools.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/EventStreamTestTools.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/EventStreamTestTools.kt index 8340ff3ee..f6b07bed2 100644 --- a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/EventStreamTestTools.kt +++ b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/EventStreamTestTools.kt @@ -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.lookup import software.amazon.smithy.rust.codegen.core.util.outputShape -import kotlin.streams.toList data class TestEventStreamProject( val model: Model, @@ -115,16 +114,13 @@ object EventStreamTestTools { val project = TestWorkspace.testProject(symbolProvider) val operationSymbol = symbolProvider.toSymbol(operationShape) project.withModule(ErrorsModule) { - val errors = model.shapes() - .filter { shape -> shape.isStructureShape && shape.hasTrait() } - .map { it.asStructureShape().get() } - .toList() + val errors = model.structureShapes.filter { shape -> shape.hasTrait() } when (codegenTarget) { CodegenTarget.CLIENT -> CombinedErrorGenerator(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() }) { - StructureGenerator(model, symbolProvider, this, shape as StructureShape).render(codegenTarget) + for (shape in model.structureShapes.filter { shape -> shape.hasTrait() }) { + StructureGenerator(model, symbolProvider, this, shape).render(codegenTarget) requirements.renderBuilderForShape(this, codegenContext, shape) } } -- GitLab