Let's put options back to AbstractClientDeleteModel, AbstractClientUpdateModel

mongodb#1593

Author: stIncMale

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

@@ -22,24 +22,28 @@
  */
 public abstract class AbstractClientDeleteModel<T> implements ClientWriteModel {
     private final Bson filter;
+    private final T options;
 
-    AbstractClientDeleteModel(final Bson filter) {
+    AbstractClientDeleteModel(final Bson filter, final T options) {
         this.filter = filter;
+        this.options = options;
     }
 
     public final Bson getFilter() {
         return filter;
     }
 
-    abstract String getToStringDescription();
+    public final T getOptions() {
+        return options;
+    }
 
-    abstract T getOptions();
+    abstract String getToStringDescription();
 
     @Override
     public final String toString() {
         return getToStringDescription()
                 + "{filter=" + filter
-                + ", options=" + getOptions()
+                + ", options=" + options
                 + '}';
     }
 }

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

@@ -32,16 +32,19 @@ public abstract class AbstractClientUpdateModel<T> {
     private final Bson update;
     @Nullable
     private final Iterable<? extends Bson> updatePipeline;
+    private final T options;
 
     AbstractClientUpdateModel(
             final Bson filter,
             @Nullable
             final Bson update,
-            @Nullable final Iterable<? extends Bson> updatePipeline) {
+            @Nullable final Iterable<? extends Bson> updatePipeline,
+            final T options) {
         this.filter = filter;
         assertTrue(update == null ^ updatePipeline == null);
         this.update = update;
         this.updatePipeline = updatePipeline;
+        this.options = options;
     }
 
     public final Bson getFilter() {
@@ -56,16 +59,18 @@ public final Optional<Iterable<? extends Bson>> getUpdatePipeline() {
         return ofNullable(updatePipeline);
     }
 
-    abstract String getToStringDescription();
+    public final T getOptions() {
+        return options;
+    }
 
-    abstract T getOptions();
+    abstract String getToStringDescription();
 
     @Override
     public final String toString() {
         return getToStringDescription()
                 + "{filter=" + filter
                 + ", update=" + (update != null ? update : updatePipeline)
-                + ", options=" + getOptions()
+                + ", options=" + options
                 + '}';
     }
 }

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

@@ -23,15 +23,8 @@
  * This class is not part of the public API and may be removed or changed at any time.
  */
 public final class ConcreteClientDeleteManyModel extends AbstractClientDeleteModel<ConcreteClientDeleteManyOptions> implements ClientWriteModel {
-    private final ConcreteClientDeleteManyOptions options;
-
     public ConcreteClientDeleteManyModel(final Bson filter, @Nullable final ClientDeleteManyOptions options) {
-        super(filter);
-        this.options = options == null ? ConcreteClientDeleteManyOptions.MUTABLE_EMPTY : (ConcreteClientDeleteManyOptions) options;
-    }
-
-    public ConcreteClientDeleteManyOptions getOptions() {
-        return options;
+        super(filter, options == null ? ConcreteClientDeleteManyOptions.MUTABLE_EMPTY : (ConcreteClientDeleteManyOptions) options);
     }
 
     @Override

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

@@ -23,15 +23,8 @@
  * This class is not part of the public API and may be removed or changed at any time.
  */
 public final class ConcreteClientDeleteOneModel extends AbstractClientDeleteModel<ConcreteClientDeleteOneOptions> implements ClientWriteModel {
-    private final ConcreteClientDeleteOneOptions options;
-
     public ConcreteClientDeleteOneModel(final Bson filter, @Nullable final ClientDeleteOneOptions options) {
-        super(filter);
-        this.options = options == null ? ConcreteClientDeleteOneOptions.MUTABLE_EMPTY : (ConcreteClientDeleteOneOptions) options;
-    }
-
-    public ConcreteClientDeleteOneOptions getOptions() {
-        return options;
+        super(filter, options == null ? ConcreteClientDeleteOneOptions.MUTABLE_EMPTY : (ConcreteClientDeleteOneOptions) options);
     }
 
     @Override

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

@@ -23,27 +23,19 @@
  * This class is not part of the public API and may be removed or changed at any time.
  */
 public final class ConcreteClientUpdateManyModel extends AbstractClientUpdateModel<ConcreteClientUpdateManyOptions> implements ClientWriteModel {
-    private final ConcreteClientUpdateManyOptions options;
-
     public ConcreteClientUpdateManyModel(
             final Bson filter,
             @Nullable
             final Bson update,
             @Nullable
             final Iterable<? extends Bson> updatePipeline,
             @Nullable final ClientUpdateManyOptions options) {
-        super(filter, update, updatePipeline);
-        this.options = options == null ? ConcreteClientUpdateManyOptions.MUTABLE_EMPTY : (ConcreteClientUpdateManyOptions) options;
-    }
-
-    public ConcreteClientUpdateManyOptions getOptions() {
-        return options;
+        super(filter, update, updatePipeline,
+                options == null ? ConcreteClientUpdateManyOptions.MUTABLE_EMPTY : (ConcreteClientUpdateManyOptions) options);
     }
 
     @Override
     String getToStringDescription() {
         return "ClientUpdateManyModel";
     }
-
-
 }

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

@@ -23,21 +23,15 @@
  * This class is not part of the public API and may be removed or changed at any time.
  */
 public final class ConcreteClientUpdateOneModel extends AbstractClientUpdateModel<ConcreteClientUpdateOneOptions> implements ClientWriteModel {
-    private final ConcreteClientUpdateOneOptions options;
-
     public ConcreteClientUpdateOneModel(
             final Bson filter,
             @Nullable
             final Bson update,
             @Nullable
             final Iterable<? extends Bson> updatePipeline,
             @Nullable final ClientUpdateOneOptions options) {
-        super(filter, update, updatePipeline);
-        this.options = options == null ? ConcreteClientUpdateOneOptions.MUTABLE_EMPTY : (ConcreteClientUpdateOneOptions) options;
-    }
-
-    public ConcreteClientUpdateOneOptions getOptions() {
-        return options;
+        super(filter, update, updatePipeline,
+                options == null ? ConcreteClientUpdateOneOptions.MUTABLE_EMPTY : (ConcreteClientUpdateOneOptions) options);
     }
 
     @Override