address PR feedbacks

Author: AllanZhengYP

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

@@ -20,7 +20,7 @@
 
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.OperationShape;
-import software.amazon.smithy.typescript.codegen.integration.EventStreamGenerator;
+import software.amazon.smithy.typescript.codegen.integration.AddEventStreamDependency;
 
 /**
  * Utility methods for generators for each components.
@@ -34,7 +34,7 @@ public static String getOperationSerializerContextType(
         // add default SerdeContext
         List<String> contextInterfaceList = getDefaultOperationSerdeContextTypes(writer);
         //check if event stream trait exists
-        if (EventStreamGenerator.operationHasEventStreamInput(model, operation)
+        if (AddEventStreamDependency.operationHasEventStreamInput(model, operation)
         ) {
             writer.addImport("EventStreamSerdeContext", "__EventStreamSerdeContext", "@aws-sdk/types");
             contextInterfaceList.add("__EventStreamSerdeContext");
@@ -47,7 +47,7 @@ public static String getOperationDeserializerContextType(
         // add default SerdeContext
         List<String> contextInterfaceList = getDefaultOperationSerdeContextTypes(writer);
         //check if event stream trait exists
-        if (EventStreamGenerator.operationHasEventStreamOutput(model, operation)
+        if (AddEventStreamDependency.operationHasEventStreamOutput(model, operation)
         ) {
             writer.addImport("EventStreamSerdeContext", "__EventStreamSerdeContext", "@aws-sdk/types");
             contextInterfaceList.add("__EventStreamSerdeContext");

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/EventStreamGenerator.java renamed to smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/AddEventStreamDependency.java

@@ -34,18 +34,15 @@
 /**
  * Adds event streams if needed.
  */
-public class EventStreamGenerator implements TypeScriptIntegration {
+public class AddEventStreamDependency implements TypeScriptIntegration {
 
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
         return ListUtils.of(
                 RuntimeClientPlugin.builder()
-                        .withConventions(
-                                TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_CONFIG_RESOLVER.dependency,
-                                "EventStreamSerde",
-                                RuntimeClientPlugin.Convention.HAS_CONFIG
-                        )
-                        .servicePredicate(EventStreamGenerator::hasEventStream)
+                        .withConventions(TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_CONFIG_RESOLVER.dependency,
+                                "EventStreamSerde", RuntimeClientPlugin.Convention.HAS_CONFIG)
+                        .servicePredicate(AddEventStreamDependency::hasEventStream)
                         .build()
         );
     }
@@ -60,13 +57,11 @@ public void addConfigInterfaceFields(
         if (!hasEventStream(model, settings.getService(model))) {
             return;
         }
-        writer.addImport(
-                "EventStreamSerdeProvider",
-                "EventStreamSerdeProvider",
-                TypeScriptDependency.AWS_SDK_TYPES.packageName
-        );
+        writer.addDependency(TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_CONFIG_RESOLVER);
+        writer.addImport("EventStreamSerdeProvider", "__EventStreamSerdeProvider",
+                TypeScriptDependency.AWS_SDK_TYPES.packageName);
         writer.writeDocs("The function that provides necessary utilities for generating and signing event stream");
-        writer.write("eventStreamSerdeProvider?: EventStreamSerdeProvider;");
+        writer.write("eventStreamSerdeProvider?: __EventStreamSerdeProvider;\n");
     }
 
     @Override
@@ -84,28 +79,22 @@ public void addRuntimeConfigValues(
         switch (target) {
             case NODE:
                 writer.addDependency(TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_NODE);
-                writer.addImport(
-                        "eventStreamSerdeProvider",
-                        "eventStreamSerdeProvider",
-                        TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_NODE.packageName
-                );
+                writer.addImport("eventStreamSerdeProvider", "eventStreamSerdeProvider",
+                        TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_NODE.packageName);
                 writer.write("eventStreamSerdeProvider");
                 break;
             case BROWSER:
                 writer.addDependency(TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_BROWSER);
-                writer.addImport(
-                        "eventStreamSerdeProvider",
-                        "eventStreamSerdeProvider",
-                        TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_BROWSER.packageName
-                );
+                writer.addImport("eventStreamSerdeProvider", "eventStreamSerdeProvider",
+                        TypeScriptDependency.AWS_SDK_EVENTSTREAM_SERDE_BROWSER.packageName);
                 writer.write("eventStreamSerdeProvider");
                 break;
             default:
                 // do nothing
         }
     }
 
-    public static final boolean hasEventStream(
+    private static boolean hasEventStream(
             Model model,
             ServiceShape service
     ) {