Remove unnecessary TypeScriptDelegator constructor

Author: gosar

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

@@ -139,7 +139,7 @@ class CodegenVisitor extends ShapeVisitor.Default<Void> {
                 ? ApplicationProtocol.createDefaultHttpApplicationProtocol()
                 : protocolGenerator.getApplicationProtocol();
 
-        writers = new TypeScriptDelegator(settings, model, fileManifest, symbolProvider, integrations);
+        writers = new TypeScriptDelegator(fileManifest, symbolProvider);
     }
 
     private ProtocolGenerator resolveProtocolGenerator(

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

@@ -109,16 +109,7 @@ public TypeScriptCodegenContext createContext(CreateContextDirective<TypeScriptS
                 .runtimePlugins(runtimePlugins)
                 .protocolGenerator(protocolGenerator)
                 .applicationProtocol(applicationProtocol)
-
-//                //TODO: fix delegator constructor
-//                .writerDelegator(new TypeScriptDelegator(
-//                        directive.settings(), directive.model(),
-//                        directive.fileManifest(), directive.symbolProvider(),
-//                        directive.integrations())) // TODO: integrations?
-
-                //TODO: fix delegator constructor
                 .writerDelegator(new TypeScriptDelegator(directive.fileManifest(), directive.symbolProvider()))
-
                 .build();
     }
 

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

@@ -21,8 +21,6 @@
 import software.amazon.smithy.codegen.core.SymbolDependency;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.codegen.core.WriterDelegator;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 @SmithyUnstableApi
@@ -32,17 +30,6 @@ final class TypeScriptDelegator extends WriterDelegator<TypeScriptWriter> {
         super(fileManifest, symbolProvider, new TypeScriptWriter.TypeScriptWriterFactory());
     }
 
-    // TODO: remove
-    TypeScriptDelegator(
-            TypeScriptSettings settings,
-            Model model,
-            FileManifest fileManifest,
-            SymbolProvider symbolProvider,
-            List<TypeScriptIntegration> integrations
-    ) {
-        super(fileManifest, symbolProvider, new TypeScriptWriter.TypeScriptWriterFactory());
-    }
-
     /**
      * Gets all of the dependencies that have been registered in writers owned by the delegator, along with any
      * unconditional dependencies.

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/RuntimeConfigGeneratorTest.java

@@ -65,8 +65,7 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
         SymbolProvider symbolProvider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
-        TypeScriptDelegator delegator = new TypeScriptDelegator(
-                settings, model, manifest, symbolProvider, integrations);
+        TypeScriptDelegator delegator = new TypeScriptDelegator(manifest, symbolProvider);
         RuntimeConfigGenerator generator = new RuntimeConfigGenerator(
                 settings, model, symbolProvider, delegator, integrations);
         generator.generate(LanguageTarget.NODE);

smithy-typescript-codegen/src/test/java/software/amazon/smithy/typescript/codegen/TypeScriptDelegatorTest.java

@@ -5,71 +5,15 @@
 
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.build.MockManifest;
-import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolProvider;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.Shape;
-import software.amazon.smithy.model.shapes.ShapeId;
-import software.amazon.smithy.utils.ListUtils;
 
 public class TypeScriptDelegatorTest {
-    @Test
-    public void vendsWritersForShapes() {
-        Model model = createModel();
-        Shape fooShape = model.expectShape(ShapeId.from("smithy.example#Foo"));
-        SymbolProvider provider = createProvider();
-        MockManifest manifest = new MockManifest();
-        TypeScriptSettings settings = new TypeScriptSettings();
-        TypeScriptDelegator delegator = new TypeScriptDelegator(
-                settings, model, manifest, provider, ListUtils.of());
-
-        delegator.useShapeWriter(fooShape, writer -> writer.write("Hello!"));
-        delegator.flushWriters();
-
-        assertThat(manifest.getFileString("Foo.txt").get(), equalTo("Hello!\n"));
-    }
-
     @Test
     public void addsBuiltinDependencies() {
-        Model model = createModel();
-        SymbolProvider provider = createProvider();
+        SymbolProvider provider = (shape) -> null;
         MockManifest manifest = new MockManifest();
-        TypeScriptSettings settings = new TypeScriptSettings();
-        TypeScriptDelegator delegator = new TypeScriptDelegator(
-                settings, model, manifest, provider, ListUtils.of());
+        TypeScriptDelegator delegator = new TypeScriptDelegator(manifest, provider);
 
         assertThat(delegator.getDependencies(), equalTo(TypeScriptDependency.getUnconditionalDependencies()));
     }
-
-    @Test
-    public void appendsToOpenedWriterWithNewline() {
-        Model model = createModel();
-        Shape fooShape = model.expectShape(ShapeId.from("smithy.example#Foo"));
-        SymbolProvider provider = createProvider();
-        MockManifest manifest = new MockManifest();
-        TypeScriptSettings settings = new TypeScriptSettings();
-        TypeScriptDelegator delegator = new TypeScriptDelegator(
-                settings, model, manifest, provider, ListUtils.of());
-
-        delegator.useShapeWriter(fooShape, writer -> writer.write("Hello!"));
-        delegator.useShapeWriter(fooShape, writer -> writer.write("Goodbye!"));
-        delegator.flushWriters();
-
-        assertThat(manifest.getFileString("Foo.txt").get(), equalTo("Hello!\n\nGoodbye!\n"));
-    }
-
-    private static Model createModel() {
-        return Model.assembler()
-                .addImport(TypeScriptDelegatorTest.class.getResource("testmodel.smithy"))
-                .assemble()
-                .unwrap();
-    }
-
-    private static SymbolProvider createProvider() {
-        return shape -> Symbol.builder()
-                .name(shape.getId().getName())
-                .namespace(shape.getId().getNamespace(), "/")
-                .definitionFile(shape.getId().getName() + ".txt")
-                .build();
-    }
 }