Skip to content

Commit db1866a

Browse files
committed
Remove deprecated connection string option
JAVA-4144
1 parent f845b65 commit db1866a

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

driver-core/src/main/com/mongodb/ConnectionString.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,17 +1018,6 @@ private Map<String, List<String>> parseOptions(final String optionsPart) {
10181018
LOGGER.warn("Uri option 'wtimeout' has been deprecated, use 'wtimeoutms' instead.");
10191019
}
10201020
}
1021-
String legacySecondaryOkOption = "slaveok";
1022-
// handle legacy secondary ok settings
1023-
String legacySecondaryOk = getLastValue(optionsMap, legacySecondaryOkOption);
1024-
if (legacySecondaryOk != null && !optionsMap.containsKey("readpreference")) {
1025-
String readPreference = Boolean.TRUE.equals(parseBoolean(legacySecondaryOk, legacySecondaryOkOption))
1026-
? "secondaryPreferred" : "primary";
1027-
optionsMap.put("readpreference", singletonList(readPreference));
1028-
if (LOGGER.isWarnEnabled()) {
1029-
LOGGER.warn(format("Uri option '%s' has been deprecated, use 'readpreference' instead.", legacySecondaryOkOption));
1030-
}
1031-
}
10321021
// handle legacy j settings
10331022
if (optionsMap.containsKey("j") && !optionsMap.containsKey("journal")) {
10341023
optionsMap.put("journal", optionsMap.remove("j"));

driver-core/src/test/unit/com/mongodb/ConnectionStringSpecification.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,6 @@ class ConnectionStringSpecification extends Specification {
604604
thrown(IllegalArgumentException)
605605
}
606606

607-
private static final LEGACY_SECONDARY_OK = 'slaveOk'
608-
609607
@Unroll
610608
def 'should correct parse read preference for #readPreference'() {
611609
expect:
@@ -620,9 +618,6 @@ class ConnectionStringSpecification extends Specification {
620618
'?readPreference=secondary') | secondary()
621619
new ConnectionString('mongodb://localhost/' +
622620
'?readPreference=secondaryPreferred') | secondaryPreferred()
623-
new ConnectionString("mongodb://localhost/?${LEGACY_SECONDARY_OK}=true") | secondaryPreferred()
624-
new ConnectionString("mongodb://localhost/?${LEGACY_SECONDARY_OK}=false") | primary()
625-
new ConnectionString("mongodb://localhost/?${LEGACY_SECONDARY_OK}=foo") | primary()
626621
new ConnectionString('mongodb://localhost/' +
627622
'?readPreference=secondaryPreferred' +
628623
'&readPreferenceTags=dc:ny,rack:1' +

driver-legacy/src/test/unit/com/mongodb/MongoClientURISpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ class MongoClientURISpecification extends Specification {
422422
+ 'minPoolSize=7;maxIdleTimeMS=1000;maxLifeTimeMS=2000;maxConnecting=1;'
423423
+ 'replicaSet=test;'
424424
+ 'connectTimeoutMS=2500;socketTimeoutMS=5500;autoConnectRetry=true;'
425-
+ 'slaveOk=true;safe=false;w=1;wtimeout=2600')
425+
+ 'readPreference=secondaryPreferred;safe=false;w=1;wtimeout=2600')
426426

427427
MongoClientOptions.Builder builder = MongoClientOptions.builder()
428428
.connectionsPerHost(10)

0 commit comments

Comments
 (0)