Merge pull request #143 from komamitsu/update-dependencies

Upgrade dependencies
komamitsu · Aug 31, 2019 · 73faf59 · 73faf59
2 parents 95f2d59 + e107c6e
commit 73faf59
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 plugins {
   id 'net.saliman.cobertura' version '2.6.1'
   id 'com.github.kt3k.coveralls' version '2.8.4'
-  id "com.github.johnrengelman.shadow" version "5.0.0"
+  id "com.github.johnrengelman.shadow" version "5.1.0"
 }
 
 allprojects {
@@ -45,13 +45,13 @@ subprojects {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.3.2'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
-    testImplementation 'org.mockito:mockito-core:2.23.4'
-    testImplementation 'com.google.guava:guava:27.0.1-jre'
+    testImplementation 'org.mockito:mockito-core:3.0.0'
+    testImplementation 'com.google.guava:guava:28.0-jre'
 
-    implementation 'org.slf4j:slf4j-api:1.7.25'
-    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.17'
-    implementation 'org.komamitsu:phi-accural-failure-detector:0.0.4'
-    implementation 'net.jodah:failsafe:1.1.1'
+    implementation 'org.slf4j:slf4j-api:1.7.28'
+    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.18'
+    implementation 'org.komamitsu:phi-accural-failure-detector:0.0.5'
+    implementation 'net.jodah:failsafe:2.3.1'
   }
 
   test {

diff --git a/fluency-aws-s3/src/main/java/org/komamitsu/fluency/aws/s3/ingester/sender/AwsS3Sender.java b/fluency-aws-s3/src/main/java/org/komamitsu/fluency/aws/s3/ingester/sender/AwsS3Sender.java
@@ -47,7 +47,7 @@
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
-import java.util.concurrent.TimeUnit;
+import java.time.temporal.ChronoUnit;
 import java.util.zip.GZIPOutputStream;
 
 public class AwsS3Sender
@@ -68,8 +68,8 @@ public AwsS3Sender(S3ClientBuilder s3ClientBuilder, Config config)
         config.validateValues();
         this.config = config;
         this.retryPolicy =
-                new RetryPolicy().
-                        retryOn(ex -> {
+                new RetryPolicy<Void>().
+                        handleIf(ex -> {
                             if (ex == null) {
                                 // Success. Shouldn't retry.
                                 return false;
@@ -90,7 +90,7 @@ public AwsS3Sender(S3ClientBuilder s3ClientBuilder, Config config)
                         withBackoff(
                                 getRetryInternalMs(),
                                 getMaxRetryInternalMs(),
-                                TimeUnit.MILLISECONDS,
+                                ChronoUnit.MILLIS,
                                 getRetryFactor()).
                         withMaxRetries(getRetryMax());
 

diff --git a/.../src/main/java/org/komamitsu/fluency/treasuredata/ingester/sender/TreasureDataSender.java b/.../src/main/java/org/komamitsu/fluency/treasuredata/ingester/sender/TreasureDataSender.java
@@ -44,6 +44,7 @@
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
+import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPOutputStream;
@@ -68,8 +69,8 @@ public TreasureDataSender(Config config)
         config.validateValues();
         this.config = config;
         this.retryPolicy =
-                new RetryPolicy().
-                        retryOn(ex -> {
+                new RetryPolicy<Void>().
+                        handleIf(ex -> {
                             if (ex == null) {
                                 // Success. Shouldn't retry.
                                 return false;
@@ -90,7 +91,7 @@ public TreasureDataSender(Config config)
                         withBackoff(
                                 getRetryInternalMs(),
                                 getMaxRetryInternalMs(),
-                                TimeUnit.MILLISECONDS,
+                                ChronoUnit.MILLIS,
                                 getRetryFactor()).
                         withMaxRetries(getRetryMax());