Rename keyrings to match AWS SDK V2 naming conventions.

smswz · smswz · commit 05cfffd94635 · 2022-06-23T15:54:04.000-05:00
diff --git a/src/main/java/software/amazon/encryption/s3/materials/AesGcmKeyring.java b/src/main/java/software/amazon/encryption/s3/materials/AesGcmKeyring.java
@@ -13,7 +13,7 @@
 /**
  * AESKeyring will use an AES key to wrap the data key used to encrypt content.
  */
-public class AESKeyring implements Keyring {
+public class AesGcmKeyring implements Keyring {
 
     private static final String KEY_ALGORITHM = "AES";
     private static final String KEY_PROVIDER_ID = "AES/GCM";
@@ -26,7 +26,7 @@ public class AESKeyring implements Keyring {
     private final SecureRandom _secureRandom;
     private final DataKeyGenerator _dataKeyGenerator;
 
-    private AESKeyring(Builder builder) {
+    private AesGcmKeyring(Builder builder) {
         _wrappingKey = builder._wrappingKey;
         _secureRandom = builder._secureRandom;
         _dataKeyGenerator = builder._dataKeyGenerator;
@@ -139,8 +139,8 @@ public Builder dataKeyGenerator(DataKeyGenerator dataKeyGenerator) {
             return this;
         }
 
-        public AESKeyring build() {
-            return new AESKeyring(this);
+        public AesGcmKeyring build() {
+            return new AesGcmKeyring(this);
         }
     }
 }
diff --git a/src/main/java/software/amazon/encryption/s3/materials/KmsContextKeyring.java b/src/main/java/software/amazon/encryption/s3/materials/KmsContextKeyring.java
@@ -17,7 +17,7 @@
 /**
  * AESKeyring will call to KMS to wrap the data key used to encrypt content.
  */
-public class KMSContextKeyring implements Keyring {
+public class KmsContextKeyring implements Keyring {
 
     private static final String KEY_PROVIDER_ID = "kms+context";
 
@@ -29,7 +29,7 @@ public class KMSContextKeyring implements Keyring {
     private final String _wrappingKeyId;
     private final DataKeyGenerator _dataKeyGenerator;
 
-    public KMSContextKeyring(Builder builder) {
+    public KmsContextKeyring(Builder builder) {
         _kmsClient = builder._kmsClient;
         _wrappingKeyId = builder._wrappingKeyId;
         _dataKeyGenerator = builder._dataKeyGenerator;
@@ -135,8 +135,8 @@ public Builder dataKeyGenerator(DataKeyGenerator dataKeyGenerator) {
             return this;
         }
 
-        public KMSContextKeyring build() {
-            return new KMSContextKeyring(this);
+        public KmsContextKeyring build() {
+            return new KmsContextKeyring(this);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* AESKeyring will use an AES key to wrap the data key used to encrypt content.`
`15`	`15`	`*/`
`16`		`-public class AESKeyring implements Keyring {`
	`16`	`+public class AesGcmKeyring implements Keyring {`
`17`	`17`
`18`	`18`	`private static final String KEY_ALGORITHM = "AES";`
`19`	`19`	`private static final String KEY_PROVIDER_ID = "AES/GCM";`
`@@ -26,7 +26,7 @@ public class AESKeyring implements Keyring {`
`26`	`26`	`private final SecureRandom _secureRandom;`
`27`	`27`	`private final DataKeyGenerator _dataKeyGenerator;`
`28`	`28`
`29`		`- private AESKeyring(Builder builder) {`
	`29`	`+ private AesGcmKeyring(Builder builder) {`
`30`	`30`	`_wrappingKey = builder._wrappingKey;`
`31`	`31`	`_secureRandom = builder._secureRandom;`
`32`	`32`	`_dataKeyGenerator = builder._dataKeyGenerator;`
`@@ -139,8 +139,8 @@ public Builder dataKeyGenerator(DataKeyGenerator dataKeyGenerator) {`
`139`	`139`	`return this;`
`140`	`140`	`}`
`141`	`141`
`142`		`- public AESKeyring build() {`
`143`		`- return new AESKeyring(this);`
	`142`	`+ public AesGcmKeyring build() {`
	`143`	`+ return new AesGcmKeyring(this);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`/**`
`18`	`18`	`* AESKeyring will call to KMS to wrap the data key used to encrypt content.`
`19`	`19`	`*/`
`20`		`-public class KMSContextKeyring implements Keyring {`
	`20`	`+public class KmsContextKeyring implements Keyring {`
`21`	`21`
`22`	`22`	`private static final String KEY_PROVIDER_ID = "kms+context";`
`23`	`23`
`@@ -29,7 +29,7 @@ public class KMSContextKeyring implements Keyring {`
`29`	`29`	`private final String _wrappingKeyId;`
`30`	`30`	`private final DataKeyGenerator _dataKeyGenerator;`
`31`	`31`
`32`		`- public KMSContextKeyring(Builder builder) {`
	`32`	`+ public KmsContextKeyring(Builder builder) {`
`33`	`33`	`_kmsClient = builder._kmsClient;`
`34`	`34`	`_wrappingKeyId = builder._wrappingKeyId;`
`35`	`35`	`_dataKeyGenerator = builder._dataKeyGenerator;`
`@@ -135,8 +135,8 @@ public Builder dataKeyGenerator(DataKeyGenerator dataKeyGenerator) {`
`135`	`135`	`return this;`
`136`	`136`	`}`
`137`	`137`
`138`		`- public KMSContextKeyring build() {`
`139`		`- return new KMSContextKeyring(this);`
	`138`	`+ public KmsContextKeyring build() {`
	`139`	`+ return new KmsContextKeyring(this);`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`}`