Fixes #353 Upgrade Dependencies (#360)

dekobon · web-flow · commit 58299c84ebbf · 2017-10-12T16:06:22.000-07:00
Fixes #353 - Upgrade Dependencies * We resolve a number of compiler warnings. * Migrated to use lang FieldUtils instead of deprecated Mockito Whitebox for reading private fields.
diff --git a/java-manta-benchmark/pom.xml b/java-manta-benchmark/pom.xml
@@ -19,7 +19,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <dependency.jmh.version>1.17.5</dependency.jmh.version>
+        <dependency.jmh.version>1.19</dependency.jmh.version>
         <uberjar.name>benchmarks</uberjar.name>
     </properties>
 
@@ -50,6 +50,17 @@
             <artifactId>commons-io</artifactId>
             <version>${dependency.commons-io.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${dependency.commons-text.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
diff --git a/java-manta-benchmark/src/main/java/com/joyent/manta/benchmark/Benchmark.java b/java-manta-benchmark/src/main/java/com/joyent/manta/benchmark/Benchmark.java
@@ -17,7 +17,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.NullOutputStream;
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.text.CharacterPredicates;
+import org.apache.commons.text.RandomStringGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -95,6 +96,14 @@ public final class Benchmark {
      */
     private static int sizeInBytesOrNoOfDirs;
 
+    /**
+     * Random string generator instance for generating test data.
+     */
+    private static final RandomStringGenerator STRING_GENERATOR =
+            new RandomStringGenerator.Builder()
+                    .filteredBy(CharacterPredicates.LETTERS)
+                    .build();
+
     /**
      * Use the main method and not the constructor.
      */
@@ -454,7 +463,7 @@ private static Duration[] measurePutDir(final int diretoryCount) throws IOExcept
 
         for (int i = 0; i < diretoryCount; i++) {
             path.append(MantaClient.SEPARATOR)
-                .append(RandomStringUtils.randomAlphabetic(2));
+                .append(STRING_GENERATOR.generate(2));
         }
 
         final long start = System.nanoTime();
diff --git a/java-manta-client-kryo-serialization/pom.xml b/java-manta-client-kryo-serialization/pom.xml
@@ -12,7 +12,7 @@
     <description>Module providing functionality for serializing encrypted multipart uploads</description>
 
     <properties>
-        <dependency.minlog.slf4j.version>1.8</dependency.minlog.slf4j.version>
+        <dependency.minlog.slf4j.version>1.12</dependency.minlog.slf4j.version>
     </properties>
 
     <dependencies>
diff --git a/java-manta-client-kryo-serialization/src/main/java/com/joyent/manta/serialization/BaseBlockCipherSerializer.java b/java-manta-client-kryo-serialization/src/main/java/com/joyent/manta/serialization/BaseBlockCipherSerializer.java
@@ -13,7 +13,6 @@
 import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer;
 import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.modes.GCMBlockCipher;
 import org.bouncycastle.crypto.modes.SICBlockCipher;
@@ -124,6 +123,7 @@ public BaseBlockCipherSerializer(final Kryo kryo, final Class<T> serializeClass)
      *
      * @param kryo Kryo instance
      */
+    @SuppressWarnings("deprecation")
     private void registerClasses(final Kryo kryo) {
         final Class<?> bufferedGenericBlockCipherClass = findClass(
                 "org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$BufferedGenericBlockCipher");
@@ -134,8 +134,8 @@ private void registerClasses(final Kryo kryo) {
         final Class<?> aeadGenericBlockCipherClass = findClass(
                 "org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$AEADGenericBlockCipher");
 
-        kryo.register(AESFastEngine.class, new CompatibleFieldSerializer<>(
-                kryo, AESFastEngine.class));
+        kryo.register(org.bouncycastle.crypto.engines.AESFastEngine.class, new CompatibleFieldSerializer<>(
+                kryo, org.bouncycastle.crypto.engines.AESFastEngine.class));
         kryo.register(AESEngine.class, new CompatibleFieldSerializer<>(
                 kryo, AESEngine.class));
         kryo.register(BufferedBlockCipher.class);
diff --git a/java-manta-client-unshaded/pom.xml b/java-manta-client-unshaded/pom.xml
@@ -165,6 +165,19 @@
             <version>${dependency.objenesis.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${dependency.commons-text.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- These dependencies are declared at the module level because we can not
              inherit exclusions from the parent. -->
         <dependency>
diff --git a/java-manta-client-unshaded/src/main/java/com/joyent/manta/client/MantaObjectMapper.java b/java-manta-client-unshaded/src/main/java/com/joyent/manta/client/MantaObjectMapper.java
@@ -12,7 +12,6 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
@@ -47,9 +46,7 @@ public MantaObjectMapper() {
                 .without(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES);
         setConfig(deserializationConfig);
 
-        SerializationConfig serializationConfig = getSerializationConfig()
-                .with(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS)
-                .without(SerializationFeature.WRITE_NULL_MAP_VALUES);
+        SerializationConfig serializationConfig = getSerializationConfig();
         setConfig(serializationConfig);
 
         setSerializationInclusion(JsonInclude.Include.NON_NULL);
diff --git a/java-manta-client-unshaded/src/main/java/com/joyent/manta/client/crypto/AesCbcCipherDetails.java b/java-manta-client-unshaded/src/main/java/com/joyent/manta/client/crypto/AesCbcCipherDetails.java
@@ -103,7 +103,7 @@ static long calculateContentLength(final long plaintextSize, final int blockByte
         final boolean hasIV) {
 
         if (plaintextSize <= 0) {
-            return blockBytes + tagOrHmacBytes;
+            return (long)blockBytes + tagOrHmacBytes;
         }
 
         long calculatedContentLength = plaintextSize;
diff --git a/java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaMemoizationException.java b/java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaMemoizationException.java
@@ -11,6 +11,9 @@
  * Exception class for errors related to encryption state memoization.
  */
 public class MantaMemoizationException extends MantaEncryptionException {
+
+    private static final long serialVersionUID = 5416151858078164147L;
+
     /**
      * @param message The error message.
      */
diff --git a/java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaNoHttpResponseException.java b/java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaNoHttpResponseException.java
@@ -16,6 +16,9 @@
  * @since 3.1.7
  */
 public class MantaNoHttpResponseException extends MantaIOException {
+
+    private static final long serialVersionUID = -8445041694257893001L;
+
     /**
      * Constructs an instance with {@code null}
      * as its error detail message.
diff --git a/java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaReflectionException.java b/java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaReflectionException.java
@@ -12,6 +12,8 @@
  */
 public class MantaReflectionException extends MantaException {
 
+    private static final long serialVersionUID = 8476251230398493965L;
+
     /**
      * @param message The exception message.
      */
diff --git a/java-manta-client-unshaded/src/main/java/com/joyent/manta/util/LookupMap.java b/java-manta-client-unshaded/src/main/java/com/joyent/manta/util/LookupMap.java
@@ -28,6 +28,7 @@
  * @author <a href="https://github.com/dekobon">Elijah Zupancic</a>
  * @since 3.0.0
  */
+@SuppressWarnings("JavaLangClash") // Suppress false positive with error prone compiler
 public class LookupMap<String, V> implements Map<String, V>  {
     /**
      /**
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/crypto/AbstractCipherDetailsTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/crypto/AbstractCipherDetailsTest.java
@@ -46,9 +46,9 @@ protected void sizeCalculationWorksComparedToActualCipher(final SupportedCipherD
         final long ciphertextSize;
 
         if (cipherDetails.isAEADCipher()) {
-            ciphertextSize = ciphertext.length;
+            ciphertextSize = (long)ciphertext.length;
         } else {
-            ciphertextSize = ciphertext.length + cipherDetails.getAuthenticationTagOrHmacLengthInBytes();
+            ciphertextSize = (long)(ciphertext.length + cipherDetails.getAuthenticationTagOrHmacLengthInBytes());
         }
 
         long calculatedCiphertextSize = cipherDetails.ciphertextSize(plaintext.length);
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/crypto/EncryptingEntityTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/crypto/EncryptingEntityTest.java
@@ -19,8 +19,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.BoundedInputStream;
 import org.apache.commons.io.input.BrokenInputStream;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.text.CharacterPredicates;
+import org.apache.commons.text.RandomStringGenerator;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.conn.EofSensorInputStream;
@@ -31,6 +32,8 @@
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -46,11 +49,14 @@
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.function.Predicate;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
 
 @Test
 public class EncryptingEntityTest {
+    private static final RandomStringGenerator STRING_GENERATOR =
+            new RandomStringGenerator.Builder()
+                    .filteredBy(CharacterPredicates.LETTERS)
+                    .build();
+
     /* Constructor Tests */
 
     @Test(expectedExceptions = MantaClientEncryptionException.class)
@@ -124,7 +130,7 @@ public void canSurviveNetworkFailuresInAesCbc() throws Exception {
 
     private void canBeWrittenIdempotently(final SupportedCipherDetails cipherDetails) throws Exception {
         final SecretKey secretKey = SecretKeyUtils.generate(cipherDetails);
-        final String content = RandomStringUtils.randomAlphanumeric(RandomUtils.nextInt(500, 1500));
+        final String content = STRING_GENERATOR.generate(RandomUtils.nextInt(500, 1500));
         final ExposedStringEntity contentEntity = new ExposedStringEntity(
                 content,
                 StandardCharsets.UTF_8);
@@ -175,7 +181,7 @@ private void canBeWrittenIdempotently(final SupportedCipherDetails cipherDetails
     public void doesNotCloseSuppliedOutputStreamWhenWrittenSuccessfully() throws Exception {
         final SupportedCipherDetails cipherDetails = DefaultsConfigContext.DEFAULT_CIPHER;
         final SecretKey secretKey = SecretKeyUtils.generate(cipherDetails);
-        final String content = RandomStringUtils.randomAlphanumeric(RandomUtils.nextInt(500, 1500));
+        final String content = STRING_GENERATOR.generate(RandomUtils.nextInt(500, 1500));
         final ExposedStringEntity contentEntity = new ExposedStringEntity(
                 content,
                 StandardCharsets.UTF_8);
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/crypto/MantaEncryptedObjectInputStreamTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/crypto/MantaEncryptedObjectInputStreamTest.java
@@ -26,6 +26,8 @@
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
 
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -46,8 +48,6 @@
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.UUID;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
 
 import static java.nio.file.StandardOpenOption.READ;
 import static java.nio.file.StandardOpenOption.WRITE;
@@ -752,15 +752,15 @@ public int readAll(InputStream in, byte[] target) throws IOException {
             }
 
             final int skipSize = 15;
-            totalRead += in.skip(skipSize);
+            totalRead += Math.toIntExact(in.skip(skipSize));
 
             if ((lastRead = in.read()) == -1) {
                 return -1;
             } else {
                 target[totalRead++] = (byte)lastRead;
             }
 
-            totalRead += in.skip(skipSize);
+            totalRead += Math.toIntExact(in.skip(skipSize));
 
             return totalRead;
         }
@@ -966,7 +966,7 @@ private void canReadByteRange(SupportedCipherDetails cipherDetails,
          * size of the plaintext. */
         ByteRangeConversion ranges = cipherDetails.translateByteRange(startPosInclusive, endPosInclusive);
         long ciphertextStart = ranges.getCiphertextStartPositionInclusive();
-        long plaintextLength = (endPosInclusive - startPosInclusive) + 1;
+        long plaintextLength = ((long)(endPosInclusive - startPosInclusive)) + 1L;
 
         /* Here, we simulate being passed only a subset of the total bytes of
          * a file - just like how the output of a HTTP range request would be
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/multipart/EncryptingPartEntityTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/multipart/EncryptingPartEntityTest.java
@@ -15,8 +15,9 @@
 import com.joyent.manta.config.DefaultsConfigContext;
 import com.joyent.manta.http.entity.ExposedStringEntity;
 import org.apache.commons.io.input.BrokenInputStream;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.text.CharacterPredicates;
+import org.apache.commons.text.RandomStringGenerator;
 import org.apache.http.entity.InputStreamEntity;
 import org.mockito.Mockito;
 import org.testng.Assert;
@@ -43,6 +44,11 @@ public ByteArrayOutputStream call(final long uploadedBytes) throws IOException {
                 }
             };
 
+    private static final RandomStringGenerator STRING_GENERATOR =
+            new RandomStringGenerator.Builder()
+                    .filteredBy(CharacterPredicates.LETTERS)
+                    .build();
+
     @BeforeMethod
     public void setup() throws Exception {
         final SupportedCipherDetails cipherDetails = DefaultsConfigContext.DEFAULT_CIPHER;
@@ -59,7 +65,7 @@ public void setup() throws Exception {
 
     public void doesNotCloseSuppliedOutputStreamWhenFailureOccurs() throws Exception {
         final ExposedStringEntity contentEntity = new ExposedStringEntity(
-                RandomStringUtils.randomAlphanumeric(RandomUtils.nextInt(500, 1500)),
+                STRING_GENERATOR.generate(RandomUtils.nextInt(500, 1500)),
                 StandardCharsets.UTF_8);
 
         final EncryptingPartEntity encryptingPartEntity = new EncryptingPartEntity(
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/multipart/ServerSideMultipartManagerTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/client/multipart/ServerSideMultipartManagerTest.java
@@ -50,7 +50,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/http/MantaConnectionFactoryTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/http/MantaConnectionFactoryTest.java
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/http/StandardHttpHelperTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/http/StandardHttpHelperTest.java
diff --git a/java-manta-client-unshaded/src/test/java/com/joyent/manta/http/entity/DigestedEntityTest.java b/java-manta-client-unshaded/src/test/java/com/joyent/manta/http/entity/DigestedEntityTest.java
diff --git a/java-manta-it/src/test/java/com/joyent/test/util/SpuriousIOException.java b/java-manta-it/src/test/java/com/joyent/test/util/SpuriousIOException.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ static long calculateContentLength(final long plaintextSize, final int blockByte`
`103`	`103`	`final boolean hasIV) {`
`104`	`104`
`105`	`105`	`if (plaintextSize <= 0) {`
`106`		`- return blockBytes + tagOrHmacBytes;`
	`106`	`+ return (long)blockBytes + tagOrHmacBytes;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`long calculatedContentLength = plaintextSize;`