JAVA-1005, JAVA-1009: Added support for minPoolSize, maxIdleTimeMS and maxLifeTimeMS to MongoClientURI

Author: jyemin

src/main/com/mongodb/MongoClientURI.java

@@ -66,10 +66,13 @@
  * <li>{@code ssl=true|false}: Whether to connect using SSL.</li>
  * <li>{@code connectTimeoutMS=ms}: How long a connection can take to be opened before timing out.</li>
  * <li>{@code socketTimeoutMS=ms}: How long a send or receive on a socket can take before timing out.</li>
+ * <li>{@code maxIdleTimeMS=ms}: Maximum idle time of a pooled connection. A connection that exceeds this limit will be closed</li>
+ * <li>{@code maxLifeTimeMS=ms}: Maximum life time of a pooled connection. A connection that exceeds this limit will be closed</li>
  * </ul>
  * <p>Connection pool configuration:</p>
  * <ul>
  * <li>{@code maxPoolSize=n}: The maximum number of connections in the connection pool.</li>
+ * <li>{@code minPoolSize=n}: The minimum number of connections in the connection pool.</li>
  * <li>{@code waitQueueMultiple=n} : this multiplier, multiplied with the maxPoolSize setting, gives the maximum number of
  * threads that may be waiting for a connection to become available from the pool.  All further threads will get an
  * exception right away.</li>
@@ -262,10 +265,13 @@ public MongoClientURI(String uri, MongoClientOptions.Builder builder) {
     static Set<String> allKeys = new HashSet<String>();
 
     static {
+        generalOptionsKeys.add("minpoolsize");
         generalOptionsKeys.add("maxpoolsize");
         generalOptionsKeys.add("waitqueuemultiple");
         generalOptionsKeys.add("waitqueuetimeoutms");
         generalOptionsKeys.add("connecttimeoutms");
+        generalOptionsKeys.add("maxidletimems");
+        generalOptionsKeys.add("maxlifetimems");
         generalOptionsKeys.add("sockettimeoutms");
         generalOptionsKeys.add("sockettimeoutms");
         generalOptionsKeys.add("autoconnectretry");
@@ -309,6 +315,12 @@ private MongoClientOptions createOptions(Map<String, List<String>> optionsMap, M
 
             if (key.equals("maxpoolsize")) {
                 builder.connectionsPerHost(Integer.parseInt(value));
+            } else if (key.equals("minpoolsize")) {
+                builder.minConnectionsPerHost(Integer.parseInt(value));
+            } else if (key.equals("maxidletimems")) {
+                builder.maxConnectionIdleTime(Integer.parseInt(value));
+            } else if (key.equals("maxlifetimems")) {
+                builder.maxConnectionLifeTime(Integer.parseInt(value));
             } else if (key.equals("waitqueuemultiple")) {
                 builder.threadsAllowedToBlockForConnectionMultiplier(Integer.parseInt(value));
             } else if (key.equals("waitqueuetimeoutms")) {

src/test/com/mongodb/MongoClientURITest.java

@@ -201,18 +201,21 @@ public void testSSLOption() {
     public void testOptions() {
         MongoClientURI uAmp = new MongoClientURI("mongodb://localhost/?" +
                 "maxPoolSize=10&waitQueueMultiple=5&waitQueueTimeoutMS=150&" +
+                "minPoolSize=7&maxIdleTimeMS=1000&maxLifeTimeMS=2000&" +
                 "replicaSet=test&" +
                 "connectTimeoutMS=2500&socketTimeoutMS=5500&autoConnectRetry=true&" +
                 "slaveOk=true&safe=false&w=1&wtimeout=2500&fsync=true");
         assertOnOptions(uAmp.getOptions());
         MongoClientURI uSemi = new MongoClientURI("mongodb://localhost/?" +
                 "maxPoolSize=10;waitQueueMultiple=5;waitQueueTimeoutMS=150;" +
+                "minPoolSize=7;maxIdleTimeMS=1000;maxLifeTimeMS=2000;" +
                 "replicaSet=test;" +
                 "connectTimeoutMS=2500;socketTimeoutMS=5500;autoConnectRetry=true;" +
                 "slaveOk=true;safe=false;w=1;wtimeout=2500;fsync=true");
         assertOnOptions(uSemi.getOptions());
         MongoClientURI uMixed = new MongoClientURI("mongodb://localhost/test?" +
                 "maxPoolSize=10&waitQueueMultiple=5;waitQueueTimeoutMS=150;" +
+                "minPoolSize=7&maxIdleTimeMS=1000;maxLifeTimeMS=2000&" +
                 "replicaSet=test;" +
                 "connectTimeoutMS=2500;socketTimeoutMS=5500&autoConnectRetry=true;" +
                 "slaveOk=true;safe=false&w=1;wtimeout=2500;fsync=true");
@@ -307,6 +310,9 @@ public void testMultipleIPV6ServersWithPorts() {
     @SuppressWarnings("deprecation")
     private void assertOnOptions(MongoClientOptions options) {
         assertEquals(10, options.getConnectionsPerHost(), 10);
+        assertEquals(7, options.getMinConnectionsPerHost());
+        assertEquals(1000, options.getMaxConnectionIdleTime());
+        assertEquals(2000, options.getMaxConnectionLifeTime());
         assertEquals(5, options.getThreadsAllowedToBlockForConnectionMultiplier());
         assertEquals(150, options.getMaxWaitTime());
         assertEquals(5500, options.getSocketTimeout());