From 4a294ccdf7d6bf9e9fa5a1caa32d29c725d7a150 Mon Sep 17 00:00:00 2001
From: Stefan <stefan.maute@bosch.io>
Date: Fri, 12 Aug 2022 12:00:29 +0200
Subject: [PATCH 1/4] remove LimitOption and ImmutableLimitOption; remove use
 of limit option in search; minor code adjustments;

Signed-off-by: Stefan <stefan.maute@bosch.io>
Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
---
 .../internal/RqlOptionParser.scala            |  13 +-
 .../options/rql/RqlOptionsParserTest.java     |  36 +---
 .../thingsearch/api/PolicyReferenceTag.java   |   5 +-
 .../api/SearchNamespaceReportResult.java      |   2 +-
 .../api/SearchNamespaceResultEntry.java       |  10 +-
 .../api/ThingSearchMappingStrategies.java     |   1 +
 .../api/ThingsSearchConstants.java            |   1 +
 .../ditto/thingsearch/api/UpdateReason.java   |   1 +
 .../api/events/ThingsOutOfSync.java           |   1 +
 .../query/filter/ParameterOptionVisitor.java  |   9 -
 .../filter/ParameterOptionVisitorTest.java    |  33 ----
 thingsearch/model/pom.xml                     |   7 +
 .../model/ImmutableLimitOption.java           |  86 ---------
 .../model/ImmutableSearchQueryBuilder.java    |  44 +----
 .../ditto/thingsearch/model/LimitOption.java  |  47 -----
 .../thingsearch/model/OptionVisitor.java      |   7 -
 .../thingsearch/model/SearchModelFactory.java |  19 +-
 .../ditto/thingsearch/model/SearchQuery.java  |  18 +-
 .../thingsearch/model/SearchQueryBuilder.java |  19 --
 .../model/ImmutableLimitOptionTest.java       |  69 -------
 .../ImmutableSearchQueryBuilderTest.java      |  91 +--------
 .../assertions/LogicalSearchFilterAssert.java |  10 +-
 .../PropertySearchFilterAssert.java           |   3 +
 .../model/assertions/SearchFilterAssert.java  |  10 +-
 .../model/assertions/SearchQueryAssert.java   |  44 ++---
 .../model/assertions/SearchResultAssert.java  |  10 +-
 .../persistence/PersistenceConstants.java     |   3 +-
 .../read/MongoThingsSearchPersistence.java    |   8 +
 .../visitors/CreateBsonPredicateVisitor.java  |  10 +-
 .../criteria/visitors/CreateBsonVisitor.java  |   1 +
 .../visitors/GetSortBsonVisitor.java          |   2 +-
 .../write/ThingsSearchUpdaterPersistence.java |   1 +
 .../MongoThingsSearchUpdaterPersistence.java  |   2 +
 .../write/mapping/BsonArrayDiff.java          |   1 +
 .../persistence/write/mapping/BsonDiff.java   |   1 +
 .../write/mapping/BsonDiffVisitor.java        |   2 +
 .../mapping/BsonPrimitiveValueVisitor.java    |   1 +
 .../write/mapping/BsonSizeVisitor.java        |   1 +
 .../write/mapping/BsonValueVisitor.java       |  14 +-
 .../write/mapping/EnforcedThingMapper.java    |   3 +
 .../write/mapping/EvaluatedPolicy.java        |   8 +
 ...IndexLengthRestrictionEnforcerVisitor.java |   2 +
 .../write/mapping/JsonInternalVisitor.java    |   3 +-
 .../write/mapping/JsonObjectVisitor.java      |   2 +
 .../persistence/write/mapping/JsonToBson.java |   3 +
 .../write/model/AbstractWriteModel.java       |   4 +-
 .../write/model/ThingDeleteModel.java         |   2 +
 .../write/model/ThingWriteModel.java          |   4 +
 .../write/model/WriteResultAndErrors.java     |   1 +
 .../write/streaming/BackgroundSyncStream.java |   4 +-
 .../write/streaming/ConsistencyLag.java       |   3 +-
 .../streaming/SudoSignalEnrichmentFacade.java |   9 +-
 .../starter/actors/ThingsSearchCursor.java    | 181 ++++++++----------
 53 files changed, 221 insertions(+), 651 deletions(-)
 delete mode 100755 thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOption.java
 delete mode 100755 thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/LimitOption.java
 delete mode 100755 thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOptionTest.java

diff --git a/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala b/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala
index 1cd3936731..35ea12cea1 100644
--- a/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala
+++ b/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala
@@ -17,7 +17,7 @@ import org.eclipse.ditto.rql.model.ParserException
 import org.eclipse.ditto.rql.parser.internal.RqlParserBase
 import org.eclipse.ditto.rql.parser.thingsearch.OptionParser
 import org.eclipse.ditto.thingsearch.model
-import org.eclipse.ditto.thingsearch.model.{LimitOption, SearchModelFactory, SortOption, SortOptionEntry}
+import org.eclipse.ditto.thingsearch.model.{SearchModelFactory, SortOption, SortOptionEntry}
 
 import java.util
 import scala.collection.JavaConverters
@@ -31,7 +31,6 @@ import scala.util.{Failure, Success}
   * Sort                       = "sort", '(', SortProperty, { ',', SortProperty }, ')'
   * SortProperty               = SortOrder, PropertyLiteral
   * SortOrder                  = '+' | '-'
