Skip to content

replace AstFilterFieldPath with string directly #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2025
Merged

replace AstFilterFieldPath with string directly #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/main/java/com/mongodb/hibernate/internal/translate/AbstractMqlTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand Down
5 changes: 2 additions & 3 deletions ...ava/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
27 changes: 0 additions & 27 deletions ...ain/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFilterFieldPath.java
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions ...java/com/mongodb/hibernate/internal/translate/mongoast/command/AstDeleteCommandTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions ...java/com/mongodb/hibernate/internal/translate/mongoast/command/AstUpdateCommandTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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))));

Expand Down
3 changes: 1 addition & 2 deletions ...odb/hibernate/internal/translate/mongoast/command/aggregate/AstAggregateCommandTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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")));
Expand Down
4 changes: 1 addition & 3 deletions ...m/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstMatchStageTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 = """
Expand Down
5 changes: 3 additions & 2 deletions ...om/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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}}\
Expand Down
9 changes: 6 additions & 3 deletions .../java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstLogicalFilterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 =
"""
Expand Down
32 changes: 0 additions & 32 deletions src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/FilterTestUtils.java
View file
Open in desktop

This file was deleted.