Skip to content

Commit 58299c8

Browse files
authored
Fixes #353 Upgrade Dependencies (#360)
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.
1 parent c858491 commit 58299c8

21 files changed

Lines changed: 137 additions & 76 deletions

File tree

java-manta-benchmark/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<packaging>jar</packaging>
2020

2121
<properties>
22-
<dependency.jmh.version>1.17.5</dependency.jmh.version>
22+
<dependency.jmh.version>1.19</dependency.jmh.version>
2323
<uberjar.name>benchmarks</uberjar.name>
2424
</properties>
2525

@@ -50,6 +50,17 @@
5050
<artifactId>commons-io</artifactId>
5151
<version>${dependency.commons-io.version}</version>
5252
</dependency>
53+
<dependency>
54+
<groupId>org.apache.commons</groupId>
55+
<artifactId>commons-text</artifactId>
56+
<version>${dependency.commons-text.version}</version>
57+
<exclusions>
58+
<exclusion>
59+
<groupId>org.apache.commons</groupId>
60+
<artifactId>commons-lang3</artifactId>
61+
</exclusion>
62+
</exclusions>
63+
</dependency>
5364
<dependency>
5465
<groupId>org.openjdk.jmh</groupId>
5566
<artifactId>jmh-core</artifactId>

java-manta-benchmark/src/main/java/com/joyent/manta/benchmark/Benchmark.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import org.apache.commons.io.FileUtils;
1818
import org.apache.commons.io.IOUtils;
1919
import org.apache.commons.io.output.NullOutputStream;
20-
import org.apache.commons.lang3.RandomStringUtils;
20+
import org.apache.commons.text.CharacterPredicates;
21+
import org.apache.commons.text.RandomStringGenerator;
2122
import org.slf4j.Logger;
2223
import org.slf4j.LoggerFactory;
2324

