Skip to content

fix: criteria for event stream member detection #1624

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

Merged
merged 1 commit into from
Jun 20, 2025
Merged

fix: criteria for event stream member detection #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions ...main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -454,7 +451,7 @@ private void generateEventStreamDeserializer(GenerationContext context, UnionSha
});
});
});
writer.write("return {$$unknown: output};");
Copy link
Contributor Author

@kuhe kuhe Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fixes a bug introduced in #572

Copy link
Contributor Author

@kuhe kuhe Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's no impact because $unknown events are dropped from the asyncIterable

writer.write("return {$$unknown: event as any};");
});
});
});
Expand Down
6 changes: 0 additions & 6 deletions .../java/software/amazon/smithy/typescript/codegen/integration/EventStreamGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand Down