Added slaveOk support to ConnectionString

JAVA-1433
mongodb · Oct 6, 2014 · edb6952 · edb6952
1 parent a90fdab
commit edb6952
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/driver-core/src/main/com/mongodb/ConnectionString.java b/driver-core/src/main/com/mongodb/ConnectionString.java
@@ -22,7 +22,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37,6 +36,7 @@
 import static com.mongodb.AuthenticationMechanism.PLAIN;
 import static com.mongodb.AuthenticationMechanism.SCRAM_SHA_1;
 import static java.lang.String.format;
+import static java.util.Arrays.asList;
 
 
 /**
@@ -472,6 +472,10 @@ private Map<String, List<String>> parseOptions(final String optionsPart) {
         if (optionsMap.containsKey("wtimeout") && !optionsMap.containsKey("wtimeoutms")) {
             optionsMap.put("wtimeoutms", optionsMap.remove("wtimeout"));
         }
+        // JAVA-1433 handle legacy slaveok settings
+        if (optionsMap.containsKey("slaveok") && !optionsMap.containsKey("readpreference")) {
+            optionsMap.put("readpreference", asList("secondaryPreferred"));
+        }
 
         return optionsMap;
     }
@@ -593,7 +597,7 @@ public String getURI() {
      * @return the credentials
      */
     public List<MongoCredential> getCredentialList() {
-        return credentials != null ? Arrays.asList(credentials) : new ArrayList<MongoCredential>();
+        return credentials != null ? asList(credentials) : new ArrayList<MongoCredential>();
     }
 
     /**

diff --git a/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy b/driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy
@@ -188,6 +188,7 @@ class ConnectionStringSpecification extends Specification {
         uri                                                              | readPreference
         new ConnectionString('mongodb://localhost/' +
                                    '?readPreference=secondaryPreferred') | secondaryPreferred()
+        new ConnectionString('mongodb://localhost/?slaveOk=true')        | secondaryPreferred()
         new ConnectionString('mongodb://localhost/' +
                                    '?readPreference=secondaryPreferred' +
                                    '&readPreferenceTags=dc:ny,rack:1' +