Skip to content

Commit 584f7ed

Browse files
authored
Remove usused code from ProtocolGenerator.GenerationContext (#564)
1 parent 3e13fb8 commit 584f7ed

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CodegenVisitor.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ void execute() {
223223
ShapeId protocol = protocolGenerator.getProtocol();
224224
ProtocolGenerator.GenerationContext context = new ProtocolGenerator.GenerationContext();
225225
context.setProtocolName(protocolGenerator.getName());
226-
context.setIntegrations(integrations);
227226
context.setModel(model);
228227
context.setService(service);
229228
context.setSettings(settings);
@@ -337,7 +336,6 @@ public Void serviceShape(ServiceShape shape) {
337336
writers.useFileWriter(fileName, writer -> {
338337
ProtocolGenerator.GenerationContext context = new ProtocolGenerator.GenerationContext();
339338
context.setProtocolName(protocolGenerator.getName());
340-
context.setIntegrations(integrations);
341339
context.setModel(model);
342340
context.setService(shape);
343341
context.setSettings(settings);
@@ -348,17 +346,15 @@ public Void serviceShape(ServiceShape shape) {
348346
protocolGenerator.generateResponseDeserializers(context);
349347
}
350348
if (context.getSettings().generateServerSdk()) {
351-
ProtocolGenerator.GenerationContext serverContext =
352-
context.withSymbolProvider(symbolProvider);
353-
protocolGenerator.generateRequestDeserializers(serverContext);
354-
protocolGenerator.generateResponseSerializers(serverContext);
355-
protocolGenerator.generateFrameworkErrorSerializer(serverContext);
349+
protocolGenerator.generateRequestDeserializers(context);
350+
protocolGenerator.generateResponseSerializers(context);
351+
protocolGenerator.generateFrameworkErrorSerializer(context);
356352
writers.useShapeWriter(shape, w -> {
357-
protocolGenerator.generateServiceHandlerFactory(serverContext.withWriter(w));
353+
protocolGenerator.generateServiceHandlerFactory(context.withWriter(w));
358354
});
359355
for (OperationShape operation: TopDownIndex.of(model).getContainedOperations(service)) {
360356
writers.useShapeWriter(operation, w -> {
361-
protocolGenerator.generateOperationHandlerFactory(serverContext.withWriter(w), operation);
357+
protocolGenerator.generateOperationHandlerFactory(context.withWriter(w), operation);
362358
});
363359
}
364360
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package software.amazon.smithy.typescript.codegen.integration;
1717

1818
import java.util.Collection;
19-
import java.util.List;
2019
import java.util.function.Supplier;
2120
import java.util.stream.Collectors;
2221
import software.amazon.smithy.codegen.core.CodegenException;
@@ -274,7 +273,6 @@ class GenerationContext {
274273
private SymbolProvider symbolProvider;
275274
private TypeScriptWriter writer;
276275
private Supplier<TypeScriptWriter> writerSupplier;
277-
private List<TypeScriptIntegration> integrations;
278276
private String protocolName;
279277

280278
public TypeScriptSettings getSettings() {
@@ -330,14 +328,6 @@ public void setDeferredWriter(Supplier<TypeScriptWriter> writerSupplier) {
330328
}
331329
}
332330

333-
public List<TypeScriptIntegration> getIntegrations() {
334-
return integrations;
335-
}
336-
337-
public void setIntegrations(List<TypeScriptIntegration> integrations) {
338-
this.integrations = integrations;
339-
}
340-
341331
public String getProtocolName() {
342332
return protocolName;
343333
}
@@ -354,17 +344,10 @@ public GenerationContext copy() {
354344
copy.setSymbolProvider(symbolProvider);
355345
copy.setWriter(writer);
356346
copy.setDeferredWriter(writerSupplier);
357-
copy.setIntegrations(integrations);
358347
copy.setProtocolName(protocolName);
359348
return copy;
360349
}
361350

362-
public GenerationContext withSymbolProvider(SymbolProvider newProvider) {
363-
GenerationContext copyContext = copy();
364-
copyContext.setSymbolProvider(newProvider);
365-
return copyContext;
366-
}
367-
368351
public GenerationContext withWriter(TypeScriptWriter newWriter) {
369352
GenerationContext copyContext = copy();
370353
copyContext.setWriter(newWriter);

0 commit comments

Comments
 (0)