replace AstFilterFieldPath with string directly (#99)

NathanQingyangXu · web-flow · commit 2bd6d04c5493 · 2025-05-22T09:19:31.000-04:00
diff --git a/src/main/java/com/mongodb/hibernate/internal/translate/AbstractMqlTranslator.java b/src/main/java/com/mongodb/hibernate/internal/translate/AbstractMqlTranslator.java
@@ -61,7 +61,6 @@
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFieldOperationFilter;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilter;
-import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilterFieldPath;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstLogicalFilter;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -333,8 +332,7 @@ private AstFilter getKeyFilter(AbstractRestrictedTableMutation<? extends Mutatio
         assertTrue(tableMutation.getNumberOfKeyBindings() == 1);
         var keyBinding = tableMutation.getKeyBindings().get(0);
 
-        var astFilterFieldPath =
-                new AstFilterFieldPath(keyBinding.getColumnReference().getColumnExpression());
+        var astFilterFieldPath = keyBinding.getColumnReference().getColumnExpression();
         var fieldValue = acceptAndYield(keyBinding.getValueExpression(), FIELD_VALUE);
         return new AstFieldOperationFilter(astFilterFieldPath, new AstComparisonFilterOperation(EQ, fieldValue));
     }
@@ -429,7 +427,7 @@ public void visitRelationalPredicate(ComparisonPredicate comparisonPredicate) {
         var astComparisonFilterOperator = getAstComparisonFilterOperator(operator);
 
         var astFilterOperation = new AstComparisonFilterOperation(astComparisonFilterOperator, comparisonValue);
-        var filter = new AstFieldOperationFilter(new AstFilterFieldPath(fieldPath), astFilterOperation);
+        var filter = new AstFieldOperationFilter(fieldPath, astFilterOperation);
         astVisitorValueHolder.yield(FILTER, filter);
     }
 
@@ -508,7 +506,7 @@ public void visitBooleanExpressionPredicate(BooleanExpressionPredicate booleanEx
         var fieldPath = acceptAndYield(booleanExpressionPredicate.getExpression(), FIELD_PATH);
         var astFilterOperation =
                 new AstComparisonFilterOperation(EQ, booleanExpressionPredicate.isNegated() ? FALSE : TRUE);
-        var filter = new AstFieldOperationFilter(new AstFilterFieldPath(fieldPath), astFilterOperation);
+        var filter = new AstFieldOperationFilter(fieldPath, astFilterOperation);
         astVisitorValueHolder.yield(FILTER, filter);
     }
 
diff --git a/src/main/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilter.java b/src/main/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilter.java
@@ -18,13 +18,12 @@
 
 import org.bson.BsonWriter;
 
-public record AstFieldOperationFilter(AstFilterFieldPath fieldPath, AstFilterOperation filterOperation)
-        implements AstFilter {
+public record AstFieldOperationFilter(String fieldPath, AstFilterOperation filterOperation) implements AstFilter {
     @Override
     public void render(BsonWriter writer) {
         writer.writeStartDocument();
         {
-            fieldPath.render(writer);
+            writer.writeName(fieldPath);
             filterOperation.render(writer);
         }
         writer.writeEndDocument();
diff --git a/src/main/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFilterFieldPath.java b/src/main/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFilterFieldPath.java
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstDeleteCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstDeleteCommandTests.java
@@ -22,7 +22,6 @@
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperation;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFieldOperationFilter;
-import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilterFieldPath;
 import org.bson.BsonString;
 import org.junit.jupiter.api.Test;
 
@@ -33,8 +32,7 @@ void testRendering() {
 
         var collection = "books";
         var filter = new AstFieldOperationFilter(
-                new AstFilterFieldPath("isbn"),
-                new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonString("978-3-16-148410-0"))));
+                "isbn", new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonString("978-3-16-148410-0"))));
 
         var deleteCommand = new AstDeleteCommand(collection, filter);
 
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstUpdateCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstUpdateCommandTests.java
@@ -24,7 +24,6 @@
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFieldOperationFilter;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilter;
-import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilterFieldPath;
 import java.util.List;
 import org.bson.BsonInt64;
 import org.bson.BsonString;
