fix merge

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/config/ConnectionConfig.java

@@ -57,6 +57,7 @@ public class ConnectionConfig implements Cloneable {
 
     private final Timeout connectTimeout;
     private final Timeout socketTimeout;
+    private final Timeout idleTimeout;
     private final TimeValue validateAfterInactivity;
     private final TimeValue timeToLive;
 
@@ -81,12 +82,13 @@ public class ConnectionConfig implements Cloneable {
      * Intended for CDI compatibility
      */
     protected ConnectionConfig() {
-        this(DEFAULT_CONNECT_TIMEOUT, null, null, null, false, DEFAULT_HE_ATTEMPT_DELAY, DEFAULT_HE_OTHER_FAMILY_DELAY, ProtocolFamilyPreference.INTERLEAVE);
+        this(DEFAULT_CONNECT_TIMEOUT, null, null, null, null, false, DEFAULT_HE_ATTEMPT_DELAY, DEFAULT_HE_OTHER_FAMILY_DELAY, ProtocolFamilyPreference.INTERLEAVE);
     }
 
     ConnectionConfig(
             final Timeout connectTimeout,
             final Timeout socketTimeout,
+            final Timeout idleTimeout,
             final TimeValue validateAfterInactivity,
             final TimeValue timeToLive,
             final boolean staggeredConnectEnabled,
@@ -96,6 +98,7 @@ protected ConnectionConfig() {
         super();
         this.connectTimeout = connectTimeout;
         this.socketTimeout = socketTimeout;
+        this.idleTimeout = idleTimeout;
         this.validateAfterInactivity = validateAfterInactivity;
         this.timeToLive = timeToLive;
         this.staggeredConnectEnabled = staggeredConnectEnabled;
@@ -118,6 +121,13 @@ public Timeout getConnectTimeout() {
         return connectTimeout;
     }
 
+    /**
+     * @see Builder#setIdleTimeout(Timeout)
+     */
+    public Timeout getIdleTimeout() {
+        return idleTimeout;
+    }
+
     /**
      * @see Builder#setValidateAfterInactivity(TimeValue)
      */
@@ -183,6 +193,7 @@ public String toString() {
         builder.append("[");
         builder.append("connectTimeout=").append(connectTimeout);
         builder.append(", socketTimeout=").append(socketTimeout);
+        builder.append(", idleTimeout=").append(idleTimeout);
         builder.append(", validateAfterInactivity=").append(validateAfterInactivity);
         builder.append(", timeToLive=").append(timeToLive);
         builder.append(", staggeredConnectEnabled=").append(staggeredConnectEnabled);
@@ -213,6 +224,7 @@ public static class Builder {
 
         private Timeout socketTimeout;
         private Timeout connectTimeout;
+        private Timeout idleTimeout;
         private TimeValue validateAfterInactivity;
         private TimeValue timeToLive;
 
@@ -237,7 +249,15 @@ public Builder setSocketTimeout(final int soTimeout, final TimeUnit timeUnit) {
         }
 
         /**
-         * Determines the default socket timeout value for I/O operations.
+         * Determines the default socket timeout value for I/O operations on
+         * connections created by this configuration.
+         * A timeout value of zero is interpreted as an infinite timeout.
+         * <p>
+         * This value acts as a baseline at the connection management layer.
+         * This parameter overrides the socket timeout setting applied at the I/O layer
+         * and in its tuen can overridden by settings applied at the protocol layer
+         * for the duration of a message exchange.
+         * </p>
          * <p>
          * Default: {@code null} (undefined)
          * </p>
@@ -274,6 +294,35 @@ public Builder setConnectTimeout(final long connectTimeout, final TimeUnit timeU
             return this;
         }
 
+        /**
+         * Determines the maximum period of idleness for a connection.
+         * Connections that are idle for longer than {@code idleTimeout} are no
+         * longer eligible for reuse.
+         * <p>
+         * A timeout value of zero is interpreted as an infinite timeout.
+         * </p>
+         * <p>
+         * Default: {@code null} (undefined)
+         * </p>
+         *
+         * @return this instance.
+         *
+         * @since 5.6
+         */
+        public Builder setIdleTimeout(final Timeout idleTimeout) {
+            this.idleTimeout = idleTimeout;
+            return this;
+        }
+
+        /**
+         * @return this instance.
+         * @see #setIdleTimeout(Timeout)
+         */
+        public Builder setIdleTimeout(final long idleTimeout, final TimeUnit timeUnit) {
+            this.idleTimeout = Timeout.of(idleTimeout, timeUnit);
+            return this;
+        }
+
         /**
          * Defines period of inactivity after which persistent connections must
          * be re-validated prior to being leased to the consumer. Negative values passed
@@ -369,6 +418,7 @@ public ConnectionConfig build() {
             return new ConnectionConfig(
                     connectTimeout != null ? connectTimeout : DEFAULT_CONNECT_TIMEOUT,
                     socketTimeout,
+                    idleTimeout,
                     validateAfterInactivity,
                     timeToLive,
                     staggeredConnectEnabled,