|
16 | 16 | package software.amazon.smithy.typescript.codegen.integration; |
17 | 17 |
|
18 | 18 | import java.util.List; |
| 19 | +import java.util.Objects; |
19 | 20 | import java.util.Optional; |
20 | 21 | import java.util.Set; |
21 | 22 | import java.util.TreeSet; |
@@ -103,12 +104,15 @@ public void generateEventStreamSerializers( |
103 | 104 | TopDownIndex topDownIndex = TopDownIndex.of(model); |
104 | 105 | Set<OperationShape> operations = topDownIndex.getContainedOperations(service); |
105 | 106 | TreeSet<UnionShape> eventUnionsToSerialize = new TreeSet<>(); |
106 | | - TreeSet<Pair<String, StructureShape>> eventShapesToMarshall = new TreeSet<>(); |
| 107 | + TreeSet<Pair<String, StructureShape>> eventShapesToMarshall = new TreeSet<>( |
| 108 | + (a, b) -> Objects.compare(a.getRight(), b.getRight(), StructureShape::compareTo) |
| 109 | + ); |
| 110 | + |
107 | 111 | for (OperationShape operation : operations) { |
108 | 112 | if (hasEventStreamInput(context, operation)) { |
109 | 113 | UnionShape eventsUnion = getEventStreamInputShape(context, operation); |
110 | 114 | eventUnionsToSerialize.add(eventsUnion); |
111 | | - eventsUnion.members().stream() |
| 115 | + eventsUnion.members() |
112 | 116 | .forEach(member -> { |
113 | 117 | eventShapesToMarshall.add(Pair.of( |
114 | 118 | member.getMemberName(), |
@@ -161,6 +165,7 @@ public void generateEventStreamDeserializers( |
161 | 165 | Set<OperationShape> operations = topDownIndex.getContainedOperations(service); |
162 | 166 | TreeSet<UnionShape> eventUnionsToDeserialize = new TreeSet<>(); |
163 | 167 | TreeSet<StructureShape> eventShapesToUnmarshall = new TreeSet<>(); |
| 168 | + |
164 | 169 | for (OperationShape operation : operations) { |
165 | 170 | if (hasEventStreamOutput(context, operation)) { |
166 | 171 | UnionShape eventsUnion = getEventStreamOutputShape(context, operation); |
|
0 commit comments