Use java.time Durations

Author: larsgrefer

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttp2AutoConfiguration.java

@@ -15,7 +15,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.CookieHandler;
+import java.time.Duration;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Lars Grefer
@@ -65,19 +67,19 @@ public OkHttpClient okHttp2Client() throws IOException {
             okHttpClient.setCookieHandler(cookieHandler);
         }
 
-        OkHttpProperties.Timeout connectTimeout = properties.getConnectTimeout();
+        Duration connectTimeout = properties.getConnectTimeout();
         if (connectTimeout != null) {
-            okHttpClient.setConnectTimeout(connectTimeout.getValue(), connectTimeout.getUnit());
+            okHttpClient.setConnectTimeout(connectTimeout.toMillis(), TimeUnit.MILLISECONDS);
         }
 
-        OkHttpProperties.Timeout readTimeout = properties.getReadTimeout();
+        Duration readTimeout = properties.getReadTimeout();
         if (readTimeout != null) {
-            okHttpClient.setReadTimeout(readTimeout.getValue(), readTimeout.getUnit());
+            okHttpClient.setReadTimeout(readTimeout.toMillis(), TimeUnit.MILLISECONDS);
         }
 
-        OkHttpProperties.Timeout writeTimeout = properties.getWriteTimeout();
+        Duration writeTimeout = properties.getWriteTimeout();
         if (writeTimeout != null) {
-            okHttpClient.setWriteTimeout(writeTimeout.getValue(), writeTimeout.getUnit());
+            okHttpClient.setWriteTimeout(writeTimeout.toMillis(), TimeUnit.MILLISECONDS);
         }
 
         if (dns != null) {

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttp3AutoConfiguration.java

@@ -14,7 +14,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Lars Grefer
@@ -60,24 +62,24 @@ public OkHttpClient okHttp3Client() throws IOException {
             builder.cache(okHttp3Cache());
         }
 
-        OkHttpProperties.Timeout connectTimeout = properties.getConnectTimeout();
+        Duration connectTimeout = properties.getConnectTimeout();
         if (connectTimeout != null) {
-            builder.connectTimeout(connectTimeout.getValue(), connectTimeout.getUnit());
+            builder.connectTimeout(connectTimeout.toMillis(), TimeUnit.MILLISECONDS);
         }
 
-        OkHttpProperties.Timeout readTimeout = properties.getReadTimeout();
+        Duration readTimeout = properties.getReadTimeout();
         if (readTimeout != null) {
-            builder.readTimeout(readTimeout.getValue(), readTimeout.getUnit());
+            builder.readTimeout(readTimeout.toMillis(), TimeUnit.MILLISECONDS);
         }
 
-        OkHttpProperties.Timeout writeTimeout = properties.getWriteTimeout();
+        Duration writeTimeout = properties.getWriteTimeout();
         if (writeTimeout != null) {
-            builder.writeTimeout(writeTimeout.getValue(), writeTimeout.getUnit());
+            builder.writeTimeout(writeTimeout.toMillis(), TimeUnit.MILLISECONDS);
         }
 
-        OkHttpProperties.PingInterval pingInterval = properties.getPingInterval();
+        Duration pingInterval = properties.getPingInterval();
         if(pingInterval != null) {
-            builder.pingInterval(pingInterval.getValue(), pingInterval.getUnit());
+            builder.pingInterval(pingInterval.toMillis(), TimeUnit.MILLISECONDS);
         }
 
         if (cookieJar != null) {

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttpProperties.java

@@ -4,7 +4,7 @@
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
 
 import static lombok.AccessLevel.NONE;
 
@@ -20,17 +20,17 @@ public class OkHttpProperties {
     /**
      * The default connect timeout for new connections.
      */
-    private Timeout connectTimeout;
+    private Duration connectTimeout;
 
     /**
      * The default read timeout for new connections.
      */
-    private Timeout readTimeout;
+    private Duration readTimeout = Duration.ofSeconds(10);
 
     /**
      * The default write timeout for new connections.
      */
-    private Timeout writeTimeout;
+    private Duration writeTimeout = Duration.ofSeconds(10);
 
     /**
      * The interval between web socket pings initiated by this client. Use this to
@@ -40,7 +40,7 @@ public class OkHttpProperties {
      * <p>
      * <p>The default value of 0 disables client-initiated pings.
      */
-    private PingInterval pingInterval;
+    private Duration pingInterval;
 
     @Setter(NONE)
     private Cache cache = new Cache();
@@ -61,41 +61,6 @@ public class OkHttpProperties {
      */
     private boolean retryOnConnectionFailure = true;
 
-    /**
-     * @author Lars Grefer
-     */
-    @Getter
-    @Setter
-    public static class Duration {
-        private TimeUnit unit = TimeUnit.MILLISECONDS;
-    }
-
-    /**
-     * @author Lars Grefer
-     */
-    @Getter
-    @Setter
-    public static class Timeout extends Duration {
-
-        /**
-         * A value of 0 means no timeout, otherwise values must be between 1 and {@link Integer#MAX_VALUE} when converted to milliseconds.
-         */
-        private long value = 10_000;
-    }
-
-    /**
-     * @author Lars Grefer
-     */
-    @Getter
-    @Setter
-    public static class PingInterval extends Duration {
-
-        /**
-         * The interval between web socket pings initiated by this client (The default value of 0 disables client-initiated pings).
-         */
-        private long value = 0;
-    }
-
     /**
      * @author Lars Grefer
      */