diff --git a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java index 797bc21dd36..30b3a7ad548 100644 --- a/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java +++ b/smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java @@ -39,7 +39,6 @@ import software.amazon.smithy.model.traits.ErrorTrait; import software.amazon.smithy.model.traits.EventHeaderTrait; import software.amazon.smithy.model.traits.EventPayloadTrait; -import software.amazon.smithy.model.traits.HttpPayloadTrait; import software.amazon.smithy.model.traits.StreamingTrait; import software.amazon.smithy.typescript.codegen.TypeScriptDependency; import software.amazon.smithy.typescript.codegen.TypeScriptWriter; @@ -90,9 +89,7 @@ public static MemberShape getEventStreamMember(GenerationContext context, Struct Shape target = context.getModel().expectShape(shape.getTarget()); boolean targetStreaming = target.hasTrait(StreamingTrait.class); boolean targetUnion = target.isUnionShape(); - boolean memberStreaming = shape.hasTrait(StreamingTrait.class); - boolean memberPayload = shape.hasTrait(HttpPayloadTrait.class); - return memberPayload && targetUnion && (targetStreaming || memberStreaming); + return targetUnion && targetStreaming; }).toList(); if (eventStreamMembers.isEmpty()) { @@ -454,7 +451,7 @@ private void generateEventStreamDeserializer(GenerationContext context, UnionSha }); }); }); - writer.write("return {$$unknown: output};"); + writer.write("return {$$unknown: event as any};"); }); }); }); diff --git a/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGeneratorTest.java b/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGeneratorTest.java index f815d998430..9298633e0fe 100644 --- a/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGeneratorTest.java +++ b/smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGeneratorTest.java @@ -35,8 +35,6 @@ void getEventStreamMember( when(streamingTarget1.hasTrait(StreamingTrait.class)).thenReturn(true); when(streamingTarget1.isUnionShape()).thenReturn(true); - when(eventStreamMember1.hasTrait(StreamingTrait.class)).thenReturn(false); - when(eventStreamMember1.hasTrait(HttpPayloadTrait.class)).thenReturn(true); MemberShape eventStreamMember = EventStreamGenerator.getEventStreamMember( context, @@ -90,15 +88,11 @@ void getEventStreamMemberTooMany( when(model.expectShape(streamingMember1ShapeId)).thenReturn(streamingTarget1); when(streamingTarget1.hasTrait(StreamingTrait.class)).thenReturn(true); when(streamingTarget1.isUnionShape()).thenReturn(true); - when(eventStreamMember1.hasTrait(StreamingTrait.class)).thenReturn(false); - when(eventStreamMember1.hasTrait(HttpPayloadTrait.class)).thenReturn(true); when(eventStreamMember2.getTarget()).thenReturn(streamingMember2ShapeId); when(model.expectShape(streamingMember2ShapeId)).thenReturn(streamingTarget2); when(streamingTarget2.hasTrait(StreamingTrait.class)).thenReturn(true); when(streamingTarget2.isUnionShape()).thenReturn(true); - when(eventStreamMember2.hasTrait(StreamingTrait.class)).thenReturn(false); - when(eventStreamMember2.hasTrait(HttpPayloadTrait.class)).thenReturn(true); try { MemberShape eventStreamMember = EventStreamGenerator.getEventStreamMember(