Minor java code cleanup

Ajay Kemparaj · bdonlan · commit eb8702e82759 · 2018-10-22T10:56:24.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -100,7 +100,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -110,7 +110,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+                <version>3.0.1</version>
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>1024m</maxmemory>
@@ -172,7 +172,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.20</version>
+                        <version>2.22.0</version>
                         <configuration>
                             <includes>
                                 <include>**/AllTestsSuite.java</include>
@@ -193,7 +193,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.20</version>
+                        <version>2.22.0</version>
                         <configuration>
                             <includes>
                                 <include>**/FastTestsOnlySuite.java</include>
diff --git a/src/main/java/com/amazonaws/encryptionsdk/DefaultCryptoMaterialsManager.java b/src/main/java/com/amazonaws/encryptionsdk/DefaultCryptoMaterialsManager.java
@@ -125,7 +125,7 @@ public DefaultCryptoMaterialsManager(MasterKeyProvider<?> mkp) {
                 }
 
                 pubKey = deserializeTrailingKeyFromEc(request.getAlgorithm(), serializedPubKey);
-            } catch (final GeneralSecurityException ex) {
+            } catch (final IllegalStateException ex) {
                 throw new AwsCryptoException(ex);
             }
         }
@@ -136,10 +136,7 @@ public DefaultCryptoMaterialsManager(MasterKeyProvider<?> mkp) {
                                   .build();
     }
 
-    private PublicKey deserializeTrailingKeyFromEc(
-            CryptoAlgorithm algo,
-            String pubKey
-    ) throws GeneralSecurityException {
+    private PublicKey deserializeTrailingKeyFromEc(CryptoAlgorithm algo, String pubKey)  {
         return TrailingSignatureAlgorithm.forCryptoAlgorithm(algo).deserializePublicKey(pubKey);
     }
 
diff --git a/src/main/java/com/amazonaws/encryptionsdk/caching/CachingCryptoMaterialsManager.java b/src/main/java/com/amazonaws/encryptionsdk/caching/CachingCryptoMaterialsManager.java
@@ -11,6 +11,7 @@
 import com.amazonaws.encryptionsdk.CryptoMaterialsManager;
 import com.amazonaws.encryptionsdk.DefaultCryptoMaterialsManager;
 import com.amazonaws.encryptionsdk.MasterKeyProvider;
+import com.amazonaws.encryptionsdk.exception.AwsCryptoException;
 import com.amazonaws.encryptionsdk.internal.EncryptionContextSerializer;
 import com.amazonaws.encryptionsdk.internal.Utils;
 import com.amazonaws.encryptionsdk.model.DecryptionMaterialsRequest;
@@ -249,7 +250,7 @@ private CachingCryptoMaterialsManager(Builder builder) {
                     partitionId.getBytes(StandardCharsets.UTF_8)
             );
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
+            throw new AwsCryptoException(e);
         }
     }
 
@@ -349,7 +350,7 @@ private byte[] getCacheIdentifier(EncryptionMaterialsRequest req) {
 
             return digest.digest();
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
+            throw new AwsCryptoException(e);
         }
     }
 
@@ -377,7 +378,7 @@ private byte[] getCacheIdentifier(DecryptionMaterialsRequest req) {
 
             return digest.digest();
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
+            throw new AwsCryptoException(e);
         }
     }
 
diff --git a/src/main/java/com/amazonaws/encryptionsdk/internal/BlockEncryptionHandler.java b/src/main/java/com/amazonaws/encryptionsdk/internal/BlockEncryptionHandler.java
@@ -14,8 +14,6 @@
 package com.amazonaws.encryptionsdk.internal;
 
 import java.io.ByteArrayOutputStream;
