Polish

Author: evgeniycheban

src/main/java/org/springframework/data/reindexer/repository/query/ReindexerQueryCreator.java

@@ -28,10 +28,10 @@
 import ru.rt.restream.reindexer.Query.Condition;
 import ru.rt.restream.reindexer.ReindexerIndex;
 
-import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.reindexer.repository.util.PageableUtils;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.repository.query.ReturnedType;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
@@ -191,7 +191,7 @@ else if (this.tree.isExistsProjection()) {
 		}
 		Pageable pageable = this.parameters.getPageable();
 		if (pageable.isPaged()) {
-			criteria.limit(pageable.getPageSize()).offset(getOffsetAsInteger(pageable));
+			criteria.limit(pageable.getPageSize()).offset(PageableUtils.getOffsetAsInteger(pageable));
 		}
 		if (sort.isSorted()) {
 			for (Order order : sort) {
@@ -206,7 +206,7 @@ else if (this.tree.isExistsProjection()) {
 				 * - AND the requested page number > 0
 				 * - AND the requested page size was bigger than the derived result limitation via the First/Top keyword.
 				 */
-				int firstResult = getOffsetAsInteger(pageable);
+				int firstResult = PageableUtils.getOffsetAsInteger(pageable);
 				if (pageable.getPageSize() > this.tree.getMaxResults() && firstResult > 0) {
 					criteria.offset(firstResult - (pageable.getPageSize() - this.tree.getMaxResults()));
 				}
@@ -218,11 +218,4 @@ else if (this.tree.isExistsProjection()) {
 		}
 		return criteria;
 	}
-
-	static int getOffsetAsInteger(Pageable pageable) {
-		if (pageable.getOffset() > Integer.MAX_VALUE) {
-			throw new InvalidDataAccessApiUsageException("Page offset exceeds Integer.MAX_VALUE (" + Integer.MAX_VALUE + ")");
-		}
-		return Math.toIntExact(pageable.getOffset());
-	}
 }

src/main/java/org/springframework/data/reindexer/repository/query/StringBasedReindexerRepositoryQuery.java

@@ -33,6 +33,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.expression.ValueExpressionParser;
+import org.springframework.data.reindexer.repository.util.PageableUtils;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.QueryMethod;
 import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
@@ -208,7 +209,7 @@ private String prepareQuery(ReindexerParameterAccessor parameters) {
 				result.append(" limit ").append(maxResults);
 			}
 			if (result.indexOf("offset") == -1) {
-				int firstResult = ReindexerQueryCreator.getOffsetAsInteger(pageable);
+				int firstResult = PageableUtils.getOffsetAsInteger(pageable);
 				if (firstResult > 0) {
 					/*
 					 * In order to return the correct results, we have to adjust the first result offset to be returned if:

src/main/java/org/springframework/data/reindexer/repository/support/SimpleReindexerRepository.java

@@ -33,6 +33,7 @@
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.reindexer.repository.ReindexerRepository;
 import org.springframework.data.reindexer.repository.query.ReindexerEntityInformation;
+import org.springframework.data.reindexer.repository.util.PageableUtils;
 import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.util.Assert;
 
@@ -119,9 +120,9 @@ public Page<T> findAll(Pageable pageable) {
 		}
 		Query<T> query = this.namespace.query();
 		for (Order order : pageable.getSort()) {
-			query = query.sort(order.getProperty(), order.isDescending());
+			query.sort(order.getProperty(), order.isDescending());
 		}
-		query = query.limit(pageable.getPageSize()).offset((int) pageable.getOffset()).reqTotal();
+		query.limit(pageable.getPageSize()).offset(PageableUtils.getOffsetAsInteger(pageable)).reqTotal();
 		try (ResultIterator<T> iterator = query.execute()) {
 			List<T> content = new ArrayList<>();
 			while (iterator.hasNext()) {

src/main/java/org/springframework/data/reindexer/repository/util/PageableUtils.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 evgeniycheban
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.reindexer.repository.util;
+
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * Provide a set of utility methods to support {@link Pageable}s.
+ *
+ * @author Greg Turnquist
+ * @author Evgeniy Cheban
+ */
+public final class PageableUtils {
+
+	private PageableUtils() {
+		throw new IllegalStateException("Cannot instantiate a utility class!");
+	}
+
+	/**
+	 * Convert a {@link Pageable}'s offset value from {@link Long} to {@link Integer} to support JPA spec methods.
+	 *
+	 * @param pageable the {@link Pageable} to use
+	 * @return integer
+	 * @throws InvalidDataAccessApiUsageException if {@link Pageable}'s offset exceeds {@link Integer#MAX_VALUE}
+	 */
+	public static int getOffsetAsInteger(Pageable pageable) {
+		if (pageable.getOffset() > Integer.MAX_VALUE) {
+			throw new InvalidDataAccessApiUsageException("Page offset exceeds Integer.MAX_VALUE (" + Integer.MAX_VALUE + ")");
+		}
+		return Math.toIntExact(pageable.getOffset());
+	}
+}