Skip to content

fix(event-streams): use member name as :event-type header value #1349

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
kuhe merged 2 commits into from
Jul 24, 2024
Merged

fix(event-streams): use member name as :event-type header value #1349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
175dee0
fix(event-streams): use member name as :event-type header value
kuhe Jul 24, 2024
4a996ac
comparator
kuhe Jul 24, 2024
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
30 changes: 21 additions & 9 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 @@ -16,6 +16,7 @@
package software.amazon.smithy.typescript.codegen.integration;

import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.TreeSet;
Expand Down Expand Up @@ -43,6 +44,7 @@
import software.amazon.smithy.typescript.codegen.TypeScriptWriter;
import software.amazon.smithy.typescript.codegen.integration.ProtocolGenerator.GenerationContext;
import software.amazon.smithy.typescript.codegen.knowledge.SerdeElisionIndex;
import software.amazon.smithy.utils.Pair;
import software.amazon.smithy.utils.SmithyUnstableApi;

/**
Expand Down Expand Up @@ -102,30 +104,38 @@ public void generateEventStreamSerializers(
TopDownIndex topDownIndex = TopDownIndex.of(model);
Set<OperationShape> operations = topDownIndex.getContainedOperations(service);
TreeSet<UnionShape> eventUnionsToSerialize = new TreeSet<>();
TreeSet<StructureShape> eventShapesToMarshall = new TreeSet<>();
TreeSet<Pair<String, StructureShape>> eventShapesToMarshall = new TreeSet<>(
(a, b) -> Objects.compare(a.getRight(), b.getRight(), StructureShape::compareTo)
);

for (OperationShape operation : operations) {
if (hasEventStreamInput(context, operation)) {
UnionShape eventsUnion = getEventStreamInputShape(context, operation);
eventUnionsToSerialize.add(eventsUnion);
Set<StructureShape> eventShapes = eventsUnion.members().stream()
.map(member -> model.expectShape(member.getTarget()).asStructureShape().get())
.collect(Collectors.toSet());
eventShapes.forEach(eventShapesToMarshall::add);
eventsUnion.members()
.forEach(member -> {
eventShapesToMarshall.add(Pair.of(
member.getMemberName(),
model.expectShape(member.getTarget()).asStructureShape().get()
));
});
}
}

eventUnionsToSerialize.forEach(eventsUnion -> {
generateEventStreamSerializer(context, eventsUnion);
});
SerdeElisionIndex serdeElisionIndex = SerdeElisionIndex.of(model);
eventShapesToMarshall.forEach(event -> {
eventShapesToMarshall.forEach(memberNameAndEvent -> {
generateEventMarshaller(
context,
event,
memberNameAndEvent.getLeft(),
memberNameAndEvent.getRight(),
documentContentType,
serializeInputEventDocumentPayload,
documentShapesToSerialize,
serdeElisionIndex);
serdeElisionIndex
);
});
}

Expand Down Expand Up @@ -155,6 +165,7 @@ public void generateEventStreamDeserializers(
Set<OperationShape> operations = topDownIndex.getContainedOperations(service);
TreeSet<UnionShape> eventUnionsToDeserialize = new TreeSet<>();
TreeSet<StructureShape> eventShapesToUnmarshall = new TreeSet<>();

for (OperationShape operation : operations) {
if (hasEventStreamOutput(context, operation)) {
UnionShape eventsUnion = getEventStreamOutputShape(context, operation);
Expand Down Expand Up @@ -237,6 +248,7 @@ private Symbol getSymbol(GenerationContext context, Shape shape) {

public void generateEventMarshaller(
GenerationContext context,
String memberName,
StructureShape event,
String documentContentType,
Runnable serializeInputEventDocumentPayload,
Expand All @@ -253,7 +265,7 @@ public void generateEventMarshaller(
+ "): __Message => {", "}", methodName, symbol, () -> {
writer.openBlock("const headers: __MessageHeaders = {", "}", () -> {
//fix headers required by event stream
writer.write("\":event-type\": { type: \"string\", value: $S },", symbol.getName());
writer.write("\":event-type\": { type: \"string\", value: $S },", memberName);
writer.write("\":message-type\": { type: \"string\", value: \"event\" },");
writeEventContentTypeHeader(context, event, documentContentType);
});
Expand Down