Remove deprecation warnings. (mongodb#1613) (mongodb#1614)

JAVA-5770

Author: vbabanin

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

@@ -509,7 +509,6 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
 
         credential = createCredentials(combinedOptionsMaps, userName, password);
         warnOnUnsupportedOptions(combinedOptionsMaps);
-        warnDeprecatedTimeouts(combinedOptionsMaps);
     }
 
     private static final Set<String> GENERAL_OPTIONS_KEYS = new LinkedHashSet<>();
@@ -518,7 +517,6 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
     private static final Set<String> WRITE_CONCERN_KEYS = new HashSet<>();
     private static final Set<String> COMPRESSOR_KEYS = new HashSet<>();
     private static final Set<String> ALL_KEYS = new HashSet<>();
-    private static final Set<String> DEPRECATED_TIMEOUT_KEYS = new HashSet<>();
 
     static {
         GENERAL_OPTIONS_KEYS.add("minpoolsize");
@@ -592,10 +590,6 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
         ALL_KEYS.addAll(READ_PREFERENCE_KEYS);
         ALL_KEYS.addAll(WRITE_CONCERN_KEYS);
         ALL_KEYS.addAll(COMPRESSOR_KEYS);
-
-        DEPRECATED_TIMEOUT_KEYS.add("sockettimeoutms");
-        DEPRECATED_TIMEOUT_KEYS.add("waitqueuetimeoutms");
-        DEPRECATED_TIMEOUT_KEYS.add("wtimeoutms");
     }
 
     // Any options contained in the connection string completely replace the corresponding options specified in TXT records,
@@ -616,15 +610,6 @@ private void warnOnUnsupportedOptions(final Map<String, List<String>> optionsMap
                     .forEach(k -> LOGGER.warn(format("Connection string contains unsupported option '%s'.", k)));
         }
     }
-    private void warnDeprecatedTimeouts(final Map<String, List<String>> optionsMap) {
-        if (LOGGER.isWarnEnabled()) {
-            optionsMap.keySet()
-                    .stream()
-                    .filter(DEPRECATED_TIMEOUT_KEYS::contains)
-                    .forEach(k -> LOGGER.warn(format("Use of deprecated timeout option: '%s'. Prefer 'timeoutMS' instead.", k)));
-        }
-    }
-
 
     private void translateOptions(final Map<String, List<String>> optionsMap) {
         boolean tlsInsecureSet = false;