Divide ClientUpdateOptions and ClientDeleteOptions

build.gradle

@@ -59,6 +59,7 @@ ext {
     junitBomVersion = '5.10.2'
     logbackVersion = '1.3.14'
     graalSdkVersion = '24.0.0'
+    reflectionsVersion = '0.9.10'
     gitVersion = getGitVersion()
 }
 
@@ -128,7 +129,7 @@ configure(scalaProjects) {
         testImplementation('org.scalatestplus:junit-4-13_%%:3.2.9.0')
         testImplementation('org.scalatestplus:mockito-3-12_%%:3.2.10.0')
         testImplementation("ch.qos.logback:logback-classic:$logbackVersion")
-        testImplementation('org.reflections:reflections:0.9.10')
+        testImplementation("org.reflections:reflections:$reflectionsVersion")
     }
 
     test{

driver-core/build.gradle

@@ -60,6 +60,7 @@ dependencies {
 
     testImplementation project(':bson').sourceSets.test.output
     testImplementation('org.junit.jupiter:junit-jupiter-api')
+    testImplementation("org.reflections:reflections:$reflectionsVersion")
     testRuntimeOnly "io.netty:netty-tcnative-boringssl-static"
 
     classifiers.forEach {

driver-core/src/main/com/mongodb/client/model/bulk/BaseClientDeleteOptions.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mongodb.client.model.bulk;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+/**
+ * The methods declared in this interface are part of the public API of subclasses or sub-interfaces.
+ */
+interface BaseClientDeleteOptions {
+
+    BaseClientDeleteOptions collation(@Nullable Collation collation);
+
+    BaseClientDeleteOptions hint(@Nullable Bson hint);
+
+    BaseClientDeleteOptions hintString(@Nullable String hintString);
+}

driver-core/src/main/com/mongodb/client/model/bulk/BaseClientUpdateOptions.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb.client.model.bulk;
+
+import com.mongodb.client.model.Collation;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+/**
+ * The methods declared in this interface are part of the public API of subclasses or sub-interfaces.
+ */
+interface BaseClientUpdateOptions {
+
+    BaseClientUpdateOptions arrayFilters(@Nullable Iterable<? extends Bson> arrayFilters);
+
+    BaseClientUpdateOptions collation(@Nullable Collation collation);
+
+    BaseClientUpdateOptions hint(@Nullable Bson hint);
+
+    BaseClientUpdateOptions hintString(@Nullable String hintString);
+
+    BaseClientUpdateOptions upsert(@Nullable Boolean upsert);
+}

driver-core/src/main/com/mongodb/client/model/bulk/ClientDeleteOptions.java → driver-core/src/main/com/mongodb/client/model/bulk/ClientDeleteManyOptions.java

@@ -17,7 +17,7 @@
 
 import com.mongodb.annotations.Sealed;
 import com.mongodb.client.model.Collation;
-import com.mongodb.internal.client.model.bulk.ConcreteClientDeleteOptions;
+import com.mongodb.internal.client.model.bulk.ConcreteClientDeleteManyOptions;
 import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
@@ -27,14 +27,14 @@
  * @since 5.3
  */
 @Sealed
-public interface ClientDeleteOptions {
+public interface ClientDeleteManyOptions extends BaseClientDeleteOptions {
     /**
      * Creates the default options.
      *
      * @return The default options.
      */
-    static ClientDeleteOptions clientDeleteOptions() {
-        return new ConcreteClientDeleteOptions();
+    static ClientDeleteManyOptions clientDeleteManyOptions() {
+        return new ConcreteClientDeleteManyOptions();
     }
 
     /**
@@ -43,7 +43,8 @@ static ClientDeleteOptions clientDeleteOptions() {
      * @param collation The collation. {@code null} represents the server default.
      * @return {@code this}.
      */
-    ClientDeleteOptions collation(@Nullable Collation collation);
+    @Override
+    ClientDeleteManyOptions collation(@Nullable Collation collation);
 
     /**
      * Sets the index specification,
@@ -52,7 +53,8 @@ static ClientDeleteOptions clientDeleteOptions() {
      * @param hint The index specification. {@code null} represents the server default.
      * @return {@code this}.
      */
-    ClientDeleteOptions hint(@Nullable Bson hint);
+    @Override
+    ClientDeleteManyOptions hint(@Nullable Bson hint);
 
     /**
      * Sets the index name,
@@ -61,5 +63,6 @@ static ClientDeleteOptions clientDeleteOptions() {
      * @param hintString The index name. {@code null} represents the server default.
      * @return {@code this}.
      */
-    ClientDeleteOptions hintString(@Nullable String hintString);
+    @Override
+    ClientDeleteManyOptions hintString(@Nullable String hintString);
 }

driver-core/src/main/com/mongodb/client/model/bulk/ClientDeleteOneOptions.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.mongodb.client.model.bulk;
+
+import com.mongodb.annotations.Sealed;
+import com.mongodb.client.model.Collation;
+import com.mongodb.internal.client.model.bulk.ConcreteClientDeleteOneOptions;
+import com.mongodb.lang.Nullable;
+import org.bson.conversions.Bson;
+
+/**
+ * The options to apply when deleting a document.
+ *
+ * @since 5.3
+ */
+@Sealed
+public interface ClientDeleteOneOptions extends BaseClientDeleteOptions {
+    /**
+     * Creates the default options.
+     *
+     * @return The default options.
+     */
+    static ClientDeleteOneOptions clientDeleteOneOptions() {
+        return new ConcreteClientDeleteOneOptions();
+    }
+
+    /**
+     * Sets the collation.
+     *
+     * @param collation The collation. {@code null} represents the server default.
+     * @return {@code this}.
+     */
+    @Override
+    ClientDeleteOneOptions collation(@Nullable Collation collation);
+
+    /**
+     * Sets the index specification,
+     * {@code null}-ifies {@linkplain #hintString(String) hint string}.
+     *
+     * @param hint The index specification. {@code null} represents the server default.
+     * @return {@code this}.
+     */
+    @Override
+    ClientDeleteOneOptions hint(@Nullable Bson hint);
+
+    /**
+     * Sets the index name,
+     * {@code null}-ifies {@linkplain #hint(Bson) hint}.
+     *
+     * @param hintString The index name. {@code null} represents the server default.
+     * @return {@code this}.
+     */
+    @Override
+    ClientDeleteOneOptions hintString(@Nullable String hintString);
+}

driver-core/src/main/com/mongodb/client/model/bulk/ClientNamespacedWriteModel.java

@@ -62,8 +62,8 @@ static <TDocument> ClientNamespacedInsertOneModel insertOne(final MongoNamespace
 
     /**
      * Creates a model for updating at most one document in the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #updateOne(MongoNamespace, Bson, Bson, ClientUpdateOptions)}
-     * with the {@linkplain ClientUpdateOptions#clientUpdateOptions() default options}.
+     * This method is functionally equivalent to {@link #updateOne(MongoNamespace, Bson, Bson, ClientUpdateOneOptions)}
+     * with the {@linkplain ClientUpdateOneOptions#clientUpdateOneOptions() default options}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -91,7 +91,7 @@ static ClientNamespacedUpdateOneModel updateOne(final MongoNamespace namespace,
      * @see Updates
      */
     static ClientNamespacedUpdateOneModel updateOne(
-            final MongoNamespace namespace, final Bson filter, final Bson update, final ClientUpdateOptions options) {
+            final MongoNamespace namespace, final Bson filter, final Bson update, final ClientUpdateOneOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("update", update);
@@ -101,8 +101,8 @@ static ClientNamespacedUpdateOneModel updateOne(
 
     /**
      * Creates a model for updating at most one document in the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #updateOne(MongoNamespace, Bson, Iterable, ClientUpdateOptions)}
-     * with the {@linkplain ClientUpdateOptions#clientUpdateOptions() default options}.
+     * This method is functionally equivalent to {@link #updateOne(MongoNamespace, Bson, Iterable, ClientUpdateOneOptions)}
+     * with the {@linkplain ClientUpdateOneOptions#clientUpdateOneOptions() default options}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -131,7 +131,7 @@ static ClientNamespacedUpdateOneModel updateOne(
      * @see Aggregates
      */
     static ClientNamespacedUpdateOneModel updateOne(
-            final MongoNamespace namespace, final Bson filter, final Iterable<? extends Bson> updatePipeline, final ClientUpdateOptions options) {
+            final MongoNamespace namespace, final Bson filter, final Iterable<? extends Bson> updatePipeline, final ClientUpdateOneOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("updatePipeline", updatePipeline);
@@ -141,8 +141,8 @@ static ClientNamespacedUpdateOneModel updateOne(
 
     /**
      * Creates a model for updating all documents in the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #updateMany(MongoNamespace, Bson, Bson, ClientUpdateOptions)}
-     * with the {@linkplain ClientUpdateOptions#clientUpdateOptions() default}.
+     * This method is functionally equivalent to {@link #updateMany(MongoNamespace, Bson, Bson, ClientUpdateManyOptions)}
+     * with the {@linkplain ClientUpdateManyOptions#clientUpdateManyOptions() default}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -170,7 +170,7 @@ static ClientNamespacedUpdateManyModel updateMany(final MongoNamespace namespace
      * @see Updates
      */
     static ClientNamespacedUpdateManyModel updateMany(
-            final MongoNamespace namespace, final Bson filter, final Bson update, final ClientUpdateOptions options) {
+            final MongoNamespace namespace, final Bson filter, final Bson update, final ClientUpdateManyOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("update", update);
@@ -180,8 +180,8 @@ static ClientNamespacedUpdateManyModel updateMany(
 
     /**
      * Creates a model for updating all documents in the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #updateMany(MongoNamespace, Bson, Iterable, ClientUpdateOptions)}
-     * with the {@linkplain ClientUpdateOptions#clientUpdateOptions() default options}.
+     * This method is functionally equivalent to {@link #updateMany(MongoNamespace, Bson, Iterable, ClientUpdateManyOptions)}
+     * with the {@linkplain ClientUpdateManyOptions#clientUpdateManyOptions() default options}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -210,7 +210,7 @@ static ClientNamespacedUpdateManyModel updateMany(
      * @see Aggregates
      */
     static ClientNamespacedUpdateManyModel updateMany(
-            final MongoNamespace namespace, final Bson filter, final Iterable<? extends Bson> updatePipeline, final ClientUpdateOptions options) {
+            final MongoNamespace namespace, final Bson filter, final Iterable<? extends Bson> updatePipeline, final ClientUpdateManyOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("updatePipeline", updatePipeline);
@@ -220,8 +220,8 @@ static ClientNamespacedUpdateManyModel updateMany(
 
     /**
      * Creates a model for replacing at most one document in the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #replaceOne(MongoNamespace, Bson, Object, ClientReplaceOptions)}
-     * with the {@linkplain ClientReplaceOptions#clientReplaceOptions() default options}.
+     * This method is functionally equivalent to {@link #replaceOne(MongoNamespace, Bson, Object, ClientReplaceOneOptions)}
+     * with the {@linkplain ClientReplaceOneOptions#clientReplaceOneOptions() default options}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -251,7 +251,7 @@ static <TDocument> ClientNamespacedReplaceOneModel replaceOne(final MongoNamespa
      * @see Filters
      */
     static <TDocument> ClientNamespacedReplaceOneModel replaceOne(
-            final MongoNamespace namespace, final Bson filter, final TDocument replacement, final ClientReplaceOptions options) {
+            final MongoNamespace namespace, final Bson filter, final TDocument replacement, final ClientReplaceOneOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("replacement", replacement);
@@ -261,8 +261,8 @@ static <TDocument> ClientNamespacedReplaceOneModel replaceOne(
 
     /**
      * Creates a model for deleting at most one document from the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #deleteOne(MongoNamespace, Bson, ClientDeleteOptions)}
-     * with the {@linkplain ClientDeleteOptions#clientDeleteOptions() default options}.
+     * This method is functionally equivalent to {@link #deleteOne(MongoNamespace, Bson, ClientDeleteOneOptions)}
+     * with the {@linkplain ClientDeleteOneOptions#clientDeleteOneOptions() default options}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -284,7 +284,7 @@ static ClientNamespacedDeleteOneModel deleteOne(final MongoNamespace namespace,
      * @return The requested {@link ClientNamespacedDeleteOneModel}.
      * @see Filters
      */
-    static ClientNamespacedDeleteOneModel deleteOne(final MongoNamespace namespace, final Bson filter, final ClientDeleteOptions options) {
+    static ClientNamespacedDeleteOneModel deleteOne(final MongoNamespace namespace, final Bson filter, final ClientDeleteOneOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("options", options);
@@ -293,8 +293,8 @@ static ClientNamespacedDeleteOneModel deleteOne(final MongoNamespace namespace,
 
     /**
      * Creates a model for deleting all documents from the {@code namespace} matching the {@code filter}.
-     * This method is functionally equivalent to {@link #deleteMany(MongoNamespace, Bson, ClientDeleteOptions)}
-     * with the {@linkplain ClientDeleteOptions#clientDeleteOptions() default options}.
+     * This method is functionally equivalent to {@link #deleteMany(MongoNamespace, Bson, ClientDeleteManyOptions)}
+     * with the {@linkplain ClientDeleteManyOptions#clientDeleteManyOptions() default options}.
      *
      * @param namespace The namespace.
      * @param filter The filter.
@@ -316,7 +316,7 @@ static ClientNamespacedDeleteManyModel deleteMany(final MongoNamespace namespace
      * @return The requested {@link ClientNamespacedDeleteManyModel}.
      * @see Filters
      */
-    static ClientNamespacedDeleteManyModel deleteMany(final MongoNamespace namespace, final Bson filter, final ClientDeleteOptions options) {
+    static ClientNamespacedDeleteManyModel deleteMany(final MongoNamespace namespace, final Bson filter, final ClientDeleteManyOptions options) {
         notNull("namespace", namespace);
         notNull("filter", filter);
         notNull("options", options);