Fix for ./gradlew test to be successful

smithy-lang · May 20, 2020 · fd24896 · fd24896
1 parent 3c73a41
commit fd24896
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructureGenerator.java b/...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/StructureGenerator.java
@@ -21,7 +21,6 @@
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.codegen.core.SymbolReference;
 import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.traits.ErrorTrait;
 

diff --git a/...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java b/...degen/src/main/java/software/amazon/smithy/typescript/codegen/StructuredMemberWriter.java
@@ -98,7 +98,11 @@ void writeFilterSensitiveLog(TypeScriptWriter writer, String objectParam) {
     /**
      * Recursively writes filterSensitiveLog for StructureShape.
      */
-    private void writeStructureFilterSensitiveLog(TypeScriptWriter writer, Shape structureTarget, String structureParam) {
+    private void writeStructureFilterSensitiveLog(
+            TypeScriptWriter writer,
+            Shape structureTarget,
+            String structureParam
+    ) {
         if (structureTarget.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
             // member is Sensitive, hide the value.
             writer.write("SENSITIVE_STRING");
@@ -111,7 +115,11 @@ private void writeStructureFilterSensitiveLog(TypeScriptWriter writer, Shape str
     /**
      * Recursively writes filterSensitiveLog for CollectionShape.
      */
-    private void writeCollectionFilterSensitiveLog(TypeScriptWriter writer, MemberShape collectionMember, String collectionParam) {
+    private void writeCollectionFilterSensitiveLog(
+            TypeScriptWriter writer,
+            MemberShape collectionMember,
+            String collectionParam
+    ) {
         if (collectionMember.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
             // member is Sensitive, hide the value.
             writer.write("SENSITIVE_STRING");
@@ -162,7 +170,7 @@ private void writeMapFilterSensitiveLog(TypeScriptWriter writer, MemberShape map
             mapParam, accParam, keyParam, valueParam, symbolProvider.toSymbol(mapMember), () -> {
                 writer.write("...$L,", accParam);
                 Shape memberTarget = model.expectShape(mapMember.getTarget());
-                writer.openBlock("[$L]: ",",", keyParam, () -> {
+                writer.openBlock("[$L]: ", ",", keyParam, () -> {
                     if (memberTarget instanceof StructureShape) {
                         writeStructureFilterSensitiveLog(writer, memberTarget, valueParam);
                     } else if (memberTarget instanceof CollectionShape) {
@@ -189,15 +197,15 @@ private void writeMapFilterSensitiveLog(TypeScriptWriter writer, MemberShape map
 
     /**
      * Identifies if iteration is required on member.
-     * 
+     *
      * @param member a {@link MemberShape} to check for iteration required.
      * @return Returns true if the iteration is required on member.
      */
     private boolean isIterationRequired(MemberShape member) {
         Shape memberTarget = model.expectShape(member.getTarget());
         if (memberTarget instanceof StructureShape) {
             return true;
-        } if (memberTarget instanceof CollectionShape) {
+        } else if (memberTarget instanceof CollectionShape) {
             MemberShape collectionMember = ((CollectionShape) memberTarget).getMember();
             return isIterationRequired(collectionMember);
         } else if (memberTarget instanceof MapShape) {
@@ -209,7 +217,7 @@ private boolean isIterationRequired(MemberShape member) {
 
     /**
      * Identifies if member needs to be overwritten in filterSensitiveLog.
-     * 
+     *
      * @param member a {@link MemberShape} to check if overwrite is required.
      * @return Returns true if the overwrite is required on member.
      */
@@ -220,7 +228,8 @@ private boolean isMemberOverwriteRequired(MemberShape member) {
     }
 
     /**
-     * 
+     * Returns sanitized value of the member
+     *
      * @param member a {@link MemberShape} to be sanitized.
      * @return Returns sanitized value of the member
      */

diff --git a/...degen/src/test/java/software/amazon/smithy/typescript/codegen/StructureGeneratorTest.java b/...degen/src/test/java/software/amazon/smithy/typescript/codegen/StructureGeneratorTest.java
@@ -65,10 +65,9 @@ public void testErrorStructureCodegen(String file, String expectedType) {
         assertThat(contents, containsString("as __isa"));
         assertThat(contents, containsString("as __SmithyException"));
         assertThat(contents, containsString(expectedType));
-        assertThat(contents, containsString("namespace Err {\n"
-                                            + "  export const isa = (o: any): o is Err => "
-                                            + "__isa(o, \"Err\");\n"
-                                            + "}"));
+        assertThat(contents, containsString("namespace Err {"));
+        assertThat(contents, containsString("  export const isa = (o: any): o is Err => "
+                                            + "__isa(o, \"Err\");\n"));
     }
 
     @Test