Add private getMaterialItem method in MetaStore

Moves duplicated code into a common method in the MetaStore.

Author: johnwalker

src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/providers/store/MetaStore.java

@@ -158,13 +158,7 @@ public MetaStore(final AmazonDynamoDB ddb, final String tableName,
 
     @Override
     public EncryptionMaterialsProvider getProvider(final String materialName, final long version) {
-        final Map<String, AttributeValue> ddbKey = new HashMap<String, AttributeValue>();
-        ddbKey.put(DEFAULT_HASH_KEY, new AttributeValue().withS(materialName));
-        ddbKey.put(DEFAULT_RANGE_KEY, new AttributeValue().withN(Long.toString(version)));
-        final Map<String, AttributeValue> item = ddbGet(ddbKey);
-        if (item == null || item.isEmpty()) {
-            throw new IndexOutOfBoundsException("No material found: " + materialName + "#" + version);
-        }
+        Map<String, AttributeValue> item = getMaterialItem(materialName, version);
         return decryptProvider(item);
     }
 
@@ -215,14 +209,7 @@ public long getVersionFromMaterialDescription(final Map<String, String> descript
      */
     public void replicate(final String materialName, final long version, final MetaStore targetMetaStore) {
         try {
-            final Map<String, AttributeValue> ddbKey = new HashMap<String, AttributeValue>();
-            ddbKey.put(DEFAULT_HASH_KEY, new AttributeValue().withS(materialName));
-            ddbKey.put(DEFAULT_RANGE_KEY, new AttributeValue().withN(Long.toString(version)));
-            final Map<String, AttributeValue> item = ddbGet(ddbKey);
-            if (item == null || item.isEmpty()) {
-                throw new IndexOutOfBoundsException("No material found: " + materialName + "#" + version);
-            }
-
+            Map<String, AttributeValue> item = getMaterialItem(materialName, version);
             final Map<String, AttributeValue> plainText = getPlainText(item);
             final Map<String, AttributeValue> encryptedText = targetMetaStore.getEncryptedText(plainText);
             final PutItemRequest put = new PutItemRequest().withTableName(targetMetaStore.tableName).withItem(encryptedText)
@@ -233,6 +220,17 @@ public void replicate(final String materialName, final long version, final MetaS
         }
     }
 
+    private Map<String, AttributeValue> getMaterialItem(final String materialName, final long version) {
+        final Map<String, AttributeValue> ddbKey = new HashMap<String, AttributeValue>();
+        ddbKey.put(DEFAULT_HASH_KEY, new AttributeValue().withS(materialName));
+        ddbKey.put(DEFAULT_RANGE_KEY, new AttributeValue().withN(Long.toString(version)));
+        final Map<String, AttributeValue> item = ddbGet(ddbKey);
+        if (item == null || item.isEmpty()) {
+            throw new IndexOutOfBoundsException("No material found: " + materialName + "#" + version);
+        }
+        return item;
+    }
+
     /**
      * Creates a DynamoDB Table with the correct properties to be used with a ProviderStore.
      *