Refactor MongoDB query operations: introduce QueryOperationWithField to eliminate redundancy and unify field name handling across query operations.

Author: jgaleotti

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/AllOperation.java

@@ -6,20 +6,15 @@
  * Represent $all operation.
  * Matches arrays that contain all elements specified in the query.
  */
-public class AllOperation<V> extends QueryOperation{
-    private final String fieldName;
+public class AllOperation<V> extends QueryOperationWithField {
     private final List<V> values;
 
     public AllOperation(String fieldName, List<V> values) {
-        this.fieldName = fieldName;
+        super(fieldName);
         this.values = values;
     }
 
-    public String getFieldName() {
-        return fieldName;
-    }
-
     public List<V> getValues() {
         return values;
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/AndOperation.java

@@ -6,7 +6,7 @@
  * Represent $and operation.
  * Joins query clauses with a logical AND returns all documents that match the conditions of all clauses.
  */
-public class AndOperation extends QueryOperation{
+public class AndOperation extends QueryOperation {
     private final List<QueryOperation> conditions;
 
     public AndOperation(List<QueryOperation> conditions) {
@@ -16,4 +16,4 @@ public AndOperation(List<QueryOperation> conditions) {
     public List<QueryOperation> getConditions() {
         return conditions;
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/ComparisonOperation.java

@@ -1,19 +1,14 @@
 package org.evomaster.client.java.controller.mongo.operations;
 
-public abstract class ComparisonOperation<V> extends QueryOperation{
-    private final String fieldName;
+public abstract class ComparisonOperation<V> extends QueryOperationWithField {
     private final V value;
 
     ComparisonOperation(String fieldName, V value) {
-        this.fieldName = fieldName;
+        super(fieldName);
         this.value = value;
     }
 
-    public String getFieldName() {
-        return fieldName;
-    }
-
     public V getValue() {
         return value;
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/ElemMatchOperation.java

@@ -5,20 +5,15 @@
  * Selects documents if element in the array field matches all the specified $elemMatch conditions.
  * Here it only has one condition to match implementation in "com.mongodb.client.model.Filters"
  */
-public class ElemMatchOperation extends QueryOperation{
-    private final String fieldName;
+public class ElemMatchOperation extends QueryOperationWithField {
     private final QueryOperation condition;
 
     public ElemMatchOperation(String fieldName, QueryOperation condition) {
-        this.fieldName = fieldName;
+        super( fieldName);
         this.condition = condition;
     }
 
-    public String getFieldName() {
-        return fieldName;
-    }
-
     public QueryOperation getCondition() {
         return condition;
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/EqualsOperation.java

@@ -4,8 +4,8 @@
  * Represent $eq operation.
  * Matches documents where the value of a field equals the specified value.
  */
-public class EqualsOperation<V> extends ComparisonOperation<V>{
+public class EqualsOperation<V> extends ComparisonOperation<V> {
     public EqualsOperation(String fieldName, V value) {
         super(fieldName, value);
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/ExistsOperation.java

@@ -5,20 +5,15 @@
  * When boolean is true, $exists matches the documents that contain the field.
  * When boolean is false, the query returns only the documents that do not contain the field.
  */
-public class ExistsOperation extends QueryOperation{
-    private final String fieldName;
+public class ExistsOperation extends QueryOperationWithField {
     private final Boolean bool;
 
     public ExistsOperation(String fieldName, Boolean bool) {
-        this.fieldName = fieldName;
+        super(fieldName);
         this.bool = bool;
     }
 
-    public String getFieldName() {
-        return fieldName;
-    }
-
     public Boolean getBoolean() {
         return bool;
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/GreaterThanEqualsOperation.java

@@ -4,8 +4,8 @@
  * Represent $gte operation.
  * Selects the documents where the value of the field is greater than or equal to a specified value
  */
-public class GreaterThanEqualsOperation<V> extends ComparisonOperation<V>{
+public class GreaterThanEqualsOperation<V> extends ComparisonOperation<V> {
     public GreaterThanEqualsOperation(String fieldName, V value) {
         super(fieldName, value);
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/GreaterThanOperation.java

@@ -4,8 +4,8 @@
  * Represent $gt operation.
  * Selects the documents where the value of the field is greater than or equal to a specified value
  */
-public class GreaterThanOperation<V> extends ComparisonOperation<V>{
+public class GreaterThanOperation<V> extends ComparisonOperation<V> {
     public GreaterThanOperation(String fieldName, V value) {
         super(fieldName, value);
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/InOperation.java

@@ -6,20 +6,15 @@
  * Represent $in operation.
  * Selects the documents where the value of a field equals any value in the specified array.
  */
-public class InOperation<V> extends QueryOperation{
-    private final String fieldName;
+public class InOperation<V> extends QueryOperationWithField {
     private final List<V> values;
 
     public InOperation(String fieldName, List<V> values) {
-        this.fieldName = fieldName;
+        super(fieldName);
         this.values = values;
     }
 
-    public String getFieldName() {
-        return fieldName;
-    }
-
     public List<V> getValues() {
         return values;
     }
-}
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/mongo/operations/JsonSchemaOperation.java

@@ -4,7 +4,7 @@
  * Represent $jsonSchema operation.
  * Matches documents that satisfy the specified JSON Schema.
  */
-public class JsonSchemaOperation extends QueryOperation{
+public class JsonSchemaOperation extends QueryOperation {
     private final Object schema;
 
     public JsonSchemaOperation(Object schema) {
@@ -14,4 +14,4 @@ public JsonSchemaOperation(Object schema) {
     public Object getSchema() {
         return schema;
     }
-}
+}