Repository pageable methods rename refactors

talhadilber · talhadilber · commit a58029ffe453 · 2024-03-01T09:24:14.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>io.github.tdilber</groupId>
     <artifactId>spring-jpa-dynamic-query</artifactId>
-    <version>0.3.2</version>
+    <version>0.3.0</version>
     <packaging>jar</packaging>
     <name>Spring Jpa Dynamic Query</name>
     <description>Spring Jpa Dynamic Query (JDQ) Project</description>
diff --git 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
@@ -21,25 +21,25 @@ public interface DynamicSpecificationRepository<T, ID> extends JpaRepository<T,
 
     List<T> findAll(DynamicQuery dynamicQuery);
 
-    Page<T> findAllPage(DynamicQuery dynamicQuery);
+    Page<T> findAllAsPage(DynamicQuery dynamicQuery);
 
-    List<Tuple> findAllTuple(DynamicQuery dynamicQuery);
+    List<Tuple> findAllAsTuple(DynamicQuery dynamicQuery);
 
-    Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery);
+    Page<Tuple> findAllAsTuplePage(DynamicQuery dynamicQuery);
 
     <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
 
-    <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
+    <ResultType> Page<ResultType> findAllAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
 
     QueryBuilder<T, ID> queryBuilder();
 
     Page<T> findAll(List<Criteria> criteriaList, Pageable pageable);
 
     long count(List<Criteria> criteriaList);
 
-    void fetchPartially(ListConsumer<T> processor, int pageSize);
+    void consumePartially(ListConsumer<T> processor, int pageSize);
 
-    void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize);
+    void consumePartially(Specification<T> specification, ListConsumer<T> processor, int pageSize);
 
-    void fetchPartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize);
+    void consumePartially(List<Criteria> criteriaList, ListConsumer<T> 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
@@ -43,17 +43,17 @@ public List<T> findAll(DynamicQuery dynamicQuery) {
     }
 
     @Override
-    public Page<T> findAllPage(DynamicQuery dynamicQuery) {
+    public Page<T> findAllAsPage(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);
     }
 
     @Override
-    public List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {
+    public List<Tuple> findAllAsTuple(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);
     }
 
     @Override
-    public Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {
+    public Page<Tuple> findAllAsTuplePage(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);
     }
 
@@ -63,7 +63,7 @@ public <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<Re
     }
 
     @Override
-    public <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
+    public <ResultType> Page<ResultType> findAllAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);
     }
 
@@ -91,12 +91,12 @@ public long count(List<Criteria> criteriaList) {
     }
 
     @Override
