Minor cleanups

Author: alextwoods

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/CborBodyAssertion.java

@@ -45,18 +45,23 @@ protected void doAssert(LoggedRequest actual) throws Exception {
         assertEquals(expected, actualJson);
     }
 
+    /**
+     * CBOR allows serializing floating point numbers to different sizes (eg, float16/32/64).
+     * However, in assertEquals float and double nodes will never be equal so we convert them
+     * all to doubles.
+     */
     private JsonNode normalizeToDoubles(JsonNode node) {
         if (node.isFloat() || node.isDouble()) {
             return DoubleNode.valueOf(node.doubleValue());
-        } else if (node.isInt() || node.isLong() || node.isShort() || node.isBigInteger() || node.isBigDecimal()) {
-            return DoubleNode.valueOf(node.doubleValue());
-        } else if (node.isArray()) {
+        }
+        if (node.isArray()) {
             ArrayNode array = MAPPER.createArrayNode();
             for (JsonNode item : node) {
                 array.add(normalizeToDoubles(item));
             }
             return array;
-        } else if (node.isObject()) {
+        }
+        if (node.isObject()) {
             ObjectNode obj = MAPPER.createObjectNode();
             node.fields().forEachRemaining(entry -> obj.set(entry.getKey(), normalizeToDoubles(entry.getValue())));
             return obj;

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/JsonBodyAssertion.java

@@ -45,30 +45,34 @@ protected void doAssert(LoggedRequest actual) throws Exception {
         assertEquals(expected, actualJson);
     }
 
+    /**
+     * We serialize some numbers (in particular epoch timestamps) as doubles such as 123.000.
+     * In protocol tests, these values are parsed as longs.  This conversion insures that
+     * 123.000 will equal 123.
+     */
     public static JsonNode convertWholeNumberDoubleToLong(JsonNode node) {
+        if (node.isDouble()) {
+            double value = node.doubleValue();
+            if (value % 1 == 0) {
+                if (value >= Integer.MIN_VALUE && value <= Integer.MAX_VALUE) {
+                    return new IntNode((int) value);
+                }
+                return new LongNode((long) value);
+            }
+        }
         if (node.isObject()) {
             ObjectNode obj = (ObjectNode) node;
             ObjectNode result = obj.objectNode();
-            obj.fieldNames().forEachRemaining(field -> {
-                result.set(field, convertWholeNumberDoubleToLong(obj.get(field)));
-            });
+            obj.fieldNames().forEachRemaining(field -> result.set(field, convertWholeNumberDoubleToLong(obj.get(field))));
             return result;
-        } else if (node.isArray()) {
+        }
+        if (node.isArray()) {
             ArrayNode array = (ArrayNode) node;
             ArrayNode result = array.arrayNode();
             for (JsonNode item : array) {
                 result.add(convertWholeNumberDoubleToLong(item));
             }
             return result;
-        } else if (node.isDouble()) {
-            double value = node.doubleValue();
-            if (value % 1 == 0) {
-                if (value >= Integer.MIN_VALUE && value <= Integer.MAX_VALUE) {
-                    return new IntNode((int) value);
-                } else {
-                    return new LongNode((long) value);
-                }
-            }
         }
         return node;
     }

test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryParamsAssertion.java

@@ -15,11 +15,12 @@
 
 package software.amazon.awssdk.protocol.asserts.marshalling;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.collection.IsMapContaining.hasKey;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertNotNull;
 import static software.amazon.awssdk.protocol.asserts.marshalling.QueryUtils.parseQueryParams;
 import static software.amazon.awssdk.protocol.asserts.marshalling.QueryUtils.parseQueryParamsFromBody;
 
@@ -68,6 +69,8 @@ protected void doAssert(LoggedRequest actual) throws Exception {
     }
 
     private void doAssert(Map<String, List<String>> actualParams) {
+        assertNotNull(actualParams);
+
         if (contains != null) {
             assertContains(actualParams);
         }
@@ -87,7 +90,7 @@ private void doAssert(Map<String, List<String>> actualParams) {
 
 
     private void assertContains(Map<String, List<String>> actualParams) {
-        contains.entrySet().forEach(e -> assertThat(actualParams.get(e.getKey()), containsInAnyOrder(e.getValue().toArray())));
+        contains.forEach((key, value) -> assertThat(actualParams.get(key), containsInAnyOrder(value.toArray())));
     }
 
     private void assertDoesNotContain(Map<String, List<String>> actualParams) {
@@ -100,8 +103,8 @@ private void assertMustContain(Map<String, List<String>> actualParams) {
 
     private void assertContainsOnly(Map<String, List<String>> actualParams) {
         assertThat(actualParams.keySet(), equalTo(containsOnly.keySet()));
-        containsOnly.entrySet().forEach(e -> assertThat(
-            actualParams.get(e.getKey()), containsInAnyOrder(e.getValue().toArray())
+        containsOnly.forEach((key, value) -> assertThat(
+            actualParams.get(key), containsInAnyOrder(value.toArray())
         ));
     }