Merge pull request #2 from kaiyaok2/fixed_all_flaky_tests

Addresses Changes

Author: kaiyaok2

sdk1/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshaller.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.TreeMap;
 import java.util.List;
 import java.util.Map;
 
@@ -119,7 +120,10 @@ private static void marshall(final AttributeValue attributeValue, final DataOutp
         marshall(attr, out);
       }
     } else if (attributeValue.getM() != null) {
-      final Map<String, AttributeValue> m = attributeValue.getM();
+      // Using TreeMap to ensure deterministic entry order
+      final Map<String, AttributeValue> m = new TreeMap<>(attributeValue.getM());
+      // Update the deterministic order to attributeValue
+      attributeValue.setM(m);
       final List<String> mKeys = new ArrayList<String>(m.keySet());
       Collections.sort(mKeys);
       out.writeChar('M');

sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptorTest.java

@@ -199,6 +199,7 @@ public void ensureEncryptedAttributesUnmodified() throws GeneralSecurityExceptio
     Map<String, AttributeValue> encryptedAttributes =
         encryptor.encryptAllFieldsExcept(
             Collections.unmodifiableMap(attribs), context, "hashKey", "rangeKey", "version");
+    // Using TreeMap before casting to string to avoid nondeterministic key orders.
     String encryptedString = new TreeMap<>(encryptedAttributes).toString();
     encryptor.decryptAllFieldsExcept(
         Collections.unmodifiableMap(encryptedAttributes),

sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshallerTest.java

@@ -266,12 +266,9 @@ public void testSimpleMapWithNull() {
       marshall(av);
       Assert.fail("Unexpected success");
     } catch (final NullPointerException npe) {
-      // Map entries may permute under nondeterministic Java API
-      String npeMessage = npe.getMessage();
-      String common = "Encountered null map value for key NullKeyValue while marshalling attribute value ";
-      String case1 = common + "{M: {KeyValue={S: ValueValue,}, NullKeyValue=null},}";
-      String case2 = common + "{M: {NullKeyValue=null, KeyValue={S: ValueValue,}},}";
-      Assert.assertTrue(case1.equals(npeMessage) || case2.equals(npeMessage));
+      Assert.assertEquals(
+          "Encountered null map value for key NullKeyValue while marshalling attribute value {M: {KeyValue={S: ValueValue,}, NullKeyValue=null},}",
+          npe.getMessage());
     }
   }