-    public void fetchPartially(ListConsumer<T> processor, int pageSize) {
-        fetchPartially((Specification<T>) null, processor, pageSize);
+    public void consumePartially(ListConsumer<T> processor, int pageSize) {
+        consumePartially((Specification<T>) null, processor, pageSize);
     }
 
     @Override
-    public void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {
+    public void consumePartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {
         Page<T> page = this.findAll((Specification<T>) null, PageRequest.of(0, pageSize));
         processor.accept(page.getContent());
         long totalElements = page.getTotalElements();
@@ -107,7 +107,7 @@ public void fetchPartially(Specification<T> specification, ListConsumer<T> proce
     }
 
     @Override
-    public void fetchPartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {
+    public void consumePartially(List<Criteria> criteriaList, ListConsumer<T> 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
@@ -25,23 +25,23 @@ default List<T> findAll(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery);
     }
 
-    default Page<T> findAllPage(DynamicQuery dynamicQuery) {
+    default Page<T> findAllAsPage(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);
     }
 
-    default List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {
+    default List<Tuple> findAllAsTuple(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);
     }
 
-    default Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {
+    default Page<Tuple> findAllAsTuplePage(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);
     }
 
     default <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsList(this, dynamicQuery, resultTypeClass);
     }
 
-    default <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
+    default <ResultType> Page<ResultType> findAllAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);
     }
 
@@ -53,19 +53,19 @@ default Page<T> findAll(List<Criteria> criteriaList, Pageable pageable) {
         return DynamicQueryManager.findAll(this, criteriaList, pageable);
     }
 
-    static <T> Specification<T> getSpecificationWithCriteria(List<Criteria> criteriaList) {
+    static <T> Specification<T> createSpecification(List<Criteria> criteriaList) {
         return DynamicQueryManager.getSpecification(criteriaList);
     }
 
     default long count(List<Criteria> criteriaList) {
         return DynamicQueryManager.count(this, criteriaList);
     }
 
-    default void fetchPartially(ListConsumer<T> processor, int pageSize) {
-        fetchPartially((Specification<T>) null, processor, pageSize);
+    default void consumePartially(ListConsumer<T> processor, int pageSize) {
+        consumePartially((Specification<T>) null, processor, pageSize);
     }
 
-    default void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {
+    default void consumePartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {
         Page<T> page = this.findAll((Specification<T>) null, PageRequest.of(0, pageSize));
         processor.accept(page.getContent());
         long totalElements = page.getTotalElements();
@@ -75,7 +75,7 @@ default void fetchPartially(Specification<T> specification, ListConsumer<T> proc
         }
     }
 
-    default void fetchPartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {
+    default void consumePartially(List<Criteria> criteriaList, ListConsumer<T> 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
@@ -39,7 +39,7 @@ public ResponseEntity<List<Customer>> getCustomerWithCriteria(CriteriaList crite
 
     @GetMapping("/user/as-page")
     public ResponseEntity<Page<User>> getUserWithSearchFilterAsPage(DynamicQuery dynamicQuery) {
-        Page<User> userList = userRepository.findAllPage(dynamicQuery);
+        Page<User> userList = userRepository.findAllAsPage(dynamicQuery);
         return ResponseEntity.ok().body(userList);
     }
 
@@ -51,7 +51,7 @@ public ResponseEntity<List<User>> getUserWithSearchFilterAsList(DynamicQuery dyn
 
     @GetMapping("/customer/as-page")
     public ResponseEntity<Page<Customer>> getCustomerWithSearchFilterAsPage(DynamicQuery dynamicQuery) {
-        Page<Customer> customerList = customerRepository.findAllPage(dynamicQuery);
+        Page<Customer> customerList = customerRepository.findAllAsPage(dynamicQuery);
         return ResponseEntity.ok().body(customerList);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected Predicate addPredicate(Path<?> root, CriteriaBuilder builder, Criteria`
`122`	`122`	`criteria.setValues(deserialize(root.get(criteria.getKey()).getJavaType(), criteria.getValues()));`
`123`	`123`	`} catch (Exception e) {`
`124`	`124`	`throw new DynamicQueryNoAvailableEnumException("There is a "`
`125`		`- + root.get(criteria.getKey()).getJavaType().getSimpleName() + " Enum Problem in Criteria Key: "`
	`125`	`+ + root.get(criteria.getKey()).getJavaType().getSimpleName() + " Problem in Criteria Key: "`
`126`	`126`	`+ criteria.getKey(), e);`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,17 @@ public List<T> findAll(DynamicQuery dynamicQuery) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public Page<T> findAllPage(DynamicQuery dynamicQuery) {`
	`46`	`+ public Page<T> findAllAsPage(DynamicQuery dynamicQuery) {`
`47`	`47`	`return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {`
	`51`	`+ public List<Tuple> findAllAsTuple(DynamicQuery dynamicQuery) {`
`52`	`52`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {`
	`56`	`+ public Page<Tuple> findAllAsTuplePage(DynamicQuery dynamicQuery) {`
`57`	`57`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);`
`58`	`58`	`}`
`59`	`59`
`@@ -63,7 +63,7 @@ public <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<Re`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
	`66`	`+ public <ResultType> Page<ResultType> findAllAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
`67`	`67`	`return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);`
`68`	`68`	`}`
`69`	`69`
`@@ -91,12 +91,12 @@ public long count(List<Criteria> criteriaList) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`		`- public void fetchPartially(ListConsumer<T> processor, int pageSize) {`
`95`		`- fetchPartially((Specification<T>) null, processor, pageSize);`
	`94`	`+ public void consumePartially(ListConsumer<T> processor, int pageSize) {`
	`95`	`+ consumePartially((Specification<T>) null, processor, pageSize);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
`99`		`- public void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {`
	`99`	`+ public void consumePartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {`
`100`	`100`	`Page<T> page = this.findAll((Specification<T>) null, PageRequest.of(0, pageSize));`
`101`	`101`	`processor.accept(page.getContent());`
`102`	`102`	`long totalElements = page.getTotalElements();`
`@@ -107,7 +107,7 @@ public void fetchPartially(Specification<T> specification, ListConsumer<T> proce`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@Override`
`110`		`- public void fetchPartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {`
	`110`	`+ public void consumePartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {`
`111`	`111`	`long totalElements = DynamicQueryManager.count(this, criteriaList);`
`112`	`112`
`113`	`113`	`for (int i = 0; (long) i * pageSize < totalElements; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -25,23 +25,23 @@ default List<T> findAll(DynamicQuery dynamicQuery) {`
`25`	`25`	`return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery);`
`26`	`26`	`}`
`27`	`27`
`28`		`- default Page<T> findAllPage(DynamicQuery dynamicQuery) {`
	`28`	`+ default Page<T> findAllAsPage(DynamicQuery dynamicQuery) {`
`29`	`29`	`return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);`
`30`	`30`	`}`
`31`	`31`
`32`		`- default List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {`
	`32`	`+ default List<Tuple> findAllAsTuple(DynamicQuery dynamicQuery) {`
`33`	`33`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);`
`34`	`34`	`}`
`35`	`35`
`36`		`- default Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {`
	`36`	`+ default Page<Tuple> findAllAsTuplePage(DynamicQuery dynamicQuery) {`
`37`	`37`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`default <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
`41`	`41`	`return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsList(this, dynamicQuery, resultTypeClass);`
`42`	`42`	`}`
`43`	`43`
`44`		`- default <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
	`44`	`+ default <ResultType> Page<ResultType> findAllAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
`45`	`45`	`return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);`
`46`	`46`	`}`
`47`	`47`
`@@ -53,19 +53,19 @@ default Page<T> findAll(List<Criteria> criteriaList, Pageable pageable) {`
`53`	`53`	`return DynamicQueryManager.findAll(this, criteriaList, pageable);`
`54`	`54`	`}`
`55`	`55`
`56`		`- static <T> Specification<T> getSpecificationWithCriteria(List<Criteria> criteriaList) {`
	`56`	`+ static <T> Specification<T> createSpecification(List<Criteria> criteriaList) {`
`57`	`57`	`return DynamicQueryManager.getSpecification(criteriaList);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`default long count(List<Criteria> criteriaList) {`
`61`	`61`	`return DynamicQueryManager.count(this, criteriaList);`
`62`	`62`	`}`
`63`	`63`
`64`		`- default void fetchPartially(ListConsumer<T> processor, int pageSize) {`
`65`		`- fetchPartially((Specification<T>) null, processor, pageSize);`
	`64`	`+ default void consumePartially(ListConsumer<T> processor, int pageSize) {`
	`65`	`+ consumePartially((Specification<T>) null, processor, pageSize);`
`66`	`66`	`}`
`67`	`67`
`68`		`- default void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {`
	`68`	`+ default void consumePartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {`
`69`	`69`	`Page<T> page = this.findAll((Specification<T>) null, PageRequest.of(0, pageSize));`
`70`	`70`	`processor.accept(page.getContent());`
`71`	`71`	`long totalElements = page.getTotalElements();`
`@@ -75,7 +75,7 @@ default void fetchPartially(Specification<T> specification, ListConsumer<T> proc`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`- default void fetchPartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {`
	`78`	`+ default void consumePartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {`
`79`	`79`	`long totalElements = DynamicQueryManager.count(this, criteriaList);`
`80`	`80`
`81`	`81`	`for (int i = 0; (long) i * pageSize < totalElements; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public ResponseEntity<List<Customer>> getCustomerWithCriteria(CriteriaList crite`
`39`	`39`
`40`	`40`	`@GetMapping("/user/as-page")`
`41`	`41`	`public ResponseEntity<Page<User>> getUserWithSearchFilterAsPage(DynamicQuery dynamicQuery) {`
`42`		`- Page<User> userList = userRepository.findAllPage(dynamicQuery);`
	`42`	`+ Page<User> userList = userRepository.findAllAsPage(dynamicQuery);`
`43`	`43`	`return ResponseEntity.ok().body(userList);`
`44`	`44`	`}`
`45`	`45`
`@@ -51,7 +51,7 @@ public ResponseEntity<List<User>> getUserWithSearchFilterAsList(DynamicQuery dyn`
`51`	`51`
`52`	`52`	`@GetMapping("/customer/as-page")`
`53`	`53`	`public ResponseEntity<Page<Customer>> getCustomerWithSearchFilterAsPage(DynamicQuery dynamicQuery) {`
`54`		`- Page<Customer> customerList = customerRepository.findAllPage(dynamicQuery);`
	`54`	`+ Page<Customer> customerList = customerRepository.findAllAsPage(dynamicQuery);`
`55`	`55`	`return ResponseEntity.ok().body(customerList);`
`56`	`56`	`}`
`57`	`57`