fix: criteria for event stream member detection

Author: kuhe

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java

@@ -90,9 +90,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 +452,7 @@ private void generateEventStreamDeserializer(GenerationContext context, UnionSha
                             });
                         });
                     });
-                    writer.write("return {$$unknown: output};");
+                    writer.write("return {$$unknown: event};");
                 });
             });
         });

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(