diff --git a/build.gradle b/build.gradle index df2f70c49de..7ed2112856d 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,7 @@ configure(coreProjects) { apply plugin: 'idea' group = 'org.mongodb' - version = '5.3.0-SNAPSHOT' + version = '5.3.2-SNAPSHOT' repositories { mavenLocal() diff --git a/driver-core/src/main/com/mongodb/ConnectionString.java b/driver-core/src/main/com/mongodb/ConnectionString.java index 69db84eb072..062ca1d45c2 100644 --- a/driver-core/src/main/com/mongodb/ConnectionString.java +++ b/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; diff --git a/driver-kotlin-extensions/build.gradle.kts b/driver-kotlin-extensions/build.gradle.kts index 25b437e0fad..76f36ca33b2 100644 --- a/driver-kotlin-extensions/build.gradle.kts +++ b/driver-kotlin-extensions/build.gradle.kts @@ -165,4 +165,6 @@ tasks.javadocJar.configure { // =========================== tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) } -afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.core" } } } +afterEvaluate { + tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.extensions" } } +} diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java index 1e81db2045e..948c666489c 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java @@ -208,7 +208,7 @@ public GridFSUploadPublisher<Void> uploadFromPublisher(final ClientSession clien final Publisher<ByteBuffer> source, final GridFSUploadOptions options) { return createGridFSUploadPublisher(chunkSizeBytes, filesCollection, chunksCollection, - notNull("clientSession", clientSession), new BsonObjectId(), filename, options, source); + notNull("clientSession", clientSession), id, filename, options, source); } @Override