Fix query with sort and limit (Azure#18339)

* add failing test demonstrating issue with generated query

* do not assume query ends in whitespace when appending offset

Author: Blackbaud-MikeLueders

sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java

@@ -134,6 +134,11 @@ public static void afterClassCleanup() {
         cosmosTemplate.deleteContainer(personInfo.getContainerName());
     }
 
+    private void insertPerson(Person person) {
+        cosmosTemplate.insert(person,
+            new PartitionKey(personInfo.getPartitionKeyFieldValue(person)));
+    }
+
     @Test(expected = CosmosAccessException.class)
     public void testInsertDuplicateId() {
         cosmosTemplate.insert(Person.class.getSimpleName(), TEST_PERSON,
@@ -419,6 +424,33 @@ public void testPaginationQuery() {
         assertThat(responseDiagnosticsTestUtils.getCosmosResponseStatistics().getRequestCharge()).isGreaterThan(0);
     }
 
+    @Test
+    public void testFindWithSortAndLimit() {
+        final Person testPerson4 = new Person("id_4", "fred", NEW_LAST_NAME, HOBBIES, ADDRESSES, AGE);
+        final Person testPerson5 = new Person("id_5", "barney", NEW_LAST_NAME, HOBBIES, ADDRESSES, AGE);
+        final Person testPerson6 = new Person("id_6", "george", NEW_LAST_NAME, HOBBIES, ADDRESSES, AGE);
+
+        insertPerson(testPerson4);
+        insertPerson(testPerson5);
+        insertPerson(testPerson6);
+
+        final Criteria criteria = Criteria.getInstance(CriteriaType.IS_EQUAL, "lastName",
+            Collections.singletonList(NEW_LAST_NAME), Part.IgnoreCaseType.ALWAYS);
+        final CosmosQuery query = new CosmosQuery(criteria);
+        query.with(Sort.by(Sort.Direction.ASC, "firstName"));
+
+        final List<Person> result = TestUtils.toList(cosmosTemplate.find(query, Person.class, containerName));
+        assertThat(result.size()).isEqualTo(3);
+        assertThat(result.get(0).getFirstName()).isEqualTo("barney");
+        assertThat(result.get(1).getFirstName()).isEqualTo("fred");
+        assertThat(result.get(2).getFirstName()).isEqualTo("george");
+
+        query.setLimit(1);
+        final List<Person> resultWithLimit = TestUtils.toList(cosmosTemplate.find(query, Person.class, containerName));
+        assertThat(resultWithLimit.size()).isEqualTo(1);
+        assertThat(resultWithLimit.get(0).getFirstName()).isEqualTo("barney");
+    }
+
     @Test
     public void testFindAllWithPageableAndSort() {
         cosmosTemplate.insert(TEST_PERSON_2,

sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/generator/AbstractQueryGenerator.java

@@ -259,7 +259,7 @@ protected SqlQuerySpec generateCosmosQuery(@NonNull CosmosQuery query,
 
         if (query.getLimit() > 0) {
             queryString = new StringBuilder(queryString)
-                .append("OFFSET 0 LIMIT ")
+                .append(" OFFSET 0 LIMIT ")
                 .append(query.getLimit()).toString();
         }