Remove unnecessary useShapeWriter method

Author: gosar

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

@@ -347,7 +347,7 @@ public Void stringShape(StringShape shape) {
     @Override
     public Void operationShape(OperationShape operation) {
         if (settings.generateServerSdk()) {
-            writers.useShapeWriter(operation, symbolProvider, w -> {
+            writers.useShapeWriter(operation, w -> {
                 ServerGenerator.generateOperationHandler(symbolProvider, service, operation, w);
             });
         }
@@ -395,11 +395,11 @@ public Void serviceShape(ServiceShape shape) {
                     protocolGenerator.generateRequestDeserializers(serverContext);
                     protocolGenerator.generateResponseSerializers(serverContext);
                     protocolGenerator.generateFrameworkErrorSerializer(serverContext);
-                    writers.useShapeWriter(shape, symbolProvider, w -> {
+                    writers.useShapeWriter(shape, w -> {
                         protocolGenerator.generateServiceHandlerFactory(serverContext.withWriter(w));
                     });
                     for (OperationShape operation: TopDownIndex.of(model).getContainedOperations(service)) {
-                        writers.useShapeWriter(operation, symbolProvider, w -> {
+                        writers.useShapeWriter(operation, w -> {
                             protocolGenerator.generateOperationHandlerFactory(serverContext.withWriter(w), operation);
                         });
                     }
@@ -462,7 +462,7 @@ private void generateClient(ServiceShape shape) {
     private void generateServiceInterface(ServiceShape shape) {
         TopDownIndex topDownIndex = TopDownIndex.of(model);
         Set<OperationShape> operations = new TreeSet<>(topDownIndex.getContainedOperations(shape));
-        writers.useShapeWriter(shape, symbolProvider, writer -> {
+        writers.useShapeWriter(shape, writer -> {
             ServerGenerator.generateOperationsType(symbolProvider, shape, operations, writer);
             ServerGenerator.generateServerInterfaces(symbolProvider, shape, operations, writer);
             ServerGenerator.generateServiceHandler(symbolProvider, shape, operations, writer);
@@ -484,7 +484,7 @@ private void generateCommands(ServiceShape shape) {
 
             if (settings.generateServerSdk()) {
                 ServerCommandGenerator.writeIndex(model, service, symbolProvider, fileManifest);
-                writers.useShapeWriter(operation, symbolProvider, commandWriter -> new ServerCommandGenerator(
+                writers.useShapeWriter(operation, commandWriter -> new ServerCommandGenerator(
                         settings, model, operation, symbolProvider, commandWriter,
                         protocolGenerator, applicationProtocol).run());
             }

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

@@ -85,12 +85,11 @@ List<SymbolDependency> getDependencies() {
      * with the writer.
      *
      * @param shape Shape to create the writer for.
-     * @param provider The symbol provider to use (instead of the default one).
      * @param writerConsumer Consumer that accepts and works with the file.
      */
-    void useShapeWriter(Shape shape, SymbolProvider provider, Consumer<TypeScriptWriter> writerConsumer) {
+    void useShapeWriter(Shape shape, Consumer<TypeScriptWriter> writerConsumer) {
         // Checkout/create the appropriate writer for the shape.
-        Symbol symbol = provider.toSymbol(shape);
+        Symbol symbol = symbolProvider.toSymbol(shape);
         String fileName = symbol.getDefinitionFile();
         if (!fileName.startsWith(Paths.get(".", CodegenUtils.SOURCE_FOLDER).toString())) {
             fileName = Paths.get(".", CodegenUtils.SOURCE_FOLDER, fileName).toString();
@@ -106,26 +105,13 @@ void useShapeWriter(Shape shape, SymbolProvider provider, Consumer<TypeScriptWri
         // Allow integrations to do things like add onSection callbacks.
         // These onSection callbacks are removed when popState is called.
         for (TypeScriptIntegration integration : integrations) {
-            integration.onShapeWriterUse(settings, model, provider, writer, shape);
+            integration.onShapeWriterUse(settings, model, symbolProvider, writer, shape);
         }
 
         writerConsumer.accept(writer);
         writer.popState();
     }
 
-    /**
-     * Gets a previously created writer or creates a new one if needed.
-     *
-     * <p>Any imports required by the given symbol are automatically registered
-     * with the writer.
-     *
-     * @param shape Shape to create the writer for.
-     * @param writerConsumer Consumer that accepts and works with the file.
-     */
-    void useShapeWriter(Shape shape, Consumer<TypeScriptWriter> writerConsumer) {
-        useShapeWriter(shape, symbolProvider, writerConsumer);
-    }
-
     /**
      * Gets a previously created writer or creates a new one if needed
      * and adds a new line if the writer already exists.