re-organize the functions

Author: AllanZhengYP

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

@@ -19,8 +19,8 @@
 import java.util.List;
 
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.knowledge.EventStreamIndex;
 import software.amazon.smithy.model.shapes.OperationShape;
-import software.amazon.smithy.typescript.codegen.integration.AddEventStreamDependency;
 
 /**
  * Utility methods needed across Java packages.
@@ -39,27 +39,40 @@ public static boolean isJsonMediaType(String mediaType) {
         return mediaType.equals("application/json") || mediaType.endsWith("+json");
     }
 
-
+    /**
+     * Get context type for command serializer functions.
+     * @param writer The code writer.
+     * @param model The model for the service containing the given command.
+     * @param operation The operation shape for given command.
+     * @return The TypeScript type for the serializer context
+     */
     public static String getOperationSerializerContextType(
             TypeScriptWriter writer, Model model, OperationShape operation) {
         // add default SerdeContext
         List<String> contextInterfaceList = getDefaultOperationSerdeContextTypes(writer);
         //check if event stream trait exists
-        if (AddEventStreamDependency.operationHasEventStreamInput(model, operation)
-        ) {
+        EventStreamIndex eventStreamIndex = model.getKnowledge(EventStreamIndex.class);
+        if (eventStreamIndex.getInputInfo(operation).isPresent()) {
             writer.addImport("EventStreamSerdeContext", "__EventStreamSerdeContext", "@aws-sdk/types");
             contextInterfaceList.add("__EventStreamSerdeContext");
         }
         return String.join(" & ", contextInterfaceList);
     }
 
+    /**
+     * Get context type for command deserializer function.
+     * @param writer The code writer.
+     * @param model The model for the service containing the given command.
+     * @param operation The operation shape for given command.
+     * @return The TypeScript type for the deserializer context
+     */
     public static String getOperationDeserializerContextType(
             TypeScriptWriter writer, Model model, OperationShape operation) {
         // add default SerdeContext
         List<String> contextInterfaceList = getDefaultOperationSerdeContextTypes(writer);
         //check if event stream trait exists
-        if (AddEventStreamDependency.operationHasEventStreamOutput(model, operation)
-        ) {
+        EventStreamIndex eventStreamIndex = model.getKnowledge(EventStreamIndex.class);
+        if (eventStreamIndex.getOutputInfo(operation).isPresent()) {
             writer.addImport("EventStreamSerdeContext", "__EventStreamSerdeContext", "@aws-sdk/types");
             contextInterfaceList.add("__EventStreamSerdeContext");
         }

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

@@ -24,7 +24,6 @@
 import software.amazon.smithy.model.knowledge.TopDownIndex;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
-import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.typescript.codegen.LanguageTarget;
 import software.amazon.smithy.typescript.codegen.TypeScriptDependency;
 import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
@@ -34,7 +33,7 @@
 /**
  * Adds event streams if needed.
  */
-public class AddEventStreamDependency implements TypeScriptIntegration {
+public final class AddEventStreamDependency implements TypeScriptIntegration {
 
     @Override
     public List<RuntimeClientPlugin> getClientPlugins() {
@@ -100,67 +99,13 @@ private static boolean hasEventStream(
     ) {
         TopDownIndex topDownIndex = model.getKnowledge(TopDownIndex.class);
         Set<OperationShape> operations = topDownIndex.getContainedOperations(service);
+        EventStreamIndex eventStreamIndex = model.getKnowledge(EventStreamIndex.class);
         for (OperationShape operation : operations) {
-            if (operationHasEventStream(model, service, operation)) {
+            if (eventStreamIndex.getInputInfo(operation).isPresent()
+                    || eventStreamIndex.getOutputInfo(operation).isPresent()) {
                 return true;
             }
         }
         return false;
     }
-
-    public static final boolean operationHasEventStream(
-            Model model,
-            ServiceShape service,
-            OperationShape operation
-    ) {
-        if (operationHasEventStreamInput(model, operation) || operationHasEventStreamOutput(model, operation)) {
-            return true;
-        }
-        return false;
-    }
-
-    public static final boolean operationHasEventStreamInput(
-            Model model,
-            OperationShape operation
-    ) {
-        EventStreamIndex eventStreamIndex = model.getKnowledge(EventStreamIndex.class);
-        if (eventStreamIndex.getInputInfo(operation).isPresent()) {
-            return true;
-        }
-        return false;
-    }
-
-    public static final boolean operationHasEventStreamOutput(
-            Model model,
-            OperationShape operation
-    ) {
-        EventStreamIndex eventStreamIndex = model.getKnowledge(EventStreamIndex.class);
-        if (eventStreamIndex.getOutputInfo(operation).isPresent()) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * The value of event header 'type' property of given shape.
-     *
-     * @param shape shape bond to event header
-     * @return string literal for the event message header type
-     */
-    public static String getEventHeaderType(Shape shape) {
-        switch (shape.getType()) {
-            case BOOLEAN:
-            case BYTE:
-            case SHORT:
-            case INTEGER:
-            case LONG:
-            case STRING:
-            case TIMESTAMP:
-                return shape.getType().toString();
-            case BLOB:
-                return "binary";
-            default:
-                return "binary";
-        }
-    }
 }