Fix pmd_analyze issues.

Author: phipag

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/BatchE2ET.java

@@ -131,7 +131,7 @@ void cleanUpTest() {
                 .build());
 
         for (Map<String, AttributeValue> item : items.items()) {
-            HashMap<String, AttributeValue> key = new HashMap<String, AttributeValue>() {
+            Map<String, AttributeValue> key = new HashMap<String, AttributeValue>() {
                 {
                     put("functionName", AttributeValue.builder()
                             .s(item.get("functionName").s())

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/LargeMessageE2ET.java

@@ -109,8 +109,8 @@ void bigSQSMessageOffloadedToS3_shouldLoadFromS3() throws IOException {
         final ExtendedClientConfiguration extendedClientConfig = new ExtendedClientConfiguration()
                 .withPayloadSupportEnabled(s3Client, bucketName);
         try (AmazonSQSExtendedClient client = new AmazonSQSExtendedClient(
-                SqsClient.builder().region(region).httpClient(httpClient).build(), extendedClientConfig)) {
-            InputStream inputStream = this.getClass().getResourceAsStream("/large_sqs_message.txt");
+                SqsClient.builder().region(region).httpClient(httpClient).build(), extendedClientConfig);
+                InputStream inputStream = this.getClass().getResourceAsStream("/large_sqs_message.txt");) {
             String bigMessage = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
 
             // WHEN

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/LargeMessageIdempotentE2ET.java

@@ -111,22 +111,23 @@ static void tearDown() {
     void test_ttlNotExpired_doesNotInsertInDDB_ttlExpired_insertInDDB() throws InterruptedException,
             IOException {
         // GIVEN
-        InputStream inputStream = this.getClass().getResourceAsStream("/large_sqs_message.txt");
-        String bigMessage = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
-
-        // upload manually to S3
-        String key = UUID.randomUUID().toString();
-        s3Client.putObject(PutObjectRequest.builder()
-                .bucket(bucketName)
-                .key(key)
-                .build(), RequestBody.fromString(bigMessage));
+        String s3Key = UUID.randomUUID().toString();
+        try (InputStream inputStream = this.getClass().getResourceAsStream("/large_sqs_message.txt")) {
+            String bigMessage = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
+
+            // upload manually to S3
+            s3Client.putObject(PutObjectRequest.builder()
+                    .bucket(bucketName)
+                    .key(s3Key)
+                    .build(), RequestBody.fromString(bigMessage));
+        }
 
         // WHEN
         SendMessageRequest messageRequest = SendMessageRequest.builder()
                 .queueUrl(queueUrl)
                 .messageBody(String.format(
                         "[\"software.amazon.payloadoffloading.PayloadS3Pointer\",{\"s3BucketName\":\"%s\",\"s3Key\":\"%s\"}]",
-                        bucketName, key))
+                        bucketName, s3Key))
                 .messageAttributes(Collections.singletonMap("SQSLargePayloadSize", MessageAttributeValue.builder()
                         .stringValue("300977")
                         .dataType("Number")

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/TracingE2ET.java

@@ -91,7 +91,7 @@ void test_tracing() {
         assertThat(initSegment.getAnnotations()).isNull();
 
         final SubSegment handleRequestSegment = trace.getSubsegments().stream()
-                .filter(subSegment -> subSegment.getName().equals("## handleRequest"))
+                .filter(subSegment -> "## handleRequest".equals(subSegment.getName()))
                 .findFirst().orElse(null);
         assertNotNull(handleRequestSegment);
         assertThat(handleRequestSegment.getName()).isEqualTo("## handleRequest");

powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/ValidationALBE2ET.java

@@ -61,17 +61,17 @@ static void tearDown() {
 
     @Test
     void test_validInboundSQSEvent() throws IOException {
-        InputStream inputStream = this.getClass().getResourceAsStream("/validation/valid_alb_in_out_event.json");
-        String validEvent = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
-
-        // WHEN
-        InvocationResult invocationResult = invokeFunction(functionName, validEvent);
-
-        // THEN
-        // invocation should pass validation and return 200
-        JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
-        assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(200);
-        assertThat(validJsonNode.get("body").asText()).isEqualTo("{\"price\": 150}");
+        try (InputStream is = this.getClass().getResourceAsStream("/validation/valid_alb_in_out_event.json")) {
+            String validEvent = IOUtils.toString(is, StandardCharsets.UTF_8);
+            // WHEN
+            InvocationResult invocationResult = invokeFunction(functionName, validEvent);
+
+            // THEN
+            // invocation should pass validation and return 200
+            JsonNode validJsonNode = objectMapper.readTree(invocationResult.getResult());
+            assertThat(validJsonNode.get("statusCode").asInt()).isEqualTo(200);
+            assertThat(validJsonNode.get("body").asText()).isEqualTo("{\"price\": 150}");
+        }
     }
 
     @Test