Move to SDK-1.11.x. First prod release!

aws · Jul 13, 2016 · cd84cd3 · cd84cd3
1 parent 2e8bbed
commit cd84cd3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 182 deletions.
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ You can download the [latest snapshot release][download] or pick it up from Mave
   <dependency>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-dynamodb-encryption-java</artifactId>
-    <version>0.0.9-SNAPSHOT</version>
+    <version>1.11.0</version>
   </dependency>
 ```
 
@@ -163,4 +163,4 @@ For signing, the user specified signing key can be either symmetric or asymmetri
 [materialprovider]: src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/providers/EncryptionMaterialsProvider.java
 [privatekey]: http://docs.oracle.com/javase/7/docs/api/java/security/PrivateKey.html
 [secretkey]: http://docs.oracle.com/javase/7/docs/api/javax/crypto/SecretKey.html
-[download]: https://github.com/awslabs/aws-dynamodb-encryption-java/releases/tag/0.0.9-SNAPSHOT
+[download]: https://github.com/awslabs/aws-dynamodb-encryption-java/releases/tag/1.11.0
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-dynamodb-encryption-java</artifactId>
-  <version>0.0.9-SNAPSHOT</version>
+  <version>1.11.0</version>
   <packaging>jar</packaging>
 
   <name>aws-dynamodb-encryption-java</name>
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-bom</artifactId>
-        <version>1.10.63</version>
+        <version>1.11.15</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/test/java/com/amazonaws/services/dynamodbv2/testing/FakeKMS.java b/src/test/java/com/amazonaws/services/dynamodbv2/testing/FakeKMS.java
@@ -25,7 +25,7 @@
 import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.ResponseMetadata;
 import com.amazonaws.regions.Region;
-import com.amazonaws.services.kms.AWSKMS;
+import com.amazonaws.services.kms.AbstractAWSKMS;
 import com.amazonaws.services.kms.model.CancelKeyDeletionRequest;
 import com.amazonaws.services.kms.model.CancelKeyDeletionResult;
 import com.amazonaws.services.kms.model.CreateAliasRequest;
@@ -77,28 +77,11 @@
 import com.amazonaws.services.kms.model.UpdateAliasRequest;
 import com.amazonaws.services.kms.model.UpdateKeyDescriptionRequest;
 
-public class FakeKMS implements AWSKMS {
+public class FakeKMS extends AbstractAWSKMS {
     private static final SecureRandom rnd = new SecureRandom();
     private static final String ACCOUNT_ID = "01234567890";
     private final Map<DecryptMapKey, DecryptResult> results_ = new HashMap<>();
 
-    @Override
-    public void createAlias(CreateAliasRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CreateGrantResult createGrant(CreateGrantRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CreateKeyResult createKey() throws AmazonServiceException, AmazonClientException {
-        return createKey(new CreateKeyRequest());
-    }
-
     @Override
     public CreateKeyResult createKey(CreateKeyRequest req) throws AmazonServiceException,
             AmazonClientException {
@@ -123,42 +106,6 @@ public DecryptResult decrypt(DecryptRequest req) throws AmazonServiceException,
         }
     }
 
-    @Override
-    public void deleteAlias(DeleteAliasRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public DescribeKeyResult describeKey(DescribeKeyRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void disableKey(DisableKeyRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void disableKeyRotation(DisableKeyRotationRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enableKey(EnableKeyRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enableKeyRotation(EnableKeyRotationRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public EncryptResult encrypt(EncryptRequest req) throws AmazonServiceException,
             AmazonClientException {
@@ -208,123 +155,6 @@ public GenerateDataKeyWithoutPlaintextResult generateDataKeyWithoutPlaintext(
                 generateDataKey.getCiphertextBlob()).withKeyId(req.getKeyId());
     }
 
-    @Override
-    public GenerateRandomResult generateRandom() throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public GenerateRandomResult generateRandom(GenerateRandomRequest arg0)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest arg0) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public GetKeyPolicyResult getKeyPolicy(GetKeyPolicyRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public GetKeyRotationStatusResult getKeyRotationStatus(GetKeyRotationStatusRequest arg0)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListAliasesResult listAliases() throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListAliasesResult listAliases(ListAliasesRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListGrantsResult listGrants(ListGrantsRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListKeyPoliciesResult listKeyPolicies(ListKeyPoliciesRequest arg0)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListKeysResult listKeys() throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListKeysResult listKeys(ListKeysRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putKeyPolicy(PutKeyPolicyRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ReEncryptResult reEncrypt(ReEncryptRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void retireGrant() throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void retireGrant(RetireGrantRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void revokeGrant(RevokeGrantRequest arg0) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void updateAlias(UpdateAliasRequest req) throws AmazonServiceException,
-            AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ScheduleKeyDeletionResult scheduleKeyDeletion(ScheduleKeyDeletionRequest scheduleKeyDeletionRequest)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListRetirableGrantsResult listRetirableGrants(ListRetirableGrantsRequest listRetirableGrantsRequest)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CancelKeyDeletionResult cancelKeyDeletion(CancelKeyDeletionRequest cancelKeyDeletionRequest)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public void setEndpoint(String arg0) throws IllegalArgumentException {
         // Do nothing
@@ -340,12 +170,6 @@ public void shutdown() {
         // Do nothing
     }
 
-    @Override
-    public void updateKeyDescription(UpdateKeyDescriptionRequest arg0)
-            throws AmazonServiceException, AmazonClientException {
-        throw new UnsupportedOperationException();
-    }
-
     public void dump() {
         System.out.println(results_);
     }