HHH-18077 extremely minor cleanup after fix

Signed-off-by: Gavin King <gavin@hibernate.org>
hibernate · May 7, 2024 · dc0ca63 · dc0ca63
1 parent 5512281
commit dc0ca63
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
@@ -181,29 +181,33 @@ public KeyedResultList<R> getKeyedResultList(KeyedPage<R> keyedPage) {
 	}
 
 	private static <R> KeyedPage<R> nextPage(KeyedPage<R> keyedPage, List<KeyedResult<R>> results) {
-		if (keyedPage.getKeyInterpretation() == KEY_OF_FIRST_ON_NEXT_PAGE) {
+		if ( keyedPage.getKeyInterpretation() == KEY_OF_FIRST_ON_NEXT_PAGE ) {
+			// the results come in reverse order
 			return !results.isEmpty()
 					? keyedPage.nextPage( results.get(0).getKey() )
 					: null;
 		}
-
-		final int pageSize = keyedPage.getPage().getSize();
-		return results.size() == pageSize + 1
-				? keyedPage.nextPage( results.get(pageSize - 1).getKey() )
-				: null;
+		else {
+			final int pageSize = keyedPage.getPage().getSize();
+			return results.size() == pageSize + 1
+					? keyedPage.nextPage( results.get(pageSize - 1).getKey() )
+					: null;
+		}
 	}
 
 	private static <R> KeyedPage<R> previousPage(KeyedPage<R> keyedPage, List<KeyedResult<R>> results) {
-		if (keyedPage.getKeyInterpretation() == KEY_OF_FIRST_ON_NEXT_PAGE) {
+		if ( keyedPage.getKeyInterpretation() == KEY_OF_FIRST_ON_NEXT_PAGE ) {
+			// the results come in reverse order
 			final int pageSize = keyedPage.getPage().getSize();
 			return results.size() == pageSize + 1
 					? keyedPage.previousPage( results.get(pageSize - 1).getKey() )
 					: null;
 		}
-
-		return !results.isEmpty()
-				? keyedPage.previousPage( results.get(0).getKey() )
-				: null;
+		else {
+			return !results.isEmpty()
+					? keyedPage.previousPage( results.get(0).getKey() )
+					: null;
+		}
 	}
 
 	public abstract Class<R> getExpectedResultType();

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyedResult.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/KeyedResult.java
@@ -47,6 +47,7 @@ static <R> List<R> collectResults(List<KeyedResult<R>> executed, int pageSize, K
 				}
 				break;
 			case KEY_OF_FIRST_ON_NEXT_PAGE:
+				// the results come in reverse order
 				for (int i = pageSize-1; i>=0; i--) {
 					if (i < size) {
 						resultList.add( executed.get(i).getResult() );