@@ -41,7 +40,7 @@ void testRendering() {
 
         final AstFilter filter;
         filter = new AstFieldOperationFilter(
-                new AstFilterFieldPath("_id"),
+                "_id",
                 new AstComparisonFilterOperation(
                         AstComparisonFilterOperator.EQ, new AstLiteralValue(new BsonInt64(12345L))));
 
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstAggregateCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstAggregateCommandTests.java
@@ -22,7 +22,6 @@
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperation;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFieldOperationFilter;
-import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilterFieldPath;
 import java.util.List;
 import org.bson.BsonInt32;
 import org.junit.jupiter.api.Test;
@@ -32,7 +31,7 @@ class AstAggregateCommandTests {
     @Test
     void testRendering() {
         var matchStage = new AstMatchStage(new AstFieldOperationFilter(
-                new AstFilterFieldPath("_id"),
+                "_id",
                 new AstComparisonFilterOperation(
                         AstComparisonFilterOperator.EQ, new AstLiteralValue(new BsonInt32(1)))));
         var projectStage = new AstProjectStage(List.of(new AstProjectStageIncludeSpecification("title")));
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstMatchStageTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstMatchStageTests.java
@@ -22,7 +22,6 @@
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperation;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFieldOperationFilter;
-import com.mongodb.hibernate.internal.translate.mongoast.filter.AstFilterFieldPath;
 import org.bson.BsonString;
 import org.junit.jupiter.api.Test;
 
@@ -31,8 +30,7 @@ class AstMatchStageTests {
     @Test
     void testRendering() {
         var astFilter = new AstFieldOperationFilter(
-                new AstFilterFieldPath("title"),
-                new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonString("Jane Eyre"))));
+                "title", new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonString("Jane Eyre"))));
         var astMatchStage = new AstMatchStage(astFilter);
 
         var expectedJson = """
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilterTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilterTests.java
@@ -18,8 +18,8 @@
 
 import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
 import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;
-import static com.mongodb.hibernate.internal.translate.mongoast.filter.FilterTestUtils.createFieldOperationFilter;
 
+import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
 import org.bson.BsonInt32;
 import org.junit.jupiter.api.Test;
 
@@ -28,7 +28,8 @@ class AstFieldOperationFilterTests {
     @Test
     void testRendering() {
 
-        var astFieldOperationFilter = createFieldOperationFilter("fieldName", EQ, new BsonInt32(1));
+        var astFieldOperationFilter = new AstFieldOperationFilter(
+                "fieldName", new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonInt32(1))));
 
         var expectedJson = """
                            {"fieldName": {"$eq": 1}}\
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstLogicalFilterTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstLogicalFilterTests.java
@@ -18,8 +18,8 @@
 
 import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
 import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;
-import static com.mongodb.hibernate.internal.translate.mongoast.filter.FilterTestUtils.createFieldOperationFilter;
 
+import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
 import java.util.List;
 import org.bson.BsonInt32;
 import org.bson.BsonString;
@@ -33,8 +33,11 @@ void testRendering(AstLogicalFilterOperator operator) {
         var astLogicalFilter = new AstLogicalFilter(
                 operator,
                 List.of(
-                        createFieldOperationFilter("field1", EQ, new BsonInt32(1)),
-                        createFieldOperationFilter("field2", EQ, new BsonString("1"))));
+                        new AstFieldOperationFilter(
+                                "field1", new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonInt32(1)))),
+                        new AstFieldOperationFilter(
+                                "field2",
+                                new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonString("1"))))));
 
         var expectedJson =
                 """
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/FilterTestUtils.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/FilterTestUtils.java

Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,12 @@`
`18`	`18`
`19`	`19`	`import org.bson.BsonWriter;`
`20`	`20`
`21`		`-public record AstFieldOperationFilter(AstFilterFieldPath fieldPath, AstFilterOperation filterOperation)`
`22`		`- implements AstFilter {`
	`21`	`+public record AstFieldOperationFilter(String fieldPath, AstFilterOperation filterOperation) implements AstFilter {`
`23`	`22`	`@Override`
`24`	`23`	`public void render(BsonWriter writer) {`
`25`	`24`	`writer.writeStartDocument();`
`26`	`25`	`{`
`27`		`- fieldPath.render(writer);`
	`26`	`+ writer.writeName(fieldPath);`
`28`	`27`	`filterOperation.render(writer);`
`29`	`28`	`}`
`30`	`29`	`writer.writeEndDocument();`