Remove deprecated TypeScriptCodegenPlugin.createSymbolProvider()

Author: gosar

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

@@ -17,9 +17,7 @@
 
 import software.amazon.smithy.build.PluginContext;
 import software.amazon.smithy.build.SmithyBuildPlugin;
-import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.codegen.core.directed.CodegenDirector;
-import software.amazon.smithy.model.Model;
 import software.amazon.smithy.typescript.codegen.integration.TypeScriptIntegration;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
@@ -64,10 +62,4 @@ public void execute(PluginContext context) {
         // Run it!
         runner.run();
     }
-
-    // TODO: Look to remove it
-    @Deprecated
-    public static SymbolProvider createSymbolProvider(Model model, TypeScriptSettings settings) {
-        return new SymbolVisitor(model, settings);
-    }
 }

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

@@ -29,7 +29,7 @@ public void generatesNamedEnums() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        Symbol symbol = TypeScriptCodegenPlugin.createSymbolProvider(model, settings).toSymbol(shape);
+        Symbol symbol = new SymbolVisitor(model, settings).toSymbol(shape);
         new EnumGenerator(shape, symbol, writer).run();
 
         assertThat(writer.toString(), containsString("export enum Baz {"));
@@ -54,7 +54,7 @@ public void generatesUnnamedEnums() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        Symbol symbol = TypeScriptCodegenPlugin.createSymbolProvider(model, settings).toSymbol(shape);
+        Symbol symbol = new SymbolVisitor(model, settings).toSymbol(shape);
         new EnumGenerator(shape, symbol, writer).run();
 
         assertThat(writer.toString(), containsString("export type Baz = \"BAR\" | \"FOO\""));

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

@@ -22,7 +22,7 @@ public void writesIndex() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        SymbolProvider symbolProvider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider symbolProvider = new SymbolVisitor(model, settings);
         MockManifest manifest = new MockManifest();
         List<TypeScriptIntegration> integrations = new ArrayList<>();
         integrations.add(new TypeScriptIntegration() {

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

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

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

@@ -27,7 +27,7 @@ public void addsCustomIntegrationDependencyFields() {
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
         TypeScriptWriter writer = new TypeScriptWriter("./foo");
-        SymbolProvider symbolProvider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider symbolProvider = new SymbolVisitor(model, settings);
         ApplicationProtocol applicationProtocol = ApplicationProtocol.createDefaultHttpApplicationProtocol();
 
         List<TypeScriptIntegration> integrations = new ArrayList<>();

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

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.build.MockManifest;
 import software.amazon.smithy.build.PluginContext;
+import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.loader.ModelAssembler;
 import software.amazon.smithy.model.node.Node;
@@ -594,7 +595,7 @@ public void generatesNonErrorStructures() {
                 .build());
 
         TypeScriptWriter writer = new TypeScriptWriter("./foo");
-        new StructureGenerator(model, TypeScriptCodegenPlugin.createSymbolProvider(model, settings), writer, struct).run();
+        new StructureGenerator(model, new SymbolVisitor(model, settings), writer, struct).run();
         String output = writer.toString();
 
         assertThat(output, containsString("export interface Bar {"));
@@ -625,7 +626,7 @@ public void generatesNonErrorStructuresThatExtendOtherInterfaces() {
                 .build());
 
         TypeScriptWriter writer = new TypeScriptWriter("./foo");
-        new StructureGenerator(model, TypeScriptCodegenPlugin.createSymbolProvider(model, settings), writer, struct).run();
+        new StructureGenerator(model, new SymbolVisitor(model, settings), writer, struct).run();
         String output = writer.toString();
 
         assertThat(output, containsString("export interface Bar {"));

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

@@ -32,7 +32,7 @@ public void createsSymbols() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
         Symbol symbol = provider.toSymbol(shape);
 
         assertThat(symbol.getName(), equalTo("Hello"));
@@ -54,7 +54,7 @@ public void createsSymbolsIntoTargetNamespace() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
         Symbol symbol1 = provider.toSymbol(shape1);
         Symbol symbol2 = provider.toSymbol(shape2);
         MockManifest manifest = new MockManifest();
@@ -85,7 +85,7 @@ public void escapesReservedWords() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
         Symbol symbol = provider.toSymbol(shape);
 
         assertThat(symbol.getName(), equalTo("_Pick"));
@@ -107,7 +107,7 @@ public void doesNotEscapeBuiltins() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
 
         Symbol structSymbol = provider.toSymbol(struct);
         Symbol memberSymbol = provider.toSymbol(member);
@@ -139,7 +139,7 @@ public void escapesRecursiveSymbols() {
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
 
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
         Symbol listSymbol = provider.toSymbol(list);
 
         assertThat(listSymbol.getName(), equalTo("(_Record)[]"));
@@ -157,7 +157,7 @@ public void createsCommandModules() {
                 .build());
 
         Shape command = model.expectShape(ShapeId.from("smithy.example#GetFoo"));
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
         Symbol commandSymbol = provider.toSymbol(command);
 
         assertThat(commandSymbol.getName(), equalTo("GetFooCommand"));
@@ -184,7 +184,7 @@ public void usesLazyJsonStringForJsonMediaType() {
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
 
-        SymbolProvider provider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider provider = new SymbolVisitor(model, settings);
         Symbol memberSymbol = provider.toSymbol(member);
 
         assertThat(memberSymbol.getName(), equalTo("__LazyJsonString | string"));

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

@@ -40,7 +40,7 @@ public void generatesTaggedUnions() {
                 .withMember("package", Node.from("example"))
                 .withMember("packageVersion", Node.from("1.0.0"))
                 .build());
-        SymbolProvider symbolProvider = TypeScriptCodegenPlugin.createSymbolProvider(model, settings);
+        SymbolProvider symbolProvider = new SymbolVisitor(model, settings);
         TypeScriptWriter writer = new TypeScriptWriter("./Example");
         new UnionGenerator(model, symbolProvider, writer, unionShape).run();
         String output = writer.toString();