move maxConnectionIdleTime changes in S3Config into ObjectConfig

Author: dunedodo

src/main/java/com/emc/object/ObjectConfig.java

@@ -61,6 +61,8 @@ public abstract class ObjectConfig<T extends ObjectConfig<T>> {
     public static final int DEFAULT_CHUNKED_ENCODING_SIZE = 2 * 1024 * 1024; // 2MB to match ECS buffer size
     public static final int DEFAULT_CONNECT_TIMEOUT = 15000; // 15 seconds
     public static final int DEFAULT_READ_TIMEOUT = 0; // default is infinity
+    public static final int DEFAULT_MAX_CONNECTION_IDLE_TIME = 0;
+
 
     // NOTE: if you add a property, make sure you add it to the cloning constructor!
     private Protocol protocol;
@@ -79,6 +81,8 @@ public abstract class ObjectConfig<T extends ObjectConfig<T>> {
     private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
     private int readTimeout = DEFAULT_READ_TIMEOUT;
     private String sessionToken;
+    private int maxConnectionIdleTime = DEFAULT_MAX_CONNECTION_IDLE_TIME;
+
 
     private Map<String, Object> properties = new HashMap<String, Object>();
 
@@ -137,6 +141,7 @@ public ObjectConfig(ObjectConfig<T> other) {
         this.connectTimeout = other.connectTimeout;
         this.readTimeout = other.readTimeout;
         this.sessionToken = other.sessionToken;
+        this.maxConnectionIdleTime = other.maxConnectionIdleTime;
         this.properties = new HashMap<String, Object>(other.properties);
     }
 
@@ -218,6 +223,7 @@ public SmartConfig toSmartConfig() {
         // READ_TIMEOUT
         smartConfig.setProperty(ClientConfig.PROPERTY_READ_TIMEOUT, readTimeout);
 
+        smartConfig.setMaxConnectionIdleTime(maxConnectionIdleTime);
 
         return smartConfig;
     }
@@ -455,6 +461,20 @@ public void setSessionToken(String sessionToken) {
         this.sessionToken = sessionToken;
     }
 
+    @ConfigUriProperty
+    public int getMaxConnectionIdleTime() {
+        return maxConnectionIdleTime;
+    }
+
+    /**
+     * Set the maximum amount of time (in milliseconds) to keep a connection alive and idle.
+     * This is a hint to the underlying connection pool, and is not guaranteed to be honored.
+     * A zero value indicates no limit to the life time.
+     */
+    public void setMaxConnectionIdleTime(int maxConnectionIdleTime) {
+        this.maxConnectionIdleTime = maxConnectionIdleTime;
+    }
+
     @ConfigUriProperty(converter = ConfigUri.StringPropertyConverter.class)
     public Map<String, Object> getProperties() {
         return properties;
@@ -564,6 +584,11 @@ public T withReadTimeout(int readTimeout) {
         return (T) this;
     }
 
+    public T withMaxConnectionIdleTime(int maxConnectionIdleTime) {
+        setMaxConnectionIdleTime(maxConnectionIdleTime);
+        return (T) this;
+    }
+
     @SuppressWarnings("unchecked")
     public T withProperty(String propName, Object value) {
         setProperty(propName, value);

src/main/java/com/emc/object/s3/S3Config.java

@@ -67,7 +67,6 @@ public class S3Config extends ObjectConfig<S3Config> {
     public static final int DEFAULT_INITIAL_RETRY_DELAY = 1000; // ms
     public static final int DEFAULT_RETRY_LIMIT = 3;
     public static final int DEFAULT_RETRY_BUFFER_SIZE = 2 * 1024 * 1024;
-    public static final int DEFAULT_MAX_CONNECTION_IDLE_TIME = 0;
 
     protected static int defaultPort(Protocol protocol) {
         if (protocol == Protocol.HTTP) return DEFAULT_HTTP_PORT;
@@ -86,7 +85,6 @@ protected static int defaultPort(Protocol protocol) {
     protected float faultInjectionRate = 0.0f;
     protected boolean signMetadataSearch = true;
     protected boolean useV2Signer = true;
-    protected int maxConnectionIdleTime = DEFAULT_MAX_CONNECTION_IDLE_TIME;
 
     /**
      * Empty constructor for internal use only!
@@ -133,7 +131,6 @@ public S3Config(S3Config other) {
         this.faultInjectionRate = other.faultInjectionRate;
         this.signMetadataSearch = other.signMetadataSearch;
         this.useV2Signer = other.useV2Signer;
-        this.maxConnectionIdleTime = other.maxConnectionIdleTime;
     }
 
     @Override
@@ -246,7 +243,7 @@ public void setRetryBufferSize(int retryBufferSize) {
     public float getFaultInjectionRate() {
         return faultInjectionRate;
     }
-    
+
     /**
      * Sets the fault injection rate. Enables fault injection when this number is &gt; 0. The rate is a ratio expressed as
      * a decimal between 0 and 1.  This is the rate at which faults (HTTP 500 errors) should randomly be injected into
@@ -284,20 +281,6 @@ public void setUseV2Signer(boolean useV2Signer) {
         this.useV2Signer = useV2Signer;
     }
 
-    @ConfigUriProperty
-    public int getMaxConnectionIdleTime() {
-        return maxConnectionIdleTime;
-    }
-
-    /**
-     * Set the maximum amount of time (in milliseconds) to keep a connection alive and idle.
-     * This is a hint to the underlying connection pool, and is not guaranteed to be honored.
-     * A zero value indicates no limit to the life time.
-     */
-    public void setMaxConnectionIdleTime(int maxConnectionIdleTime) {
-        this.maxConnectionIdleTime = maxConnectionIdleTime;
-    }
-
     public S3Config withUseVHost(boolean useVHost) {
         setUseVHost(useVHost);
         return this;
@@ -348,11 +331,6 @@ public S3Config withUseV2Signer(boolean useV2Signer) {
         return this;
     }
 
-    public S3Config withMaxConnectionIdleTime(int maxConnectionIdleTime) {
-        setMaxConnectionIdleTime(maxConnectionIdleTime);
-        return this;
-    }
-
     @Override
     public String toString() {
         return "S3Config{" +