From a58029ffe453cd08dc701cfabbad4e1bac50fd82 Mon Sep 17 00:00:00 2001 From: talhadilber Date: Fri, 1 Mar 2024 09:24:14 +0300 Subject: [PATCH] Repository pageable methods rename refactors --- pom.xml | 2 +- .../beyt/jdq/query/DynamicSpecification.java | 2 +- .../DynamicSpecificationRepository.java | 14 +++++++------- .../DynamicSpecificationRepositoryImpl.java | 16 ++++++++-------- .../repository/JpaDynamicQueryRepository.java | 18 +++++++++--------- .../jdq/testenv/controller/TestController.java | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 5fdcfcb..46daacf 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ io.github.tdilber spring-jpa-dynamic-query - 0.3.2 + 0.3.0 jar Spring Jpa Dynamic Query Spring Jpa Dynamic Query (JDQ) Project diff --git a/src/main/java/com/beyt/jdq/query/DynamicSpecification.java b/src/main/java/com/beyt/jdq/query/DynamicSpecification.java index 8f8d44c..4872e53 100644 --- a/src/main/java/com/beyt/jdq/query/DynamicSpecification.java +++ b/src/main/java/com/beyt/jdq/query/DynamicSpecification.java @@ -122,7 +122,7 @@ protected Predicate addPredicate(Path root, CriteriaBuilder builder, Criteria criteria.setValues(deserialize(root.get(criteria.getKey()).getJavaType(), criteria.getValues())); } catch (Exception e) { throw new DynamicQueryNoAvailableEnumException("There is a " - + root.get(criteria.getKey()).getJavaType().getSimpleName() + " Enum Problem in Criteria Key: " + + root.get(criteria.getKey()).getJavaType().getSimpleName() + " Problem in Criteria Key: " + criteria.getKey(), e); } } diff --git a/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepository.java b/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepository.java index 1777c80..241ee5b 100644 --- a/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepository.java +++ b/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepository.java @@ -21,15 +21,15 @@ public interface DynamicSpecificationRepository extends JpaRepository findAll(DynamicQuery dynamicQuery); - Page findAllPage(DynamicQuery dynamicQuery); + Page findAllAsPage(DynamicQuery dynamicQuery); - List findAllTuple(DynamicQuery dynamicQuery); + List findAllAsTuple(DynamicQuery dynamicQuery); - Page findAllPageTuple(DynamicQuery dynamicQuery); + Page findAllAsTuplePage(DynamicQuery dynamicQuery); List findAll(DynamicQuery dynamicQuery, Class resultTypeClass); - Page findAllPage(DynamicQuery dynamicQuery, Class resultTypeClass); + Page findAllAsPage(DynamicQuery dynamicQuery, Class resultTypeClass); QueryBuilder queryBuilder(); @@ -37,9 +37,9 @@ public interface DynamicSpecificationRepository extends JpaRepository criteriaList); - void fetchPartially(ListConsumer processor, int pageSize); + void consumePartially(ListConsumer processor, int pageSize); - void fetchPartially(Specification specification, ListConsumer processor, int pageSize); + void consumePartially(Specification specification, ListConsumer processor, int pageSize); - void fetchPartially(List criteriaList, ListConsumer processor, int pageSize); + void consumePartially(List criteriaList, ListConsumer processor, int pageSize); } diff --git a/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepositoryImpl.java b/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepositoryImpl.java index 145ac90..4d56428 100644 --- a/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepositoryImpl.java +++ b/src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepositoryImpl.java @@ -43,17 +43,17 @@ public List findAll(DynamicQuery dynamicQuery) { } @Override - public Page findAllPage(DynamicQuery dynamicQuery) { + public Page findAllAsPage(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery); } @Override - public List findAllTuple(DynamicQuery dynamicQuery) { + public List findAllAsTuple(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery); } @Override - public Page findAllPageTuple(DynamicQuery dynamicQuery) { + public Page findAllAsTuplePage(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery); } @@ -63,7 +63,7 @@ public List findAll(DynamicQuery dynamicQuery, Class Page findAllPage(DynamicQuery dynamicQuery, Class resultTypeClass) { + public Page findAllAsPage(DynamicQuery dynamicQuery, Class resultTypeClass) { return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass); } @@ -91,12 +91,12 @@ public long count(List criteriaList) { } @Override - public void fetchPartially(ListConsumer processor, int pageSize) { - fetchPartially((Specification) null, processor, pageSize); + public void consumePartially(ListConsumer processor, int pageSize) { + consumePartially((Specification) null, processor, pageSize); } @Override - public void fetchPartially(Specification specification, ListConsumer processor, int pageSize) { + public void consumePartially(Specification specification, ListConsumer processor, int pageSize) { Page page = this.findAll((Specification) null, PageRequest.of(0, pageSize)); processor.accept(page.getContent()); long totalElements = page.getTotalElements(); @@ -107,7 +107,7 @@ public void fetchPartially(Specification specification, ListConsumer proce } @Override - public void fetchPartially(List criteriaList, ListConsumer processor, int pageSize) { + public void consumePartially(List criteriaList, ListConsumer processor, int pageSize) { long totalElements = DynamicQueryManager.count(this, criteriaList); for (int i = 0; (long) i * pageSize < totalElements; i++) { diff --git a/src/main/java/com/beyt/jdq/repository/JpaDynamicQueryRepository.java b/src/main/java/com/beyt/jdq/repository/JpaDynamicQueryRepository.java index 775f3e5..b71b533 100644 --- a/src/main/java/com/beyt/jdq/repository/JpaDynamicQueryRepository.java +++ b/src/main/java/com/beyt/jdq/repository/JpaDynamicQueryRepository.java @@ -25,15 +25,15 @@ default List findAll(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery); } - default Page findAllPage(DynamicQuery dynamicQuery) { + default Page findAllAsPage(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery); } - default List findAllTuple(DynamicQuery dynamicQuery) { + default List findAllAsTuple(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery); } - default Page findAllPageTuple(DynamicQuery dynamicQuery) { + default Page findAllAsTuplePage(DynamicQuery dynamicQuery) { return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery); } @@ -41,7 +41,7 @@ default List findAll(DynamicQuery dynamicQuery, Class Page findAllPage(DynamicQuery dynamicQuery, Class resultTypeClass) { + default Page findAllAsPage(DynamicQuery dynamicQuery, Class resultTypeClass) { return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass); } @@ -53,7 +53,7 @@ default Page findAll(List criteriaList, Pageable pageable) { return DynamicQueryManager.findAll(this, criteriaList, pageable); } - static Specification getSpecificationWithCriteria(List criteriaList) { + static Specification createSpecification(List criteriaList) { return DynamicQueryManager.getSpecification(criteriaList); } @@ -61,11 +61,11 @@ default long count(List criteriaList) { return DynamicQueryManager.count(this, criteriaList); } - default void fetchPartially(ListConsumer processor, int pageSize) { - fetchPartially((Specification) null, processor, pageSize); + default void consumePartially(ListConsumer processor, int pageSize) { + consumePartially((Specification) null, processor, pageSize); } - default void fetchPartially(Specification specification, ListConsumer processor, int pageSize) { + default void consumePartially(Specification specification, ListConsumer processor, int pageSize) { Page page = this.findAll((Specification) null, PageRequest.of(0, pageSize)); processor.accept(page.getContent()); long totalElements = page.getTotalElements(); @@ -75,7 +75,7 @@ default void fetchPartially(Specification specification, ListConsumer proc } } - default void fetchPartially(List criteriaList, ListConsumer processor, int pageSize) { + default void consumePartially(List criteriaList, ListConsumer processor, int pageSize) { long totalElements = DynamicQueryManager.count(this, criteriaList); for (int i = 0; (long) i * pageSize < totalElements; i++) { diff --git a/src/test/java/com/beyt/jdq/testenv/controller/TestController.java b/src/test/java/com/beyt/jdq/testenv/controller/TestController.java index 11403ea..9629595 100644 --- a/src/test/java/com/beyt/jdq/testenv/controller/TestController.java +++ b/src/test/java/com/beyt/jdq/testenv/controller/TestController.java @@ -39,7 +39,7 @@ public ResponseEntity> getCustomerWithCriteria(CriteriaList crite @GetMapping("/user/as-page") public ResponseEntity> getUserWithSearchFilterAsPage(DynamicQuery dynamicQuery) { - Page userList = userRepository.findAllPage(dynamicQuery); + Page userList = userRepository.findAllAsPage(dynamicQuery); return ResponseEntity.ok().body(userList); } @@ -51,7 +51,7 @@ public ResponseEntity> getUserWithSearchFilterAsList(DynamicQuery dyn @GetMapping("/customer/as-page") public ResponseEntity> getCustomerWithSearchFilterAsPage(DynamicQuery dynamicQuery) { - Page customerList = customerRepository.findAllPage(dynamicQuery); + Page customerList = customerRepository.findAllAsPage(dynamicQuery); return ResponseEntity.ok().body(customerList); }