From a2ac9841620f7b60bc31d91f2a1ba33c39cbe2d6 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Wed, 10 Apr 2024 16:27:35 +0200 Subject: [PATCH] slightly simplify generated code for pagination using static imports Signed-off-by: Gavin King --- .../processor/annotation/AbstractQueryMethod.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java index 62fe9f3666..5b380dd43c 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java @@ -374,8 +374,8 @@ public abstract class AbstractQueryMethod extends AbstractAnnotatedMethod { "\t\t\t\t\t\t.collect(toList());\n" + //SHOULD BE new CursoredPageRecord<> "\t\treturn new CursoredPageRecord(_results.getResultList(), _cursors, _totalResults, pageRequest,\n" + - "\t\t\t\t_results.isLastPage() ? null : PageRequest.afterCursor(_cursors.get(_cursors.size()-1), pageRequest.page()+1, pageRequest.size(), pageRequest.requestTotal()),\n" + - "\t\t\t\t_results.isFirstPage() ? null : PageRequest.beforeCursor(_cursors.get(0), pageRequest.page()-1, pageRequest.size(), pageRequest.requestTotal()));"; + "\t\t\t\t_results.isLastPage() ? null : afterCursor(_cursors.get(_cursors.size()-1), pageRequest.page()+1, pageRequest.size(), pageRequest.requestTotal()),\n" + + "\t\t\t\t_results.isFirstPage() ? null : beforeCursor(_cursors.get(0), pageRequest.page()-1, pageRequest.size(), pageRequest.requestTotal()));"; static final String MAKE_KEYED_PAGE = "\tvar _unkeyedPage =\n" + @@ -667,9 +667,11 @@ public abstract class AbstractQueryMethod extends AbstractAnnotatedMethod { unwrapQuery(declaration, unwrapped); declaration .append("\t\t\t.getKeyedResultList(_keyedPage);\n"); - annotationMetaEntity.importType("jakarta.data.page.PageRequest"); - annotationMetaEntity.importType("jakarta.data.page.PageRequest.Cursor"); + annotationMetaEntity.importType(JD_PAGE_REQUEST); + annotationMetaEntity.importType(JD_PAGE_REQUEST + ".Cursor"); annotationMetaEntity.importType("jakarta.data.page.impl.CursoredPageRecord"); + annotationMetaEntity.staticImport(JD_PAGE_REQUEST, "beforeCursor"); + annotationMetaEntity.staticImport(JD_PAGE_REQUEST, "afterCursor"); String fragment = MAKE_KEYED_SLICE .replace("pageRequest", parameterName(JD_PAGE_REQUEST, paramTypes, paramNames))