Move symbol visitor factory to artifact enum

Author: JordonPhillips

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

@@ -25,7 +25,6 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.function.BiFunction;
 import java.util.logging.Logger;
 import software.amazon.smithy.build.FileManifest;
 import software.amazon.smithy.build.PluginContext;
@@ -46,6 +45,7 @@
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.EnumTrait;
 import software.amazon.smithy.model.traits.PaginatedTrait;
+import software.amazon.smithy.typescript.codegen.TypeScriptSettings.ArtifactType;
 import software.amazon.smithy.typescript.codegen.integration.ProtocolGenerator;
 import software.amazon.smithy.typescript.codegen.integration.RuntimeClientPlugin;
 import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
@@ -78,11 +78,7 @@ class CodegenVisitor extends ShapeVisitor.Default<Void> {
     private final ProtocolGenerator protocolGenerator;
     private final ApplicationProtocol applicationProtocol;
 
-    CodegenVisitor(
-            PluginContext context,
-            BiFunction<Model, TypeScriptSettings, SymbolProvider> createSymbolProvider,
-            TypeScriptSettings.ArtifactType artifactType
-    ) {
+    CodegenVisitor(PluginContext context, ArtifactType artifactType) {
         // Load all integrations.
         ClassLoader loader = context.getPluginClassLoader().orElse(getClass().getClassLoader());
         LOGGER.info("Attempting to discover TypeScriptIntegration from the classpath...");
@@ -117,7 +113,7 @@ class CodegenVisitor extends ShapeVisitor.Default<Void> {
                 settings.generateClient() ? "client" : "server", service.getId()));
 
         // Decorate the symbol provider using integrations.
-        SymbolProvider resolvedProvider = createSymbolProvider.apply(model, settings);
+        SymbolProvider resolvedProvider = artifactType.createSymbolProvider(model, settings);
         for (TypeScriptIntegration integration : integrations) {
             resolvedProvider = integration.decorateSymbolProvider(settings, model, resolvedProvider);
         }

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

@@ -33,20 +33,10 @@ public String getName() {
 
     @Override
     public void execute(PluginContext context) {
-        new CodegenVisitor(
-                context,
-                TypeScriptCodegenPlugin::createSymbolProvider,
-                ArtifactType.CLIENT
-        ).execute();
+        new CodegenVisitor(context, ArtifactType.CLIENT).execute();
     }
 
-    /**
-     * Creates a TypeScript symbol provider.
-     *
-     * @param model Model to generate symbols for.
-     * @param settings Settings used by the plugin.
-     * @return Returns the created provider.
-     */
+    @Deprecated
     public static SymbolProvider createSymbolProvider(Model model, TypeScriptSettings settings) {
         return new SymbolVisitor(model, settings);
     }

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

@@ -17,8 +17,6 @@
 
 import software.amazon.smithy.build.PluginContext;
 import software.amazon.smithy.build.SmithyBuildPlugin;
-import software.amazon.smithy.codegen.core.SymbolProvider;
-import software.amazon.smithy.model.Model;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings.ArtifactType;
 
 /**
@@ -33,21 +31,6 @@ public String getName() {
 
     @Override
     public void execute(PluginContext context) {
-        new CodegenVisitor(
-                context,
-                TypeScriptServerCodegenPlugin::createSymbolProvider,
-                ArtifactType.SSDK
-        ).execute();
-    }
-
-    /**
-     * Creates a TypeScript symbol provider.
-     *
-     * @param model Model to generate symbols for.
-     * @param settings Settings used by the plugin.
-     * @return Returns the created provider.
-     */
-    public static SymbolProvider createSymbolProvider(Model model, TypeScriptSettings settings) {
-        return new ServerSymbolVisitor(model, new SymbolVisitor(model, settings));
+        new CodegenVisitor(context, ArtifactType.SSDK).execute();
     }
 }

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

@@ -19,9 +19,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.BiFunction;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import software.amazon.smithy.codegen.core.CodegenException;
+import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.knowledge.ServiceIndex;
 import software.amazon.smithy.model.node.BooleanNode;
@@ -317,7 +319,24 @@ public void setProtocol(ShapeId protocol) {
      * An enum indicating the type of artifact the code generator will produce.
      */
     public enum ArtifactType {
-        CLIENT,
-        SSDK
+        CLIENT(SymbolVisitor::new),
+        SSDK((m, s) -> new ServerSymbolVisitor(m, new SymbolVisitor(m, s)));
+
+        private final BiFunction<Model, TypeScriptSettings, SymbolProvider> symbolProviderFactory;
+
+        ArtifactType(BiFunction<Model, TypeScriptSettings, SymbolProvider> symbolProviderFactory) {
+            this.symbolProviderFactory = symbolProviderFactory;
+        }
+
+        /**
+         * Creates a TypeScript symbol provider suited to the artifact type.
+         *
+         * @param model Model to generate symbols for.
+         * @param settings Settings used by the symbol provider.
+         * @return Returns the created provider.
+         */
+        public SymbolProvider createSymbolProvider(Model model, TypeScriptSettings settings) {
+            return symbolProviderFactory.apply(model, settings);
+        }
     }
 }