Use isStructureShape() and isUnionShape() instead of instanceof

Author: trivikr

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

@@ -26,7 +26,6 @@
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.StructureShape;
-import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.IdempotencyTokenTrait;
 import software.amazon.smithy.model.traits.SensitiveTrait;
 import software.amazon.smithy.model.traits.StreamingTrait;
@@ -83,7 +82,7 @@ void writeFilterSensitiveLog(TypeScriptWriter writer, String objectParam) {
                     if (member.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
                         // member is Sensitive, hide the value.
                         writer.write("SENSITIVE_STRING");
-                    } else if (memberTarget instanceof StructureShape || memberTarget instanceof UnionShape) {
+                    } else if (memberTarget.isStructureShape() || memberTarget.isUnionShape()) {
                         writeStructureFilterSensitiveLog(writer, memberTarget, memberParam);
                     } else if (memberTarget instanceof CollectionShape) {
                         MemberShape collectionMember = ((CollectionShape) memberTarget).getMember();
@@ -135,7 +134,7 @@ void writeCollectionFilterSensitiveLog(
             String itemParam = "item";
             Shape collectionMemberTarget = model.expectShape(collectionMember.getTarget());
             writer.write("$L => ", itemParam);
-            if (collectionMemberTarget instanceof StructureShape || collectionMemberTarget instanceof UnionShape) {
+            if (collectionMemberTarget.isStructureShape() || collectionMemberTarget.isUnionShape()) {
                 writeStructureFilterSensitiveLog(writer, collectionMemberTarget, itemParam);
             } else if (collectionMemberTarget instanceof CollectionShape) {
                 MemberShape nestedCollectionMember = ((CollectionShape) collectionMemberTarget).getMember();
@@ -176,7 +175,7 @@ void writeMapFilterSensitiveLog(TypeScriptWriter writer, MemberShape mapMember,
                 writer.write("...$L,", accParam);
                 Shape mapMemberTarget = model.expectShape(mapMember.getTarget());
                 writer.openBlock("[$L]: ", ",", keyParam, () -> {
-                    if (mapMemberTarget instanceof StructureShape || mapMemberTarget instanceof UnionShape) {
+                    if (mapMemberTarget.isStructureShape() || mapMemberTarget.isUnionShape()) {
                         writeStructureFilterSensitiveLog(writer, mapMemberTarget, valueParam);
                     } else if (mapMemberTarget instanceof CollectionShape) {
                         MemberShape collectionMember = ((CollectionShape) mapMemberTarget).getMember();
@@ -214,10 +213,10 @@ private boolean isMemberOverwriteRequired(MemberShape member, Set<String> parent
 
         Shape memberTarget = model.expectShape(member.getTarget());
         parents.add(symbolProvider.toMemberName(member));
-        if (memberTarget instanceof UnionShape) {
+        if (memberTarget.isUnionShape()) {
             // always call filterSensitiveLog for UnionShape
             return true;
-        } else if (memberTarget instanceof StructureShape) {
+        } else if (memberTarget.isStructureShape()) {
             Collection<MemberShape> structureMemberList = ((StructureShape) memberTarget).getAllMembers().values();
             for (MemberShape structureMember: structureMemberList) {
                 if (!parents.contains(symbolProvider.toMemberName(structureMember))

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

@@ -25,7 +25,6 @@
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.SimpleShape;
-import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.SensitiveTrait;
 import software.amazon.smithy.utils.StringUtils;
@@ -249,7 +248,7 @@ private void writeFilterSensitiveLog() {
                         String memberParam = String.format("%s.%s", objectParam, memberName);
 
                         writer.write("if (${1L}.${2L} !== undefined) return {${2L}: ", objectParam, memberName);
-                        if (memberTarget instanceof StructureShape || memberTarget instanceof UnionShape) {
+                        if (memberTarget.isStructureShape() || memberTarget.isUnionShape()) {
                             structuredMemberWriter.writeStructureFilterSensitiveLog(writer, memberTarget, memberParam);
                         } else if (memberTarget instanceof CollectionShape) {
                             MemberShape collectionMember = ((CollectionShape) memberTarget).getMember();