Address code comments

The minor ones from adamthom-amzn#1

Author: gosar

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsAuthPlugin.java

@@ -123,7 +123,7 @@ private static boolean testServiceId(Shape serviceShape, String expectedId) {
     }
 
     private static boolean isAwsService(Shape serviceShape) {
-        return serviceShape.getTrait(ServiceTrait.class).isPresent();
+        return serviceShape.hasTrait(ServiceTrait.class);
     }
 
     private static boolean operationUsesAwsAuth(Model model, ServiceShape service, OperationShape operation) {

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddAwsRuntimeConfig.java

@@ -116,12 +116,14 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
                         + "trait was found on " + service.getId());
             }
         }
-        runtimeConfigs.putAll(getDefaultConfig(target, isAwsService(settings, model)));
+        runtimeConfigs.putAll(getDefaultConfig(target, settings, model));
         return runtimeConfigs;
     }
 
-    private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget target, boolean isAwsService) {
+    private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget target, TypeScriptSettings settings,
+                                                                     Model model) {
         Map<String, Consumer<TypeScriptWriter>> defaultConfigs = new HashMap();
+        boolean isAwsService = isAwsService(settings, model);
         switch (target) {
             case SHARED:
                 return MapUtils.of(
@@ -176,6 +178,6 @@ private Map<String, Consumer<TypeScriptWriter>> getDefaultConfig(LanguageTarget
     }
 
     private static boolean isAwsService(TypeScriptSettings settings, Model model) {
-        return settings.getService(model).getTrait(ServiceTrait.class).isPresent();
+        return settings.getService(model).hasTrait(ServiceTrait.class);
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddBuiltinPlugins.java

@@ -133,6 +133,6 @@ private static boolean testServiceId(Shape serviceShape, String expectedId) {
     }
 
     private static boolean testAwsService(Shape serviceShape) {
-        return serviceShape.getTrait(ServiceTrait.class).isPresent();
+        return serviceShape.hasTrait(ServiceTrait.class);
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AddUserAgentDependency.java

@@ -53,13 +53,14 @@ public void addConfigInterfaceFields(
             SymbolProvider symbolProvider,
             TypeScriptWriter writer
     ) {
-        if (isAwsService(settings, model)) {
-            writer.addImport("Provider", "Provider", TypeScriptDependency.AWS_SDK_TYPES.packageName);
-            writer.addImport("UserAgent", "__UserAgent", TypeScriptDependency.AWS_SDK_TYPES.packageName);
-            writer.writeDocs("The provider populating default tracking information to be sent with `user-agent`, "
-                    + "`x-amz-user-agent` header\n@internal");
-            writer.write("defaultUserAgentProvider?: Provider<__UserAgent>;\n");
+        if (!isAwsService(settings, model)) {
+            return;
         }
+        writer.addImport("Provider", "Provider", TypeScriptDependency.AWS_SDK_TYPES.packageName);
+        writer.addImport("UserAgent", "__UserAgent", TypeScriptDependency.AWS_SDK_TYPES.packageName);
+        writer.writeDocs("The provider populating default tracking information to be sent with `user-agent`, "
+                + "`x-amz-user-agent` header\n@internal");
+        writer.write("defaultUserAgentProvider?: Provider<__UserAgent>;\n");
     }
 
     @Override
@@ -105,6 +106,6 @@ private static boolean isAwsService(TypeScriptSettings settings, Model model) {
     }
 
     private static boolean isAwsService(ServiceShape serviceShape) {
-        return serviceShape.getTrait(ServiceTrait.class).isPresent();
+        return serviceShape.hasTrait(ServiceTrait.class);
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsEndpointGeneratorIntegration.java

@@ -88,6 +88,6 @@ public Map<String, Consumer<TypeScriptWriter>> getRuntimeConfigWriters(
     }
 
     private static boolean isAwsService(TypeScriptSettings settings, Model model) {
-        return settings.getService(model).getTrait(ServiceTrait.class).isPresent();
+        return settings.getService(model).hasTrait(ServiceTrait.class);
     }
 }

codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/AwsPackageFixturesGeneratorIntegration.java

@@ -92,6 +92,6 @@ public void writeAdditionalFiles(
     }
 
     private static boolean isAwsService(TypeScriptSettings settings, Model model) {
-        return settings.getService(model).getTrait(ServiceTrait.class).isPresent();
+        return settings.getService(model).hasTrait(ServiceTrait.class);
     }
 }