-  * Limit                      = "limit", '(', IntegerLiteral, ',', IntegerLiteral, ')'
   * </pre>
   */
 private class RqlOptionParser(override val input: ParserInput) extends RqlParserBase(input) {
@@ -54,7 +53,7 @@ private class RqlOptionParser(override val input: ParserInput) extends RqlParser
     * Option                     = Sort | Limit | Cursor | Size
     */
   private def Option: Rule1[model.Option] = rule {
-    Sort | Limit | Cursor | Size
+    Sort | Cursor | Size
   }
 
   /**
@@ -89,14 +88,6 @@ private class RqlOptionParser(override val input: ParserInput) extends RqlParser
     '-' ~ push(SortOptionEntry.SortOrder.DESC)
   }
 
-  /**
-    * Limit                      = "limit", '(', IntegerLiteral, ',', IntegerLiteral, ')'
-    */
-  private def Limit: Rule1[LimitOption] = rule {
-    "limit" ~ '(' ~ LongLiteral ~ ',' ~ LongLiteral ~ ')' ~> ((offset: java.lang.Long, count: java.lang.Long) =>
-      SearchModelFactory.newLimitOption(offset.toInt, count.toInt))
-  }
-
   /**
     * Cursor                      = "cursor", '(', StringLiteral, ')'
     */
diff --git a/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java b/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java
index ccd9477083..b8d021cb06 100755
--- a/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java
+++ b/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java
@@ -21,7 +21,6 @@
 import org.eclipse.ditto.rql.parser.thingsearch.OptionParser;
 import org.eclipse.ditto.rql.parser.thingsearch.RqlOptionParser;
 import org.eclipse.ditto.thingsearch.model.CursorOption;
-import org.eclipse.ditto.thingsearch.model.LimitOption;
 import org.eclipse.ditto.thingsearch.model.Option;
 import org.eclipse.ditto.thingsearch.model.SizeOption;
 import org.eclipse.ditto.thingsearch.model.SortOption;
@@ -109,40 +108,18 @@ public void invalidSortMissingOrderAtSecondProperty() throws ParserException {
         parser.parse("sort(-username,owner)");
     }
 
-    @Test
-    public void parseLimitSuccess() throws ParserException {
-        final List<Option> options = parser.parse("limit(0,1)");
-        assertThat(options.size()).isEqualTo(1);
-        final LimitOption limitOption = (LimitOption) options.get(0);
-        assertThat(limitOption.getCount()).isEqualTo(1);
-        assertThat(limitOption.getOffset()).isEqualTo(0);
-    }
-
-    @Test(expected = ParserException.class)
-    public void invalidLimitMissingNumber() throws ParserException {
-        parser.parse("limit(0)");
-    }
-
-    @Test(expected = ParserException.class)
-    public void invalidLimitTooManyArguments() throws ParserException {
-        parser.parse("limit(0,1,2)");
-    }
-
     @Test
     public void parseOptionCombinations() throws ParserException {
-        final List<Option> options = parser.parse("limit(0,1),sort(-attributes/username),cursor(ABC),size(463)");
+        final List<Option> options = parser.parse("sort(-attributes/username),cursor(ABC),size(463)");
         assertThat(options.size()).isEqualTo(4);
 
-        final LimitOption limitOption = (LimitOption) options.get(0);
-        assertThat(limitOption.getCount()).isEqualTo(1);
-        assertThat(limitOption.getOffset()).isEqualTo(0);
-
-        final SortOption sortOption = (SortOption) options.get(1);
+        final SortOption sortOption = (SortOption) options.get(0);
         assertThat(sortOption.getEntries().stream()
                 .map(SortOptionEntry::getPropertyPath)
                 .map(JsonPointer::toString)
                 .anyMatch("/attributes/username"::equals)
         ).isTrue();
+
         assertThat(sortOption.getEntries().stream()
                 .filter(soe -> JsonPointer.of("/attributes/username").equals(soe.getPropertyPath()))
                 .map(SortOptionEntry::getOrder)
@@ -158,7 +135,7 @@ public void parseOptionCombinations() throws ParserException {
 
     @Test
     public void parseAndUnparseAreInverseOfEachOther() throws ParserException {
-        final String input = "limit(0,1),sort(-attributes/username)";
+        final String input = "cursor(ABC),sort(-attributes/username)";
         final List<Option> parsed = parser.parse(input);
         final String unparsed = RqlOptionParser.unparse(parsed);
         final List<Option> reParsed = parser.parse(unparsed);
@@ -166,11 +143,6 @@ public void parseAndUnparseAreInverseOfEachOther() throws ParserException {
         assertThat(reParsed).isEqualTo(parsed);
     }
 
-    @Test(expected = ParserException.class)
-    public void invalidLimitArgumentsExceedsLong() throws ParserException {
-        parser.parse("limit(100000000000000000000,10)");
-    }
-
     @Test(expected = ParserException.class)
     public void cursorWithoutContentOrClosingParenthesis() throws ParserException {
         parser.parse("cursor(");
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/PolicyReferenceTag.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/PolicyReferenceTag.java
index b813740e95..aa87dee863 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/PolicyReferenceTag.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/PolicyReferenceTag.java
@@ -133,9 +133,9 @@ public int hashCode() {
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" +
-                "thingId='" + thingId + '\'' +
+                "thingId='" + thingId + "\"" +
                 ", policyTag=" + policyTag +
-                ']';
+                "]";
     }
 
     /**
@@ -165,4 +165,5 @@ private JsonFields() {
         }
 
     }
+
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceReportResult.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceReportResult.java
index ee7e62c4da..e3511d7c34 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceReportResult.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceReportResult.java
@@ -141,7 +141,7 @@ public int hashCode() {
     public String toString() {
         return "SearchNamespaceReportResult{" +
                 "searchNamespaceResultEntries=" + searchNamespaceResultEntries +
-                '}';
+                "}";
     }
 
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceResultEntry.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceResultEntry.java
index 2ca5da2d47..3e9cd4d7cd 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceResultEntry.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/SearchNamespaceResultEntry.java
@@ -17,13 +17,13 @@
 
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.json.FieldType;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.json.Jsonifiable;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonObject;
-import org.eclipse.ditto.base.model.json.FieldType;
-import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.base.model.json.Jsonifiable;
 
 
 /**
@@ -141,9 +141,9 @@ public String getNamespace() {
     @Override
     public String toString() {
         return "SearchNamespaceResultEntry{" +
-                "namespace='" + namespace + '\'' +
+                "namespace='" + namespace + "\"" +
                 ", count=" + count +
-                '}';
+                "}";
     }
 
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingSearchMappingStrategies.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingSearchMappingStrategies.java
index 5a60288aac..9dee89cd93 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingSearchMappingStrategies.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingSearchMappingStrategies.java
@@ -58,6 +58,7 @@ public static ThingSearchMappingStrategies getInstance() {
             result = new ThingSearchMappingStrategies(getThingSearchMappingStrategies());
             instance = result;
         }
+
         return result;
     }
 
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingsSearchConstants.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingsSearchConstants.java
index 8261dddeb5..04f1cb7f60 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingsSearchConstants.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/ThingsSearchConstants.java
@@ -61,4 +61,5 @@ public final class ThingsSearchConstants {
     private ThingsSearchConstants() {
         // no-op
     }
+
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/UpdateReason.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/UpdateReason.java
index ec6c612421..4c59bd04ad 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/UpdateReason.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/UpdateReason.java
@@ -48,4 +48,5 @@ public enum UpdateReason {
      * A force update is executed after actor startup to ensure consistency against the database.
      */
     FORCE_UPDATE_AFTER_START
+
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/events/ThingsOutOfSync.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/events/ThingsOutOfSync.java
index 0954099431..282f3c7855 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/events/ThingsOutOfSync.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/events/ThingsOutOfSync.java
@@ -193,4 +193,5 @@ public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<
                 .set(JSON_THING_IDS, thingIdsJsonArray, predicate)
                 .build();
     }
+
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java
index 533313053f..c756bf01b5 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java
@@ -24,7 +24,6 @@
 import org.eclipse.ditto.rql.query.expression.FieldExpressionFactory;
 import org.eclipse.ditto.rql.query.expression.SortFieldExpression;
 import org.eclipse.ditto.thingsearch.model.CursorOption;
-import org.eclipse.ditto.thingsearch.model.LimitOption;
 import org.eclipse.ditto.thingsearch.model.Option;
 import org.eclipse.ditto.thingsearch.model.OptionVisitor;
 import org.eclipse.ditto.thingsearch.model.SizeOption;
@@ -65,14 +64,6 @@ public ParameterOptionVisitor visitAll(final Iterable<Option> options) {
         return this;
     }
 
-    @Override
-    public void visit(final LimitOption limitOption) {
-        checkNotNull(limitOption, "limit option");
-        final long skip = limitOption.getOffset();
-        final long limit = limitOption.getCount();
-        queryBuilder.skip(skip).limit(limit);
-    }
-
     @Override
     public void visit(final org.eclipse.ditto.thingsearch.model.SortOption sortOption) {
         checkNotNull(sortOption, "sort option");
diff --git a/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java b/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java
index fd38d74600..e7d00f6ae6 100644
--- a/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java
+++ b/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java
@@ -24,7 +24,6 @@
 import org.eclipse.ditto.rql.query.SortDirection;
 import org.eclipse.ditto.rql.query.expression.FieldExpressionFactory;
 import org.eclipse.ditto.rql.query.expression.SortFieldExpression;
-import org.eclipse.ditto.thingsearch.model.LimitOption;
 import org.eclipse.ditto.thingsearch.model.Option;
 import org.eclipse.ditto.thingsearch.model.SearchModelFactory;
 import org.eclipse.ditto.thingsearch.model.SortOption;
@@ -78,17 +77,6 @@ public void constructorWithNullQueryBuilder() {
     }
 
 
-    @Test
-    public void visitLimitOption() {
-        // test
-        visitor.visitAll(Collections.singletonList(SearchModelFactory.newLimitOption(KNOWN_SKIP, KNOWN_LIMIT)));
-
-        // verify
-        verify(qbMock).skip(KNOWN_SKIP);
-        verify(qbMock).limit(KNOWN_LIMIT);
-    }
-
-
     @Test
     public void visitSortOptionWithSingleSortOption() {
         // prepare
@@ -140,27 +128,6 @@ public void visitSortOptionMultiple() {
                                 SortDirection.ASC)));
     }
 
-
-
-    @Test
-    public void visitLimitOptionAndSortOption() {
-        // test
-        final LimitOption limitOption = SearchModelFactory.newLimitOption(KNOWN_SKIP, KNOWN_LIMIT);
-        SortOption sortOption = SearchModelFactory.newSortOption(Collections.emptyList());
-        sortOption = sortOption.add(POINTER_1, SortOptionEntry.SortOrder.ASC);
-
-        // test
-        visitor.visitAll(Arrays.asList(limitOption, sortOption));
-
-        // verify
-        verify(qbMock).skip(KNOWN_SKIP);
-        verify(qbMock).limit(KNOWN_LIMIT);
-        verify(exprFactoryMock).sortBy(POINTER_1.toString());
-        verify(qbMock).sort(
-                Collections.singletonList(new org.eclipse.ditto.rql.query.SortOption(exprMock,
-                        SortDirection.ASC)));
-    }
-
     @Test
     public void visitCursorAndSizeOptions() {
         final Option cursorOption = SearchModelFactory.newCursorOption("cursor");
diff --git a/thingsearch/model/pom.xml b/thingsearch/model/pom.xml
index 7daa553b36..8acce3056c 100644
--- a/thingsearch/model/pom.xml
+++ b/thingsearch/model/pom.xml
@@ -107,6 +107,13 @@
                             <!--<exclude></exclude>-->
                             <exclude>org.eclipse.ditto.thingsearch.model.signals.commands.query.StreamThings</exclude>
                             <exclude>org.eclipse.ditto.thingsearch.model.signals.events.ThingsOutOfSync</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.LimitOption</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.OptionVisitor#visit(org.eclipse.ditto.thingsearch.model.LimitOption)</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchModelFactory#newLimitOption(int,int)</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchQuery#getAllOptions()</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchQuery#getLimitOption()</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchQueryBuilder#limit(int,int)</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchQueryBuilder#removeLimitation()</exclude>
                         </excludes>
                     </parameter>
                 </configuration>
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOption.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOption.java
deleted file mode 100755
index e628dabff1..0000000000
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOption.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2017 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.ditto.thingsearch.model;
-
-import java.util.Objects;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An immutable implementation of {@link LimitOption}.
- */
-@Immutable
-final class ImmutableLimitOption implements LimitOption {
-
-    /**
-     * The maximum allowed value for count.
-     */
-    static final int MAX_COUNT = ImmutableSizeOption.MAX_SIZE;
-
-    private final int offset;
-    private final int count;
-
-    private ImmutableLimitOption(final int offset, final int count) {
-        this.offset = offset;
-        this.count = count;
-    }
-
-    /**
-     * Returns a new instance of {@code ImmutableLimitOption} with the given offset and count.
-     *
-     * @param offset the offset to be set.
-     * @param count the count to be set.
-     * @return the new limit option.
-     */
-    public static ImmutableLimitOption of(final int offset, final int count) {
-        return new ImmutableLimitOption(offset, count);
-    }
-
-    @Override
-    public void accept(final OptionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final ImmutableLimitOption that = (ImmutableLimitOption) o;
-        return offset == that.offset && count == that.count;
-    }
-
-    @Override
-    public int getOffset() {
-        return offset;
-    }
-
-    @Override
-    public int getCount() {
-        return count;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(offset, count);
-    }
-
-    @Override
-    public String toString() {
-        return "limit(" + offset + "," + count + ")";
-    }
-
-}
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilder.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilder.java
index e2a5dcf953..545a51219e 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilder.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilder.java
@@ -12,11 +12,9 @@
  */
 package org.eclipse.ditto.thingsearch.model;
 
-import static org.eclipse.ditto.base.model.common.ConditionChecker.checkArgument;
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,12 +35,10 @@ final class ImmutableSearchQueryBuilder implements SearchQueryBuilder {
 
     private final SearchFilter searchFilter;
     private final Map<JsonPointer, SortOptionEntry> sortOptionEntries;
-    private LimitOption limitOption;
 
     private ImmutableSearchQueryBuilder(final SearchFilter theSearchFilter) {
         searchFilter = theSearchFilter;
         sortOptionEntries = new LinkedHashMap<>();
-        limitOption = null;
     }
 
     /**
@@ -80,23 +76,6 @@ public SearchQueryBuilder removeSortOptionFor(final CharSequence propertyPath) {
         return this;
     }
 
-    @Override
-    public SearchQueryBuilder limit(final int offset, final int count) {
-        checkArgument(offset, o -> (o >= 0), () -> "The offset must not be negative!");
-        checkArgument(count, c -> (c > 0), () -> "The count must neither be negative nor zero!");
-        checkArgument(count, c -> (c <= ImmutableLimitOption.MAX_COUNT),
-                () -> "The count must not be greater than 200!");
-
-        limitOption = ImmutableLimitOption.of(offset, count);
-        return this;
-    }
-
-    @Override
-    public SearchQueryBuilder removeLimitation() {
-        limitOption = null;
-        return this;
-    }
-
     @Override
     public SearchQuery build() {
         return new ImmutableSearchQuery(this);
@@ -111,13 +90,11 @@ private static final class ImmutableSearchQuery implements SearchQuery {
 
         private final SearchFilter filter;
         private final SortOption sortOption;
-        private final LimitOption limitOption;
 
         private ImmutableSearchQuery(final ImmutableSearchQueryBuilder builder) {
             filter = builder.searchFilter;
             final List<SortOptionEntry> sortOptionEntries = new ArrayList<>(builder.sortOptionEntries.values());
             sortOption = !sortOptionEntries.isEmpty() ? ImmutableSortOption.of(sortOptionEntries) : null;
-            limitOption = builder.limitOption;
         }
 
         @Override
@@ -130,19 +107,6 @@ public Optional<SortOption> getSortOption() {
             return Optional.ofNullable(sortOption);
         }
 
-        @Override
-        public Optional<LimitOption> getLimitOption() {
-            return Optional.ofNullable(limitOption);
-        }
-
-        @Override
-        public Collection<Option> getAllOptions() {
-            final List<Option> result = new ArrayList<>(2);
-            result.add(sortOption);
-            getLimitOption().ifPresent(result::add);
-            return result;
-        }
-
         @Override
         public String getFilterAsString() {
             return filter.toString();
@@ -152,10 +116,6 @@ public String getFilterAsString() {
         public String getOptionsAsString() {
             final StringBuilder stringBuilder = new StringBuilder();
 
-            getLimitOption()
-                    .map(Option::toString)
-                    .ifPresent(stringBuilder::append);
-
             getSortOption()
                     .map(Option::toString)
                     .ifPresent(sortOptionString -> {
@@ -170,9 +130,7 @@ public String getOptionsAsString() {
 
         @Override
         public String toString() {
-            return getClass().getSimpleName() + " [" + "filter=" + filter + ", sortOption=" + sortOption +
-                    ", limitOption="
-                    + limitOption + "]";
+            return getClass().getSimpleName() + " [" + "filter=" + filter + ", sortOption=" + sortOption + "]";
         }
     }
 
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/LimitOption.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/LimitOption.java
deleted file mode 100755
index 3a7ee558bf..0000000000
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/LimitOption.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.ditto.thingsearch.model;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * The limit option determines the pagination of the search result.
- */
-@Immutable
-public interface LimitOption extends Option {
-
-    /**
-     * Returns the offset of this option.
-     *
-     * @return the offset.
-     */
-    int getOffset();
-
-    /**
-     * Returns the count of this option.
-     *
-     * @return the count.
-     */
-    int getCount();
-
-    /**
-     * Returns the string representation of this limit option. The string consists of the prefix {@code "limit("}
-     * which is followed by the comma-separated offset and count value and finally of the suffix {@code ")"}. An
-     * example string might look like {@code "limit(0,25)"};
-     *
-     * @return the string representation of this limit option.
-     */
-    @Override
-    String toString();
-
-}
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/OptionVisitor.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/OptionVisitor.java
index 2e0aeefe91..64499ab57c 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/OptionVisitor.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/OptionVisitor.java
@@ -17,13 +17,6 @@
  */
 public interface OptionVisitor {
 
-    /**
-     * Is called by a {@link LimitOption} in its {@link LimitOption#accept(OptionVisitor)} method.
-     *
-     * @param limitOption an instance of the {@link LimitOption}.
-     */
-    void visit(LimitOption limitOption);
-
     /**
      * Is called by a {@link SortOption} in its {@link SortOption#accept(OptionVisitor)} method.
      *
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java
index 6fbe202267..c89df886e0 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java
@@ -160,8 +160,8 @@ public static LogicalSearchFilter not(final SearchFilter filter) {
      * final SearchProperty searchProperty = SearchModelFactory.property("attributes/manufacturer");
      * final PropertySearchFilter searchFilter = searchProperty.eq("Bosch");
      *
-     * final SearchQuery query = SearchModelFactory.newSearchQueryBuilder(searchFilter) //
-     *    .limit(0, 25) //
+     * final SearchQuery query = SearchModelFactory.newSearchQueryBuilder(searchFilter)
+     *    .sortAsc("attributes/manufacturer")
      *    .build();
      * </pre>
      *
@@ -180,8 +180,8 @@ public static SearchProperty property(final JsonPointer propertyPath) {
      * final SearchProperty searchProperty = SearchModelFactory.property("attributes/manufacturer");
      * final PropertySearchFilter searchFilter = searchProperty.eq("Bosch");
      *
-     * final SearchQuery query = SearchModelFactory.newSearchQueryBuilder(searchFilter) //
-     *    .limit(0, 25) //
+     * final SearchQuery query = SearchModelFactory.newSearchQueryBuilder(searchFilter)
+     *    .sortAsc("attributes/manufacturer")
      *    .build();
      * </pre>
      *
@@ -254,17 +254,6 @@ public static SortOptionEntry newSortOptionEntry(final CharSequence propertyPath
         return ImmutableSortOptionEntry.of(propertyPath, sortOrder);
     }
 
-    /**
-     * Creates a new {@link LimitOption} for the provided {@code offset} and {@code count}.
-     *
-     * @param offset the offset to use for the LimitOption
-     * @param count the count to include in the LimitOption
-     * @return the created LimitOption
-     */
-    public static LimitOption newLimitOption(final int offset, final int count) {
-        return ImmutableLimitOption.of(offset, count);
-    }
-
     /**
      * Creates a new {@link SizeOption}.
      *
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQuery.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQuery.java
index 016c1095ef..16aa442e53 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQuery.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQuery.java
@@ -12,7 +12,6 @@
  */
 package org.eclipse.ditto.thingsearch.model;
 
-import java.util.Collection;
 import java.util.Optional;
 
 import javax.annotation.concurrent.Immutable;
@@ -56,24 +55,9 @@ static SearchQueryBuilder newBuilder(final SearchFilter filter) {
      */
     Optional<SortOption> getSortOption();
 
-    /**
-     * Returns the option which determines pagination of the search result.
-     *
-     * @return the option for determining the pagination of the search result.
-     */
-    Optional<LimitOption> getLimitOption();
-
-    /**
-     * Returns a collection of all options of this search query. Changes on this collection won't be reflected by the
-     * search query.
-     *
-     * @return the options of this query.
-     */
-    Collection<Option> getAllOptions();
-
     /**
      * Returns the string representation of all options combined. For example, if a limit and a sort option is specified
-     * in this query, the result might look like {@code "limit(0,25),sort(+thingId,-attributes/manufacturer)"}.
+     * in this query, the result might look like {@code "sort(+thingId,-attributes/manufacturer)"}.
      *
      * @return the string representation of all options combined. If this query does not contain any options, an empty
      * string is returned.
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQueryBuilder.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQueryBuilder.java
index 07bb40c8a4..74edb9dfdf 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQueryBuilder.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchQueryBuilder.java
@@ -49,25 +49,6 @@ public interface SearchQueryBuilder {
      */
     SearchQueryBuilder removeSortOptionFor(CharSequence propertyPath);
 
-    /**
-     * Sets a limit for pagination. The maximum allowed count is {@code 200}.
-     *
-     * @param offset determines, if a search result contains multiple results, from which entry the result entries are
-     * returned. This makes it possible to skip unwanted entries.
-     * @param count determines, if a search result contains multiple results, how many entries are returned.
-     * @return this builder to allow method chaining.
-     * @throws IllegalArgumentException if any argument is negative or if {@code count} is zero or greater than {@code
-     * 200}.
-     */
-    SearchQueryBuilder limit(int offset, int count);
-
-    /**
-     * Removes a previously set limit for pagination.
-     *
-     * @return this builder to allow method chaining.
-     */
-    SearchQueryBuilder removeLimitation();
-
     /**
      * Creates a new immutable {@code SearchQuery} object based on the properties of this builder.
      *
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOptionTest.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOptionTest.java
deleted file mode 100755
index 333bdb1a52..0000000000
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableLimitOptionTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2017 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.ditto.thingsearch.model;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
-import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import nl.jqno.equalsverifier.EqualsVerifier;
-
-/**
- * Unit test for {@link ImmutableLimitOption}.
- */
-public final class ImmutableLimitOptionTest {
-
-    private static final int KNOWN_OFFSET = 23;
-    private static final int KNOWN_COUNT = 42;
-
-    private ImmutableLimitOption underTest = null;
-
-    @Before
-    public void setUp() {
-        underTest = ImmutableLimitOption.of(KNOWN_OFFSET, KNOWN_COUNT);
-    }
-
-    @Test
-    public void assertImmutability() {
-        assertInstancesOf(ImmutableLimitOption.class, areImmutable());
-    }
-
-    @Test
-    public void testHashCodeAndEquals() {
-        EqualsVerifier.forClass(ImmutableLimitOption.class)
-                .usingGetClass()
-                .verify();
-    }
-
-    @Test
-    public void getOffsetReturnsExpected() {
-        assertThat(underTest.getOffset()).isEqualTo(KNOWN_OFFSET);
-    }
-
-    @Test
-    public void getCountReturnsExpected() {
-        assertThat(underTest.getCount()).isEqualTo(KNOWN_COUNT);
-    }
-
-    @Test
-    public void toStringReturnsExpected() {
-        final String expected = "limit(23,42)";
-
-        assertThat(underTest.toString()).isEqualTo(expected);
-    }
-
-}
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilderTest.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilderTest.java
index 1238c99ad1..2cf8cbdae3 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilderTest.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchQueryBuilderTest.java
@@ -17,7 +17,6 @@
 import static org.mockito.Mockito.mock;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 
 import org.eclipse.ditto.json.JsonFactory;
@@ -29,9 +28,8 @@
  */
 public final class ImmutableSearchQueryBuilderTest {
 
-    private static final JsonPointer ATTRIBUTE_PATH = JsonFactory.newPointer("attributes/manufacturer");
-    private static final int KNOWN_OFFSET = 3;
-    private static final int KNOWN_COUNT = 12;
+    private static final JsonPointer ATTRIBUTE_PATH =
+            JsonFactory.newPointer("attributes/manufacturer");
 
     @Test(expected = NullPointerException.class)
     public void tryToCreateInstanceWithNullSearchFilter() {
@@ -94,7 +92,6 @@ public void overwritingSortOptionWorksAsExpected() {
                 ImmutableSortOption.of(Arrays.asList(attributePathEntry, thingIdEntry));
 
         assertThat(searchQuery)
-                .hasNoLimitOption()
                 .hasSortOption(expectedSortOption);
     }
 
@@ -125,87 +122,6 @@ public void buildQueryWithSortOption() {
                 .hasOptionsString("sort(+/attributes/manufacturer,-/thingId)");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void tryToSetLimitOptionWithNegativeOffset() {
-        ImmutableSearchQueryBuilder.of(mock(SearchFilter.class))
-                .sortAsc(ATTRIBUTE_PATH)
-                .limit(-1, KNOWN_COUNT)
-                .build();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void tryToSetLimitOptionWithNegativeCount() {
-        ImmutableSearchQueryBuilder.of(mock(SearchFilter.class))
-                .sortAsc(ATTRIBUTE_PATH)
-                .limit(KNOWN_OFFSET, -1)
-                .build();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void tryToSetLimitOptionWithTooBigCount() {
-        ImmutableSearchQueryBuilder.of(mock(SearchFilter.class))
-                .sortAsc(ATTRIBUTE_PATH)
-                .limit(KNOWN_OFFSET, ImmutableLimitOption.MAX_COUNT + 1)
-                .build();
-    }
-
-    @Test
-    public void removeLimitOptionWorksAsExpected() {
-        final ImmutableSortOptionEntry attributePathEntry = ImmutableSortOptionEntry.asc(ATTRIBUTE_PATH);
-
-        final SearchQuery searchQuery = ImmutableSearchQueryBuilder.of(mock(SearchFilter.class))
-                .limit(KNOWN_OFFSET, KNOWN_COUNT)
-                .sortAsc(attributePathEntry.getPropertyPath())
-                .removeLimitation()
-                .build();
-
-        assertThat(searchQuery)
-                .hasNoLimitOption()
-                .hasSortOption(ImmutableSortOption.of(Collections.singletonList(attributePathEntry)));
-    }
-
-    @Test
-    public void buildQueryWithoutLimitOption() {
-        final ImmutableSearchQueryBuilder underTest = ImmutableSearchQueryBuilder.of(mock(SearchFilter.class));
-
-        assertThat(underTest.build()).hasNoLimitOption();
-    }
-
-    @Test
-    public void buildQueryWithLimitOption() {
-        final byte offset = 3;
-        final byte count = 5;
-
-        final SearchQuery searchQuery = ImmutableSearchQueryBuilder.of(mock(SearchFilter.class))
-                .limit(offset, count)
-                .build();
-
-        final ImmutableLimitOption expectedLimitOption = ImmutableLimitOption.of(offset, count);
-
-        assertThat(searchQuery)
-                .hasLimitOption(expectedLimitOption)
-                .hasOptionsString("limit(3,5)");
-    }
-
-    @Test
-    public void getAllOptionsReturnsExpected() {
-        final byte offset = 3;
-        final byte count = 5;
-        final SearchQuery searchQuery = ImmutableSearchQueryBuilder.of(mock(SearchFilter.class))
-                .limit(offset, count)
-                .sortDesc(ATTRIBUTE_PATH)
-                .build();
-
-        final ImmutableLimitOption expectedLimitOption = ImmutableLimitOption.of(offset, count);
-        final ImmutableSortOptionEntry attributePathEntry = ImmutableSortOptionEntry.desc(ATTRIBUTE_PATH);
-        final ImmutableSortOption expectedSortOption =
-                ImmutableSortOption.of(Collections.singletonList(attributePathEntry));
-
-        final Collection<Option> allOptions = searchQuery.getAllOptions();
-
-        assertThat(allOptions).containsOnly(expectedLimitOption, expectedSortOption);
-    }
-
     @Test
     public void buildFullyFledgedSearchQuery() {
         final JsonPointer test = JsonFactory.newPointer("attributes/test");
@@ -218,7 +134,6 @@ public void buildFullyFledgedSearchQuery() {
                         SearchModelFactory.property(test1).gt(doubleValue));
 
         final SearchQuery searchQuery = SearchModelFactory.newSearchQueryBuilder(searchFilter)
-                .limit(0, 25)
                 .sortAsc(test)
                 .sortDesc(test1)
                 .build();
@@ -227,7 +142,7 @@ public void buildFullyFledgedSearchQuery() {
                 .hasFilter(searchFilter)
                 .hasFilterString("and(eq(" + test + ",false)," +
                         "gt(" + test1 + ",42.23))")
-                .hasOptionsString("limit(0,25),sort(+/attributes/test,-/attributes/test1)");
+                .hasOptionsString("sort(+/attributes/test,-/attributes/test1)");
     }
 
 }
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/LogicalSearchFilterAssert.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/LogicalSearchFilterAssert.java
index 89cf1d6a90..b4044885a1 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/LogicalSearchFilterAssert.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/LogicalSearchFilterAssert.java
@@ -36,11 +36,12 @@ public LogicalSearchFilterAssert(final LogicalSearchFilter actual) {
     public LogicalSearchFilterAssert containsOnlyFilter(final SearchFilter... expectedFilters) {
         isNotNull();
         final Collection<SearchFilter> actualFilters = actual.getFilters();
-        Assertions.assertThat(actualFilters) //
+        Assertions.assertThat(actualFilters)
                 .overridingErrorMessage(
                         "Expected LogicalSearchFilter to contain the filter(s) \n<%s> but it contained \n<%s>",
-                        expectedFilters, actualFilters) //
+                        expectedFilters, actualFilters)
                 .containsOnly(expectedFilters);
+
         return this;
     }
 
@@ -48,11 +49,12 @@ public LogicalSearchFilterAssert containsAmountOfFilters(final int expectedAmoun
         isNotNull();
         final Collection<SearchFilter> filters = actual.getFilters();
         final int actualAmountOfFilters = filters.size();
-        Assertions.assertThat(actualAmountOfFilters) //
+        Assertions.assertThat(actualAmountOfFilters)
                 .overridingErrorMessage(
                         "Expected amount of filters of LogicalSearchFilter to be \n<%s> but it was \n<%s>",
-                        expectedAmount, actualAmountOfFilters) //
+                        expectedAmount, actualAmountOfFilters)
                 .isEqualTo(expectedAmount);
+
         return this;
     }
 
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/PropertySearchFilterAssert.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/PropertySearchFilterAssert.java
index c61e597fb5..b8e633a095 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/PropertySearchFilterAssert.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/PropertySearchFilterAssert.java
@@ -44,6 +44,7 @@ public PropertySearchFilterAssert hasPath(final JsonPointer expectedPath) {
                         expectedPath,
                         actualPath)
                 .isEqualTo(expectedPath);
+
         return this;
     }
 
@@ -54,6 +55,7 @@ public PropertySearchFilterAssert hasNoValue() {
                 .overridingErrorMessage("Expected PropertySearchFilterAssert not to have any values but it had <%s>",
                         actualValues)
                 .isEmpty();
+
         return this;
     }
 
@@ -64,6 +66,7 @@ public PropertySearchFilterAssert hasOnlyValue(final JsonValue... expectedValues
                 .overridingErrorMessage("Expected PropertySearchFilter to have value(s) \n<%s> but it had \n<%s>",
                         expectedValues, actualValues)
                 .containsOnly(expectedValues);
+
         return this;
     }
 
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchFilterAssert.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchFilterAssert.java
index 3dd04d9d5b..4d26f3ac56 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchFilterAssert.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchFilterAssert.java
@@ -36,20 +36,22 @@ protected SearchFilterAssert(final F actual, final Class<? extends SearchFilterA
     public S hasType(final SearchFilter.Type expectedType) {
         isNotNull();
         final SearchFilter.Type actualType = actual.getType();
-        Assertions.assertThat(actualType) //
+        Assertions.assertThat(actualType)
                 .overridingErrorMessage("Expected SearchFilter to have type \n<%s> but it had \n<%s>", expectedType,
-                        actualType) //
+                        actualType)
                 .isSameAs(expectedType);
+
         return myself;
     }
 
     public S hasStringRepresentation(final String expectedStringRepresentation) {
         isNotNull();
         final String actualStringRepresentation = actual.toString();
-        Assertions.assertThat(actualStringRepresentation) //
+        Assertions.assertThat(actualStringRepresentation)
                 .overridingErrorMessage("Expected string representation of SearchFilter to be \n<%s> but it was \n<%s>",
-                        expectedStringRepresentation, actualStringRepresentation) //
+                        expectedStringRepresentation, actualStringRepresentation)
                 .isEqualTo(expectedStringRepresentation);
+
         return myself;
     }
 
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchQueryAssert.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchQueryAssert.java
index 82ff35cb44..cae660a677 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchQueryAssert.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchQueryAssert.java
@@ -16,7 +16,6 @@
 
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.Assertions;
-import org.eclipse.ditto.thingsearch.model.LimitOption;
 import org.eclipse.ditto.thingsearch.model.SearchFilter;
 import org.eclipse.ditto.thingsearch.model.SearchQuery;
 import org.eclipse.ditto.thingsearch.model.SortOption;
@@ -38,72 +37,57 @@ public SearchQueryAssert(final SearchQuery actual) {
     public SearchQueryAssert hasFilter(final SearchFilter expectedFilter) {
         isNotNull();
         final SearchFilter actualFilter = actual.getFilter();
-        Assertions.assertThat(actualFilter) //
+        Assertions.assertThat(actualFilter)
                 .overridingErrorMessage("Expected the SearchQuery to have the search filter \n<%s> but it had \n<%s>",
-                        expectedFilter, actualFilter) //
+                        expectedFilter, actualFilter)
                 .isEqualTo(expectedFilter);
+
         return this;
     }
 
     public SearchQueryAssert hasFilterString(final String expectedFilterString) {
         isNotNull();
         final String actualFilterString = actual.getFilterAsString();
-        Assertions.assertThat(actualFilterString) //
+        Assertions.assertThat(actualFilterString)
                 .overridingErrorMessage(
                         "Expected the search filter string of the SearchQuery to be \n<%s> but it was " + "\n<%s>",
-                        expectedFilterString, actualFilterString) //
+                        expectedFilterString, actualFilterString)
                 .isEqualTo(expectedFilterString);
+
         return this;
     }
 
     public SearchQueryAssert hasNoSortOption() {
         isNotNull();
         final Optional<SortOption> actualSortOption = actual.getSortOption();
-        Assertions.assertThat(actualSortOption) //
+        Assertions.assertThat(actualSortOption)
                 .overridingErrorMessage("Expected the SearchQuery not to have a sort option but it had <%s>",
-                        actualSortOption) //
+                        actualSortOption)
                 .isEmpty();
+
         return this;
     }
 
     public SearchQueryAssert hasSortOption(final SortOption expectedSortOption) {
         isNotNull();
         final Optional<SortOption> actualSortOption = actual.getSortOption();
-        Assertions.assertThat(actualSortOption) //
+        Assertions.assertThat(actualSortOption)
                 .overridingErrorMessage(
                         "Expected the SearchQuery to have sort option \n<Optional[%s]> but it had \n<%s>",
-                        expectedSortOption, actualSortOption) //
+                        expectedSortOption, actualSortOption)
                 .contains(expectedSortOption);
-        return this;
-    }
-
-    public SearchQueryAssert hasNoLimitOption() {
-        isNotNull();
-        final Optional<LimitOption> actualLimitOption = actual.getLimitOption();
-        Assertions.assertThat(actualLimitOption) //
-                .overridingErrorMessage("Expected the SearchQuery not to have a limit option but it had <%s>",
-                        actualLimitOption) //
-                .isEmpty();
-        return this;
-    }
 
-    public SearchQueryAssert hasLimitOption(final LimitOption expectedLimitOption) {
-        isNotNull();
-        final Optional<LimitOption> actualLimitOption = actual.getLimitOption();
-        Assertions.assertThat(actualLimitOption) //
-                .overridingErrorMessage("Expected the SearchQuery to have limit option \n<%s> but it had \n<%s>",
-                        expectedLimitOption, actualLimitOption) //
-                .contains(expectedLimitOption);
         return this;
     }
 
     public SearchQueryAssert hasOptionsString(final String expectedOptionsString) {
         isNotNull();
         final String actualOptionsString = actual.getOptionsAsString();
-        Assertions.assertThat(actualOptionsString) //
+        Assertions.assertThat(actualOptionsString)
                 .overridingErrorMessage("Expected the options string of the SearchQuery to be \n<%s> but it was \n<%s>",
-                        expectedOptionsString, actualOptionsString) //
+                        expectedOptionsString, actualOptionsString)
                 .isEqualTo(expectedOptionsString);
+
         return this;
     }
 
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java
index 4ff1efac3f..3c0f7e9cfd 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java
@@ -37,20 +37,22 @@ public SearchResultAssert(final SearchResult actual) {
     public SearchResultAssert hasNextPageOffset(final long expectedNextPageOffset) {
         isNotNull();
         final Long actualNextPageOffset = actual.getNextPageOffset().orElse(null);
-        Assertions.assertThat(actualNextPageOffset) //
+        Assertions.assertThat(actualNextPageOffset)
                 .overridingErrorMessage("Expected SearchResult to have next page offset \n<%s> but it had \n<%s>",
-                        expectedNextPageOffset, actualNextPageOffset) //
+                        expectedNextPageOffset, actualNextPageOffset)
                 .isEqualTo(expectedNextPageOffset);
+
         return this;
     }
 
     public SearchResultAssert hasNoNextPage() {
         isNotNull();
         final Long actualNextPageOffset = actual.getNextPageOffset().orElse(null);
-        Assertions.assertThat(actualNextPageOffset) //
+        Assertions.assertThat(actualNextPageOffset)
                 .overridingErrorMessage("Expected SearchResult not to have a next page offset but it had <%s>",
-                        actualNextPageOffset) //
+                        actualNextPageOffset)
                 .isEqualTo(SearchResult.NO_NEXT_PAGE);
+
         return this;
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/PersistenceConstants.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/PersistenceConstants.java
index cfc4f0031c..740ad032de 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/PersistenceConstants.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/PersistenceConstants.java
@@ -188,7 +188,6 @@ public final class PersistenceConstants {
      */
     public static final String FIELD_PATH_MODIFIED = FIELD_THING + DOT + FIELD_MODIFIED;
 
-    private PersistenceConstants() {
-    }
+    private PersistenceConstants() {}
 
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
index 1864093950..0964d496cc 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
@@ -132,6 +132,7 @@ private MongoThingsSearchPersistence(
      */
     public MongoThingsSearchPersistence withHintsByNamespace(final String jsonString) {
         final MongoHints theHints = MongoHints.byNamespace(jsonString);
+
         return new MongoThingsSearchPersistence(collection, log, indexInitializer, maxQueryTime, theHints);
     }
 
@@ -216,6 +217,7 @@ public Source<ThingId, NotUsed> findAllUnlimited(final Query query, final List<S
             @Nullable final Set<String> namespaces) {
 
         final Integer limit = query.getLimit() == Integer.MAX_VALUE ? null : query.getLimit();
+
         return findAllInternal(query, authorizationSubjectIds, namespaces, limit, null)
                 .map(MongoThingsSearchPersistence::toThingId)
                 .idleTimeout(maxQueryTime);
@@ -233,6 +235,7 @@ public Source<AbstractWriteModel, NotUsed> recoverLastWriteModel(final ThingId t
         final var publisher = collection.find(Filters.eq(PersistenceConstants.FIELD_ID, thingId.toString())).limit(1);
         final var emptySource =
                 Source.<AbstractWriteModel>single(ThingDeleteModel.of(metadata));
+
         return Source.fromPublisher(publisher)
                 .map(MongoThingsSearchPersistence::documentToWriteModel)
                 .orElse(emptySource);
@@ -290,6 +293,7 @@ public Source<Metadata, NotUsed> sudoStreamMetadata(final EntityId lowerBound) {
         final Publisher<Document> publisher = collection.find(filter)
                 .projection(relevantFieldsProjection)
                 .sort(sortById);
+
         return Source.fromPublisher(publisher).map(MongoThingsSearchPersistence::readAsMetadata);
     }
 
@@ -340,6 +344,7 @@ private static Optional<Instant> getModifiedTimestampOptional(final Document doc
         } catch (final Exception e) {
             // ignore invalid or nonexistent timestamp
         }
+
         return Optional.empty();
     }
 
@@ -380,12 +385,15 @@ private static Metadata readAsMetadata(final Document document) {
                 document.getEmbedded(List.of(PersistenceConstants.FIELD_THING, PersistenceConstants.FIELD_MODIFIED),
                         String.class);
         final Instant modified = Optional.ofNullable(nullableTimestamp).map(Instant::parse).orElse(null);
+
         return Metadata.of(thingId, thingRevision, policyId, policyRevision, modified, null);
     }
 
     private static AbstractWriteModel documentToWriteModel(final Document document) {
         final var bsonDocument = document.toBsonDocument(Document.class, MongoClient.DEFAULT_CODEC_REGISTRY());
         final Metadata actualMetadata = readAsMetadata(document);
+
         return ThingWriteModel.of(actualMetadata, bsonDocument);
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
index a53007da1a..dc6d150cba 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonPredicateVisitor.java
@@ -18,7 +18,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
@@ -118,7 +117,7 @@ public Function<String, Bson> visitGt(@Nullable final Object value) {
 
     @Override
     public Function<String, Bson> visitIn(final List<?> values) {
-        return fieldName -> Filters.in(fieldName, values.stream().map(this::resolveValue).collect(Collectors.toList()));
+        return fieldName -> Filters.in(fieldName, values.stream().map(this::resolveValue).toList());
     }
 
     @Override
@@ -163,9 +162,9 @@ public Function<String, Bson> visitNe(final Object value) {
     }
 
     private Object resolveValue(final Object value) {
-        if (value instanceof ParsedPlaceholder) {
-            final String prefix = ((ParsedPlaceholder) value).getPrefix();
-            final String name = ((ParsedPlaceholder) value).getName();
+        if (value instanceof ParsedPlaceholder parsedPlaceholder) {
+            final String prefix = parsedPlaceholder.getPrefix();
+            final String name = parsedPlaceholder.getName();
             return additionalPlaceholderResolvers.stream()
                     .filter(pr -> prefix.equals(pr.getPrefix()))
                     .filter(pr -> pr.supports(name))
@@ -175,4 +174,5 @@ private Object resolveValue(final Object value) {
         }
         return value;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonVisitor.java
index 2ba21bf4ef..0a436048d9 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/criteria/visitors/CreateBsonVisitor.java
@@ -112,4 +112,5 @@ public Bson visitOr(final List<Bson> disjoints) {
     public Bson visitAnd(final List<Bson> conjuncts) {
         return Filters.and(conjuncts);
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java
index 353fd4837f..f73c3f584c 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java
@@ -165,7 +165,7 @@ private static Object seekToPathImpl(final Document document, final String[] seg
 
     private static JsonValue toJsonValue(final Object object) {
         if (object instanceof Document document) {
-            return JsonFactory.readFrom((document).toJson());
+            return JsonFactory.readFrom(document.toJson());
         } else if (object instanceof BsonValue bsonValue) {
             return DittoBsonJson.getInstance().serialize(bsonValue);
         } else {
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/ThingsSearchUpdaterPersistence.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/ThingsSearchUpdaterPersistence.java
index 9ecb75142a..62724312e1 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/ThingsSearchUpdaterPersistence.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/ThingsSearchUpdaterPersistence.java
@@ -43,4 +43,5 @@ public interface ThingsSearchUpdaterPersistence extends NamespacePersistenceOper
      * @return a Source holding the publisher to execute the operation.
      */
     Source<ThingId, NotUsed> getOutdatedThingIds(PolicyTag policyTag);
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/impl/MongoThingsSearchUpdaterPersistence.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/impl/MongoThingsSearchUpdaterPersistence.java
index 7898c9c0c4..61c0144319 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/impl/MongoThingsSearchUpdaterPersistence.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/impl/MongoThingsSearchUpdaterPersistence.java
@@ -85,6 +85,7 @@ public Source<PolicyReferenceTag, NotUsed> getPolicyReferenceTags(final Map<Poli
                 collection.find(filter).projection(new Document()
                         .append(PersistenceConstants.FIELD_ID, new BsonInt32(1))
                         .append(PersistenceConstants.FIELD_POLICY_ID, new BsonInt32(1)));
+
         return Source.fromPublisher(publisher)
                 .mapConcat(doc -> {
                     final ThingId thingId = ThingId.of(doc.getString(PersistenceConstants.FIELD_ID));
@@ -107,6 +108,7 @@ public Source<ThingId, NotUsed> getOutdatedThingIds(final PolicyTag policyTag) {
                 PersistenceConstants.FIELD_POLICY_REVISION, policyTag.getRevision()));
         final Publisher<Document> publisher =
                 collection.find(filter).projection(new BsonDocument(PersistenceConstants.FIELD_ID, new BsonInt32(1)));
+
         return Source.fromPublisher(publisher)
                 .map(doc -> doc.getString(PersistenceConstants.FIELD_ID))
                 .map(ThingId::of);
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java
index 9e508dd460..8fe25d0632 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java
@@ -76,6 +76,7 @@ static BsonDiff diffFeaturesArray(final BsonArray minuend, final BsonArray subtr
                 // use 0 as default value to re-use root grant/revoke
                 (doc, j) -> kMap.getOrDefault(doc.get(FIELD_FEATURE_ID), 0);
         final BsonValue difference = diff(internalArrayKey, minuend, subtrahend, maxWireVersion, kMapGet);
+
         return new BsonDiff(
                 replacementSize,
                 bsonSizeVisitor.eval(difference),
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java
index 930d0a2628..01f333c225 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java
@@ -165,4 +165,5 @@ private BsonArray consumeAndExportUnset() {
     private static String getPathString(final Iterable<JsonKey> jsonPointer) {
         return StreamSupport.stream(jsonPointer.spliterator(), false).collect(Collectors.joining("."));
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitor.java
index 91b1bafe4f..58dcbe59fe 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitor.java
@@ -129,6 +129,7 @@ public Function<BsonValue, BsonDiff> object(final JsonPointer key, final BsonDoc
                     .collect(Collectors.toList());
             unset = Stream.concat(unset, deletedKeys.stream());
             diffSize += deletedKeys.stream().mapToInt(JsonPointer::length).sum();
+
             return new BsonDiff(replacementSize, diffSize, set, unset);
         };
     }
@@ -136,4 +137,5 @@ public Function<BsonValue, BsonDiff> object(final JsonPointer key, final BsonDoc
     private static BsonValue literal(final BsonValue value) {
         return value.isDocument() ? new BsonDocument().append(LITERAL, value) : value;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonPrimitiveValueVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonPrimitiveValueVisitor.java
index b5a0786b34..8ff76a29bf 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonPrimitiveValueVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonPrimitiveValueVisitor.java
@@ -119,4 +119,5 @@ default T evalPrimitive(final BsonValue value) {
                 throw new IllegalArgumentException("Unsupported primitive BsonValue " + value);
         }
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonSizeVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonSizeVisitor.java
index fe0aa90f53..7aeb802f34 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonSizeVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonSizeVisitor.java
@@ -156,4 +156,5 @@ public Integer timestamp(final BsonTimestamp value) {
     public Integer undefined() {
         return WORD;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonValueVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonValueVisitor.java
index 0a0f55f293..e6afeccc29 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonValueVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonValueVisitor.java
@@ -33,13 +33,11 @@ default T eval(final BsonValue value) {
     }
 
     default T eval(final JsonPointer key, final BsonValue value) {
-        switch (value.getBsonType()) {
-            case DOCUMENT:
-                return object(key, value.asDocument());
-            case ARRAY:
-                return array(key, value.asArray());
-            default:
-                return primitive(key, value);
-        }
+        return switch (value.getBsonType()) {
+            case DOCUMENT -> object(key, value.asDocument());
+            case ARRAY -> array(key, value.asArray());
+            default -> primitive(key, value);
+        };
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EnforcedThingMapper.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EnforcedThingMapper.java
index e6536ea9cb..06fe6c6887 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EnforcedThingMapper.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EnforcedThingMapper.java
@@ -150,6 +150,7 @@ private static BsonArray getFeatureArray(final JsonObject thing, final Evaluated
         for (final var field : features) {
             array.add(getFeatureArrayElement(field, evaluatedPolicy));
         }
+
         return array;
     }
 
@@ -169,6 +170,8 @@ private static BsonDocument getFeatureArrayElement(final JsonField featureField,
         }
 
         doc.put(FIELD_POLICY, evaluatedPolicy.forFeature(featureId));
+
         return doc;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EvaluatedPolicy.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EvaluatedPolicy.java
index 7c9ec99c6f..a6bbf48403 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EvaluatedPolicy.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/EvaluatedPolicy.java
@@ -71,12 +71,14 @@ static EvaluatedPolicy of(final Policy policy, final JsonObject thing) {
                 }
             });
         }
+
         return new EvaluatedPolicy(thingPermissions, featurePermissions);
     }
 
     BsonDocument forThing() {
         final var doc = new BsonDocument();
         thingPermissions.forEach((path, permissions) -> addPermissions(doc, path, permissions));
+
         return doc;
     }
 
@@ -92,6 +94,7 @@ BsonDocument forFeature(final String featureId) {
             featurePermissions.get(featureId)
                     .forEach((path, permissions) -> addPermissions(doc, path, permissions));
         }
+
         return doc;
     }
 
@@ -104,6 +107,7 @@ BsonArray getGlobalRead() {
         for (final var subject : globalReadSubjects) {
             array.add(new BsonString(subject));
         }
+
         return array;
     }
 
@@ -151,6 +155,7 @@ private static String toBsonKey(final JsonKey key) {
     private static BsonArray toSubjectsBson(final Set<String> subjects) {
         final var array = new BsonArray();
         subjects.forEach(subject -> array.add(new BsonString(subject)));
+
         return array;
     }
 
@@ -173,6 +178,7 @@ private static Map<JsonPointer, Boolean> getPaths(final Resources resources) {
                         map.put(resource.getPath(), true);
                     }
                 });
+
         return map;
     }
 
@@ -216,6 +222,8 @@ private static void addPathToFeaturePermissions(
 
     private static BsonDocument merge(final BsonDocument b1, final BsonDocument b2) {
         b1.forEach(b2::append);
+
         return b1;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/IndexLengthRestrictionEnforcerVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/IndexLengthRestrictionEnforcerVisitor.java
index 110e868c60..1df5fc2d2d 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/IndexLengthRestrictionEnforcerVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/IndexLengthRestrictionEnforcerVisitor.java
@@ -39,6 +39,7 @@ private IndexLengthRestrictionEnforcerVisitor(final String thingId, final int ma
 
     static JsonObject enforce(final JsonObject thingJson, final int maxArraySize) {
         final String thingId = thingJson.getValueOrThrow(Thing.JsonFields.ID);
+
         return new IndexLengthRestrictionEnforcerVisitor(thingId, maxArraySize).eval(thingJson)
                 .map(JsonValue::asObject)
                 .orElseThrow();
@@ -79,4 +80,5 @@ public Optional<JsonValue> object(final JsonPointer key, final Stream<JsonField>
     private Optional<JsonValue> singleton(final JsonPointer key, final JsonValue jsonValue) {
         return indexLengthRestrictionEnforcer.enforce(key, jsonValue);
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonInternalVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonInternalVisitor.java
index 94d3f93745..4403ea6292 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonInternalVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonInternalVisitor.java
@@ -24,7 +24,6 @@
  */
 interface JsonInternalVisitor<T> {
 
-
     T nullValue();
 
     T bool(boolean value);
@@ -55,6 +54,8 @@ default T eval(final JsonValue value) {
         } else {
             throw new UnsupportedOperationException("Unsupported JSON value: " + value);
         }
+
         return result;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonObjectVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonObjectVisitor.java
index 52a16d7722..20be9bb495 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonObjectVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonObjectVisitor.java
@@ -61,6 +61,8 @@ default Optional<T> value(final JsonPointer key, final JsonValue value) {
         } else {
             throw new UnsupportedOperationException("Unsupported JSON value: " + value);
         }
+
         return result;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonToBson.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonToBson.java
index 47972480dc..4716c47a64 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonToBson.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/JsonToBson.java
@@ -71,6 +71,7 @@ public BsonValue number(final JsonNumber value) {
     public BsonValue array(final Stream<BsonValue> values) {
         final BsonArray bsonArray = new BsonArray();
         values.forEach(bsonArray::add);
+
         return bsonArray;
     }
 
@@ -78,6 +79,8 @@ public BsonValue array(final Stream<BsonValue> values) {
     public BsonValue object(final Stream<Map.Entry<String, BsonValue>> values) {
         final BsonDocument bsonDocument = new BsonDocument();
         values.forEach(entry -> bsonDocument.append(KeyEscapeUtil.escape(entry.getKey()), entry.getValue()));
+
         return bsonDocument;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
index b23a42de0d..42020c78da 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
@@ -109,7 +109,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "[" +
-                "metadata=" + metadata;
+        return getClass().getSimpleName() + " [" +
+                "metadata=" + metadata + " ]";
     }
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingDeleteModel.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingDeleteModel.java
index 6feac3eabc..aafd49dbed 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingDeleteModel.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingDeleteModel.java
@@ -43,6 +43,7 @@ public static ThingDeleteModel of(final Metadata metadata) {
     @Override
     public WriteModel<BsonDocument> toMongo() {
         final Bson filter = getFilter();
+
         return new DeleteOneModel<>(filter);
     }
 
@@ -55,4 +56,5 @@ public ThingDeleteModel setMetadata(final Metadata metadata) {
     public String toString() {
         return super.toString() + "]";
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java
index d2db2ddcb3..d0952ee447 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java
@@ -110,6 +110,7 @@ public static ThingWriteModel ofEmptiedOut(final Metadata metadata) {
                 .append(FIELD_THING, new BsonDocument())
                 .append(FIELD_POLICY, new BsonDocument())
                 .append(FIELD_F_ARRAY, new BsonArray());
+
         return new ThingWriteModel(metadata, emptiedOutThingDocument, false, 0L);
     }
 
@@ -179,6 +180,7 @@ public boolean equals(@Nullable final Object o) {
             return false;
         }
         final ThingWriteModel that = (ThingWriteModel) o;
+
         return thingDocument.equals(that.thingDocument) &&
                 isPatchUpdate == that.isPatchUpdate &&
                 previousRevision == that.previousRevision;
@@ -235,6 +237,7 @@ private Optional<MongoWriteModel> computeDiff(final ThingWriteModel lastWriteMod
             FULL_UPDATE_COUNT.increment();
             isPatchUpdate = false;
         }
+
         return Optional.of(MongoWriteModel.of(this, mongoWriteModel, isPatchUpdate));
     }
 
@@ -264,4 +267,5 @@ private static boolean isNextWriteModelOutDated(final AbstractWriteModel lastWri
 
         return isStrictlyOlder || hasSameRevisions;
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/WriteResultAndErrors.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/WriteResultAndErrors.java
index e72497251f..969d3f17d2 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/WriteResultAndErrors.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/WriteResultAndErrors.java
@@ -185,4 +185,5 @@ public String toString() {
                 ",bulkWriteCorrelationId=" + bulkWriteCorrelationId +
                 "]";
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
index 66c506c195..d71021114f 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
@@ -208,8 +208,8 @@ private Source<Metadata, NotUsed> retrievePolicyRevisionAndEmitMismatch(final Po
                                 return Source.single(error)
                                         .log("ErrorRetrievingPolicyRevision " + policyId)
                                         .map(e -> indexed.invalidateCaches(true, true));
-                            } else if (response instanceof SudoRetrievePolicyRevisionResponse) {
-                                final long revision = ((SudoRetrievePolicyRevisionResponse) response).getRevision();
+                            } else if (response instanceof SudoRetrievePolicyRevisionResponse sudoRetrievePolicyRevisionResponse) {
+                                final long revision = sudoRetrievePolicyRevisionResponse.getRevision();
                                 return indexed.getPolicyRevision()
                                         .filter(indexedPolicyRevision -> indexedPolicyRevision.equals(revision))
                                         .map(indexedPolicyRevision -> Source.<Metadata>empty())
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/ConsistencyLag.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/ConsistencyLag.java
index 35037f15dd..45e877c8b1 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/ConsistencyLag.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/ConsistencyLag.java
@@ -14,8 +14,8 @@
 
 import java.util.Optional;
 
-import org.eclipse.ditto.thingsearch.service.persistence.write.model.Metadata;
 import org.eclipse.ditto.internal.utils.metrics.instruments.timer.StartedTimer;
+import org.eclipse.ditto.thingsearch.service.persistence.write.model.Metadata;
 
 /**
  * Timer segment names of the search updater consistency lag timer and helper methods to stop and start the segments.
@@ -139,4 +139,5 @@ private static void stopSegmentIfPresent(final StartedTimer timer, final String
             }
         });
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/SudoSignalEnrichmentFacade.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/SudoSignalEnrichmentFacade.java
index aeed851a16..7bebeaabf9 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/SudoSignalEnrichmentFacade.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/SudoSignalEnrichmentFacade.java
@@ -73,9 +73,8 @@ public CompletionStage<JsonObject> retrievePartialThing(final ThingId thingId,
     }
 
     private static CompletionStage<JsonObject> extractThing(final Object object) {
-        if (object instanceof SudoRetrieveThingResponse) {
-            final SudoRetrieveThingResponse response = (SudoRetrieveThingResponse) object;
-            return CompletableFuture.completedFuture(response.getEntity(JsonSchemaVersion.LATEST));
+        if (object instanceof SudoRetrieveThingResponse sudoRetrieveThingResponse) {
+            return CompletableFuture.completedFuture(sudoRetrieveThingResponse.getEntity(JsonSchemaVersion.LATEST));
         } else if (object instanceof ThingNotAccessibleException) {
             return CompletableFuture.completedFuture(JsonObject.empty());
         } else {
@@ -86,8 +85,8 @@ private static CompletionStage<JsonObject> extractThing(final Object object) {
     }
 
     private static Throwable toThrowable(final Object object) {
-        if (object instanceof Throwable) {
-            return (Throwable) object;
+        if (object instanceof Throwable throwable) {
+            return throwable;
         } else {
             return new IllegalStateException("Unexpected message: " + object);
         }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java
index f9f341899b..47aaa31cc2 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java
@@ -55,7 +55,6 @@
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.thingsearch.api.commands.sudo.StreamThings;
 import org.eclipse.ditto.thingsearch.model.CursorOption;
-import org.eclipse.ditto.thingsearch.model.LimitOption;
 import org.eclipse.ditto.thingsearch.model.Option;
 import org.eclipse.ditto.thingsearch.model.SearchResult;
 import org.eclipse.ditto.thingsearch.model.SearchResultBuilder;
@@ -104,8 +103,6 @@ final class ThingsSearchCursor {
     static final SortOptionEntry DEFAULT_SORT_OPTION_ENTRY =
             SortOptionEntry.asc(Thing.JsonFields.ID.getPointer());
 
-    private static final String LIMIT_OPTION_FORBIDDEN = "The options 'cursor' and 'limit' must not be used together.";
-
     private static final Base64.Encoder BASE64_URL_ENCODER_WITHOUT_PADDING = Base64.getUrlEncoder().withoutPadding();
     private static final PartialFunction<Throwable, Throwable> DECODE_ERROR_MAPPER = createDecodeErrorMapper();
 
@@ -197,8 +194,6 @@ private Optional<DittoRuntimeException> checkCursorValidity(final QueryThings qu
 
         if (commandHasDifferentFilter) {
             description = "The parameter 'filter' must not differ from the original query of the cursor.";
-        } else if (commandOptions.stream().anyMatch(LimitOption.class::isInstance)) {
-            description = LIMIT_OPTION_FORBIDDEN;
         } else if (hasIncompatibleSortOption(commandOptions)) {
             description = "The option 'sort' must not differ from the original query of the cursor.";
         } else {
@@ -209,20 +204,26 @@ private Optional<DittoRuntimeException> checkCursorValidity(final QueryThings qu
     }
 
     /**
-     * Check if options from a {@code QueryThings} command contains an incompatible sort option.
-     * A sort option is compatible with the sort option of this cursor if
-     * <ul>
-     * <li>both are identical,</li>
-     * <li>cursor option is obtained from command option by appending the default option, or</li>
-     * <li>cursor option is obtained from command option by truncating after +thingId or -thingId.</li>
-     * </ul>
+     * Augment a search result by the next cursor as needed.
      *
-     * @param commandOptions options from a command.
-     * @return whether the options contains an incompatible sort option.
+     * @param queryThings the command that produced the results.
+     * @param cursor cursor given by the command, if any.
+     * @param searchResult the search result.
+     * @param resultList items in the search result.
+     * @return search result with cursor or next-page-offset or both as appropriate.
      */
-    private boolean hasIncompatibleSortOption(final List<Option> commandOptions) {
-        return findAll(SortOption.class, commandOptions).stream()
-                .anyMatch(sortOption -> !areCompatible(this.sortOption.getEntries(), sortOption.getEntries(), 0));
+    static SearchResult processSearchResult(final QueryThings queryThings,
+            @Nullable final ThingsSearchCursor cursor,
+            final SearchResult searchResult,
+            final ResultList<?> resultList) {
+
+        if (cursor != null) {
+            // adjust next cursor by search result, do not deliver nextPageOffset
+            return cursor.searchResultWithExistingCursor(searchResult, resultList);
+        } else {
+            // compute new cursor, deliver both
+            return searchResultWithNewCursor(queryThings, searchResult, resultList);
+        }
     }
 
     /**
@@ -248,20 +249,18 @@ private SearchResult searchResultWithExistingCursor(final SearchResult searchRes
     }
 
     /**
-     * @return Compute a {@code QueryThings} using content of this cursor.
+     * Locate instances of a class within a collection.
+     *
+     * @param clazz the class.
+     * @param collection the collection.
+     * @param <T> type of the class.
+     * @return list of all instances of the class in the collection.
      */
-    private QueryThings adjustQueryThings(final QueryThings queryThings) {
-        final List<String> adjustedOptions =
-                Stream.concat(
-                        Stream.of(RqlOptionParser.unparse(Collections.singletonList(sortOption))),
-                        queryThings.getOptions()
-                                .stream()
-                                .flatMap(Collection::stream)
-                                .filter(option -> !option.startsWith("sort")))
-                        .collect(Collectors.toList());
-        // leave correlation ID alone
-        final DittoHeaders headers = queryThings.getDittoHeaders();
-        return QueryThings.of(filter, adjustedOptions, queryThings.getFields().orElse(null), namespaces, headers);
+    private static <T> List<T> findAll(final Class<T> clazz, final Collection<?> collection) {
+        return collection.stream()
+                .filter(clazz::isInstance)
+                .map(clazz::cast)
+                .toList();
     }
 
     /**
@@ -382,7 +381,6 @@ static Source<Optional<ThingsSearchCursor>, NotUsed> extractCursor(final QueryTh
         return catchExceptions(queryThings.getDittoHeaders(), () -> {
             final List<Option> options = getOptions(queryThings);
             final List<CursorOption> cursorOptions = findAll(CursorOption.class, options);
-            final List<LimitOption> limitOptions = findAll(LimitOption.class, options);
             final Optional<InvalidOptionException> sizeOptionError = checkSizeOption(options, queryThings);
             if (sizeOptionError.isPresent()) {
                 return Source.failed(sizeOptionError.get());
@@ -391,8 +389,6 @@ static Source<Optional<ThingsSearchCursor>, NotUsed> extractCursor(final QueryTh
             } else if (cursorOptions.size() > 1) {
                 // there may not be 2 or more cursor options in 1 command.
                 return Source.failed(invalidCursor("There may not be more than 1 'cursor' option.", queryThings));
-            } else if (!limitOptions.isEmpty()) {
-                return Source.failed(invalidCursor(LIMIT_OPTION_FORBIDDEN, queryThings));
             } else {
                 return decode(cursorOptions.get(0).getCursor(), system)
                         .flatMapConcat(cursor -> cursor.checkCursorValidity(queryThings, options)
@@ -441,44 +437,59 @@ private static <T> Source<T, NotUsed> catchExceptions(final DittoHeaders dittoHe
     }
 
     /**
-     * Augment a search result by the next cursor as needed.
+     * Augment a fresh search result (i.e., not obtained via any cursor) by a new cursor if appropriate.
      *
-     * @param queryThings the command that produced the results.
-     * @param cursor cursor given by the command, if any.
+     * @param queryThings the command that produced the search result.
      * @param searchResult the search result.
      * @param resultList items in the search result.
-     * @return search result with cursor or next-page-offset or both as appropriate.
+     * @return the augmented search result.
      */
-    static SearchResult processSearchResult(final QueryThings queryThings,
-            @Nullable final ThingsSearchCursor cursor,
-            final SearchResult searchResult,
-            final ResultList<?> resultList) {
+    private static SearchResult searchResultWithNewCursor(final QueryThings queryThings,
+            final SearchResult searchResult, final ResultList<?> resultList) {
 
-        if (!findAll(LimitOption.class, getOptions(queryThings)).isEmpty()) {
-            // do not deliver cursor if "limit" is specified
-            return searchResult;
-        } else if (cursor != null) {
-            // adjust next cursor by search result, do not deliver nextPageOffset
-            return cursor.searchResultWithExistingCursor(searchResult, resultList);
+        final List<Option> commandOptions = getOptions(queryThings);
+        final boolean hasSizeOption = !findAll(SizeOption.class, commandOptions).isEmpty();
+
+        if (hasNextPage(resultList)) {
+            // there are more results; append cursor and offset as appropriate
+            final SearchResultBuilder builder = searchResult.toBuilder();
+
+
+            // limit option is absent. Compute cursor.
+            final ThingsSearchCursor newCursor = computeNewCursor(queryThings, resultList);
+            builder.cursor(newCursor.encode());
+
+            // size option is present. Remove next-page-offset.
+            if (hasSizeOption) {
+                // using size option; do not deliver nextPageOffset
+                builder.nextPageOffset(null);
+            }
+
+            return builder.build();
+        } else if (hasSizeOption) {
+            // This is the last page. Size option is present. Remove next-page-offset.
+            return searchResult.toBuilder().nextPageOffset(null).build();
         } else {
-            // compute new cursor, deliver both
-            return searchResultWithNewCursor(queryThings, searchResult, resultList);
+            // This is the last page. Size option is absent. Retain next-page-offset.
+            return searchResult;
         }
     }
 
     /**
-     * Locate instances of a class within a collection.
+     * Check if options from a {@code QueryThings} command contains an incompatible sort option.
+     * A sort option is compatible with the sort option of this cursor if
+     * <ul>
+     * <li>both are identical,</li>
+     * <li>cursor option is obtained from command option by appending the default option, or</li>
+     * <li>cursor option is obtained from command option by truncating after +thingId or -thingId.</li>
+     * </ul>
      *
-     * @param clazz the class.
-     * @param collection the collection.
-     * @param <T> type of the class.
-     * @return list of all instances of the class in the collection.
+     * @param commandOptions options from a command.
+     * @return whether the options contain an incompatible sort option.
      */
-    private static <T> List<T> findAll(final Class<T> clazz, final Collection<?> collection) {
-        return collection.stream()
-                .filter(clazz::isInstance)
-                .map(clazz::cast)
-                .collect(Collectors.toList());
+    private boolean hasIncompatibleSortOption(final List<Option> commandOptions) {
+        return findAll(SortOption.class, commandOptions).stream()
+                .anyMatch(sortOption -> !areCompatible(this.sortOption.getEntries(), sortOption.getEntries(), 0));
     }
 
     /**
@@ -577,46 +588,20 @@ private static List<Option> getOptions(final QueryThings queryThings) {
     }
 
     /**
-     * Augment a fresh search result (i. e., not obtained via any cursor) by a new cursor if appropriate.
-     *
-     * @param queryThings the command that produced the search result.
-     * @param searchResult the search result.
-     * @param resultList items in the search result.
-     * @return the augmented search result.
+     * @return Compute a {@code QueryThings} using content of this cursor.
      */
-    private static SearchResult searchResultWithNewCursor(final QueryThings queryThings,
-            final SearchResult searchResult, final ResultList<?> resultList) {
-
-        final List<Option> commandOptions = getOptions(queryThings);
-        final boolean hasLimitOption = !findAll(LimitOption.class, commandOptions).isEmpty();
-        final boolean hasSizeOption = !findAll(SizeOption.class, commandOptions).isEmpty();
-
-        if (hasNextPage(resultList)) {
-            // there are more results; append cursor and offset as appropriate
-            final SearchResultBuilder builder = searchResult.toBuilder();
-
-            if (hasLimitOption) {
-                // limit option is present. Do not compute cursor.
-                builder.cursor(null);
-            } else {
-                // limit option is absent. Compute cursor.
-                final ThingsSearchCursor newCursor = computeNewCursor(queryThings, resultList);
-                builder.cursor(newCursor.encode());
-
-                // size option is present. Remove next-page-offset.
-                if (hasSizeOption) {
-                    // using size option; do not deliver nextPageOffset
-                    builder.nextPageOffset(null);
-                }
-            }
-            return builder.build();
-        } else if (hasSizeOption) {
-            // This is the last page. Size option is present. Remove next-page-offset.
-            return searchResult.toBuilder().nextPageOffset(null).build();
-        } else {
-            // This is the last page. Size option is absent. Retain next-page-offset.
-            return searchResult;
-        }
+    private QueryThings adjustQueryThings(final QueryThings queryThings) {
+        final List<String> adjustedOptions =
+                Stream.concat(
+                                Stream.of(RqlOptionParser.unparse(Collections.singletonList(sortOption))),
+                                queryThings.getOptions()
+                                        .stream()
+                                        .flatMap(Collection::stream)
+                                        .filter(option -> !option.startsWith("sort")))
+                        .toList();
+        // leave correlation ID alone
+        final DittoHeaders headers = queryThings.getDittoHeaders();
+        return QueryThings.of(filter, adjustedOptions, queryThings.getFields().orElse(null), namespaces, headers);
     }
 
     /**

From eb5a1a82bfc74521b38bff3b4f32fbf6ccb9d435 Mon Sep 17 00:00:00 2001
From: Stefan <stefan.maute@bosch.io>
Date: Fri, 12 Aug 2022 12:26:45 +0200
Subject: [PATCH 2/4] fix RqlOptionsParserTest;

Signed-off-by: Stefan <stefan.maute@bosch.io>
---
 .../thingsearch/options/rql/RqlOptionsParserTest.java  |  6 +++---
 .../service/persistence/query/QueryParser.java         |  1 +
 .../validation/DefaultQueryCriteriaValidator.java      |  1 +
 .../service/persistence/read/MongoHints.java           |  6 ++++--
 .../persistence/read/MongoThingsSearchPersistence.java |  1 +
 .../expression/visitors/AbstractFieldBsonCreator.java  |  2 ++
 .../read/expression/visitors/GetFilterBsonVisitor.java |  2 ++
 .../read/expression/visitors/GetSortBsonVisitor.java   |  2 ++
 .../persistence/write/mapping/BsonArrayDiff.java       |  4 ++++
 .../service/persistence/write/mapping/BsonDiff.java    | 10 ++++++++--
 .../persistence/write/model/AbstractWriteModel.java    |  1 +
 .../service/persistence/write/model/Metadata.java      |  2 ++
 .../write/streaming/BackgroundSyncStream.java          |  4 +++-
 .../persistence/write/streaming/EnforcementFlow.java   |  3 +++
 .../write/streaming/MongoSearchUpdaterFlow.java        |  1 +
 15 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java b/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java
index b8d021cb06..0a644bb21c 100755
--- a/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java
+++ b/rql/search-option-parser/src/test/java/org/eclipse/ditto/rql/parser/thingsearch/options/rql/RqlOptionsParserTest.java
@@ -111,7 +111,7 @@ public void invalidSortMissingOrderAtSecondProperty() throws ParserException {
     @Test
     public void parseOptionCombinations() throws ParserException {
         final List<Option> options = parser.parse("sort(-attributes/username),cursor(ABC),size(463)");
-        assertThat(options.size()).isEqualTo(4);
+        assertThat(options.size()).isEqualTo(3);
 
         final SortOption sortOption = (SortOption) options.get(0);
         assertThat(sortOption.getEntries().stream()
@@ -126,10 +126,10 @@ public void parseOptionCombinations() throws ParserException {
                 .anyMatch(SortOptionEntry.SortOrder.DESC::equals)
         ).isTrue();
 
-        final CursorOption cursorOption = (CursorOption) options.get(2);
+        final CursorOption cursorOption = (CursorOption) options.get(1);
         assertThat(cursorOption.getCursor()).isEqualTo("ABC");
 
-        final SizeOption sizeOption = (SizeOption) options.get(3);
+        final SizeOption sizeOption = (SizeOption) options.get(2);
         assertThat(sizeOption.getSize()).isEqualTo(463);
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/QueryParser.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/QueryParser.java
index 71f9bd8e33..2359169104 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/QueryParser.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/QueryParser.java
@@ -145,4 +145,5 @@ private void setOptions(final String options, final QueryBuilder queryBuilder, f
                     .build();
         }
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/validation/DefaultQueryCriteriaValidator.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/validation/DefaultQueryCriteriaValidator.java
index 603aadcdd6..fdcd9cfe1c 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/validation/DefaultQueryCriteriaValidator.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/query/validation/DefaultQueryCriteriaValidator.java
@@ -42,4 +42,5 @@ public DefaultQueryCriteriaValidator(final ActorSystem actorSystem, final Config
     public CompletionStage<Query> validateQuery(final Command<?> command, final Query query) {
         return CompletableFuture.completedStage(query);
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoHints.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoHints.java
index fac501c66f..9d9b0441ec 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoHints.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoHints.java
@@ -21,12 +21,12 @@
 import javax.annotation.Nullable;
 
 import org.bson.conversions.Bson;
+import org.eclipse.ditto.internal.utils.persistence.mongo.DittoBsonJson;
+import org.eclipse.ditto.internal.utils.persistence.mongo.indices.Index;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.thingsearch.service.persistence.Indices;
-import org.eclipse.ditto.internal.utils.persistence.mongo.DittoBsonJson;
-import org.eclipse.ditto.internal.utils.persistence.mongo.indices.Index;
 
 /**
  * Package-private interface of configured hints for MongoDB.
@@ -102,5 +102,7 @@ private static Bson fieldToBson(final JsonField field) {
         private static Optional<Index> getIndexByName(final String name) {
             return Indices.all().stream().filter(index -> Objects.equals(name, index.getName())).findAny();
         }
+
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
index 0964d496cc..c3d9167d09 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
@@ -162,6 +162,7 @@ public Source<SearchNamespaceReportResult, NotUsed> generateNamespaceCountReport
                             ? document.get(PersistenceConstants.FIELD_ID).toString()
                             : "NOT_MIGRATED";
                     final long count = Long.parseLong(document.get(PersistenceConstants.FIELD_COUNT).toString());
+
                     return new SearchNamespaceResultEntry(namespace, count);
                 })
                 .fold(new ArrayList<SearchNamespaceResultEntry>(), (list, entry) -> {
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/AbstractFieldBsonCreator.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/AbstractFieldBsonCreator.java
index 2024e8791c..03844ddae7 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/AbstractFieldBsonCreator.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/AbstractFieldBsonCreator.java
@@ -110,6 +110,7 @@ private Bson getAuthFilter(final Iterable<String> authSubjectIds, final JsonPoin
         final Bson or = child != null
                 ? Filters.or(Filters.in(grant, authSubjectIds), child)
                 : Filters.or(Filters.in(grant, authSubjectIds));
+
         return Filters.and(Filters.nin(revoke, authSubjectIds), or);
     }
 
@@ -123,6 +124,7 @@ private Stream<JsonPointer> collectPaths(final JsonPointer pointer) {
         if (pointer.isEmpty()) {
             return Stream.empty();
         }
+
         return Stream.concat(collectPaths(pointer.cutLeaf()), Stream.of(pointer));
     }
 
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 b53998b0c0..e724886079 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
@@ -125,6 +125,7 @@ Bson visitRootLevelField(final String fieldName) {
     private Bson matchValue(final CharSequence key) {
         final JsonPointer pointer = JsonPointer.of(key);
         final Bson keyValueFilter = predicateFunction.apply(toDottedPath(FIELD_THING, pointer));
+
         return getAuthorizationBson(pointer)
                 .map(authBson -> Filters.and(keyValueFilter, authBson))
                 .orElse(keyValueFilter);
@@ -133,6 +134,7 @@ private Bson matchValue(final CharSequence key) {
     private Bson matchWildcardFeatureValue(final CharSequence key) {
         final JsonPointer pointer = JsonPointer.of(key);
         final Bson keyValueFilter = predicateFunction.apply(toDottedPath(pointer));
+
         return getFeatureWildcardAuthorizationBson(pointer)
                 .map(authBson -> Filters.elemMatch(FIELD_F_ARRAY, Filters.and(keyValueFilter, authBson)))
                 .orElse(keyValueFilter);
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java
index f73c3f584c..fa0582724e 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/expression/visitors/GetSortBsonVisitor.java
@@ -65,6 +65,7 @@ public static Document projections(final List<SortOption> sortOptions) {
                 .map(SortOption::getSortExpression)
                 .map(GetSortBsonVisitor::path)
                 .forEach(path -> document.append(path, true));
+
         return document;
     }
 
@@ -82,6 +83,7 @@ public static JsonArray sortValuesAsArray(final Document document, final List<So
                 .map(GetSortBsonVisitor::path)
                 .map(seekToPath(document))
                 .forEach(value -> builder.add(toJsonValue(value)));
+
         return builder.build();
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java
index 8fe25d0632..0ac1a17c6f 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonArrayDiff.java
@@ -107,6 +107,7 @@ private static BsonValue diff(final JsonPointer key,
             for (final var element : elements) {
                 result.add(element.toBsonValue());
             }
+
             return result;
         }
     }
@@ -129,6 +130,7 @@ private static List<Element> diffAsElementList(final JsonPointer key,
                 result.add(new Replace(element));
             }
         }
+
         return result;
     }
 
@@ -136,6 +138,7 @@ private static BsonDocument getSubtrahendElement(final BsonValue subtrahendExpr,
         final BsonArray args = new BsonArray();
         args.add(subtrahendExpr);
         args.add(new BsonInt32(i));
+
         return new BsonDocument().append(ARRAY_ELEM_AT, args);
     }
 
@@ -169,6 +172,7 @@ private static List<ElementGroup> aggregateElement(final List<ElementGroup> aggr
             // Add element as a new group.
             aggregated.add(element.toSingletonGroup());
         }
+
         return aggregated;
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java
index 01f333c225..4b374e5929 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiff.java
@@ -98,13 +98,16 @@ public static BsonDiff minusThingDocs(final BsonDocument minuend, final BsonDocu
         // compute the internal array diff especially to find similar elements by internal key
         final var minuendFeatures = minuend.getArray(FIELD_F_ARRAY);
         final var subtrahendFeatures = subtrahend.getArray(FIELD_F_ARRAY);
-        final var diffFeatures = BsonArrayDiff.diffFeaturesArray(minuendFeatures, subtrahendFeatures, maxWireVersion);
+        final var diffFeatures =
+                BsonArrayDiff.diffFeaturesArray(minuendFeatures, subtrahendFeatures, maxWireVersion);
         // compute the rest of the diff without the internal array
         final var minuendWithoutInternal = minuend.clone();
         final var subtrahendWithoutInternal = subtrahend.clone();
         minuendWithoutInternal.remove(FIELD_F_ARRAY);
         subtrahendWithoutInternal.remove(FIELD_F_ARRAY);
-        final var diffWithoutInternal = minus(minuendWithoutInternal, subtrahendWithoutInternal, true, maxWireVersion);
+        final var diffWithoutInternal =
+                minus(minuendWithoutInternal, subtrahendWithoutInternal, true, maxWireVersion);
+
         return diffWithoutInternal.concat(diffFeatures);
     }
 
@@ -138,6 +141,7 @@ public List<BsonDocument> consumeAndExport() {
         if (!unsetArray.isEmpty()) {
             result.add(new BsonDocument().append(UNSET, unsetArray));
         }
+
         return result;
     }
 
@@ -153,12 +157,14 @@ public boolean isDiffSmaller() {
     private BsonDocument consumeAndExportSet() {
         final BsonDocument setDocument = new BsonDocument();
         setPointers.forEach(pair -> setDocument.append(getPathString(pair.first()), pair.second()));
+
         return setDocument;
     }
 
     private BsonArray consumeAndExportUnset() {
         final var unsetArray = new BsonArray();
         unsetPointers.forEach(path -> unsetArray.add(new BsonString(getPathString(path))));
+
         return unsetArray;
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
index 42020c78da..4595105554 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/AbstractWriteModel.java
@@ -112,4 +112,5 @@ public String toString() {
         return getClass().getSimpleName() + " [" +
                 "metadata=" + metadata + " ]";
     }
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/Metadata.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/Metadata.java
index 9ec99f6b0c..52a5e0cc22 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/Metadata.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/Metadata.java
@@ -369,6 +369,7 @@ public Metadata append(final Metadata newMetadata) {
         final List<ActorSelection> newAckRecipients = Stream.concat(ackRecipients.stream(), newMetadata.ackRecipients.stream()).toList();
         final List<UpdateReason> newReasons = Stream.concat(updateReasons.stream(), newMetadata.updateReasons.stream())
                 .toList();
+
         return new Metadata(newMetadata.thingId, newMetadata.thingRevision, newMetadata.policyId,
                 newMetadata.policyRevision, newMetadata.modified, newEvents, newTimers, newAckRecipients,
                 invalidateThing || newMetadata.invalidateThing,
@@ -419,6 +420,7 @@ public boolean equals(final Object o) {
             return false;
         }
         final Metadata that = (Metadata) o;
+
         return thingRevision == that.thingRevision &&
                 Objects.equals(policyRevision, that.policyRevision) &&
                 Objects.equals(thingId, that.thingId) &&
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
index d71021114f..d9565b7e9e 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/BackgroundSyncStream.java
@@ -94,8 +94,8 @@ public static BackgroundSyncStream of(
      */
     public Source<Metadata, NotUsed> filterForInconsistencies(final Source<Metadata, ?> metadataFromSnapshots,
             final Source<Metadata, ?> metadataFromSearchIndex) {
-
         final Comparator<Metadata> comparator = BackgroundSyncStream::compareMetadata;
+
         return MergeSortedAsPair.merge(emptyMetadata(), comparator, metadataFromSnapshots, metadataFromSearchIndex)
                 .throttle(throttleThroughput, throttlePeriod)
                 .flatMapConcat(this::filterForInconsistency);
@@ -221,6 +221,7 @@ private Source<Metadata, NotUsed> retrievePolicyRevisionAndEmitMismatch(final Po
                                         .map(r -> indexed.invalidateCaches(true, true));
                             }
                         });
+
         return Source.completionStageSource(sourceCompletionStage)
                 .mapMaterializedValue(ignored -> NotUsed.getInstance());
     }
@@ -240,6 +241,7 @@ private static int compareMetadata(final Metadata metadata1, final Metadata meta
     public static int compareThingIds(final ThingId thingId1, final ThingId thingId2) {
         final int emptyThingComparison =
                 Boolean.compare(thingId1.equals(EMPTY_THING_ID), thingId2.equals(EMPTY_THING_ID));
+
         return emptyThingComparison != 0 ? emptyThingComparison : thingId1.compareTo(thingId2);
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlow.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlow.java
index fbbe5db4d7..97e0d86cf5 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlow.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlow.java
@@ -131,6 +131,7 @@ public static EnforcementFlow of(final ActorSystem actorSystem,
         final var thingCacheConfig = updaterStreamConfig.getThingCacheConfig();
         final var thingCacheDispatcher = actorSystem.dispatchers()
                 .lookup(thingCacheConfig.getDispatcherName());
+
         return new EnforcementFlow(actorSystem, thingsShardRegion, policyEnforcerCache, askWithRetryConfig,
                 thingCacheConfig, thingCacheDispatcher);
     }
@@ -234,6 +235,7 @@ private CompletionStage<JsonObject> provideThingFuture(final ThingId thingId, fi
         } else {
             thingFuture = thingsFacade.retrieveThing(thingId, metadata.getEvents(), metadata.getThingRevision());
         }
+
         return thingFuture;
     }
 
@@ -330,6 +332,7 @@ private static CachingSignalEnrichmentFacade createThingsFacade(final ActorSyste
         final var dittoExtensionsConfig = ScopedConfig.dittoExtension(actorSystem.settings().config());
         final var cachingSignalEnrichmentFacadeProvider =
                 CachingSignalEnrichmentFacadeProvider.get(actorSystem, dittoExtensionsConfig);
+
         return cachingSignalEnrichmentFacadeProvider.getSignalEnrichmentFacade(actorSystem, sudoRetrieveThingFacade,
                 thingCacheConfig, thingCacheDispatcher, "things-search_enforcementflow_enforcer_cache_things");
     }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/MongoSearchUpdaterFlow.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/MongoSearchUpdaterFlow.java
index 5b59d11ac8..d70ad774c5 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/MongoSearchUpdaterFlow.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/MongoSearchUpdaterFlow.java
@@ -154,6 +154,7 @@ private static String extractFilterBson(final WriteModel<BsonDocument> writeMode
         } else if (writeModel instanceof DeleteManyModel) {
             return ((DeleteManyModel<BsonDocument>) writeModel).getFilter().toString();
         }
+
         return "no filter";
     }
 

From 9725b12c1d8bf980eebc49297cae7b79846a971a Mon Sep 17 00:00:00 2001
From: Stefan <stefan.maute@bosch.io>
Date: Mon, 15 Aug 2022 15:32:01 +0200
Subject: [PATCH 3/4] remove limit option from documentation and api docs;

Signed-off-by: Stefan <stefan.maute@bosch.io>
---
 .../sources/paths/search/things-count.yml     | 14 +++-----
 .../openapi/sources/paths/search/things.yml   | 14 +++-----
 .../resources/pages/ditto/basic-search.md     | 35 ++-----------------
 .../resources/pages/ditto/httpapi-search.md   | 11 +++---
 .../protocol-specification-things-search.md   |  6 ++--
 5 files changed, 20 insertions(+), 60 deletions(-)

diff --git a/documentation/src/main/resources/openapi/sources/paths/search/things-count.yml b/documentation/src/main/resources/openapi/sources/paths/search/things-count.yml
index fc61698003..3fd9a6bbe5 100644
--- a/documentation/src/main/resources/openapi/sources/paths/search/things-count.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/search/things-count.yml
@@ -13,14 +13,11 @@ get:
   description: |-
     This resource can be used to count things.
 
-    The query parameter `filter` is not mandatory. If it is not set there is
-    returned the total amount of things which the logged in user is allowed
-    to read.
+    The query parameter `filter` is not mandatory. If it is not set there is returned the total amount of things 
+    which the logged in user is allowed to read.
 
-    To search for nested properties, we use JSON Pointer notation
-    (RFC-6901). See the following example how to search for the sub property
-    `location` of the parent property `attributes` with a forward slash as
-    separator:
+    To search for nested properties, we use JSON Pointer notation (RFC-6901). See the following example how to search
+    for the sub property `location` of the parent property `attributes` with a forward slash as separator:
 
     ```eq(attributes/location,"kitchen")```
   parameters:
@@ -38,8 +35,7 @@ get:
             type: integer
     '400':
       description: |-
-        The request could not be completed. A provided parameter is in a
-        wrong format.
+        The request could not be completed. A provided parameter is in a wrong format.
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/search/things.yml b/documentation/src/main/resources/openapi/sources/paths/search/things.yml
index dc9b2a7c66..b26476fa3c 100644
--- a/documentation/src/main/resources/openapi/sources/paths/search/things.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/search/things.yml
@@ -20,11 +20,10 @@ get:
       spelling of value of the namespace, name, attribute, feature etc. is, use the *like*
       notation instead of *eq* for filtering.
 
-    * The resource supports sorting and paging. If paging is not explicitly
-      specified by means of the `size` option, a default count of `25`
-      documents is returned.
+    * The resource supports sorting and paging. If paging is not explicitly specified by means of the `size` option, 
+      a default count of `25` documents is returned.
 
-    * The internal search index is "eventually consistent".  Consistency with the latest
+    * The internal search index is "eventually consistent". Consistency with the latest
       thing updates should recover within milliseconds.
   parameters:
     - $ref: '../../parameters/searchFilter.yml'
@@ -48,9 +47,6 @@ get:
         quotation marks. Cursor IDs are given in search responses and mark the position after the last entry of
         the previous search. The meaning of cursor IDs is unspecified and may change without notice.
 
-        The paging option `limit({offset},{count})` is deprecated.
-        It may result in slow queries or timeouts and will be removed eventually.
-
         #### Examples:
 
         * ```sort(+thingId)```
@@ -67,7 +63,6 @@ get:
 
         ```size(200),cursor(LOREMIPSUM)```
 
-        The deprecated paging option `limit` may not be combined with the other paging options `size` and `cursor`.
       required: false
       schema:
         type: string
@@ -82,8 +77,7 @@ get:
             $ref: '../../schemas/search/searchResultThings.yml'
     '400':
       description: |-
-        The request could not be completed. A provided parameter is in a
-        wrong format.
+        The request could not be completed. A provided parameter is in a wrong format.
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/pages/ditto/basic-search.md b/documentation/src/main/resources/pages/ditto/basic-search.md
index 91dbfb7d6d..73aaec9c3d 100644
--- a/documentation/src/main/resources/pages/ditto/basic-search.md
+++ b/documentation/src/main/resources/pages/ditto/basic-search.md
@@ -17,8 +17,8 @@ The functionality is available for the following APIs.
 ## Search index
 
 Ditto's microservice [things-search](architecture-services-things-search.html) automatically consumes all 
-[events](basic-signals-event.html) which are emitted for changes to `Things` and `Policies` and updates an for search 
-optimized representation of the `Thing` data into its own database.
+[events](basic-signals-event.html) which are emitted for changes to `Things` and `Policies` and updates the search 
+index which contains an optimized representation of the `Thing` data. The search service has its own database.
 
 No custom indexes have to be defined as the structure in the database is "flattened" so that all data contained in 
 [Things](basic-thing.html) can be searched for efficiently.
@@ -58,7 +58,7 @@ Paging:     size(5),cursor(CURSOR_ID)
 ## Search count queries 
 
 The same syntax applies for search count queries - only the [sorting](basic-rql.html#rql-sorting) and 
-[paging](#rql-paging-deprecated) makes no sense here, so there are not necessary to specify. 
+[paging](#rql-paging-deprecated) makes no sense here, so they are not necessary to specify. 
 
 
 ## Namespaces
@@ -107,32 +107,3 @@ of the cursor. Otherwise, the request is rejected.
 option=size(10),cursor(<cursor-from-previous-result>)
 ```
 
-## RQL paging (deprecated)
-
-{% include note.html content="The limit option is deprecated, it may be removed in future releases. Use [cursor-based 
-paging](basic-search.html#sorting-and-paging-options) instead." %}
-
-The RQL limiting part specifies which part (or "page") should be returned of a large search result set.
-
-```
-limit(<offset>,<count>)
-```
-
-Limits the search results to `<count>` items, starting with the item at index `<offset>`. 
-* if the paging option is not explicitly specified, the **default** value `limit(0,25)` is used, 
-  i.e. the first `25` results are returned.
-* the **maximum** allowed count is `200`.
-
-**Example - return the first ten items**
-```
-limit(0,10)
-```
-
-**Example - return the items 11 to 20**
-```
-limit(10,10)
-```
-i.e. Return the next ten items (from index 11 to 20)
-
-{% include note.html content="We recommend **not to use high offsets** (e.g. higher than 10000) for paging
-    because of potential performance degradations." %}
diff --git a/documentation/src/main/resources/pages/ditto/httpapi-search.md b/documentation/src/main/resources/pages/ditto/httpapi-search.md
index cc9d7bd6af..038a50fd43 100644
--- a/documentation/src/main/resources/pages/ditto/httpapi-search.md
+++ b/documentation/src/main/resources/pages/ditto/httpapi-search.md
@@ -8,11 +8,11 @@ permalink: httpapi-search.html
 The [search aspect](basic-search.html) of Ditto can be accessed via an HTTP API.
 
 {% include note.html content="Find the HTTP API reference at the 
-    [Search resources](http-api-doc.html?urls.primaryName=api2#/Search)." %}
+[Search resources](http-api-doc.html?urls.primaryName=api2#/Search)." %}
 
-The concepts of the [RQL expression](basic-rql.html#rql-filter), [RQL sorting](basic-rql.html#rql-sorting) and 
-[RQL paging](basic-search.html#rql-paging-deprecated) are mapped to HTTP as query parameters which are added to 
-`GET` requests to the search endpoint:
+The concepts of the [RQL expression](basic-rql.html#rql-filter) and 
+[RQL sorting and paging options](basic-search.html#sorting-and-paging-options) are mapped to HTTP as query parameters
+which are added to `GET` requests to the search endpoint:
 
 ```
 http://localhost:8080/api/2/search/things
@@ -32,8 +32,7 @@ Default values of each option is documented [here](basic-search.html#sorting-and
 
 Complex example:
 ```
-GET .../search/things?filter=eq(attributes/location,"living-room")&option=sort(+thingId),limit(0,5)&namespaces=org
-.eclipse.ditto,foo.bar
+GET .../search/things?filter=eq(attributes/location,"living-room")&option=sort(+thingId),cursor(CURSOR_ID),size(10)&namespaces=org.eclipse.ditto,foo.bar
 ```
 
 Another Complex example with the `namespaces` parameter:
diff --git a/documentation/src/main/resources/pages/ditto/protocol-specification-things-search.md b/documentation/src/main/resources/pages/ditto/protocol-specification-things-search.md
index ba4bdee30e..4960957a55 100644
--- a/documentation/src/main/resources/pages/ditto/protocol-specification-things-search.md
+++ b/documentation/src/main/resources/pages/ditto/protocol-specification-things-search.md
@@ -97,9 +97,9 @@ In particular:
 - When given in the `options` field, `sort(<+"-><property1>, ...)` sets the order of search results.
   If not given, the default `sort(+thingId)` is used.
 
-The paging options `cursor` and `limit` of the [HTTP-API](httpapi-search.html) are not supported here, because
-they are not meaningful for the search protocol. For the HTTP-API, those options are for iterating through large
-numbers of search results over many HTTP requests in a stateless manner.
+The paging option `cursor` of the [HTTP-API](httpapi-search.html) is not supported here, because
+it is not meaningful for the search protocol. For the HTTP-API, the option is for iterating through a large
+number of search results over many HTTP requests in a stateless manner.
 The search protocol is not stateless and does not require the client to keep track of any cursor or offset;
 results of any size are streamed over an arbitrarily long period of time.
 

From 30615145161b57e243e37dcd02adef34cc0833a5 Mon Sep 17 00:00:00 2001
From: Stefan Maute <stefan.maute@bosch.io>
Date: Tue, 23 Aug 2022 13:41:18 +0200
Subject: [PATCH 4/4] remove paging functionality with nextPageOffset from
 search code; remove limit and skip vom Query and QueryBuilder interface; add
 exclusions for japicmp-maven-plugin; adapted unit tests;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
---
 .../actors/QueryThingsPerRequestActor.java    |   1 -
 .../src/main/resources/ditto-limits.conf      |   4 +-
 .../utils/search/SearchSourceBuilderTest.java |   5 -
 rql/query/pom.xml                             |   4 +
 .../org/eclipse/ditto/rql/query/Query.java    |  10 +-
 .../eclipse/ditto/rql/query/QueryBuilder.java |  16 ---
 .../internal/RqlOptionParser.scala            |   6 +-
 .../query/filter/ParameterOptionVisitor.java  |   2 +-
 .../filter/ParameterOptionVisitorTest.java    |   1 -
 thingsearch/model/pom.xml                     |   5 +
 .../model/ImmutableCursorOption.java          |   1 +
 .../model/ImmutableSearchResult.java          |  31 ++---
 .../model/ImmutableSearchResultBuilder.java   |  16 +--
 .../model/ImmutableSizeOption.java            |   6 +-
 .../thingsearch/model/SearchModelFactory.java |   5 +-
 .../ditto/thingsearch/model/SearchResult.java |  23 +---
 .../model/SearchResultBuilder.java            |   9 --
 .../ditto/thingsearch/model/SizeOption.java   |   4 +-
 .../ImmutableSearchResultBuilderTest.java     |  41 +------
 .../model/ImmutableSearchResultTest.java      |  35 ++----
 .../model/SearchModelFactoryTest.java         |  55 +--------
 .../model/assertions/SearchResultAssert.java  |  23 ----
 .../service/common/model/ResultList.java      |  15 +--
 .../service/common/model/ResultListImpl.java  |  24 +---
 .../read/MongoThingsSearchPersistence.java    |  34 +++---
 .../read/ThingsSearchPersistence.java         |   3 +-
 .../persistence/read/query/MongoQuery.java    |  33 ++----
 .../read/query/MongoQueryBuilder.java         |  47 +++-----
 .../persistence/read/query/Validator.java     |  24 ----
 .../service/starter/actors/SearchActor.java   |   7 +-
 .../starter/actors/ThingsSearchCursor.java    |  23 +---
 .../common/model/ResultListImplTest.java      |   8 +-
 .../AbstractThingSearchPersistenceITBase.java |   2 -
 .../read/{PagingIT.java => SizeIT.java}       | 107 ++++++------------
 .../service/persistence/read/SortingIT.java   |   2 +-
 .../query/MongoQueryBuilderLimitedTest.java   |  28 ++---
 .../query/MongoQueryBuilderUnlimitedTest.java |  32 ++----
 .../read/query/MongoQueryTest.java            |  13 +--
 .../src/test/resources/search-test.conf       |   4 +-
 .../service/src/test/resources/test.conf      |   4 +-
 40 files changed, 179 insertions(+), 534 deletions(-)
 rename thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/{PagingIT.java => SizeIT.java} (62%)

diff --git a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/QueryThingsPerRequestActor.java b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/QueryThingsPerRequestActor.java
index 57915f8a24..797aa6b776 100644
--- a/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/QueryThingsPerRequestActor.java
+++ b/gateway/service/src/main/java/org/eclipse/ditto/gateway/service/proxy/actors/QueryThingsPerRequestActor.java
@@ -145,7 +145,6 @@ public Receive createReceive() {
                         final JsonArray retrievedEntitiesWithFieldSelection = getEntitiesWithSelectedFields(rtrEntity);
                         final SearchResult resultWithRetrievedItems = SearchModelFactory.newSearchResultBuilder()
                                 .addAll(retrievedEntitiesWithFieldSelection)
-                                .nextPageOffset(queryThingsResponse.getSearchResult().getNextPageOffset().orElse(null))
                                 .cursor(queryThingsResponse.getSearchResult().getCursor().orElse(null))
                                 .build();
                         final QueryThingsResponse theQueryThingsResponse =
diff --git a/internal/utils/config/src/main/resources/ditto-limits.conf b/internal/utils/config/src/main/resources/ditto-limits.conf
index b0d00f053b..0a09692a6d 100644
--- a/internal/utils/config/src/main/resources/ditto-limits.conf
+++ b/internal/utils/config/src/main/resources/ditto-limits.conf
@@ -34,13 +34,13 @@ ditto.limits {
     auth-subjects-count = ${?LIMITS_MESSAGES_AUTH_SUBJECTS_COUNT}
   }
 
-  # limiations for the "things-search" service
+  # limitations for the "things-search" service
   search {
     default-page-size = 25
     default-page-size = ${?LIMITS_THINGS_SEARCH_DEFAULT_PAGE_SIZE}
 
     # the allowed maximum page size limit - e.g. specified when doing a search via HTTP:
-    # /api/1/search/things?filter=...&option=limit(0,200)
+    # /api/2/search/things?filter=...&option=size(200)
     max-page-size = 200
     max-page-size = ${?LIMITS_THINGS_SEARCH_MAX_PAGE_SIZE}
   }
diff --git a/internal/utils/search/src/test/java/org/eclipse/ditto/internal/utils/search/SearchSourceBuilderTest.java b/internal/utils/search/src/test/java/org/eclipse/ditto/internal/utils/search/SearchSourceBuilderTest.java
index 78d6001c2e..e0f81789dc 100644
--- a/internal/utils/search/src/test/java/org/eclipse/ditto/internal/utils/search/SearchSourceBuilderTest.java
+++ b/internal/utils/search/src/test/java/org/eclipse/ditto/internal/utils/search/SearchSourceBuilderTest.java
@@ -73,11 +73,6 @@ public void failWithMissingDittoHeaders() {
                 .build();
     }
 
-    @Test(expected = InvalidOptionException.class)
-    public void failOnLimitOption() {
-        SearchSource.newBuilder().options("limit(0,1)");
-    }
-
     @Test(expected = InvalidOptionException.class)
     public void failOnCursorOption() {
         SearchSource.newBuilder().options("cursor(ABC)");
diff --git a/rql/query/pom.xml b/rql/query/pom.xml
index 52a2e4f0a1..fb274dc022 100644
--- a/rql/query/pom.xml
+++ b/rql/query/pom.xml
@@ -109,6 +109,10 @@
                             <!-- Don't add excludes here before checking with the whole Ditto team -->
                             <!--<exclude></exclude>-->
                             <exclude>org.eclipse.ditto.rql.query.LikeHelper</exclude>
+                            <exclude>org.eclipse.ditto.rql.query.Query#getLimit()</exclude>
+                            <exclude>org.eclipse.ditto.rql.query.Query#getSkip()</exclude>
+                            <exclude>org.eclipse.ditto.rql.query.QueryBuilder#limit(long)</exclude>
+                            <exclude>org.eclipse.ditto.rql.query.QueryBuilder#skip(long)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/Query.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/Query.java
index 5790b9543a..4774fbaf94 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/Query.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/Query.java
@@ -32,14 +32,9 @@ public interface Query {
     List<SortOption> getSortOptions();
 
     /**
-     * @return the number of results to which this query is limited.
+     * @return the number of results for this query.
      */
-    int getLimit();
-
-    /**
-     * @return the number of results which are discarded from the beginning of this query.
-     */
-    int getSkip();
+    int getSize();
 
     /**
      * Replace criteria of this query by another.
@@ -49,4 +44,5 @@ public interface Query {
      * @since 1.1.0
      */
     Query withCriteria(Criteria criteria);
+
 }
diff --git a/rql/query/src/main/java/org/eclipse/ditto/rql/query/QueryBuilder.java b/rql/query/src/main/java/org/eclipse/ditto/rql/query/QueryBuilder.java
index d3e59cd18f..86d2f0aca5 100644
--- a/rql/query/src/main/java/org/eclipse/ditto/rql/query/QueryBuilder.java
+++ b/rql/query/src/main/java/org/eclipse/ditto/rql/query/QueryBuilder.java
@@ -28,14 +28,6 @@ public interface QueryBuilder {
      */
     QueryBuilder sort(List<SortOption> sortOptions);
 
-    /**
-     * Limits the number of elements returned by the query.
-     *
-     * @param n the (maximum) number of elements to be returned
-     * @return this builder
-     */
-    QueryBuilder limit(long n);
-
     /**
      * Limits the number of elements returned by the query.
      *
@@ -44,14 +36,6 @@ public interface QueryBuilder {
      */
     QueryBuilder size(long n);
 
-    /**
-     * Discards the given number of elements at the beginning of the query result.
-     *
-     * @param n the number of elements to be skipped
-     * @return this builder
-     */
-    QueryBuilder skip(long n);
-
     /**
      * Builds the Query.
      *
diff --git a/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala b/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala
index 35ea12cea1..2fef7ad2d4 100644
--- a/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala
+++ b/rql/search-option-parser/src/main/scala/org/eclipse/ditto/rql/parser/thingsearch/internal/RqlOptionParser.scala
@@ -27,7 +27,7 @@ import scala.util.{Failure, Success}
   * RQL Parser. Parses options in the RQL "standard" according to https://github.com/persvr/rql with the following EBNF:
   * <pre>
   * Options                    = Option, { ',', Option }
-  * Option                     = Sort | Limit
+  * Option                     = Sort | Cursor | Size
   * Sort                       = "sort", '(', SortProperty, { ',', SortProperty }, ')'
   * SortProperty               = SortOrder, PropertyLiteral
   * SortOrder                  = '+' | '-'
@@ -50,7 +50,7 @@ private class RqlOptionParser(override val input: ParserInput) extends RqlParser
   }
 
   /**
-    * Option                     = Sort | Limit | Cursor | Size
+    * Option                     = Sort | Cursor | Size
     */
   private def Option: Rule1[model.Option] = rule {
     Sort | Cursor | Size
@@ -105,6 +105,7 @@ private class RqlOptionParser(override val input: ParserInput) extends RqlParser
   }
 
   private def CursorString: Rule1[String] = PropertyLiteral
+
 }
 
 /**
@@ -132,4 +133,5 @@ object RqlOptionParser extends OptionParser {
   }
 
   private def rqlOptionsParser(string: String): RqlOptionParser = new RqlOptionParser(ParserInput.apply(string))
+
 }
diff --git a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java
index c756bf01b5..c13feb8d90 100644
--- a/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java
+++ b/thingsearch/api/src/main/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitor.java
@@ -81,7 +81,7 @@ public void visit(final CursorOption cursorOption) {
 
     @Override
     public void visit(final SizeOption sizeOption) {
-        queryBuilder.skip(0L).size(sizeOption.getSize());
+        queryBuilder.size(sizeOption.getSize());
     }
 
     private SortOption mapSort(final SortOptionEntry entry) {
diff --git a/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java b/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java
index e7d00f6ae6..a198d45f00 100644
--- a/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java
+++ b/thingsearch/api/src/test/java/org/eclipse/ditto/thingsearch/api/query/filter/ParameterOptionVisitorTest.java
@@ -135,7 +135,6 @@ public void visitCursorAndSizeOptions() {
 
         visitor.visitAll(Arrays.asList(cursorOption, sizeOption));
 
-        verify(qbMock).skip(0);
         verify(qbMock).size(123);
         verifyNoMoreInteractions(qbMock);
     }
diff --git a/thingsearch/model/pom.xml b/thingsearch/model/pom.xml
index 8acce3056c..871fb93f10 100644
--- a/thingsearch/model/pom.xml
+++ b/thingsearch/model/pom.xml
@@ -114,6 +114,11 @@
                             <exclude>org.eclipse.ditto.thingsearch.model.SearchQuery#getLimitOption()</exclude>
                             <exclude>org.eclipse.ditto.thingsearch.model.SearchQueryBuilder#limit(int,int)</exclude>
                             <exclude>org.eclipse.ditto.thingsearch.model.SearchQueryBuilder#removeLimitation()</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchModelFactory#newSearchResult(org.eclipse.ditto.json.JsonArray,long)</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchResult#getNextPageOffset()</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchResult#NO_NEXT_PAGE</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchResult$JsonFields#NEXT_PAGE_OFFSET</exclude>
+                            <exclude>org.eclipse.ditto.thingsearch.model.SearchResultBuilder#nextPageOffset(java.lang .Long)</exclude>
                         </excludes>
                     </parameter>
                 </configuration>
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableCursorOption.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableCursorOption.java
index c8a601fb3a..0bce36e291 100644
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableCursorOption.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableCursorOption.java
@@ -64,4 +64,5 @@ public int hashCode() {
     public String toString() {
         return "cursor(" + cursor + ")";
     }
+
 }
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResult.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResult.java
index f24083b46a..3ef225303b 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResult.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResult.java
@@ -38,13 +38,10 @@
 final class ImmutableSearchResult implements SearchResult {
 
     private final JsonArray items;
-    @Nullable private final Long nextPageOffset;
     @Nullable private final String cursor;
 
-    private ImmutableSearchResult(final JsonArray items, @Nullable final Long nextPageOffset,
-            @Nullable final String cursor) {
+    private ImmutableSearchResult(final JsonArray items, @Nullable final String cursor) {
         this.items = checkNotNull(items, "items");
-        this.nextPageOffset = nextPageOffset;
         this.cursor = cursor;
     }
 
@@ -54,7 +51,7 @@ private ImmutableSearchResult(final JsonArray items, @Nullable final Long nextPa
      * @return instance.
      */
     public static SearchResult empty() {
-        return of(JsonFactory.newArray(), NO_NEXT_PAGE, null);
+        return of(JsonFactory.newArray(), null);
     }
 
     /**
@@ -62,15 +59,12 @@ public static SearchResult empty() {
      * cursor.
      *
      * @param items the search result items.
-     * @param nextPageOffset the next-page-offset.
      * @param cursor the cursor.
      * @return a new {@code ImmutableSearchResult}.
      */
-    public static ImmutableSearchResult of(final JsonArray items,
-            @Nullable final Long nextPageOffset,
-            @Nullable final String cursor) {
+    public static ImmutableSearchResult of(final JsonArray items, @Nullable final String cursor) {
 
-        return new ImmutableSearchResult(items, nextPageOffset, cursor);
+        return new ImmutableSearchResult(items, cursor);
     }
 
     /**
@@ -84,10 +78,9 @@ public static ImmutableSearchResult of(final JsonArray items,
      */
     public static ImmutableSearchResult fromJson(final JsonObject jsonObject) {
         final JsonArray extractedItems = jsonObject.getValueOrThrow(JsonFields.ITEMS);
-        final Long extractedNextPageOffset = jsonObject.getValue(JsonFields.NEXT_PAGE_OFFSET).orElse(null);
         final String extractedCursor = jsonObject.getValue(JsonFields.CURSOR).orElse(null);
 
-        return of(extractedItems, extractedNextPageOffset, extractedCursor);
+        return of(extractedItems, extractedCursor);
     }
 
     @Override
@@ -95,11 +88,6 @@ public JsonArray getItems() {
         return items;
     }
 
-    @Override
-    public Optional<Long> getNextPageOffset() {
-        return Optional.ofNullable(nextPageOffset);
-    }
-
     @Override
     public Optional<String> getCursor() {
         return Optional.ofNullable(cursor);
@@ -107,7 +95,7 @@ public Optional<String> getCursor() {
 
     @Override
     public boolean hasNextPage() {
-        return cursor != null || nextPageOffset != null && nextPageOffset != NO_NEXT_PAGE;
+        return cursor != null;
     }
 
     @Override
@@ -136,7 +124,6 @@ public JsonObject toJson(final JsonSchemaVersion schemaVersion, final Predicate<
 
         final JsonObjectBuilder builder = JsonFactory.newObjectBuilder();
         builder.set(JsonFields.ITEMS, items, predicate);
-        getNextPageOffset().ifPresent(offset -> builder.set(JsonFields.NEXT_PAGE_OFFSET, offset, predicate));
         getCursor().ifPresent(cur -> builder.set(JsonFields.CURSOR, cur, predicate));
         return builder.build();
     }
@@ -150,20 +137,18 @@ public boolean equals(final Object o) {
             return false;
         }
         final ImmutableSearchResult that = (ImmutableSearchResult) o;
-        return Objects.equals(nextPageOffset, that.nextPageOffset) &&
-                Objects.equals(cursor, that.cursor) &&
+        return Objects.equals(cursor, that.cursor) &&
                 Objects.equals(items, that.items);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(items, nextPageOffset, cursor);
+        return Objects.hash(items, cursor);
     }
 
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [items=" + items +
-                ", nextPageOffset=" + nextPageOffset +
                 ", cursor=" + cursor +
                 "]";
     }
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilder.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilder.java
index dfd348432f..422da13550 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilder.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilder.java
@@ -29,7 +29,6 @@
 final class ImmutableSearchResultBuilder implements SearchResultBuilder {
 
     private final JsonArrayBuilder jsonArrayBuilder;
-    @Nullable private Long offset;
     @Nullable private String cursor;
 
     private ImmutableSearchResultBuilder(final JsonArrayBuilder theJsonArrayBuilder) {
@@ -42,8 +41,7 @@ private ImmutableSearchResultBuilder(final JsonArrayBuilder theJsonArrayBuilder)
      * @return a new builder.
      */
     public static SearchResultBuilder newInstance() {
-        return new ImmutableSearchResultBuilder(JsonFactory.newArrayBuilder())
-                .nextPageOffset(SearchResult.NO_NEXT_PAGE);
+        return new ImmutableSearchResultBuilder(JsonFactory.newArrayBuilder());
     }
 
     /**
@@ -58,17 +56,9 @@ public static SearchResultBuilder of(final SearchResult searchResult) {
         checkNotNull(searchResult, "search result");
 
         final JsonArrayBuilder jsonArrayBuilder = JsonFactory.newArrayBuilder(searchResult.getItems());
-        final Long nextPageOffset = searchResult.getNextPageOffset().orElse(null);
         final String cursor = searchResult.getCursor().orElse(null);
 
-        return new ImmutableSearchResultBuilder(jsonArrayBuilder).nextPageOffset(nextPageOffset)
-                .cursor(cursor);
-    }
-
-    @Override
-    public SearchResultBuilder nextPageOffset(@Nullable final Long nextPageOffset) {
-        offset = nextPageOffset;
-        return this;
+        return new ImmutableSearchResultBuilder(jsonArrayBuilder).cursor(cursor);
     }
 
     @Override
@@ -98,7 +88,7 @@ public SearchResultBuilder remove(final JsonValue value) {
     @Override
     public SearchResult build() {
         final JsonArray searchResultsJsonArray = jsonArrayBuilder.build();
-        return ImmutableSearchResult.of(searchResultsJsonArray, offset, cursor);
+        return ImmutableSearchResult.of(searchResultsJsonArray, cursor);
     }
 
 }
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSizeOption.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSizeOption.java
index 1797b28b25..83ac826743 100644
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSizeOption.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/ImmutableSizeOption.java
@@ -17,11 +17,6 @@
 @Immutable
 final class ImmutableSizeOption implements SizeOption {
 
-    /**
-     * The maximum allowed page size.
-     */
-    static final int MAX_SIZE = 200;
-
     private final int size;
 
     private ImmutableSizeOption(final int size) {
@@ -67,4 +62,5 @@ public int hashCode() {
     public String toString() {
         return "size(" + size + ")";
     }
+
 }
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java
index c89df886e0..e54d551dec 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchModelFactory.java
@@ -47,12 +47,11 @@ private SearchModelFactory() {
      * Creates a new {@link SearchResult}.
      *
      * @param items the items.
-     * @param nextPageOffset the offset of the next page or {@link org.eclipse.ditto.thingsearch.model.SearchResult#NO_NEXT_PAGE}.
      * @return the new immutable search results object.
      * @throws NullPointerException if {@code items} is {@code null}.
      */
-    public static SearchResult newSearchResult(final JsonArray items, final long nextPageOffset) {
-        return ImmutableSearchResult.of(items, nextPageOffset, null);
+    public static SearchResult newSearchResult(final JsonArray items) {
+        return ImmutableSearchResult.of(items, null);
     }
 
     /**
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResult.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResult.java
index 4371dc156b..c816122801 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResult.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResult.java
@@ -35,11 +35,6 @@
 @Immutable
 public interface SearchResult extends Iterable<JsonValue>, Jsonifiable.WithFieldSelectorAndPredicate<JsonField> {
 
-    /**
-     * Signals that there is no next page.
-     */
-    long NO_NEXT_PAGE = -1;
-
     /**
      * Returns a new builder with a fluent API for a {@code SearchResult}.
      *
@@ -66,13 +61,6 @@ default SearchResultBuilder toBuilder() {
      */
     JsonArray getItems();
 
-    /**
-     * Get the offset of the next page if there are more matching results available or {@link #NO_NEXT_PAGE}, if there
-     * is no next page. Superseded by {@code getCursor()}.
-     *
-     * @return the offset of the next page or {@link #NO_NEXT_PAGE}, if there is no next page.
-     */
-    Optional<Long> getNextPageOffset();
 
     /**
      * Get the cursor to the next page.
@@ -82,10 +70,9 @@ default SearchResultBuilder toBuilder() {
     Optional<String> getCursor();
 
     /**
-     * Returns {@code true} if there is a next page and thus {@link #getNextPageOffset()} does not equal
-     * {@link #NO_NEXT_PAGE}, otherwise {@code false}.
+     * Returns {@code true} if there is a cursor, otherwise {@code false}.
      *
-     * @return {@code true} if there is a next page, otherwise {@code false}.
+     * @return {@code true} if there is a cursor, otherwise {@code false}.
      */
     boolean hasNextPage();
 
@@ -150,12 +137,6 @@ final class JsonFields {
         public static final JsonFieldDefinition<JsonArray> ITEMS =
                 JsonFactory.newJsonArrayFieldDefinition("items", FieldType.REGULAR, JsonSchemaVersion.V_2);
 
-        /**
-         * JSON field containing the nextPageOffset.
-         */
-        public static final JsonFieldDefinition<Long> NEXT_PAGE_OFFSET =
-                JsonFactory.newLongFieldDefinition("nextPageOffset", FieldType.REGULAR, JsonSchemaVersion.V_2);
-
         /**
          * JSON field containing the cursor.
          */
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResultBuilder.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResultBuilder.java
index 94f4a97c0f..869170f07c 100755
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResultBuilder.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SearchResultBuilder.java
@@ -23,15 +23,6 @@
 @NotThreadSafe
 public interface SearchResultBuilder {
 
-    /**
-     * Set the offset of the next page if there are more matching results available or {@link
-     * SearchResult#NO_NEXT_PAGE}, if there is no next page.
-     *
-     * @param nextPageOffset the offset of the next page.
-     * @return this builder to allow method chaining.
-     */
-    SearchResultBuilder nextPageOffset(@Nullable Long nextPageOffset);
-
     /**
      * Set the cursor of the next page if there are more matching results available or {@code * null}, if there is no
      * next page.
diff --git a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SizeOption.java b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SizeOption.java
index 2d0b5cc9e1..a510948fd4 100644
--- a/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SizeOption.java
+++ b/thingsearch/model/src/main/java/org/eclipse/ditto/thingsearch/model/SizeOption.java
@@ -26,8 +26,8 @@ public interface SizeOption extends Option {
 
     /**
      * Returns the string representation of this option. The string consists of the prefix {@code "size("}
-     * which is followed by the size value and finally of the suffix {@code ")"}. An
-     * example string might look like {@code "size(25)"};
+     * which is followed by the size value and finally of the suffix {@code ")"}.
+     * An example string might look like {@code "size(25)"};
      *
      * @return the string representation of this option.
      */
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilderTest.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilderTest.java
index 4bc43c7991..a6417fa11f 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilderTest.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultBuilderTest.java
@@ -39,36 +39,18 @@ public void tryToCreateNewInstanceWithNullSearchResult() {
     @Test
     public void copySearchResultWithBuilder() {
         final JsonArray items = JsonFactory.newArrayBuilder().add("foo", "bar", "baz").build();
-        final long offset = 25;
-        final SearchResult searchResult = SearchModelFactory.newSearchResult(items, offset);
+        final SearchResult searchResult = SearchModelFactory.newSearchResult(items);
 
         final SearchResultBuilder underTest = ImmutableSearchResultBuilder.of(searchResult);
 
         assertThat(underTest.build()).isEqualTo(searchResult);
     }
 
-    @Test
-    public void copyAndModifyExistingSearchResultWithBuilder() {
-        final JsonArray items = JsonFactory.newArrayBuilder().add("foo", "bar", "baz").build();
-        final long offset = 25;
-        final SearchResult searchResult = SearchModelFactory.newSearchResult(items, offset);
-
-        final SearchResult newSearchResult = ImmutableSearchResultBuilder.of(searchResult)
-                .nextPageOffset(SearchResult.NO_NEXT_PAGE)
-                .build();
-
-        assertThat(newSearchResult)
-                .hasNoNextPage()
-                .containsExactlyElementsOf(searchResult.getItems());
-    }
-
     @Test
     public void createEmptySearchResult() {
         final SearchResult searchResult = underTest.build();
 
-        assertThat(searchResult)
-                .hasNoNextPage()
-                .isEmpty();
+        assertThat(searchResult).isEmpty();
     }
 
     @Test(expected = NullPointerException.class)
@@ -87,7 +69,6 @@ public void addThingItem() {
                 .build();
 
         assertThat(searchResult)
-                .hasNoNextPage()
                 .contains(TestConstants.SearchThing.THING.toJson());
     }
 
@@ -97,19 +78,7 @@ public void addAndRemoveThingItem() {
                 .remove(TestConstants.SearchThing.THING.toJson())
                 .build();
 
-        assertThat(searchResult)
-                .hasNoNextPage()
-                .isEmpty();
-    }
-
-    @Test
-    public void setNextPageOffset() {
-        final long expectedNextPageOffset = 20L;
-        final SearchResult searchResult = underTest.nextPageOffset(expectedNextPageOffset).build();
-
-        assertThat(searchResult)
-                .hasNextPageOffset(expectedNextPageOffset)
-                .isEmpty();
+        assertThat(searchResult).isEmpty();
     }
 
     @Test(expected = NullPointerException.class)
@@ -128,9 +97,7 @@ public void addItemsWorksAsExpected() {
                 .addAll(items)
                 .build();
 
-        assertThat(searchResult)
-                .containsExactlyElementsOf(items)
-                .hasNoNextPage();
+        assertThat(searchResult).containsExactlyElementsOf(items);
     }
 
 }
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultTest.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultTest.java
index 61293f5839..6469e5c0b6 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultTest.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/ImmutableSearchResultTest.java
@@ -51,11 +51,9 @@ public void constructorAndGetters() {
         final JsonArray items = JsonFactory.newArray("[1,2,3]");
         final long nextPageOffset = 10L;
 
-        final SearchResult searchResult = ImmutableSearchResult.of(items, nextPageOffset, null);
+        final SearchResult searchResult = ImmutableSearchResult.of(items, null);
 
         assertThat(searchResult.getItems()).isEqualTo(items);
-        assertThat(searchResult.getNextPageOffset()).contains(nextPageOffset);
-        assertThat(searchResult.hasNextPage()).isTrue();
     }
 
     @Test
@@ -65,8 +63,6 @@ public void emptySearchResult() {
         assertThat(searchResult.isEmpty()).isTrue();
         assertThat(searchResult.getSize()).isZero();
         assertThat(searchResult.getItems()).isEqualTo(JsonFactory.newArray());
-        assertThat(searchResult.getNextPageOffset()).contains(SearchResult.NO_NEXT_PAGE);
-        assertThat(searchResult.hasNextPage()).isFalse();
     }
 
     @Test
@@ -77,10 +73,9 @@ public void toJsonReturnsExpected() {
         final long nextPageOffset = 10L;
         final JsonObject expected = JsonFactory.newObjectBuilder()
                 .set(SearchResult.JsonFields.ITEMS, items)
-                .set(SearchResult.JsonFields.NEXT_PAGE_OFFSET, nextPageOffset)
                 .build();
 
-        final Jsonifiable<?> underTest = ImmutableSearchResult.of(items, nextPageOffset, null);
+        final Jsonifiable<?> underTest = ImmutableSearchResult.of(items, null);
 
         assertThat(underTest.toJson()).isEqualTo(expected);
     }
@@ -89,12 +84,11 @@ public void toJsonReturnsExpected() {
     public void toJsonWithAllFieldTypes() {
         final String itemsArray = "[1,2,3]";
         final JsonArray items = JsonFactory.newArray(itemsArray);
-        final long nextPageOffset = 10L;
-        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, nextPageOffset, null);
+        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, null);
 
         final String jsonStr = searchResult.toJsonString(FieldType.regularOrSpecial());
 
-        assertThat(jsonStr).isEqualTo("{\"items\":" + itemsArray + ",\"nextPageOffset\":" + nextPageOffset + "}");
+        assertThat(jsonStr).isEqualTo("{\"items\":" + itemsArray + "}");
     }
 
     @Test
@@ -102,11 +96,11 @@ public void toJsonWithRegularFieldTypes() {
         final String itemsArray = "[1,2,3]";
         final JsonArray items = JsonFactory.newArray(itemsArray);
         final long nextPageOffset = 10L;
-        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, nextPageOffset, null);
+        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, null);
 
         final String jsonStr = searchResult.toJsonString();
 
-        assertThat(jsonStr).isEqualTo("{\"items\":" + itemsArray + ",\"nextPageOffset\":" + nextPageOffset + "}");
+        assertThat(jsonStr).isEqualTo("{\"items\":" + itemsArray + "}");
     }
 
     @Test
@@ -115,25 +109,23 @@ public void emptyToJsonWithAllFieldTypes() {
 
         final String jsonStr = searchResult.toJsonString(FieldType.regularOrSpecial());
 
-        assertThat(jsonStr).isEqualTo("{\"items\":[],\"nextPageOffset\":-1}");
+        assertThat(jsonStr).isEqualTo("{\"items\":[]}");
     }
 
     @Test
     public void fromJson() {
         final String itemsArray = "[1,2,3]";
-        final long nextPageOffset = 10L;
-        final String jsonStr = "{\"items\":" + itemsArray + ",\"nextPageOffset\":" + nextPageOffset + "}";
+        final String jsonStr = "{\"items\":" + itemsArray + "}";
         final JsonObject jsonObject = JsonFactory.newObject(jsonStr);
 
         final SearchResult searchResult = ImmutableSearchResult.fromJson(jsonObject);
 
         assertThat(searchResult.getItems()).isEqualTo(JsonFactory.newArray(itemsArray));
-        assertThat(searchResult.getNextPageOffset()).contains(nextPageOffset);
     }
 
     @Test
     public void fromEmptyJson() {
-        final String jsonStr = "{\"items\":[],\"nextPageOffset\":-1}";
+        final String jsonStr = "{\"items\":[]}";
         final JsonObject jsonObject = JsonFactory.newObject(jsonStr);
 
         final SearchResult searchResult = ImmutableSearchResult.fromJson(jsonObject);
@@ -145,12 +137,10 @@ public void fromEmptyJson() {
     public void ensureSearchResultNewBuilderWorks() {
         final String itemsArray = "[1,2,3]";
         final JsonArray items = JsonFactory.newArray(itemsArray);
-        final long nextPageOffset = 10L;
-        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, nextPageOffset, null);
+        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, null);
 
         final SearchResultBuilder searchResultBuilder = SearchResult.newBuilder()
-                .addAll(items)
-                .nextPageOffset(nextPageOffset);
+                .addAll(items);
 
         assertThat(searchResult).isEqualTo(searchResultBuilder.build());
     }
@@ -159,8 +149,7 @@ public void ensureSearchResultNewBuilderWorks() {
     public void ensureRelationsToBuilderWorks() {
         final String itemsArray = "[1,2,3]";
         final JsonArray items = JsonFactory.newArray(itemsArray);
-        final long nextPageOffset = 10L;
-        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items, nextPageOffset, null);
+        final ImmutableSearchResult searchResult = ImmutableSearchResult.of(items,  null);
 
         DittoJsonAssertions.assertThat(searchResult).isEqualTo(searchResult.toBuilder().build());
     }
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/SearchModelFactoryTest.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/SearchModelFactoryTest.java
index 61b2fa2665..46b8f54b11 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/SearchModelFactoryTest.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/SearchModelFactoryTest.java
@@ -20,10 +20,6 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import org.eclipse.ditto.json.JsonArray;
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonObject;
-import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.junit.Test;
@@ -49,60 +45,13 @@ public void assertImmutability() {
     }
 
 
-    @Test
-    public void newSearchResult() {
-        final SearchResult searchResult =
-                SearchModelFactory.newSearchResult(JsonFactory.newArray(), SearchResult.NO_NEXT_PAGE);
-
-        assertThat(searchResult) //
-                .hasNoNextPage() //
-                .isEmpty();
-    }
-
-
-    @Test
-    public void newSearchResultFromJson() {
-        final JsonArray itemsArray = JsonFactory.newArrayBuilder() //
-                .add(1, 2, 3) //
-                .build();
-        final long nextPageOffset = 10L;
-        final String jsonStr = "{\"items\":" + itemsArray + ",\"nextPageOffset\":" + nextPageOffset + "}";
-        final JsonObject jsonObject = JsonFactory.newObject(jsonStr);
-
-        final SearchResult searchResult = SearchModelFactory.newSearchResult(jsonObject);
-
-        assertThat(searchResult) //
-                .containsExactlyElementsOf(itemsArray) //
-                .hasNextPageOffset(nextPageOffset);
-    }
-
-
-    @Test
-    public void newSearchResultFromJsonString() {
-        final JsonArray itemsArray = JsonFactory.newArrayBuilder() //
-                .add(1, 2, 3) //
-                .build();
-        final long nextPageOffset = 10L;
-        final String jsonStr = "{\"items\":" + itemsArray + ",\"nextPageOffset\":" + nextPageOffset + "}";
-
-        final SearchResult searchResult = SearchModelFactory.newSearchResult(jsonStr);
-
-        assertThat(searchResult) //
-                .containsExactlyElementsOf(itemsArray) //
-                .hasNextPageOffset(nextPageOffset);
-    }
-
-
     @Test
     public void newSearchResultEmpty() {
         final SearchResult searchResult = SearchModelFactory.emptySearchResult();
 
-        assertThat(searchResult) //
-                .hasNoNextPage() //
-                .isEmpty();
+        assertThat(searchResult).isEmpty();
     }
 
-
     @Test(expected = NullPointerException.class)
     public void tryToCreateAndFilterWithNullFilter1() {
         SearchModelFactory.and(null, filterMock);
@@ -129,7 +78,6 @@ public void createAndFilterWithMultipleFilters() {
         assertThat(filters).hasSize(4);
     }
 
-
     @Test(expected = NullPointerException.class)
     public void tryToCreateOrFilterWithNullFilter1() {
         SearchModelFactory.or(null, filterMock);
@@ -217,4 +165,5 @@ public void newSortOptionFromSingleEntry() {
                 SearchModelFactory.newSortOption(Collections.singletonList(expectedEntry));
         assertThat(actual).isEqualTo(expected);
     }
+
 }
diff --git a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java
index 3c0f7e9cfd..25e2420664 100755
--- a/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java
+++ b/thingsearch/model/src/test/java/org/eclipse/ditto/thingsearch/model/assertions/SearchResultAssert.java
@@ -13,7 +13,6 @@
 package org.eclipse.ditto.thingsearch.model.assertions;
 
 import org.assertj.core.api.AbstractIterableAssert;
-import org.assertj.core.api.Assertions;
 import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.json.assertions.DittoJsonAssertions;
 import org.eclipse.ditto.json.assertions.JsonValueAssert;
@@ -34,28 +33,6 @@ public SearchResultAssert(final SearchResult actual) {
         super(actual, SearchResultAssert.class);
     }
 
-    public SearchResultAssert hasNextPageOffset(final long expectedNextPageOffset) {
-        isNotNull();
-        final Long actualNextPageOffset = actual.getNextPageOffset().orElse(null);
-        Assertions.assertThat(actualNextPageOffset)
-                .overridingErrorMessage("Expected SearchResult to have next page offset \n<%s> but it had \n<%s>",
-                        expectedNextPageOffset, actualNextPageOffset)
-                .isEqualTo(expectedNextPageOffset);
-
-        return this;
-    }
-
-    public SearchResultAssert hasNoNextPage() {
-        isNotNull();
-        final Long actualNextPageOffset = actual.getNextPageOffset().orElse(null);
-        Assertions.assertThat(actualNextPageOffset)
-                .overridingErrorMessage("Expected SearchResult not to have a next page offset but it had <%s>",
-                        actualNextPageOffset)
-                .isEqualTo(SearchResult.NO_NEXT_PAGE);
-
-        return this;
-    }
-
     @Override
     protected JsonValueAssert toAssert(final JsonValue value, final String description) {
         return DittoJsonAssertions.assertThat(value).as(description);
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultList.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultList.java
index c095ff55f1..9dd85d3c5b 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultList.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultList.java
@@ -18,28 +18,17 @@
 import org.eclipse.ditto.json.JsonArray;
 
 /**
- * ResultList defines the offset of the next page in addition to the standard list operations.
+ * ResultList that has the array of sort expressions of the last result.
  *
  * @param <E> the type of the items
  */
 public interface ResultList<E> extends List<E> {
 
-    /**
-     * Signals that there is no next page.
-     */
-    long NO_NEXT_PAGE = -1;
-
-    /**
-     * Gets the offset of the next page or {@link ResultList#NO_NEXT_PAGE}.
-     *
-     * @return the offset of the next page
-     */
-    long nextPageOffset();
-
     /**
      * Get values of sort expressions of the last result.
      *
      * @return the array of sort expressions of the last result
      */
     Optional<JsonArray> lastResultSortValues();
+
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImpl.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImpl.java
index ecfeb721ed..44a5a7555f 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImpl.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImpl.java
@@ -35,30 +35,25 @@
 public final class ResultListImpl<E> implements ResultList<E> {
 
     private final List<E> items;
-    private final long nextPageOffset;
     @Nullable private final JsonArray lastResultSortValues;
 
     /**
      * Constructor.
      *
-     * @param items the items
-     * @param nextPageOffset the offset of the next page or {@link ResultList#NO_NEXT_PAGE}
+     * @param items the items.
      */
-    public ResultListImpl(final List<E> items, final long nextPageOffset) {
-        this(items, nextPageOffset, null);
+    public ResultListImpl(final List<E> items) {
+        this(items, null);
     }
 
     /**
      * Constructor.
      *
-     * @param items the items
-     * @param nextPageOffset the offset of the next page or {@link ResultList#NO_NEXT_PAGE}
+     * @param items the items.
      * @param lastResultSortValues sort values of the last result.
      */
-    public ResultListImpl(final List<E> items, final long nextPageOffset,
-            @Nullable final JsonArray lastResultSortValues) {
+    public ResultListImpl(final List<E> items, @Nullable final JsonArray lastResultSortValues) {
         this.items = Collections.unmodifiableList(new ArrayList<>(requireNonNull(items)));
-        this.nextPageOffset = nextPageOffset;
         this.lastResultSortValues = lastResultSortValues;
     }
 
@@ -177,11 +172,6 @@ public List<E> subList(final int fromIndex, final int toIndex) {
         return items.subList(fromIndex, toIndex);
     }
 
-    @Override
-    public long nextPageOffset() {
-        return nextPageOffset;
-    }
-
     @Override
     public Optional<JsonArray> lastResultSortValues() {
         return Optional.ofNullable(lastResultSortValues);
@@ -189,7 +179,7 @@ public Optional<JsonArray> lastResultSortValues() {
 
     @Override
     public int hashCode() {
-        return Objects.hash(items, nextPageOffset, lastResultSortValues);
+        return Objects.hash(items, lastResultSortValues);
     }
 
     @Override
@@ -199,7 +189,6 @@ public boolean equals(final Object obj) {
         } else {
             final ResultListImpl<?> that = (ResultListImpl<?>) obj;
             return Objects.equals(items, that.items) &&
-                    Objects.equals(nextPageOffset, that.nextPageOffset) &&
                     Objects.equals(lastResultSortValues, that.lastResultSortValues);
         }
     }
@@ -207,7 +196,6 @@ public boolean equals(final Object obj) {
     @Override
     public String toString() {
         return "ResultListImpl [items=" + items +
-                ", nextPageOffset=" + nextPageOffset +
                 ", lastResultSortValues=" + lastResultSortValues +
                 "]";
     }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
index c3d9167d09..ea5212a024 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/MongoThingsSearchPersistence.java
@@ -182,8 +182,7 @@ public Source<Long, NotUsed> count(final Query query,
         log.debug("count with query filter <{}>.", queryFilter);
 
         final CountOptions countOptions = new CountOptions()
-                .skip(query.getSkip())
-                .limit(query.getLimit())
+                .limit(query.getSize())
                 .maxTime(maxQueryTime.getSeconds(), TimeUnit.SECONDS);
 
         return Source.fromPublisher(collection.countDocuments(queryFilter, countOptions))
@@ -201,14 +200,13 @@ public Source<ResultList<TimestampedThingId>, NotUsed> findAll(final Query query
             @Nullable final List<String> authorizationSubjectIds,
             @Nullable final Set<String> namespaces) {
 
-        final int skip = query.getSkip();
-        final int limit = query.getLimit();
-        final int limitPlusOne = limit + 1;
+        final int size = query.getSize();
+        final int sizePlusOne = size + 1;
 
-        return findAllInternal(query, authorizationSubjectIds, namespaces, limitPlusOne, maxQueryTime)
-                .grouped(limitPlusOne)
+        return findAllInternal(query, authorizationSubjectIds, namespaces, sizePlusOne, maxQueryTime)
+                .grouped(sizePlusOne)
                 .orElse(Source.single(Collections.emptyList()))
-                .map(resultsPlus0ne -> toResultList(resultsPlus0ne, skip, limit, query.getSortOptions()))
+                .map(resultsPlus0ne -> toResultList(resultsPlus0ne, size, query.getSortOptions()))
                 .mapError(handleMongoExecutionTimeExceededException())
                 .log("findAll");
     }
@@ -217,9 +215,9 @@ public Source<ResultList<TimestampedThingId>, NotUsed> findAll(final Query query
     public Source<ThingId, NotUsed> findAllUnlimited(final Query query, final List<String> authorizationSubjectIds,
             @Nullable final Set<String> namespaces) {
 
-        final Integer limit = query.getLimit() == Integer.MAX_VALUE ? null : query.getLimit();
+        final Integer size = query.getSize() == Integer.MAX_VALUE ? null : query.getSize();
 
-        return findAllInternal(query, authorizationSubjectIds, namespaces, limit, null)
+        return findAllInternal(query, authorizationSubjectIds, namespaces, size, null)
                 .map(MongoThingsSearchPersistence::toThingId)
                 .idleTimeout(maxQueryTime);
     }
@@ -256,13 +254,11 @@ private Source<Document, NotUsed> findAllInternal(final Query query, final List<
 
         final Bson sortOptions = getMongoSort(query);
 
-        final int skip = query.getSkip();
         final Bson projection = GetSortBsonVisitor.projections(query.getSortOptions());
         final FindPublisher<Document> findPublisher =
                 collection.find(queryFilter, Document.class)
                         .hint(hints.getHint(namespaces).orElse(null))
                         .sort(sortOptions)
-                        .skip(skip)
                         .projection(projection);
 
         final FindPublisher<Document> findPublisherWithLimit;
@@ -298,23 +294,21 @@ public Source<Metadata, NotUsed> sudoStreamMetadata(final EntityId lowerBound) {
         return Source.fromPublisher(publisher).map(MongoThingsSearchPersistence::readAsMetadata);
     }
 
-    private ResultList<TimestampedThingId> toResultList(final List<Document> resultsPlus0ne, final int skip,
-            final int limit,
+    private ResultList<TimestampedThingId> toResultList(final List<Document> resultsPlus0ne, final int limit,
             final List<SortOption> sortOptions) {
 
-        log.debug("Creating paged ResultList from parameters: resultsPlusOne=<{}>,skip={},limit={}",
-                resultsPlus0ne, skip, limit);
+        log.debug("Creating paged ResultList from parameters: resultsPlusOne=<{}>,limit={}",
+                resultsPlus0ne, limit);
 
         final ResultList<TimestampedThingId> pagedResultList;
         if (resultsPlus0ne.size() <= limit || limit <= 0) {
-            pagedResultList = new ResultListImpl<>(toTimestampedThingIds(resultsPlus0ne), ResultList.NO_NEXT_PAGE);
+            pagedResultList = new ResultListImpl<>(toTimestampedThingIds(resultsPlus0ne));
         } else {
-            // MongoDB returned limit + 1 items. However only <limit> items are of interest per page.
+            // MongoDB returned limit + 1 items. However, only <limit> items are of interest per page.
             final List<Document> results = resultsPlus0ne.subList(0, limit);
             final Document lastResult = results.get(limit - 1);
-            final long nextPageOffset = (long) skip + limit;
             final JsonArray sortValues = GetSortBsonVisitor.sortValuesAsArray(lastResult, sortOptions);
-            pagedResultList = new ResultListImpl<>(toTimestampedThingIds(results), nextPageOffset, sortValues);
+            pagedResultList = new ResultListImpl<>(toTimestampedThingIds(results), sortValues);
         }
 
         log.debug("Returning paged ResultList: {}", pagedResultList);
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/ThingsSearchPersistence.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/ThingsSearchPersistence.java
index 813fcc39bb..4b1d002311 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/ThingsSearchPersistence.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/ThingsSearchPersistence.java
@@ -118,8 +118,7 @@ default Source<ResultList<ThingId>, NotUsed> findAll(final Query query,
         return findAll(query, authorizationSubjectIds, null)
                 .map(resultList -> {
                     final var thingIds = resultList.stream().map(TimestampedThingId::thingId).toList();
-                    return new ResultListImpl<>(thingIds, resultList.nextPageOffset(),
-                            resultList.lastResultSortValues().orElse(null));
+                    return new ResultListImpl<>(thingIds, resultList.lastResultSortValues().orElse(null));
                 });
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQuery.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQuery.java
index d7b010d0df..0177707b3f 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQuery.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQuery.java
@@ -39,26 +39,20 @@ public final class MongoQuery implements Query {
 
     private final Criteria criteria;
     private final List<SortOption> sortOptions;
-    private final int limit;
-    private final int skip;
+    private final int size;
 
     /**
      * Constructor.
      *
      * @param criteria the criteria
      * @param sortOptions the SortOptions
-     * @param limit the limit param
-     * @param skip the skip param
+     * @param size the size param
      */
-    public MongoQuery(final Criteria criteria,
-            final List<SortOption> sortOptions,
-            final int limit,
-            final int skip) {
+    public MongoQuery(final Criteria criteria, final List<SortOption> sortOptions, final int size) {
 
         this.criteria = checkNotNull(criteria, "criterion");
         this.sortOptions = Collections.unmodifiableList(new ArrayList<>(sortOptions));
-        this.limit = limit;
-        this.skip = skip;
+        this.size = size;
     }
 
     @Override
@@ -72,18 +66,13 @@ public List<SortOption> getSortOptions() {
     }
 
     @Override
-    public int getLimit() {
-        return limit;
-    }
-
-    @Override
-    public int getSkip() {
-        return skip;
+    public int getSize() {
+        return size;
     }
 
     @Override
     public Query withCriteria(final Criteria criteria) {
-        return new MongoQuery(criteria, sortOptions, limit, skip);
+        return new MongoQuery(criteria, sortOptions, size);
     }
 
     /**
@@ -115,15 +104,14 @@ public boolean equals(final Object o) {
             return false;
         }
         final MongoQuery that = (MongoQuery) o;
-        return limit == that.limit &&
-                skip == that.skip &&
+        return size == that.size &&
                 Objects.equals(criteria, that.criteria) &&
                 Objects.equals(sortOptions, that.sortOptions);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(criteria, sortOptions, limit, skip);
+        return Objects.hash(criteria, sortOptions, size);
     }
 
     @Override
@@ -131,8 +119,7 @@ public String toString() {
         return getClass().getSimpleName() + " [" +
                 "criteria=" + criteria +
                 ", sortOptions=" + sortOptions +
-                ", limit=" + limit +
-                ", skip=" + skip +
+                ", size=" + size +
                 "]";
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilder.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilder.java
index 331b212ac3..b651da8248 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilder.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilder.java
@@ -37,36 +37,34 @@
 @NotThreadSafe
 final class MongoQueryBuilder implements QueryBuilder {
 
-    static final int DEFAULT_SKIP = 0;
-
     /**
-     * The default value for the limit parameter, if we have a unlimited query (count).
+     * The default value for the size parameter, if we have a unlimited query (count).
      */
-    private static final int DEFAULT_LIMIT_UNLIMITED = 0;
+    private static final int DEFAULT_SIZE_UNLIMITED = 0;
 
     /**
-     * The max value for the limit parameter, if we have a unlimited query (count).
+     * The max value for the size parameter, if we have a unlimited query (count).
      */
-    private static final int MAX_LIMIT_UNLIMITED = Integer.MAX_VALUE;
+    private static final int MAX_SIZE_UNLIMITED = Integer.MAX_VALUE;
 
-    private static final SortFieldExpression ID_SORT_FIELD_EXPRESSION = SimpleFieldExpression.of(
-            PersistenceConstants.FIELD_ID);
+    private static final SortFieldExpression ID_SORT_FIELD_EXPRESSION =
+            SimpleFieldExpression.of(PersistenceConstants.FIELD_ID);
 
     private static final List<SortOption> DEFAULT_SORT_OPTIONS =
             Collections.singletonList(new SortOption(ID_SORT_FIELD_EXPRESSION, SortDirection.ASC));
 
     private final Criteria criteria;
-    private final int maxLimit;
-    private int limit;
-    private int skip;
+    private final int maxSize;
+    private int size;
+
     private List<SortOption> sortOptions;
 
-    private MongoQueryBuilder(final Criteria criteria, final int maxLimit, final int defaultLimit) {
+    private MongoQueryBuilder(final Criteria criteria, final int maxSize, final int defaultSize) {
 
         this.criteria = checkNotNull(criteria, "criteria");
-        this.maxLimit = maxLimit;
-        limit = defaultLimit;
-        skip = DEFAULT_SKIP;
+        this.maxSize = maxSize;
+        size = defaultSize;
+
         sortOptions = DEFAULT_SORT_OPTIONS;
     }
 
@@ -83,13 +81,13 @@ public static MongoQueryBuilder limited(final Criteria criteria, final int maxPa
     }
 
     /**
-     * Creates a builder for a unlimited query (count).
+     * Creates a builder for an unlimited query (count).
      *
      * @param criteria the query criteria.
      * @throws NullPointerException if {@code criteria} is {@code null}.
      */
     public static MongoQueryBuilder unlimited(final Criteria criteria) {
-        return new MongoQueryBuilder(criteria, MAX_LIMIT_UNLIMITED, DEFAULT_LIMIT_UNLIMITED);
+        return new MongoQueryBuilder(criteria, MAX_SIZE_UNLIMITED, DEFAULT_SIZE_UNLIMITED);
     }
 
     @Override
@@ -106,30 +104,19 @@ public QueryBuilder sort(final List<SortOption> sortOptions) {
             options.addAll(DEFAULT_SORT_OPTIONS);
             this.sortOptions = options;
         }
-        return this;
-    }
 
-    @Override
-    public QueryBuilder limit(final long n) {
-        limit = Validator.checkLimit(n, maxLimit);
         return this;
     }
 
     @Override
     public QueryBuilder size(final long n) {
-        limit = Validator.checkSize(n, maxLimit);
-        return this;
-    }
-
-    @Override
-    public QueryBuilder skip(final long n) {
-        skip = Validator.checkSkip(n);
+        size = Validator.checkSize(n, maxSize);
         return this;
     }
 
     @Override
     public Query build() {
-        return new MongoQuery(criteria, sortOptions, limit, skip);
+        return new MongoQuery(criteria, sortOptions, size);
     }
 
 }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/Validator.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/Validator.java
index 9f05770537..00e0efa891 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/Validator.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/Validator.java
@@ -22,38 +22,21 @@
 @Immutable
 final class Validator {
 
-    private static final String LIMIT_PARAM = "limit";
     private static final String SIZE_PARAM = "size";
-    private static final String SKIP_PARAM = "skip";
 
     private Validator() {
         throw new AssertionError();
     }
 
-    static int checkLimit(final long limit, final int maxLimit) {
-        return checkMaxLimit(checkMinLimit(limit), maxLimit);
-    }
 
     static int checkSize(final long size, final int maxLimit) {
         return checkMaxSize(checkMinSize(size), maxLimit);
     }
 
-    static int checkSkip(final long skip) {
-        return checkMaxSkip(checkMinSkip(skip));
-    }
-
-    private static long checkMinLimit(final long limit) {
-        return checkMinParamValue(limit, LIMIT_PARAM);
-    }
-
     private static long checkMinSize(final long limit) {
         return checkMinParamValue(limit, SIZE_PARAM);
     }
 
-    private static long checkMinSkip(final long limit) {
-        return checkMinParamValue(limit, SKIP_PARAM);
-    }
-
     private static long checkMinParamValue(final long limit, final String paramName) {
         if (limit < 0) {
             final String msgTemplate = "Parameter <{0}> must be greater than or equal to <0> but it was <{1}>!";
@@ -62,13 +45,6 @@ private static long checkMinParamValue(final long limit, final String paramName)
         return limit;
     }
 
-    private static int checkMaxSkip(final long skip) {
-        return checkMaxParamValue(skip, Integer.MAX_VALUE, SKIP_PARAM);
-    }
-
-    private static int checkMaxLimit(final long limit, final int maxLimit) {
-        return checkMaxParamValue(limit, maxLimit, LIMIT_PARAM);
-    }
     private static int checkMaxSize(final long limit, final int maxLimit) {
         return checkMaxParamValue(limit, maxLimit, SIZE_PARAM);
     }
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActor.java
index 5c33d5d022..f9c403aed6 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchActor.java
@@ -286,8 +286,7 @@ private void performStream(final StreamThings streamThings, final ActorRef sende
                         final var query =
                                 ThingsSearchCursor.adjust(cursor, parsedQuery, queryParser.getCriteriaFactory());
                         stopTimer(queryParsingTimer);
-                        searchTimer.startNewSegment(
-                                DATABASE_ACCESS_SEGMENT_NAME); // segment stopped by stopTimerAndHandleError
+                        searchTimer.startNewSegment(DATABASE_ACCESS_SEGMENT_NAME); // segment stopped by stopTimerAndHandleError
                         final List<String> subjectIds =
                                 streamThings.getDittoHeaders()
                                         .getAuthorizationContext()
@@ -443,8 +442,7 @@ private QueryThingsResponse toQueryThingsResponse(final QueryThings queryThings,
         } else {
             // only respond with the determined "thingIds", the lookup of the things is done in gateway:
             final JsonArray items = getItems(thingIds);
-            final var searchResults =
-                    SearchModelFactory.newSearchResult(items, thingIds.nextPageOffset());
+            final var searchResults = SearchModelFactory.newSearchResult(items);
             final var processedResults =
                     ThingsSearchCursor.processSearchResult(queryThings, cursor, searchResults, thingIds);
 
@@ -470,6 +468,7 @@ private static StartedTimer startNewTimer(final JsonSchemaVersion version, final
                 .tag(API_VERSION_TAG, version.toString())
                 .start();
         DittoTracing.wrapTimer(DittoTracing.extractTraceContext(withDittoHeaders), startedTimer);
+
         return startedTimer;
     }
 
diff --git a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java
index 47aaa31cc2..4687aa34df 100644
--- a/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java
+++ b/thingsearch/service/src/main/java/org/eclipse/ditto/thingsearch/service/starter/actors/ThingsSearchCursor.java
@@ -241,10 +241,9 @@ private SearchResult searchResultWithExistingCursor(final SearchResult searchRes
                     new ThingsSearchCursor(namespaces, correlationId, sortOption, filter, newValues.get());
             return searchResult.toBuilder()
                     .cursor(newCursor.encode())
-                    .nextPageOffset(null)
                     .build();
         } else {
-            return searchResult.toBuilder().nextPageOffset(null).build();
+            return searchResult;
         }
     }
 
@@ -315,7 +314,7 @@ String encode() {
      * Decode the string representation of a cursor.
      *
      * @param cursorString the string representation.
-     * @param system actor system holding the default materializer
+     * @param system actor system holding the default materializer.
      * @return source of the decoded cursor or a failed source containing a {@code DittoRuntimeException}.
      */
     static Source<ThingsSearchCursor, NotUsed> decode(final String cursorString, final ActorSystem system) {
@@ -447,9 +446,6 @@ private static <T> Source<T, NotUsed> catchExceptions(final DittoHeaders dittoHe
     private static SearchResult searchResultWithNewCursor(final QueryThings queryThings,
             final SearchResult searchResult, final ResultList<?> resultList) {
 
-        final List<Option> commandOptions = getOptions(queryThings);
-        final boolean hasSizeOption = !findAll(SizeOption.class, commandOptions).isEmpty();
-
         if (hasNextPage(resultList)) {
             // there are more results; append cursor and offset as appropriate
             final SearchResultBuilder builder = searchResult.toBuilder();
@@ -459,20 +455,10 @@ private static SearchResult searchResultWithNewCursor(final QueryThings queryThi
             final ThingsSearchCursor newCursor = computeNewCursor(queryThings, resultList);
             builder.cursor(newCursor.encode());
 
-            // size option is present. Remove next-page-offset.
-            if (hasSizeOption) {
-                // using size option; do not deliver nextPageOffset
-                builder.nextPageOffset(null);
-            }
-
             return builder.build();
-        } else if (hasSizeOption) {
-            // This is the last page. Size option is present. Remove next-page-offset.
-            return searchResult.toBuilder().nextPageOffset(null).build();
-        } else {
-            // This is the last page. Size option is absent. Retain next-page-offset.
-            return searchResult;
         }
+
+        return searchResult;
     }
 
     /**
@@ -835,4 +821,5 @@ private static Optional<InvalidOptionException> checkSizeOption(final List<Optio
             return Optional.empty();
         }
     }
+
 }
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImplTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImplTest.java
index 0587e25dea..00ed4c3ef1 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImplTest.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/common/model/ResultListImplTest.java
@@ -31,7 +31,7 @@ public void hashcodeAndEquals() {
     }
 
     // We cannot guarantee immutability for ResultListImpl, because its elements might not be immutable
-    // // @Test
+    // @Test
     // public void immutability()
     // {
     // assertInstancesOf(ResultListImpl.class, areImmutable());
@@ -40,20 +40,18 @@ public void hashcodeAndEquals() {
 
     @Test(expected = NullPointerException.class)
     public void constructorWithNull() {
-        new ResultListImpl<>(null, 1);
+        new ResultListImpl<>(null, null);
     }
 
 
     @Test
     public void basicUsage() {
-        final int nextPageOffset = 4;
         final String first = "a";
         final String second = "b";
 
-        final ResultListImpl<String> resultList = new ResultListImpl<>(Arrays.asList(first, second), nextPageOffset);
+        final ResultListImpl<String> resultList = new ResultListImpl<>(Arrays.asList(first, second));
         Assertions.assertThat(resultList).isNotEmpty().containsOnly(first, second).hasSize(2);
         Assertions.assertThat(resultList.get(0)).isEqualTo(first);
         Assertions.assertThat(resultList.get(1)).isEqualTo(second);
-        Assertions.assertThat(resultList.nextPageOffset()).isEqualTo(nextPageOffset);
     }
 }
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/AbstractThingSearchPersistenceITBase.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/AbstractThingSearchPersistenceITBase.java
index 1849e55482..2a79e43a6a 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/AbstractThingSearchPersistenceITBase.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/AbstractThingSearchPersistenceITBase.java
@@ -34,7 +34,6 @@
 import org.eclipse.ditto.rql.query.expression.FieldExpressionUtil;
 import org.eclipse.ditto.rql.query.expression.ThingsFieldExpressionFactory;
 import org.eclipse.ditto.things.model.ThingId;
-import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
 import org.eclipse.ditto.thingsearch.service.common.config.DefaultSearchPersistenceConfig;
 import org.eclipse.ditto.thingsearch.service.common.model.ResultList;
 import org.eclipse.ditto.thingsearch.service.persistence.read.MongoThingsSearchPersistence;
@@ -141,7 +140,6 @@ public void after() {
         }
         if (actorSystem != null) {
             TestKit.shutdownActorSystem(actorSystem);
-            actorSystem = null;
             log = null;
             actorSystem = null;
         }
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/PagingIT.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SizeIT.java
similarity index 62%
rename from thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/PagingIT.java
rename to thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SizeIT.java
index 138c8361ca..84f18595bb 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/PagingIT.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SizeIT.java
@@ -22,6 +22,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
+import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.policies.model.PolicyId;
 import org.eclipse.ditto.rql.query.Query;
 import org.eclipse.ditto.rql.query.QueryBuilder;
@@ -30,10 +32,8 @@
 import org.eclipse.ditto.rql.query.expression.ThingsFieldExpressionFactory;
 import org.eclipse.ditto.things.model.Thing;
 import org.eclipse.ditto.things.model.ThingId;
-import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
 import org.eclipse.ditto.thingsearch.service.common.model.ResultList;
 import org.eclipse.ditto.thingsearch.service.persistence.TestConstants;
-import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -42,19 +42,16 @@
 import com.typesafe.config.ConfigFactory;
 
 /**
- * Tests for the paging functionality of search persistence.
+ * Tests for the size option of search persistence.
  */
-public final class PagingIT extends AbstractReadPersistenceITBase {
+public final class SizeIT extends AbstractReadPersistenceITBase {
 
-    private static final int KNOWN_LIMIT = 2;
+    private static final int KNOWN_SIZE = 2;
     private static final ThingId THING_ID1 = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId1");
     private static final ThingId THING_ID2 = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId2");
     private static final ThingId THING_ID3 = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId3");
-    private static final ThingId THING_ID4 = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId4");
-    private static final ThingId THING_ID5 = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId5");
-    private static final ThingId THING_ID6 = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId6");
-    private static final List<ThingId> THING_IDS = Arrays.asList(THING_ID1, THING_ID2, THING_ID3, THING_ID4, THING_ID5,
-            THING_ID6);
+
+    private static final List<ThingId> THING_IDS = Arrays.asList(THING_ID1, THING_ID2, THING_ID3);
 
     private static DefaultLimitsConfig limitsConfig;
 
@@ -76,73 +73,34 @@ public void setUp() {
     }
 
     @Test
-    public void pageWithItemsCountLessThanLimit() {
-        // prepare
-        final List<ThingId> oneThingList = Collections.singletonList(THING_ID1);
-        insertThings(oneThingList);
-
-        final ResultList<ThingId> result = executeVersionedQueryWithChangeOptions(query -> query.limit(KNOWN_LIMIT));
-
-        // verify
-        assertPaging(result, oneThingList, ResultList.NO_NEXT_PAGE);
-    }
-
-    @Test
-    public void pageWithItemsCountEqualToLimit() {
+    public void resultWithItemsCountEqualToSize() {
         // prepare
         insertThings(THING_IDS);
 
-        final ResultList<ThingId> result = executeVersionedQueryWithChangeOptions(query -> query.limit(KNOWN_LIMIT));
+        final ResultList<ThingId> result = executeVersionedQueryWithChangeOptions(query -> query.size(KNOWN_SIZE));
 
         // verify
         final List<ThingId> expectedList = Arrays.asList(THING_ID1, THING_ID2);
-        assertPaging(result, expectedList, KNOWN_LIMIT);
-    }
-
-    @Test
-    public void pageWithSkipAndLimitLessThanTotalItems() {
-        // prepare
-        insertThings(THING_IDS);
-
-        final ResultList<ThingId> result =
-                executeVersionedQueryWithChangeOptions(query -> query.limit(KNOWN_LIMIT).skip(KNOWN_LIMIT));
-
-        // verify
-        final List<ThingId> expectedList = Arrays.asList(THING_ID3, THING_ID4);
-        assertPaging(result, expectedList, KNOWN_LIMIT * 2);
-    }
-
-    @Test
-    public void lastPageWithItemsCountLessThanLimit() {
-        // prepare
-        insertThings(THING_IDS.subList(0, THING_IDS.size() - 1));
-
-        final ResultList<ThingId> result =
-                executeVersionedQueryWithChangeOptions(query -> query.limit(KNOWN_LIMIT).skip(KNOWN_LIMIT * 2));
-
-        // verify
-        final List<ThingId> expectedList = Collections.singletonList(THING_ID5);
-        assertPaging(result, expectedList, ResultList.NO_NEXT_PAGE);
+        assertResult(result, expectedList);
     }
 
     @Test
-    public void lastPageWithItemsCountEqualToLimit() {
+    public void resultWithItemsCountLessThanSize() {
         // prepare
-        insertThings(THING_IDS);
+        final List<ThingId> oneThingList = Collections.singletonList(THING_ID1);
+        insertThings(oneThingList);
 
-        final ResultList<ThingId> result =
-                executeVersionedQueryWithChangeOptions(query -> query.limit(KNOWN_LIMIT).skip(KNOWN_LIMIT * 2));
+        final ResultList<ThingId> result = executeVersionedQueryWithChangeOptions(query -> query.size(KNOWN_SIZE));
 
         // verify
-        final List<ThingId> expectedList = Arrays.asList(THING_ID5, THING_ID6);
-        assertPaging(result, expectedList, ResultList.NO_NEXT_PAGE);
+        assertResult(result, oneThingList);
     }
 
     @Test
-    public void defaultLimitValue() {
+    public void defaultSizeValue() {
         // prepare
-        final int moreThanLimit = 30;
-        final long totalThingsCount = defaultPageSizeFromConfig + moreThanLimit;
+        final int moreThanDefaultPageSize = 30;
+        final long totalThingsCount = defaultPageSizeFromConfig + moreThanDefaultPageSize;
         final List<ThingId> allThings = new ArrayList<>((int) totalThingsCount);
         final ThingId baseThingId = TestConstants.thingId(TestConstants.Thing.NAMESPACE, "thingId");
         for (int i = 0; i < totalThingsCount; i++) {
@@ -156,39 +114,44 @@ public void defaultLimitValue() {
 
         // verify
         final List<ThingId> expectedList = allThings.subList(0, defaultPageSizeFromConfig);
-        assertPaging(result, expectedList, defaultPageSizeFromConfig);
+        assertResult(result, expectedList);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void limitValueExceedsMaximum() {
-        executeVersionedQueryWithChangeOptions(query -> query.limit(maxPageSizeFromConfig + 1));
+    public void sizeValueExceedsMaximum() {
+        executeVersionedQueryWithChangeOptions(query -> query.size(maxPageSizeFromConfig + 1));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void sizeValueBelowMinimum() {
+        executeVersionedQueryWithChangeOptions(query -> query.size(-1));
     }
 
     @Test
-    public void pageSkipsDeletedItems() {
+    public void resultSkipsDeletedItems() {
         // prepare
         insertThings(THING_IDS);
 
         // delete Thing from first page
-        final int limit = 3;
-        final ThingId thingToDelete = THING_IDS.get(limit - 1);
+        final int size = 3;
+        final ThingId thingToDelete = THING_IDS.get(size - 1);
         deleteThing(thingToDelete, 1L, PolicyId.of(thingToDelete.toString()), 1L);
 
-        final ResultList<ThingId> result = executeVersionedQueryWithChangeOptions(query -> query.limit(limit));
+        final ResultList<ThingId> result = executeVersionedQueryWithChangeOptions(query -> query.size(size));
 
         // verify
         final List<ThingId> expectedList = THING_IDS.stream()
                 .filter(id -> !thingToDelete.equals(id))
-                .limit(limit)
+                .limit(size)
                 .collect(Collectors.toList());
-        assertPaging(result, expectedList, limit);
+
+        assertResult(result, expectedList);
     }
 
-    private static void assertPaging(final ResultList<ThingId> actualResult, final List<ThingId> expectedList,
-            final long expectedNextPageOffset) {
+    private static void assertResult(final ResultList<ThingId> actualResult, final List<ThingId> expectedList) {
 
         assertThat(actualResult).containsOnly(expectedList.toArray(new ThingId[0]));
-        assertThat(actualResult.nextPageOffset()).isEqualTo(expectedNextPageOffset);
+        assertThat(actualResult).hasSize(expectedList.size());
     }
 
     private void insertThings(final Collection<ThingId> thingIds) {
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SortingIT.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SortingIT.java
index dec67b380a..f2030927a2 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SortingIT.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/SortingIT.java
@@ -296,7 +296,7 @@ private List<ThingId> createExpectedResult(final Collection<Thing> things,
                 .sorted(comparator)
                 .map(thing -> thing.getEntityId().orElseThrow(IllegalStateException::new))
                 .collect(Collectors.toList());
-        return new ResultListImpl<>(simpleList, ResultList.NO_NEXT_PAGE);
+        return new ResultListImpl<>(simpleList);
     }
 
     private static ThingId randomThingId() {
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderLimitedTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderLimitedTest.java
index 37ec1b68e9..cdb000136d 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderLimitedTest.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderLimitedTest.java
@@ -18,13 +18,13 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
+import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.rql.query.Query;
 import org.eclipse.ditto.rql.query.SortDirection;
 import org.eclipse.ditto.rql.query.SortOption;
 import org.eclipse.ditto.rql.query.criteria.Criteria;
 import org.eclipse.ditto.rql.query.expression.SimpleFieldExpression;
-import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
-import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -93,35 +93,23 @@ public void appendDefaultSortOption() {
     }
 
     @Test
-    public void buildWithLimit() {
-        final int limit = maxPageSizeFromConfig - 1;
-        final Query query = underTest.limit(limit).build();
+    public void buildWithSize() {
+        final int size = maxPageSizeFromConfig - 1;
+        final Query query = underTest.size(size).build();
 
-        assertThat(query.getLimit()).isEqualTo(limit);
+        assertThat(query.getSize()).isEqualTo(size);
     }
 
-    @Test
-    public void buildWithSkip() {
-        final int skip = 4;
-        final Query query = underTest.skip(skip).build();
-
-        assertThat(query.getSkip()).isEqualTo(skip);
-    }
 
     @Test(expected = IllegalArgumentException.class)
     public void buildWithLimitGreaterThanMaxValue() {
         final long limitTooHigh = (long) maxPageSizeFromConfig + 1;
-        underTest.limit(limitTooHigh);
+        underTest.size(limitTooHigh);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void buildWithLimitLessThanZero() {
-        underTest.limit(-1);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void buildWithSkipLessThanZero() {
-        underTest.skip(-1);
+        underTest.size(-1);
     }
 
 }
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderUnlimitedTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderUnlimitedTest.java
index 3484bfd3dd..618a493ffd 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderUnlimitedTest.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryBuilderUnlimitedTest.java
@@ -67,40 +67,26 @@ public void buildWithSort() {
     }
 
     @Test
-    public void buildWithLimit() {
-        final int limit = 4;
+    public void buildWithSize() {
+        final int size = 4;
 
-        final Query query = underTest.limit(limit).build();
+        final Query query = underTest.size(size).build();
 
-        assertThat(query.getLimit()).isEqualTo(limit);
+        assertThat(query.getSize()).isEqualTo(size);
     }
 
     @Test
-    public void buildWithSkip() {
-        final int skip = 4;
+    public void buildWithVeryHighSize() {
+        final int veryHighSize = Integer.MAX_VALUE;
 
-        final Query query = underTest.skip(skip).build();
+        final Query query = underTest.size(veryHighSize).build();
 
-        assertThat(query.getSkip()).isEqualTo(skip);
-    }
-
-    @Test
-    public void buildWithVeryHighLimit() {
-        final int veryHighLimit = Integer.MAX_VALUE;
-
-        final Query query = underTest.limit(veryHighLimit).build();
-
-        assertThat(query.getLimit()).isEqualTo(veryHighLimit);
+        assertThat(query.getSize()).isEqualTo(veryHighSize);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void buildWithLimitLessThanZero() {
-        underTest.limit(-1);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void buildWithSkipLessThanZero() {
-        underTest.skip(-1);
+        underTest.size(-1);
     }
 
 }
diff --git a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryTest.java b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryTest.java
index 423c69c294..d04d54417f 100644
--- a/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryTest.java
+++ b/thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/read/query/MongoQueryTest.java
@@ -28,6 +28,8 @@
 
 import org.bson.BsonDocument;
 import org.bson.conversions.Bson;
+import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
+import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.BsonUtil;
 import org.eclipse.ditto.rql.query.SortDirection;
 import org.eclipse.ditto.rql.query.SortOption;
@@ -36,8 +38,6 @@
 import org.eclipse.ditto.rql.query.expression.SimpleFieldExpression;
 import org.eclipse.ditto.rql.query.expression.SortFieldExpression;
 import org.eclipse.ditto.rql.query.expression.ThingsFieldExpressionFactory;
-import org.eclipse.ditto.base.service.config.limits.DefaultLimitsConfig;
-import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -103,16 +103,14 @@ public void immutability() {
 
     @Test
     public void criteriaIsCorrectlySet() {
-        final MongoQuery query = new MongoQuery(KNOWN_CRIT, knownSortOptions, defaultPageSizeFromConfig,
-                MongoQueryBuilder.DEFAULT_SKIP);
+        final MongoQuery query = new MongoQuery(KNOWN_CRIT, knownSortOptions, defaultPageSizeFromConfig);
 
         assertThat(query.getCriteria()).isEqualTo(KNOWN_CRIT);
     }
 
     @Test
     public void emptySortOptions() {
-        final MongoQuery query = new MongoQuery(KNOWN_CRIT, Collections.emptyList(), defaultPageSizeFromConfig,
-                MongoQueryBuilder.DEFAULT_SKIP);
+        final MongoQuery query = new MongoQuery(KNOWN_CRIT, Collections.emptyList(), defaultPageSizeFromConfig);
 
         assertThat(query.getCriteria()).isEqualTo(KNOWN_CRIT);
         assertThat(query.getSortOptions()).isEmpty();
@@ -121,8 +119,7 @@ public void emptySortOptions() {
 
     @Test
     public void sortOptionsAreCorrectlySet() {
-        final MongoQuery query = new MongoQuery(KNOWN_CRIT, knownSortOptions, defaultPageSizeFromConfig,
-                MongoQueryBuilder.DEFAULT_SKIP);
+        final MongoQuery query = new MongoQuery(KNOWN_CRIT, knownSortOptions, defaultPageSizeFromConfig);
 
         assertThat(query.getCriteria()).isEqualTo(KNOWN_CRIT);
         assertThat(query.getSortOptions()).isEqualTo(knownSortOptions);
diff --git a/thingsearch/service/src/test/resources/search-test.conf b/thingsearch/service/src/test/resources/search-test.conf
index 9dee2018fd..22ce1452b4 100755
--- a/thingsearch/service/src/test/resources/search-test.conf
+++ b/thingsearch/service/src/test/resources/search-test.conf
@@ -9,11 +9,11 @@ ditto {
     }
   }
   limits {
-    # limiations for the "search" service
+    # limitations for the "search" service
     search {
       default-page-size = 25
       # the allowed maximum page size limit - e.g. specified when doing a search via HTTP:
-      # /api/1/search/things?filter=...&option=limit(0,200)
+      # /api/2/search/things?filter=...&option=size(200)
       max-page-size = 200
     }
   }
diff --git a/thingsearch/service/src/test/resources/test.conf b/thingsearch/service/src/test/resources/test.conf
index 148d54b9e6..ed7d7ac72f 100755
--- a/thingsearch/service/src/test/resources/test.conf
+++ b/thingsearch/service/src/test/resources/test.conf
@@ -15,11 +15,11 @@ ditto {
     }
   }
   limits {
-    # limiations for the "search" service
+    # limitations for the "search" service
     search {
       default-page-size = 25
       # the allowed maximum page size limit - e.g. specified when doing a search via HTTP:
-      # /api/1/search/things?filter=...&option=limit(0,200)
+      # /api/2/search/things?filter=...&option=size(200)
       max-page-size = 200
     }
   }