updated formatting and changed assertion for sonar

Author: jdoherty

powertools-e2e-tests/handlers/metrics/src/main/java/software/amazon/lambda/powertools/e2e/Function.java

@@ -35,14 +35,17 @@ public class Function implements RequestHandler<Input, String> {
     @Metrics(captureColdStart = true)
     public String handleRequest(Input input, Context context) {
 
-        Instant currentTimeTruncatedPlusThirty = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toInstant(ZoneOffset.UTC).plusSeconds(30);
+        Instant currentTimeTruncatedPlusThirty =
+                LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toInstant(ZoneOffset.UTC).plusSeconds(30);
         metricsLogger.setTimestamp(currentTimeTruncatedPlusThirty);
 
         DimensionSet dimensionSet = new DimensionSet();
         input.getDimensions().forEach((key, value) -> dimensionSet.addDimension(key, value));
         metricsLogger.putDimensions(dimensionSet);
 
-        input.getMetrics().forEach((key, value) -> metricsLogger.putMetric(key, value, Unit.COUNT,input.getHighResolution().equalsIgnoreCase("true") ? StorageResolution.HIGH : StorageResolution.STANDARD ));
+        input.getMetrics().forEach((key, value) -> metricsLogger.putMetric(key, value, Unit.COUNT,
+                input.getHighResolution().equalsIgnoreCase("true") ? StorageResolution.HIGH :
+                        StorageResolution.STANDARD));
 
         return "OK";
     }

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

@@ -71,7 +71,8 @@ public static void tearDown() {
     public void test_recordMetrics() {
         // GIVEN
 
-        Instant currentTimeTruncatedToMinutes = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toInstant(ZoneOffset.UTC);
+        Instant currentTimeTruncatedToMinutes =
+                LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES).toInstant(ZoneOffset.UTC);
 
         String event1 =
                 "{ \"metrics\": {\"orders\": 1, \"products\": 4}, \"dimensions\": { \"Environment\": \"test\"}, \"highResolution\": \"false\"}";

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/MetricsLoggerTest.java

@@ -269,10 +269,11 @@ private void testLogger(Consumer<Consumer<MetricsLogger>> methodToTest) {
                                 .contains("Namespace=GlobalName");
 
                         ArrayList cloudWatchMetrics = (ArrayList) aws.get("CloudWatchMetrics");
-                        LinkedHashMap<String,Object> values = (java.util.LinkedHashMap<String, Object>) cloudWatchMetrics.get(0);
+                        LinkedHashMap<String, Object> values =
+                                (java.util.LinkedHashMap<String, Object>) cloudWatchMetrics.get(0);
                         ArrayList metricArray = (ArrayList) values.get("Metrics");
-                        LinkedHashMap<String,Object> metricValues = (LinkedHashMap<String, Object>) metricArray.get(1);
-                        assertThat(metricValues.get("StorageResolution")).isEqualTo(1);
+                        LinkedHashMap<String, Object> metricValues = (LinkedHashMap<String, Object>) metricArray.get(1);
+                        assertThat(metricValues).containsEntry("StorageResolution", 1);
                     });
         }
     }

powertools-metrics/src/test/java/software/amazon/lambda/powertools/metrics/internal/LambdaMetricsAspectTest.java

@@ -392,7 +392,8 @@ public void exceptionWhenTooManyDimensionsSet() {
 
             assertThatExceptionOfType(DimensionSetExceededException.class)
                     .isThrownBy(() -> requestHandler.handleRequest("input", context))
-                    .withMessage("Maximum number of dimensions allowed are 30. Account for default dimensions if not using setDimensions.");
+                    .withMessage(
+                            "Maximum number of dimensions allowed are 30. Account for default dimensions if not using setDimensions.");
         }
     }