From 93ca844230ac13d140e85b5e0548427f922c6165 Mon Sep 17 00:00:00 2001 From: Dominik Guggemos Date: Tue, 12 Apr 2022 15:56:26 +0200 Subject: [PATCH] partly revert commit and fix tests Signed-off-by: Dominik Guggemos --- .../read/expression/visitors/GetExistsBsonVisitor.java | 2 +- .../read/expression/visitors/GetFilterBsonVisitor.java | 2 +- .../read/expression/visitors/GetExistsBsonVisitorTest.java | 5 +++-- .../read/expression/visitors/GetFilterBsonVisitorTest.java | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitor.java index 8f7d13ef8b..2b4953a037 100644 --- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitor.java +++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitor.java @@ -123,7 +123,7 @@ Bson visitPointer(final String key) { @Override Bson visitRootLevelField(final String fieldName) { - return Filters.exists(String.join(DOT, FIELD_THING, fieldName)); + return Filters.exists(fieldName); } private Bson matchKey(final CharSequence key) { diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitor.java index ebcfe73238..780b360709 100644 --- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitor.java +++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitor.java @@ -109,7 +109,7 @@ Bson visitPointer(final String pointer) { @Override Bson visitRootLevelField(final String fieldName) { - return predicateFunction.apply(String.join(DOT, FIELD_THING, fieldName)); + return predicateFunction.apply(fieldName); } private Bson matchValue(final CharSequence key) { diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitorTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitorTest.java index 218bb89738..bcb5565f00 100644 --- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitorTest.java +++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitorTest.java @@ -140,11 +140,12 @@ public void testSimplePropertyWithLeadingSlash() { "/_modified", "/"); } + @Test public void testSimplePropertyNoLoadingSlash() { - final Bson filterBson = underTest.visitSimple("_modified"); + final Bson filterBson = underTest.visitSimple("_id"); final BsonDocument document = toBsonDocument(filterBson); - assertThat(document).isEqualTo(new BsonDocument("t._modified", EXISTS)); + assertThat(document).isEqualTo(new BsonDocument("_id", EXISTS)); } } diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitorTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitorTest.java index 3141462f9a..33da520ece 100644 --- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitorTest.java +++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitorTest.java @@ -118,9 +118,9 @@ public void testSimplePropertyWithLeadingSlash() { @Test public void testSimplePropertyNoLeadingSlash() { - final Bson attributeFilter = underTest.visitSimple("_modified"); + final Bson attributeFilter = underTest.visitSimple("_id"); final BsonDocument document = toBsonDocument(attributeFilter); - assertThat(document).isEqualTo(new BsonDocument("t._modified", BSON_VALUE)); + assertThat(document).isEqualTo(new BsonDocument("_id", BSON_VALUE)); } }