@@ -95,6 +96,14 @@ public final class Benchmark {
9596
*/
9697
private static int sizeInBytesOrNoOfDirs;
9798

99+
/**
100+
* Random string generator instance for generating test data.
101+
*/
102+
private static final RandomStringGenerator STRING_GENERATOR =
103+
new RandomStringGenerator.Builder()
104+
.filteredBy(CharacterPredicates.LETTERS)
105+
.build();
106+
98107
/**
99108
* Use the main method and not the constructor.
100109
*/
@@ -454,7 +463,7 @@ private static Duration[] measurePutDir(final int diretoryCount) throws IOExcept
454463

455464
for (int i = 0; i < diretoryCount; i++) {
456465
path.append(MantaClient.SEPARATOR)
457-
.append(RandomStringUtils.randomAlphabetic(2));
466+
.append(STRING_GENERATOR.generate(2));
458467
}
459468

460469
final long start = System.nanoTime();

java-manta-client-kryo-serialization/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<description>Module providing functionality for serializing encrypted multipart uploads</description>
1313

1414
<properties>
15-
<dependency.minlog.slf4j.version>1.8</dependency.minlog.slf4j.version>
15+
<dependency.minlog.slf4j.version>1.12</dependency.minlog.slf4j.version>
1616
</properties>
1717

1818
<dependencies>

java-manta-client-kryo-serialization/src/main/java/com/joyent/manta/serialization/BaseBlockCipherSerializer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer;
1414
import org.bouncycastle.crypto.BufferedBlockCipher;
1515
import org.bouncycastle.crypto.engines.AESEngine;
16-
import org.bouncycastle.crypto.engines.AESFastEngine;
1716
import org.bouncycastle.crypto.modes.CBCBlockCipher;
1817
import org.bouncycastle.crypto.modes.GCMBlockCipher;
1918
import org.bouncycastle.crypto.modes.SICBlockCipher;
@@ -124,6 +123,7 @@ public BaseBlockCipherSerializer(final Kryo kryo, final Class<T> serializeClass)
124123
*
125124
* @param kryo Kryo instance
126125
*/
126+
@SuppressWarnings("deprecation")
127127
private void registerClasses(final Kryo kryo) {
128128
final Class<?> bufferedGenericBlockCipherClass = findClass(
129129
"org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$BufferedGenericBlockCipher");
@@ -134,8 +134,8 @@ private void registerClasses(final Kryo kryo) {
134134
final Class<?> aeadGenericBlockCipherClass = findClass(
135135
"org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$AEADGenericBlockCipher");
136136

137-
kryo.register(AESFastEngine.class, new CompatibleFieldSerializer<>(
138-
kryo, AESFastEngine.class));
137+
kryo.register(org.bouncycastle.crypto.engines.AESFastEngine.class, new CompatibleFieldSerializer<>(
138+
kryo, org.bouncycastle.crypto.engines.AESFastEngine.class));
139139
kryo.register(AESEngine.class, new CompatibleFieldSerializer<>(
140140
kryo, AESEngine.class));
141141
kryo.register(BufferedBlockCipher.class);

java-manta-client-unshaded/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,19 @@
165165
<version>${dependency.objenesis.version}</version>
166166
</dependency>
167167

168+
<dependency>
169+
<groupId>org.apache.commons</groupId>
170+
<artifactId>commons-text</artifactId>
171+
<version>${dependency.commons-text.version}</version>
172+
<scope>test</scope>
173+
<exclusions>
174+
<exclusion>
175+
<groupId>org.apache.commons</groupId>
176+
<artifactId>commons-lang3</artifactId>
177+
</exclusion>
178+
</exclusions>
179+
</dependency>
180+
168181
<!-- These dependencies are declared at the module level because we can not
169182
inherit exclusions from the parent. -->
170183
<dependency>

java-manta-client-unshaded/src/main/java/com/joyent/manta/client/MantaObjectMapper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.fasterxml.jackson.databind.DeserializationFeature;
1313
import com.fasterxml.jackson.databind.ObjectMapper;
1414
import com.fasterxml.jackson.databind.SerializationConfig;
15-
import com.fasterxml.jackson.databind.SerializationFeature;
1615
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
1716
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1817

@@ -47,9 +46,7 @@ public MantaObjectMapper() {
4746
.without(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES);
4847
setConfig(deserializationConfig);
4948

50-
SerializationConfig serializationConfig = getSerializationConfig()
51-
.with(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS)
52-
.without(SerializationFeature.WRITE_NULL_MAP_VALUES);
49+
SerializationConfig serializationConfig = getSerializationConfig();
5350
setConfig(serializationConfig);
5451

5552
setSerializationInclusion(JsonInclude.Include.NON_NULL);

java-manta-client-unshaded/src/main/java/com/joyent/manta/client/crypto/AesCbcCipherDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static long calculateContentLength(final long plaintextSize, final int blockByte
103103
final boolean hasIV) {
104104

105105
if (plaintextSize <= 0) {
106-
return blockBytes + tagOrHmacBytes;
106+
return (long)blockBytes + tagOrHmacBytes;
107107
}
108108

109109
long calculatedContentLength = plaintextSize;

java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaMemoizationException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
* Exception class for errors related to encryption state memoization.
1212
*/
1313
public class MantaMemoizationException extends MantaEncryptionException {
14+
15+
private static final long serialVersionUID = 5416151858078164147L;
16+
1417
/**
1518
* @param message The error message.
1619
*/

java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaNoHttpResponseException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
* @since 3.1.7
1717
*/
1818
public class MantaNoHttpResponseException extends MantaIOException {
19+
20+
private static final long serialVersionUID = -8445041694257893001L;
21+
1922
/**
2023
* Constructs an instance with {@code null}
2124
* as its error detail message.

java-manta-client-unshaded/src/main/java/com/joyent/manta/exception/MantaReflectionException.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*/
1313
public class MantaReflectionException extends MantaException {
1414

15+
private static final long serialVersionUID = 8476251230398493965L;
16+
1517
/**
1618
* @param message The exception message.
1719
*/

0 commit comments

Comments
 (0)