Rearrange ClientWriteModel inheritance: "one" should extend "many", not vice versa

JAVA-5527

Author: stIncMale

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

@@ -22,16 +22,28 @@
 /**
  * This class is not part of the public API and may be removed or changed at any time.
  */
-public final class ConcreteClientDeleteManyModel extends ConcreteClientDeleteOneModel implements ClientWriteModel {
+public class ConcreteClientDeleteManyModel implements ClientWriteModel {
+    private final Bson filter;
+    private final ConcreteClientDeleteOptions options;
+
     public ConcreteClientDeleteManyModel(final Bson filter, @Nullable final ClientDeleteOptions options) {
-        super(filter, options);
+        this.filter = filter;
+        this.options = options == null ? ConcreteClientDeleteOptions.MUTABLE_EMPTY : (ConcreteClientDeleteOptions) options;
+    }
+
+    public Bson getFilter() {
+        return filter;
+    }
+
+    public ConcreteClientDeleteOptions getOptions() {
+        return options;
     }
 
     @Override
     public String toString() {
         return "ClientDeleteManyModel{"
-                + ", filter=" + getFilter()
-                + ", options=" + getOptions()
+                + ", filter=" + filter
+                + ", options=" + options
                 + '}';
     }
 }

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

@@ -22,28 +22,16 @@
 /**
  * This class is not part of the public API and may be removed or changed at any time.
  */
-public class ConcreteClientDeleteOneModel implements ClientWriteModel {
-    private final Bson filter;
-    private final ConcreteClientDeleteOptions options;
-
+public final class ConcreteClientDeleteOneModel extends ConcreteClientDeleteManyModel {
     public ConcreteClientDeleteOneModel(final Bson filter, @Nullable final ClientDeleteOptions options) {
-        this.filter = filter;
-        this.options = options == null ? ConcreteClientDeleteOptions.MUTABLE_EMPTY : (ConcreteClientDeleteOptions) options;
-    }
-
-    public Bson getFilter() {
-        return filter;
-    }
-
-    public ConcreteClientDeleteOptions getOptions() {
-        return options;
+        super(filter, options);
     }
 
     @Override
     public String toString() {
         return "ClientDeleteOneModel{"
-                + ", filter=" + filter
-                + ", options=" + options
+                + ", filter=" + getFilter()
+                + ", options=" + getOptions()
                 + '}';
     }
 }

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

@@ -15,33 +15,62 @@
  */
 package com.mongodb.internal.client.model.bulk;
 
-import com.mongodb.assertions.Assertions;
 import com.mongodb.client.model.bulk.ClientUpdateOptions;
 import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
+import java.util.Optional;
+
+import static com.mongodb.assertions.Assertions.assertTrue;
+import static java.util.Optional.ofNullable;
+
 /**
  * This class is not part of the public API and may be removed or changed at any time.
  */
-public final class ConcreteClientUpdateManyModel extends ConcreteClientUpdateOneModel implements ClientWriteModel {
+public class ConcreteClientUpdateManyModel implements ClientWriteModel {
+    private final Bson filter;
+    @Nullable
+    private final Bson update;
+    @Nullable
+    private final Iterable<? extends Bson> updatePipeline;
+    private final ConcreteClientUpdateOptions options;
+
     public ConcreteClientUpdateManyModel(
             final Bson filter,
             @Nullable
             final Bson update,
             @Nullable
             final Iterable<? extends Bson> updatePipeline,
             @Nullable final ClientUpdateOptions options) {
-        super(filter, update, updatePipeline, options);
+        this.filter = filter;
+        assertTrue(update == null ^ updatePipeline == null);
+        this.update = update;
+        this.updatePipeline = updatePipeline;
+        this.options = options == null ? ConcreteClientUpdateOptions.MUTABLE_EMPTY : (ConcreteClientUpdateOptions) options;
+    }
+
+    public Bson getFilter() {
+        return filter;
+    }
+
+    public Optional<Bson> getUpdate() {
+        return ofNullable(update);
+    }
+
+    public Optional<Iterable<? extends Bson>> getUpdatePipeline() {
+        return ofNullable(updatePipeline);
+    }
+
+    public ConcreteClientUpdateOptions getOptions() {
+        return options;
     }
 
     @Override
     public String toString() {
         return "ClientUpdateManyModel{"
-                + ", filter=" + getFilter()
-                + ", update=" + getUpdate().map(Object::toString)
-                        .orElse(getUpdatePipeline().map(Object::toString)
-                        .orElseThrow(Assertions::fail))
-                + ", options=" + getOptions()
+                + ", filter=" + filter
+                + ", update=" + (update != null ? update : updatePipeline)
+                + ", options=" + options
                 + '}';
     }
 }

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

@@ -15,62 +15,33 @@
  */
 package com.mongodb.internal.client.model.bulk;
 
+import com.mongodb.assertions.Assertions;
 import com.mongodb.client.model.bulk.ClientUpdateOptions;
 import com.mongodb.lang.Nullable;
 import org.bson.conversions.Bson;
 
-import java.util.Optional;
-
-import static com.mongodb.assertions.Assertions.assertTrue;
-import static java.util.Optional.ofNullable;
-
 /**
  * This class is not part of the public API and may be removed or changed at any time.
  */
-public class ConcreteClientUpdateOneModel implements ClientWriteModel {
-    private final Bson filter;
-    @Nullable
-    private final Bson update;
-    @Nullable
-    private final Iterable<? extends Bson> updatePipeline;
-    private final ConcreteClientUpdateOptions options;
-
+public final class ConcreteClientUpdateOneModel extends ConcreteClientUpdateManyModel {
     public ConcreteClientUpdateOneModel(
             final Bson filter,
             @Nullable
             final Bson update,
             @Nullable
             final Iterable<? extends Bson> updatePipeline,
             @Nullable final ClientUpdateOptions options) {
-        this.filter = filter;
-        assertTrue(update == null ^ updatePipeline == null);
-        this.update = update;
-        this.updatePipeline = updatePipeline;
-        this.options = options == null ? ConcreteClientUpdateOptions.MUTABLE_EMPTY : (ConcreteClientUpdateOptions) options;
-    }
-
-    public Bson getFilter() {
-        return filter;
-    }
-
-    public Optional<Bson> getUpdate() {
-        return ofNullable(update);
-    }
-
-    public Optional<Iterable<? extends Bson>> getUpdatePipeline() {
-        return ofNullable(updatePipeline);
-    }
-
-    public ConcreteClientUpdateOptions getOptions() {
-        return options;
+        super(filter, update, updatePipeline, options);
     }
 
     @Override
     public String toString() {
         return "ClientUpdateOneModel{"
-                + ", filter=" + filter
-                + ", update=" + (update != null ? update : updatePipeline)
-                + ", options=" + options
+                + ", filter=" + getFilter()
+                + ", update=" + getUpdate().map(Object::toString)
+                .orElse(getUpdatePipeline().map(Object::toString)
+                        .orElseThrow(Assertions::fail))
+                + ", options=" + getOptions()
                 + '}';
     }
 }