partly revert commit and fix tests

Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>
eclipse-ditto · Apr 12, 2022 · 93ca844 · 93ca844
1 parent 415c503
commit 93ca844
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.../ditto/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitor.java b/.../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/.../ditto/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitor.java b/.../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/...to/thingsearch/service/persistence/read/expression/visitors/GetExistsBsonVisitorTest.java b/...to/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/...to/thingsearch/service/persistence/read/expression/visitors/GetFilterBsonVisitorTest.java b/...to/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));
     }
 
 }