-import java.security.SecureRandom;
-
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 
@@ -33,7 +31,6 @@
  * {@link BlockDecryptionHandler}.
  */
 class BlockEncryptionHandler implements CryptoHandler {
-    private static final SecureRandom RND = new SecureRandom();
     private final SecretKey encryptionKey_;
     private final CryptoAlgorithm cryptoAlgo_;
     private final int nonceLen_;
diff --git a/src/main/java/com/amazonaws/encryptionsdk/internal/Constants.java b/src/main/java/com/amazonaws/encryptionsdk/internal/Constants.java
@@ -18,7 +18,7 @@ public final class Constants {
      * Default length of the message identifier used to uniquely identify every
      * ciphertext created by this library.
      */
-    public final static int MESSAGE_ID_LEN = 16;
+    public static final int MESSAGE_ID_LEN = 16;
 
     private Constants() {
         // Prevent instantiation
@@ -27,39 +27,39 @@ private Constants() {
     /**
      * Marker for identifying the final frame.
      */
-    public final static int ENDFRAME_SEQUENCE_NUMBER = ~0; // is 0xFFFFFFFF
+    public static final int ENDFRAME_SEQUENCE_NUMBER = ~0; // is 0xFFFFFFFF
 
     /**
      * The identifier for non-final frames in the framing content type. This value is used as part
      * of the additional authenticated data (AAD) when encryption of content in a frame.
      */
-    public final static String FRAME_STRING_ID = "AWSKMSEncryptionClient Frame";
+    public static final String FRAME_STRING_ID = "AWSKMSEncryptionClient Frame";
 
     /**
      * The identifier for the final frame in the framing content type. This value is used as part of
      * the additional authenticated data (AAD) when encryption of content in a frame.
      */
-    public final static String FINAL_FRAME_STRING_ID = "AWSKMSEncryptionClient Final Frame";
+    public static final String FINAL_FRAME_STRING_ID = "AWSKMSEncryptionClient Final Frame";
 
     /**
      * The identifier for the single block content type. This value is used as part of the
      * additional authenticated data (AAD) when encryption of content in a single block.
      */
-    public final static String SINGLE_BLOCK_STRING_ID = "AWSKMSEncryptionClient Single Block";
+    public static final String SINGLE_BLOCK_STRING_ID = "AWSKMSEncryptionClient Single Block";
 
     /**
      * Maximum length of the content that can be encrypted in GCM mode.
      */
-    public final static long GCM_MAX_CONTENT_LEN = (1L << 36) - 32;
+    public static final long GCM_MAX_CONTENT_LEN = (1L << 36) - 32;
 
-    public final static int MAX_NONCE_LENGTH = (1 << 8) - 1;
+    public static final int MAX_NONCE_LENGTH = (1 << 8) - 1;
 
     /**
      * Maximum value of an unsigned short.
      */
-    public final static int UNSIGNED_SHORT_MAX_VAL = (1 << 16) - 1;
+    public static final int UNSIGNED_SHORT_MAX_VAL = (1 << 16) - 1;
 
-    public final static long MAX_FRAME_NUMBER = (1L << 32) - 1;
+    public static final long MAX_FRAME_NUMBER = (1L << 32) - 1;
 
     public static final String EC_PUBLIC_KEY_FIELD = "aws-crypto-public-key";
 }
diff --git a/src/main/java/com/amazonaws/encryptionsdk/internal/DecryptionHandler.java b/src/main/java/com/amazonaws/encryptionsdk/internal/DecryptionHandler.java
@@ -515,7 +515,7 @@ private void readHeaderFields(final CiphertextHeaders ciphertextHeaders) {
 
     private void updateTrailingSignature(final CiphertextHeaders headers) {
         if (trailingSig_ != null) {
-            final byte[] reserializedHeaders = ciphertextHeaders_.toByteArray();
+            final byte[] reserializedHeaders = headers.toByteArray();
             updateTrailingSignature(reserializedHeaders, 0, reserializedHeaders.length);
         }
     }
diff --git a/src/main/java/com/amazonaws/encryptionsdk/internal/FrameEncryptionHandler.java b/src/main/java/com/amazonaws/encryptionsdk/internal/FrameEncryptionHandler.java
@@ -15,7 +15,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.security.SecureRandom;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
diff --git a/src/main/java/com/amazonaws/encryptionsdk/internal/Utils.java b/src/main/java/com/amazonaws/encryptionsdk/internal/Utils.java
@@ -21,7 +21,6 @@
 import java.util.Comparator;
 import java.util.WeakHashMap;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.regex.Pattern;
 
 /**
  * Internal utility methods.
diff --git a/src/main/java/com/amazonaws/encryptionsdk/internal/VersionInfo.java b/src/main/java/com/amazonaws/encryptionsdk/internal/VersionInfo.java
@@ -33,6 +33,6 @@ public class VersionInfo {
     /**
      * The current version number of the ciphertext produced by this library.
      */
-    public final static byte CURRENT_CIPHERTEXT_VERSION = 1;
+    public static final byte CURRENT_CIPHERTEXT_VERSION = 1;
 
 }
diff --git a/src/main/java/com/amazonaws/encryptionsdk/model/CipherFrameHeaders.java b/src/main/java/com/amazonaws/encryptionsdk/model/CipherFrameHeaders.java
@@ -113,7 +113,7 @@ public byte[] toByteArray() {
             dataStream.close();
             return outBytes.toByteArray();
         } catch (IOException e) {
-            throw new RuntimeException("Failed to serialize cipher frame headers", e);
+            throw new AwsCryptoException("Failed to serialize cipher frame headers", e);
         }
     }
 
diff --git a/src/main/java/com/amazonaws/encryptionsdk/model/CiphertextType.java b/src/main/java/com/amazonaws/encryptionsdk/model/CiphertextType.java
@@ -33,7 +33,7 @@ public enum CiphertextType {
      * This is a static method so the map is created when the class is loaded.
      * This enables fast lookups of the CiphertextType given a value.
      */
-    private static final Map<Byte, CiphertextType> ID_MAPPING = new HashMap<Byte, CiphertextType>();
+    private static final Map<Byte, CiphertextType> ID_MAPPING = new HashMap<>();
     static {
         for (final CiphertextType s : EnumSet.allOf(CiphertextType.class)) {
             ID_MAPPING.put(s.value_, s);
diff --git a/src/test/java/com/amazonaws/encryptionsdk/UtilsTest.java b/src/test/java/com/amazonaws/encryptionsdk/UtilsTest.java
@@ -5,15 +5,14 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 import org.junit.Test;
 
 import com.amazonaws.encryptionsdk.internal.Utils;
 
 public class UtilsTest {
     @Test
-    public void compareObjectIdentityTest() throws Exception {
+    public void compareObjectIdentityTest()  {
         assertNotEquals(0, Utils.compareObjectIdentity(null, new Object()));
         assertNotEquals(0, Utils.compareObjectIdentity(new Object(), null));
 
@@ -63,7 +62,7 @@ public void compareObjectIdentity_handlesHashCodeCollisions() {
     }
 
     @Test
-    public void testSaturatingAdd() throws Exception {
+    public void testSaturatingAdd()  {
         assertEquals(0, Utils.saturatingAdd(0, 0));
         assertEquals(2, Utils.saturatingAdd(1, 1));
         assertEquals(-2, Utils.saturatingAdd(-1, -1));
diff --git a/src/test/java/com/amazonaws/encryptionsdk/caching/CacheIdentifierTests.java b/src/test/java/com/amazonaws/encryptionsdk/caching/CacheIdentifierTests.java
@@ -37,8 +37,6 @@ public class CacheIdentifierTests {
         contextFull.put("encryption", "context");
     }
 
-    CachingCryptoMaterialsManager cmm;
-
     static List<KeyBlob> keyBlobs = Arrays.asList(
             new KeyBlob("this is a provider ID", "this is some key info".getBytes(UTF_8),
                         "super secret key, now with encryption!".getBytes(UTF_8)
diff --git a/src/test/java/com/amazonaws/encryptionsdk/caching/LocalCryptoMaterialsCacheTest.java b/src/test/java/com/amazonaws/encryptionsdk/caching/LocalCryptoMaterialsCacheTest.java
diff --git a/src/test/java/com/amazonaws/encryptionsdk/caching/NullCryptoMaterialsCacheTest.java b/src/test/java/com/amazonaws/encryptionsdk/caching/NullCryptoMaterialsCacheTest.java

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public DefaultCryptoMaterialsManager(MasterKeyProvider<?> mkp) {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`pubKey = deserializeTrailingKeyFromEc(request.getAlgorithm(), serializedPubKey);`
`128`		`- } catch (final GeneralSecurityException ex) {`
	`128`	`+ } catch (final IllegalStateException ex) {`
`129`	`129`	`throw new AwsCryptoException(ex);`
`130`	`130`	`}`
`131`	`131`	`}`
`@@ -136,10 +136,7 @@ public DefaultCryptoMaterialsManager(MasterKeyProvider<?> mkp) {`
`136`	`136`	`.build();`
`137`	`137`	`}`
`138`	`138`
`139`		`- private PublicKey deserializeTrailingKeyFromEc(`
`140`		`- CryptoAlgorithm algo,`
`141`		`- String pubKey`
`142`		`- ) throws GeneralSecurityException {`
	`139`	`+ private PublicKey deserializeTrailingKeyFromEc(CryptoAlgorithm algo, String pubKey) {`
`143`	`140`	`return TrailingSignatureAlgorithm.forCryptoAlgorithm(algo).deserializePublicKey(pubKey);`
`144`	`141`	`}`
`145`	`142`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import com.amazonaws.encryptionsdk.CryptoMaterialsManager;`
`12`	`12`	`import com.amazonaws.encryptionsdk.DefaultCryptoMaterialsManager;`
`13`	`13`	`import com.amazonaws.encryptionsdk.MasterKeyProvider;`
	`14`	`+import com.amazonaws.encryptionsdk.exception.AwsCryptoException;`
`14`	`15`	`import com.amazonaws.encryptionsdk.internal.EncryptionContextSerializer;`
`15`	`16`	`import com.amazonaws.encryptionsdk.internal.Utils;`
`16`	`17`	`import com.amazonaws.encryptionsdk.model.DecryptionMaterialsRequest;`
`@@ -249,7 +250,7 @@ private CachingCryptoMaterialsManager(Builder builder) {`
`249`	`250`	`partitionId.getBytes(StandardCharsets.UTF_8)`
`250`	`251`	`);`
`251`	`252`	`} catch (GeneralSecurityException e) {`
`252`		`- throw new RuntimeException(e);`
	`253`	`+ throw new AwsCryptoException(e);`
`253`	`254`	`}`
`254`	`255`	`}`
`255`	`256`
`@@ -349,7 +350,7 @@ private byte[] getCacheIdentifier(EncryptionMaterialsRequest req) {`
`349`	`350`
`350`	`351`	`return digest.digest();`
`351`	`352`	`} catch (GeneralSecurityException e) {`
`352`		`- throw new RuntimeException(e);`
	`353`	`+ throw new AwsCryptoException(e);`
`353`	`354`	`}`
`354`	`355`	`}`
`355`	`356`
`@@ -377,7 +378,7 @@ private byte[] getCacheIdentifier(DecryptionMaterialsRequest req) {`
`377`	`378`
`378`	`379`	`return digest.digest();`
`379`	`380`	`} catch (GeneralSecurityException e) {`
`380`		`- throw new RuntimeException(e);`
	`381`	`+ throw new AwsCryptoException(e);`
`381`	`382`	`}`
`382`	`383`	`}`
`383`	`384`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ private void readHeaderFields(final CiphertextHeaders ciphertextHeaders) {`
`515`	`515`
`516`	`516`	`private void updateTrailingSignature(final CiphertextHeaders headers) {`
`517`	`517`	`if (trailingSig_ != null) {`
`518`		`- final byte[] reserializedHeaders = ciphertextHeaders_.toByteArray();`
	`518`	`+ final byte[] reserializedHeaders = headers.toByteArray();`
`519`	`519`	`updateTrailingSignature(reserializedHeaders, 0, reserializedHeaders.length);`
`520`	`520`	`}`
`521`	`521`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public class VersionInfo {`
`33`	`33`	`/**`
`34`	`34`	`* The current version number of the ciphertext produced by this library.`
`35`	`35`	`*/`
`36`		`- public final static byte CURRENT_CIPHERTEXT_VERSION = 1;`
	`36`	`+ public static final byte CURRENT_CIPHERTEXT_VERSION = 1;`
`37`	`37`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public byte[] toByteArray() {`
`113`	`113`	`dataStream.close();`
`114`	`114`	`return outBytes.toByteArray();`
`115`	`115`	`} catch (IOException e) {`
`116`		`- throw new RuntimeException("Failed to serialize cipher frame headers", e);`
	`116`	`+ throw new AwsCryptoException("Failed to serialize cipher frame headers", e);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`