Fix SonarCloud Issues (#5327)

* Fix SonarCloud issues

Author: davidh44

build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/NonJavaBaseModuleCheck.java

@@ -183,13 +183,9 @@ private boolean isLegalImport(String importText) {
             return true;
         }
 
-        if (additionalLegalPackagesBySdkPackage.entrySet()
-                                               .stream()
-                                               .anyMatch(e -> currentSdkPackage.startsWith(e.getKey()) &&
-                                                              e.getValue().contains(importPackage))) {
-            return true;
-        }
-
-        return false;
+        return additionalLegalPackagesBySdkPackage.entrySet()
+                                                  .stream()
+                                                  .anyMatch(e -> currentSdkPackage.startsWith(e.getKey()) &&
+                                                                 e.getValue().contains(importPackage));
     }
 }

build-tools/src/main/java/software/amazon/awssdk/buildtools/findbugs/DisallowMethodCall.java

@@ -57,14 +57,14 @@ public void sawOpcode(int code) {
             case Const.INVOKESPECIAL:
             case Const.INVOKESTATIC:
             case Const.INVOKEINTERFACE:
-                handleMethodCall(code);
+                handleMethodCall();
                 return;
             default:
                 // Ignore - not a method call.
         }
     }
 
-    private void handleMethodCall(int code) {
+    private void handleMethodCall() {
         MethodDescriptor method = getMethodDescriptorOperand();
         SignatureParser signature = new SignatureParser(method.getSignature());
         Entry<String, String> calledMethod = new SimpleEntry<>(method.getSlashedClassName(), method.getName());

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/Utils.java

@@ -46,11 +46,9 @@ public static File createDirectory(String path) {
     }
 
     public static void createDirectory(File dir) {
-        if (!(dir.exists())) {
-            if (!dir.mkdirs()) {
-                throw new RuntimeException("Not able to create directory. "
-                        + dir.getAbsolutePath());
-            }
+        if (!dir.exists() && !dir.mkdirs()) {
+            throw new RuntimeException("Not able to create directory. "
+                                       + dir.getAbsolutePath());
         }
     }
 
@@ -65,11 +63,8 @@ public static File createFile(String dir, String fileName) throws IOException {
 
         File file = new File(dir, fileName);
 
-        if (!(file.exists())) {
-            if (!(file.createNewFile())) {
-                throw new RuntimeException("Not able to create file . "
-                        + file.getAbsolutePath());
-            }
+        if (!file.exists() && !file.createNewFile()) {
+            throw new RuntimeException("Not able to create file . " + file.getAbsolutePath());
         }
 
         return file;

codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java

@@ -78,7 +78,7 @@ public JavaCodeFormatter() {
      * @param overrideOptions user provided options to apply on top of defaults
      */
     public JavaCodeFormatter(final Map<String, Object> overrideOptions) {
-        Map formatterOptions = new HashMap<>(DEFAULT_FORMATTER_OPTIONS);
+        Map<String, Object> formatterOptions = new HashMap<>(DEFAULT_FORMATTER_OPTIONS);
         if (overrideOptions != null) {
             formatterOptions.putAll(overrideOptions);
         }

codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

@@ -153,8 +153,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
         Shape shape = allC2jShapes.get(c2jShapeName);
         String variableName = getNamingStrategy().getVariableName(c2jMemberName);
         String variableType = getTypeUtils().getJavaDataType(allC2jShapes, c2jShapeName);
-        String variableDeclarationType = getTypeUtils()
-                .getJavaDataType(allC2jShapes, c2jShapeName, getCustomizationConfig());
+        String variableDeclarationType = getTypeUtils().getJavaDataType(allC2jShapes, c2jShapeName);
 
         //If member is idempotent, then it should be of string type
         //Else throw IllegalArgumentException.

codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java

@@ -96,20 +96,14 @@ private void writeIntermediateModel(IntermediateModel model) throws IOException
         PrintWriter writer = null;
         try {
             File outDir = new File(sourcesDirectory);
-            if (!outDir.exists()) {
-                if (!outDir.mkdirs()) {
-                    throw new RuntimeException("Failed to create "
-                                               + outDir.getAbsolutePath());
-                }
+            if (!outDir.exists() && !outDir.mkdirs()) {
+                throw new RuntimeException("Failed to create " + outDir.getAbsolutePath());
             }
 
             File outputFile = new File(modelDir, fileNamePrefix + "-intermediate.json");
 
-            if (!outputFile.exists()) {
-                if (!outputFile.createNewFile()) {
-                    throw new RuntimeException("Error creating file "
-                                               + outputFile.getAbsolutePath());
-                }
+            if (!outputFile.exists() && !outputFile.createNewFile()) {
+                throw new RuntimeException("Error creating file " + outputFile.getAbsolutePath());
             }
 
             writer = new PrintWriter(outputFile, "UTF-8");

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/OperationModifiersProcessor.java

@@ -107,9 +107,7 @@ public void postprocess(IntermediateModel intermediateModel) {
              *   }
              * }
              */
-            shape.getCustomization().setArtificialResultWrapper(
-                    createArtificialResultWrapperInfo(
-                            shape, wrappedMember));
+            shape.getCustomization().setArtificialResultWrapper(createArtificialResultWrapperInfo(wrappedMember));
         }
     }
 
@@ -136,8 +134,7 @@ private String preprocessCreateResultWrapperShape(ServiceModel serviceModel,
                                             + " shape already exists in the service model.");
         }
 
-        Shape wrapperShape = createWrapperShape(wrapperShapeName,
-                                                wrappedShapeName, wrappedShape, wrappedAsMember);
+        Shape wrapperShape = createWrapperShape(wrappedShapeName, wrappedShape, wrappedAsMember);
 
         // Add the new shape to the model
         serviceModel.getShapes().put(wrapperShapeName, wrapperShape);
@@ -149,7 +146,7 @@ private String preprocessCreateResultWrapperShape(ServiceModel serviceModel,
         return wrapperShapeName;
     }
 
-    private Shape createWrapperShape(String wrapperShapeName, String wrappedShapeName, Shape wrapped, String wrappedAsMember) {
+    private Shape createWrapperShape(String wrappedShapeName, Shape wrapped, String wrappedAsMember) {
 
         Shape wrapper = new Shape();
         wrapper.setType(ShapeType.Structure.getName());
@@ -164,7 +161,7 @@ private Shape createWrapperShape(String wrapperShapeName, String wrappedShapeNam
         return wrapper;
     }
 
-    private ArtificialResultWrapper createArtificialResultWrapperInfo(ShapeModel shape, MemberModel wrappedMember) {
+    private ArtificialResultWrapper createArtificialResultWrapperInfo(MemberModel wrappedMember) {
         ArtificialResultWrapper wrapper = new ArtificialResultWrapper();
         wrapper.setWrappedMemberName(wrappedMember.getName());
         wrapper.setWrappedMemberSimpleType(wrappedMember.getVariable().getSimpleType());

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RenameShapesProcessor.java

@@ -68,7 +68,7 @@ public void preprocess(ServiceModel serviceModel) {
             String shapeName = entry.getKey();
             Shape shape = entry.getValue();
 
-            preprocessRenameMemberShapes(shapeName, shape);
+            preprocessRenameMemberShapes(shape);
         }
         for (Operation operation : serviceModel.getOperations().values()) {
 
@@ -101,7 +101,7 @@ public void postprocess(IntermediateModel intermediateModel) {
     /**
      * Rename all the member shapes within this shape
      */
-    private void preprocessRenameMemberShapes(String shapeName, Shape shape) {
+    private void preprocessRenameMemberShapes(Shape shape) {
         if (shape.getListMember() != null) {
             preprocessRenameMemberShape(shape.getListMember());
         }

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeSubstitutionsProcessor.java

@@ -96,9 +96,7 @@ public void postprocess(IntermediateModel intermediateModel) {
             return;
         }
 
-        for (ShapeModel shapeModel : intermediateModel.getShapes().values()) {
-            postprocessHandleEmitAsMember(shapeModel, intermediateModel);
-        }
+        postprocessHandleEmitAsMember(intermediateModel);
     }
 
     private void preprocessAssertNoSubstitutedShapeReferenceInOperation(Operation operation) {
@@ -219,8 +217,7 @@ private ShapeSubstitution substituteMemberShape(Member member) {
         return null;
     }
 
-    private void postprocessHandleEmitAsMember(
-            ShapeModel shape, IntermediateModel intermediateModel) {
+    private void postprocessHandleEmitAsMember(IntermediateModel intermediateModel) {
 
         /*
          * For structure members whose shape is substituted, we need to add the
@@ -271,29 +268,25 @@ private void postprocessHandleEmitAsMember(
          * additional path into the "http" metadata of all the shape members
          * that reference to this list-type shape.
          */
-        for (Entry<String, Map<String, String>> ref : substitutedListMemberReferences.entrySet()) {
-            String parentShapeC2jName = ref.getKey();
+        substitutedListMemberReferences.forEach((parentShapeC2jName, nestedListMemberOriginalShapeMap) -> {
             // {listTypeMemberName -> nestedListMemberOriginalShape}
-            Map<String, String> nestedListMemberOriginalShapeMap = ref.getValue();
 
             ShapeModel parentShape = Utils.findShapeModelByC2jName(
-                    intermediateModel, parentShapeC2jName);
+                intermediateModel, parentShapeC2jName);
 
-            for (Entry<String, String> entry : nestedListMemberOriginalShapeMap.entrySet()) {
-                String listTypeMemberC2jName = entry.getKey();
-                String nestedListMemberOriginalShapeC2jName = entry.getValue();
+            nestedListMemberOriginalShapeMap.forEach((listTypeMemberC2jName, nestedListMemberOriginalShapeC2jName) -> {
 
                 MemberModel listTypeMember = parentShape.findMemberModelByC2jName(listTypeMemberC2jName);
 
-                ShapeModel nestedListMemberOriginalShape = Utils.findShapeModelByC2jName(intermediateModel,
-                        nestedListMemberOriginalShapeC2jName);
+                ShapeModel nestedListMemberOriginalShape =
+                    Utils.findShapeModelByC2jName(intermediateModel, nestedListMemberOriginalShapeC2jName);
 
                 MemberModel emitFromMember =
-                        nestedListMemberOriginalShape.findMemberModelByC2jName(
-                                shapeSubstitutions
-                                        .get(nestedListMemberOriginalShapeC2jName)
-                                        .getEmitFromMember()
-                                                                              );
+                    nestedListMemberOriginalShape.findMemberModelByC2jName(
+                        shapeSubstitutions
+                            .get(nestedListMemberOriginalShapeC2jName)
+                            .getEmitFromMember()
+                    );
 
                 /**
                  * This customization is specifically added for
@@ -305,37 +298,32 @@ private void postprocessHandleEmitAsMember(
                  * version bump.
                  */
                 if (!shouldSkipAddingMarshallingPath(shapeSubstitutions.get(nestedListMemberOriginalShapeC2jName),
-                        parentShapeC2jName)) {
+                                                     parentShapeC2jName)) {
                     listTypeMember.getListModel().setMemberAdditionalMarshallingPath(
-                            emitFromMember.getHttp().getMarshallLocationName());
+                        emitFromMember.getHttp().getMarshallLocationName());
                 }
                 listTypeMember.getListModel().setMemberAdditionalUnmarshallingPath(
-                        emitFromMember.getHttp().getUnmarshallLocationName());
-            }
-        }
+                    emitFromMember.getHttp().getUnmarshallLocationName());
+            });
+        });
     }
 
     private void trackShapeMemberSubstitution(String shapeName, String memberName, String originalShape) {
         log.info("{} -> ({} -> {})", shapeName, memberName, originalShape);
-        if (!substitutedShapeMemberReferences.containsKey(shapeName)) {
-            substitutedShapeMemberReferences.put(shapeName, new HashMap<>());
-        }
+        substitutedShapeMemberReferences.computeIfAbsent(shapeName, k -> new HashMap<>());
         substitutedShapeMemberReferences.get(shapeName).put(memberName, originalShape);
     }
 
     private void trackListMemberSubstitution(String shapeName, String listTypeMemberName, String nestedListMemberOriginalShape) {
         log.info("{} -> ({} -> {})", shapeName, listTypeMemberName, nestedListMemberOriginalShape);
-        if (!substitutedListMemberReferences.containsKey(shapeName)) {
-            substitutedListMemberReferences.put(shapeName, new HashMap<>());
-        }
+        substitutedListMemberReferences.computeIfAbsent(shapeName, k -> new HashMap<>());
         substitutedListMemberReferences.get(shapeName).put(listTypeMemberName, nestedListMemberOriginalShape);
     }
 
     private boolean shouldSkipAddingMarshallingPath(ShapeSubstitution substitutionConfig,
                                                     String parentShapeName) {
-        return substitutionConfig.getSkipMarshallPathForShapes() == null
-               ? false
-               : substitutionConfig.getSkipMarshallPathForShapes().contains(parentShapeName);
+        return substitutionConfig.getSkipMarshallPathForShapes() != null &&
+               substitutionConfig.getSkipMarshallPathForShapes().contains(parentShapeName);
     }
 
 }

codegen/src/main/java/software/amazon/awssdk/codegen/docs/WaiterDocs.java

@@ -180,7 +180,6 @@ public static CodeBlock waiterBuilderBuildJavadoc(ClassName className) {
     }
 
     public static CodeBlock waiterOperationWithOverrideConfigConsumerBuilder(ClassName clientClassName,
-                                                                             ClassName requestClassName,
                                                                              Map.Entry<String, WaiterDefinition> waiterDefinition,
                                                                              OperationModel opModel) {
         String javadocs = new DocumentationBuilder().description("Polls {@link $T#$N} API until the desired condition "