Update AWS SDK and remaining examples to use PUT instead of CLOBBER

Update the AWS SDK to latest in order to get access to SaveBehavior.PUT for
examples.

Update tests to use the more general Function<T, T> instead of
UnaryOperator<T>.

Make it so EncryptionContextOperators can't be instantiated by adding a private
constructor.

Author: johnwalker

examples/com/amazonaws/examples/AwsKmsEncryptedObject.java

@@ -52,9 +52,9 @@ public static void encryptRecord(final String cmkArn, final String region) {
     // Encryptor creation
     final DynamoDBEncryptor encryptor = DynamoDBEncryptor.getInstance(cmp);
     // Mapper Creation
-    // Please note the use of SaveBehavior.CLOBBER (SaveBehavior.PUT works as well).
+    // Please note the use of SaveBehavior.PUT (SaveBehavior.CLOBBER works as well).
     // Omitting this can result in data-corruption.
-    DynamoDBMapperConfig mapperConfig = DynamoDBMapperConfig.builder().withSaveBehavior(SaveBehavior.CLOBBER).build();
+    DynamoDBMapperConfig mapperConfig = DynamoDBMapperConfig.builder().withSaveBehavior(SaveBehavior.PUT).build();
     DynamoDBMapper mapper = new DynamoDBMapper(ddb, mapperConfig, new AttributeEncryptor(encryptor));
 
     System.out.println("Plaintext Record: " + record);

examples/com/amazonaws/examples/EncryptionContextOverridesWithDynamoDBMapper.java

@@ -71,10 +71,10 @@ public static void encryptRecord(final String cmkArn,
         );
 
         // Mapper Creation
-        // Please note the use of SaveBehavior.CLOBBER (SaveBehavior.PUT works as well).
+        // Please note the use of SaveBehavior.PUT (SaveBehavior.CLOBBER works as well).
         // Omitting this can result in data-corruption.
         DynamoDBMapperConfig mapperConfig = DynamoDBMapperConfig.builder()
-                .withSaveBehavior(DynamoDBMapperConfig.SaveBehavior.CLOBBER).build();
+                .withSaveBehavior(DynamoDBMapperConfig.SaveBehavior.PUT).build();
         DynamoDBMapper mapper = new DynamoDBMapper(ddb, mapperConfig, new AttributeEncryptor(encryptor));
 
         System.out.println("Plaintext Record: " + record.toString());

pom.xml

@@ -43,7 +43,7 @@
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-bom</artifactId>
-        <version>1.11.434</version>
+        <version>1.11.460</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/utils/EncryptionContextOperators.java

@@ -9,6 +9,11 @@
  * Implementations of common operators for overriding the EncryptionContext
  */
 public class EncryptionContextOperators {
+
+    // Prevent instantiation
+    private EncryptionContextOperators() {
+    }
+
     /**
      * An operator for overriding EncryptionContext's table name for a specific DynamoDBEncryptor. If any table names or
      * the encryption context itself is null, then it returns the original EncryptionContext.
@@ -35,7 +40,6 @@ public static UnaryOperator<EncryptionContext> overrideEncryptionContextTableNam
         };
     }
 
-
     /**
      * An operator for mapping multiple table names in the Encryption Context to a new table name. If the table name for
      * a given EncryptionContext is missing, then it returns the original EncryptionContext. Similarly, it returns the
@@ -60,6 +64,4 @@ public static UnaryOperator<EncryptionContext> overrideEncryptionContextTableNam
             }
         };
     }
-
-
 }

src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/utils/EncryptionContextOperatorsTest.java

@@ -5,7 +5,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.UnaryOperator;
+import java.util.function.Function;
 
 import static com.amazonaws.services.dynamodbv2.datamodeling.encryption.utils.EncryptionContextOperators.overrideEncryptionContextTableName;
 import static com.amazonaws.services.dynamodbv2.datamodeling.encryption.utils.EncryptionContextOperators.overrideEncryptionContextTableNameUsingMap;
@@ -15,7 +15,7 @@ public class EncryptionContextOperatorsTest {
 
     @Test
     public void testCreateEncryptionContextTableNameOverride_expectedOverride() {
-        UnaryOperator<EncryptionContext> myNewTableName = overrideEncryptionContextTableName("OriginalTableName", "MyNewTableName");
+        Function<EncryptionContext, EncryptionContext> myNewTableName = overrideEncryptionContextTableName("OriginalTableName", "MyNewTableName");
 
         EncryptionContext context = new EncryptionContext.Builder().withTableName("OriginalTableName").build();
 
@@ -56,7 +56,7 @@ public void testCreateEncryptionContextTableNameOverrideMap_expectedOverride() {
         tableNameOverrides.put("OriginalTableName", "MyNewTableName");
 
 
-        UnaryOperator<EncryptionContext> nameOverrideMap =
+        Function<EncryptionContext, EncryptionContext> nameOverrideMap =
                 overrideEncryptionContextTableNameUsingMap(tableNameOverrides);
 
         EncryptionContext context = new EncryptionContext.Builder().withTableName("OriginalTableName").build();
@@ -74,7 +74,7 @@ public void testCreateEncryptionContextTableNameOverrideMap_multipleOverrides()
         tableNameOverrides.put("OriginalTableName2", "MyNewTableName2");
 
 
-        UnaryOperator<EncryptionContext> overrideOperator =
+        Function<EncryptionContext, EncryptionContext> overrideOperator =
                 overrideEncryptionContextTableNameUsingMap(tableNameOverrides);
 
         EncryptionContext context = new EncryptionContext.Builder().withTableName("OriginalTableName1").build();
@@ -136,17 +136,15 @@ public void testNullCasesCreateEncryptionContextTableNameOverrideFromMap_nullMap
 
 
     private void assertEncryptionContextUnchanged(EncryptionContext encryptionContext, String originalTableName, String newTableName) {
-        UnaryOperator<EncryptionContext> encryptionContextTableNameOverride = overrideEncryptionContextTableName(originalTableName, newTableName);
+        Function<EncryptionContext, EncryptionContext> encryptionContextTableNameOverride = overrideEncryptionContextTableName(originalTableName, newTableName);
         EncryptionContext newEncryptionContext = encryptionContextTableNameOverride.apply(encryptionContext);
         assertEquals(encryptionContext, newEncryptionContext);
     }
 
 
     private void assertEncryptionContextUnchangedFromMap(EncryptionContext encryptionContext, Map<String, String> overrideMap) {
-        UnaryOperator<EncryptionContext> encryptionContextTableNameOverrideFromMap = overrideEncryptionContextTableNameUsingMap(overrideMap);
+        Function<EncryptionContext, EncryptionContext> encryptionContextTableNameOverrideFromMap = overrideEncryptionContextTableNameUsingMap(overrideMap);
         EncryptionContext newEncryptionContext = encryptionContextTableNameOverrideFromMap.apply(encryptionContext);
         assertEquals(encryptionContext, newEncryptionContext);
     }
-
-
-}
+}