chore: Rename Directkmsmaterialsprovider to Directkmsmaterialprovider

DynamoDbEncryption/runtimes/java/src/main/sdkv2/com/amazonaws/services/dynamodbv2/datamodeling/sdkv2/encryption/providers/DirectKmsMaterialsProvider.java → DynamoDbEncryption/runtimes/java/src/main/sdkv2/com/amazonaws/services/dynamodbv2/datamodeling/sdkv2/encryption/providers/DirectKmsMaterialProvider.java

@@ -49,7 +49,7 @@
  *
  * @see <a href="http://docs.aws.amazon.com/kms/latest/developerguide/encrypt-context.html">KMS Encryption Context</a>
  */
-public class DirectKmsMaterialsProvider implements EncryptionMaterialsProvider {
+public class DirectKmsMaterialProvider implements EncryptionMaterialsProvider {
 
   private static final String COVERED_ATTR_CTX_KEY = "aws-kms-ec-attr";
   private static final String SIGNING_KEY_ALGORITHM = "amzn-ddb-sig-alg";
@@ -72,11 +72,11 @@ public class DirectKmsMaterialsProvider implements EncryptionMaterialsProvider {
   private final int sigKeyLength;
   private final String sigKeyDesc;
 
-  public DirectKmsMaterialsProvider(KmsClient kms) {
+  public DirectKmsMaterialProvider(KmsClient kms) {
     this(kms, null);
   }
 
-  public DirectKmsMaterialsProvider(
+  public DirectKmsMaterialProvider(
     KmsClient kms,
     String encryptionKeyId,
     Map<String, String> materialDescription
@@ -106,7 +106,7 @@ public DirectKmsMaterialsProvider(
     this.sigKeyLength = parts.length == 2 ? Integer.parseInt(parts[1]) : 256;
   }
 
-  public DirectKmsMaterialsProvider(KmsClient kms, String encryptionKeyId) {
+  public DirectKmsMaterialProvider(KmsClient kms, String encryptionKeyId) {
     this(kms, encryptionKeyId, Collections.emptyMap());
   }
 
@@ -249,7 +249,7 @@ protected String getEncryptionKeyId() {
 
   /**
    * Select encryption key id to be used to generate data key. The default implementation of this method returns
-   * {@link DirectKmsMaterialsProvider#encryptionKeyId}.
+   * {@link DirectKmsMaterialProvider#encryptionKeyId}.
    *
    * @param context encryption context.
    * @return the encryptionKeyId.
@@ -344,7 +344,7 @@ private static void populateKmsEcFromEc(
         );
       } else {
         throw new UnsupportedOperationException(
-          "DirectKmsMaterialsProvider only supports String, Number, and Binary HashKeys"
+          "DirectKmsMaterialProvider only supports String, Number, and Binary HashKeys"
         );
       }
     }
@@ -369,7 +369,7 @@ private static void populateKmsEcFromEc(
         );
       } else {
         throw new UnsupportedOperationException(
-          "DirectKmsMaterialsProvider only supports String, Number, and Binary RangeKeys"
+          "DirectKmsMaterialProvider only supports String, Number, and Binary RangeKeys"
         );
       }
     }

DynamoDbEncryption/runtimes/java/src/test/sdkv2/com/amazonaws/services/dynamodbv2/datamodeling/sdkv2/HolisticIT.java

@@ -10,7 +10,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionFlags;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.AsymmetricStaticProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.CachingMostRecentProvider;
-import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialsProvider;
+import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.EncryptionMaterialsProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.SymmetricStaticProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.WrappedMaterialsProvider;
@@ -872,13 +872,13 @@ private EncryptionMaterialsProvider createProvider(
         }
       case ScenarioManifest.AWS_KMS_PROVIDER_NAME:
         if (materialDescription != null && !materialDescription.isEmpty()) {
-          return new DirectKmsMaterialsProvider(
+          return new DirectKmsMaterialProvider(
             kmsClient,
             keyDataMap.get(keys.decryptName).keyId,
             materialDescription
           );
         }
-        return new DirectKmsMaterialsProvider(
+        return new DirectKmsMaterialProvider(
           kmsClient,
           keyDataMap.get(keys.decryptName).keyId
         );

DynamoDbEncryption/runtimes/java/src/test/sdkv2/com/amazonaws/services/dynamodbv2/datamodeling/sdkv2/HolisticITHelper.java

@@ -7,7 +7,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.DynamoDBEncryptor;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionContext;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionFlags;
-import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialsProvider;
+import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.testing.DdbRecordMatcher;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.testing.ScenarioManifest;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -114,7 +114,7 @@ public static void decryptNonBmpHashKeyVectorAndWithNullKeyId(
     loadKeyData(scenarioManifest.keyDataPath);
 
     DynamoDBEncryptor encryptor = DynamoDBEncryptor.getInstance(
-      new DirectKmsMaterialsProvider(kmsClient)
+      new DirectKmsMaterialProvider(kmsClient)
     );
     EncryptionContext ctx = EncryptionContext
       .builder()

DynamoDbEncryption/runtimes/java/src/test/sdkv2/com/amazonaws/services/dynamodbv2/datamodeling/sdkv2/encryption/providers/DirectKmsMaterialsProviderTest.java → DynamoDbEncryption/runtimes/java/src/test/sdkv2/com/amazonaws/services/dynamodbv2/datamodeling/sdkv2/encryption/providers/DirectKmsMaterialProviderTest.java

@@ -45,7 +45,7 @@
 import software.amazon.awssdk.services.kms.model.GenerateDataKeyRequest;
 import software.amazon.awssdk.services.kms.model.GenerateDataKeyResponse;
 
-public class DirectKmsMaterialsProviderTest {
+public class DirectKmsMaterialProviderTest {
 
   private FakeKMS kms;
   private String keyId;
@@ -64,10 +64,7 @@ public void setUp() {
 
   @Test
   public void simple() {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
 
     EncryptionMaterials eMat = prov.getEncryptionMaterials(ctx);
     SecretKey encryptionKey = eMat.getEncryptionKey();
@@ -96,10 +93,7 @@ public void simple() {
 
   @Test
   public void simpleWithKmsEc() {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
 
     Map<String, AttributeValue> attrVals = new HashMap<>();
     attrVals.put("hk", AttributeValue.builder().s("HashKeyValue").build());
@@ -136,10 +130,7 @@ public void simpleWithKmsEc() {
 
   @Test
   public void simpleWithKmsEc2() throws GeneralSecurityException {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
 
     Map<String, AttributeValue> attrVals = new HashMap<>();
     attrVals.put("hk", AttributeValue.builder().n("10").build());
@@ -176,10 +167,7 @@ public void simpleWithKmsEc2() throws GeneralSecurityException {
 
   @Test
   public void simpleWithKmsEc3() throws GeneralSecurityException {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
 
     Map<String, AttributeValue> attrVals = new HashMap<>();
     attrVals.put(
@@ -243,10 +231,7 @@ public void simpleWithKmsEc3() throws GeneralSecurityException {
 
   @Test
   public void randomEnvelopeKeys() throws GeneralSecurityException {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
 
     EncryptionMaterials eMat = prov.getEncryptionMaterials(ctx);
     SecretKey encryptionKey = eMat.getEncryptionKey();
@@ -264,10 +249,7 @@ public void randomEnvelopeKeys() throws GeneralSecurityException {
   @Test
   public void testRefresh() {
     // This does nothing, make sure we don't throw and exception.
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
     prov.refresh();
   }
 
@@ -276,7 +258,7 @@ public void explicitContentKeyAlgorithm() throws GeneralSecurityException {
     Map<String, String> desc = new HashMap<>();
     desc.put(WrappedRawMaterials.CONTENT_KEY_ALGORITHM, "AES");
 
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(
       kms,
       keyId,
       desc
@@ -301,7 +283,7 @@ public void explicitContentKeyLength128() throws GeneralSecurityException {
     Map<String, String> desc = new HashMap<>();
     desc.put(WrappedRawMaterials.CONTENT_KEY_ALGORITHM, "AES/128");
 
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(
       kms,
       keyId,
       desc
@@ -328,7 +310,7 @@ public void explicitContentKeyLength256() throws GeneralSecurityException {
     Map<String, String> desc = new HashMap<>();
     desc.put(WrappedRawMaterials.CONTENT_KEY_ALGORITHM, "AES/256");
 
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(
       kms,
       keyId,
       desc
@@ -398,7 +380,7 @@ public void extendedWithDerivedEncryptionKeyId() {
 
   @Test(expectedExceptions = SdkException.class)
   public void encryptionKeyIdMismatch() throws SdkException {
-    DirectKmsMaterialsProvider directProvider = new DirectKmsMaterialsProvider(
+    DirectKmsMaterialProvider directProvider = new DirectKmsMaterialProvider(
       kms,
       keyId
     );
@@ -469,12 +451,12 @@ public GenerateDataKeyResponse generateDataKey(GenerateDataKeyRequest r) {
       }
     };
     assertFalse(gdkCalled.get());
-    new DirectKmsMaterialsProvider(kmsSpy, keyId).getEncryptionMaterials(ctx);
+    new DirectKmsMaterialProvider(kmsSpy, keyId).getEncryptionMaterials(ctx);
     assertTrue(gdkCalled.get());
   }
 
   private static class ExtendedKmsMaterialsProvider
-    extends DirectKmsMaterialsProvider {
+    extends DirectKmsMaterialProvider {
 
     private final String encryptionKeyIdAttributeName;
 
@@ -553,15 +535,12 @@ private static EncryptionContext ctx(EncryptionMaterials mat) {
 
   @Test(expectedExceptions = NullPointerException.class)
   public void constructorNullKmsClient() {
-    new DirectKmsMaterialsProvider(null, keyId);
+    new DirectKmsMaterialProvider(null, keyId);
   }
 
   @Test(expectedExceptions = UnsupportedOperationException.class)
   public void unsupportedHashKeyType() {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
     Map<String, AttributeValue> attrVals = new HashMap<>();
     attrVals.put("hk", AttributeValue.builder().bool(true).build());
     EncryptionContext boolCtx = new EncryptionContext.Builder()
@@ -573,10 +552,7 @@ public void unsupportedHashKeyType() {
 
   @Test(expectedExceptions = UnsupportedOperationException.class)
   public void unsupportedRangeKeyType() {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
     Map<String, AttributeValue> attrVals = new HashMap<>();
     attrVals.put("hk", AttributeValue.builder().s("HashKeyValue").build());
     attrVals.put("rk", AttributeValue.builder().bool(true).build());
@@ -590,10 +566,7 @@ public void unsupportedRangeKeyType() {
 
   @Test(expectedExceptions = NullPointerException.class)
   public void hashKeyMissingFromAttributeValues() {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
     EncryptionContext missingCtx = new EncryptionContext.Builder()
       .hashKeyName("hk")
       .attributeValues(Collections.emptyMap())
@@ -603,10 +576,7 @@ public void hashKeyMissingFromAttributeValues() {
 
   @Test(expectedExceptions = NullPointerException.class)
   public void rangeKeyMissingFromAttributeValues() {
-    DirectKmsMaterialsProvider prov = new DirectKmsMaterialsProvider(
-      kms,
-      keyId
-    );
+    DirectKmsMaterialProvider prov = new DirectKmsMaterialProvider(kms, keyId);
     Map<String, AttributeValue> attrVals = new HashMap<>();
     attrVals.put("hk", AttributeValue.builder().s("HashKeyValue").build());
     EncryptionContext missingCtx = new EncryptionContext.Builder()

Examples/runtimes/java/DDBECwithSDKV2/src/main/java/AwsKmsEncryptedItem.java

@@ -4,7 +4,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.DynamoDBEncryptor;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionContext;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionFlags;
-import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialsProvider;
+import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialProvider;
 import java.security.GeneralSecurityException;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -54,8 +54,8 @@ public static void encryptRecord(
     );
     record.put(IGNORED_FIELD_NAME, AttributeValue.builder().s("alone").build());
 
-    // Create DirectKmsMaterialsProvider
-    final DirectKmsMaterialsProvider cmp = new DirectKmsMaterialsProvider(
+    // Create DirectKmsMaterialProvider
+    final DirectKmsMaterialProvider cmp = new DirectKmsMaterialProvider(
       kmsClient,
       cmkArn
     );

Examples/runtimes/java/DDBECwithSDKV2/src/main/java/AwsKmsMultiRegionKey.java

@@ -4,7 +4,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.DynamoDBEncryptor;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionContext;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionFlags;
-import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialsProvider;
+import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialProvider;
 import java.security.GeneralSecurityException;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -104,8 +104,10 @@ public static void encryptRecord(
     record.put(IGNORED_FIELD_NAME, AttributeValue.builder().s("alone").build());
 
     // Set up encryptor with first region's KMS key
-    final DirectKmsMaterialsProvider cmpEncrypt =
-      new DirectKmsMaterialsProvider(kmsEncrypt, cmkArnEncrypt);
+    final DirectKmsMaterialProvider cmpEncrypt = new DirectKmsMaterialProvider(
+      kmsEncrypt,
+      cmkArnEncrypt
+    );
     final DynamoDBEncryptor encryptor = DynamoDBEncryptor.getInstance(
       cmpEncrypt
     );
@@ -149,8 +151,10 @@ public static void encryptRecord(
     );
 
     // Set up decryptor using the replica key from second region
-    final DirectKmsMaterialsProvider cmpDecrypt =
-      new DirectKmsMaterialsProvider(kmsDecrypt, cmkArnDecrypt);
+    final DirectKmsMaterialProvider cmpDecrypt = new DirectKmsMaterialProvider(
+      kmsDecrypt,
+      cmkArnDecrypt
+    );
     final DynamoDBEncryptor decryptor = DynamoDBEncryptor.getInstance(
       cmpDecrypt
     );

Examples/runtimes/java/DDBECwithSDKV2/src/main/java/MostRecentEncryptedItem.java

@@ -5,7 +5,7 @@
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionContext;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.EncryptionFlags;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.CachingMostRecentProvider;
-import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialsProvider;
+import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialProvider;
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.store.MetaStore;
 import java.security.GeneralSecurityException;
 import java.util.EnumSet;
@@ -22,7 +22,7 @@
 
 /**
  * This demonstrates how to use the CachingMostRecentProvider backed by a MetaStore
- * and the DirectKmsMaterialsProvider to encrypt your data.
+ * and the DirectKmsMaterialProvider to encrypt your data.
  */
 public class MostRecentEncryptedItem {
 
@@ -62,7 +62,7 @@ public static void encryptRecord(
     record.put(IGNORED_FIELD_NAME, AttributeValue.builder().s("alone").build());
 
     // Provider Configuration to protect the data keys
-    final DirectKmsMaterialsProvider kmsProv = new DirectKmsMaterialsProvider(
+    final DirectKmsMaterialProvider kmsProv = new DirectKmsMaterialProvider(
       kmsClient,
       cmkArn
     );

Examples/runtimes/java/Migration/DDBECv2ToAWSDBE/src/main/java/software/amazon/cryptography/examples/migration/awsdbe/MigrationExampleStep1.java

@@ -1,7 +1,7 @@
 package software.amazon.cryptography.examples.migration.awsdbe;
 
 import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.DynamoDBEncryptor;
-import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialsProvider;
+import com.amazonaws.services.dynamodbv2.datamodeling.sdkv2.encryption.providers.DirectKmsMaterialProvider;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -100,7 +100,7 @@ public static void MigrationStep1(
 
     // 5. Configure the same DynamoDBEncryptor that we did in Step 0.
     final KmsClient kmsClient = KmsClient.create();
-    final DirectKmsMaterialsProvider cmp = new DirectKmsMaterialsProvider(
+    final DirectKmsMaterialProvider cmp = new DirectKmsMaterialProvider(
       kmsClient,
       kmsKeyId
     );