renamed repository method names

talhadilber · talhadilber · commit 3ceaa960c716 · 2024-02-23T09:51:19.000+03:00
diff --git a/src/main/java/com/beyt/query/DynamicQueryManager.java b/src/main/java/com/beyt/query/DynamicQueryManager.java
@@ -218,9 +218,8 @@ protected static <Entity, ResultType> Iterable<ResultType> getEntityListWithRetu
         }
 
         if (isPage) {
-            Specification<Entity> finalSpecification = specification;
             return PageableExecutionUtils.getPage(typedQuery.getResultList(), pageable,
-                    () -> executeCountQuery(getCountQuery(finalSpecification, entityClass)));
+                    () -> executeCountQuery(getCountQuery(specification, entityClass)));
         } else {
             return typedQuery.getResultList();
         }
diff --git a/src/main/java/com/beyt/repository/DynamicSpecificationRepository.java b/src/main/java/com/beyt/repository/DynamicSpecificationRepository.java
@@ -17,29 +17,29 @@
 @NoRepositoryBean
 public interface DynamicSpecificationRepository<T, ID> extends JpaRepository<T, ID>, JpaSpecificationExecutor<T> {
 
-    List<T> findAllWithCriteria(List<Criteria> criteriaList);
+    List<T> findAll(List<Criteria> criteriaList);
 
-    List<T> findAllWithSearchQuery(DynamicQuery dynamicQuery);
+    List<T> findAll(DynamicQuery dynamicQuery);
 
-    Page<T> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery);
+    Page<T> findAllPage(DynamicQuery dynamicQuery);
 
-    List<Tuple> findAllWithSearchQueryWithTuple(DynamicQuery dynamicQuery);
+    List<Tuple> findAllTuple(DynamicQuery dynamicQuery);
 
-    Page<Tuple> findAllWithSearchQueryWithTupleAsPage(DynamicQuery dynamicQuery);
+    Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery);
 
-    <ResultType> List<ResultType> findAllWithSearchQuery(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
+    <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
 
-    <ResultType> Page<ResultType> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
+    <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass);
 
-    QueryBuilder<T, ID> query();
+    QueryBuilder<T, ID> queryBuilder();
 
-    Page<T> findAllWithCriteria(List<Criteria> criteriaList, Pageable pageable);
+    Page<T> findAll(List<Criteria> criteriaList, Pageable pageable);
 
-    long countWithCriteria(List<Criteria> criteriaList);
+    long count(List<Criteria> criteriaList);
 
     void fetchPartially(ListConsumer<T> processor, int pageSize);
 
     void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize);
 
-    void fetchPartiallyWithCriteria(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize);
+    void fetchPartially(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize);
 }
diff --git a/src/main/java/com/beyt/repository/DynamicSpecificationRepositoryImpl.java b/src/main/java/com/beyt/repository/DynamicSpecificationRepositoryImpl.java
@@ -33,47 +33,47 @@ public DynamicSpecificationRepositoryImpl(JpaEntityInformation<T, ?> entityInfor
     }
 
     @Override
-    public List<T> findAllWithCriteria(List<Criteria> criteriaList) {
+    public List<T> findAll(List<Criteria> criteriaList) {
         return DynamicQueryManager.findAll(this, criteriaList);
     }
 
     @Override
-    public List<T> findAllWithSearchQuery(DynamicQuery dynamicQuery) {
+    public List<T> findAll(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery);
     }
 
     @Override
-    public Page<T> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery) {
+    public Page<T> findAllPage(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);
     }
 
     @Override
-    public List<Tuple> findAllWithSearchQueryWithTuple(DynamicQuery dynamicQuery) {
+    public List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);
     }
 
     @Override
-    public Page<Tuple> findAllWithSearchQueryWithTupleAsPage(DynamicQuery dynamicQuery) {
+    public Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);
     }
 
     @Override
-    public <ResultType> List<ResultType> findAllWithSearchQuery(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
+    public <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsList(this, dynamicQuery, resultTypeClass);
     }
 
     @Override
-    public <ResultType> Page<ResultType> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
+    public <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);
     }
 
     @Override
-    public QueryBuilder<T, ID> query() {
+    public QueryBuilder<T, ID> queryBuilder() {
         return new QueryBuilder<>(this);
     }
 
     @Override
-    public Page<T> findAllWithCriteria(List<Criteria> criteriaList, Pageable pageable) {
+    public Page<T> findAll(List<Criteria> criteriaList, Pageable pageable) {
         return DynamicQueryManager.findAll(this, criteriaList, pageable);
     }
 
@@ -86,13 +86,13 @@ public Class<T> getDomainClass() {
     }
 
     @Override
-    public long countWithCriteria(List<Criteria> criteriaList) {
+    public long count(List<Criteria> criteriaList) {
         return DynamicQueryManager.count(this, criteriaList);
     }
 
     @Override
     public void fetchPartially(ListConsumer<T> processor, int pageSize) {
-        fetchPartially(null, processor, pageSize);
+        fetchPartially((Specification<T>) null, processor, pageSize);
     }
 
     @Override
@@ -107,7 +107,7 @@ public void fetchPartially(Specification<T> specification, ListConsumer<T> proce
     }
 
     @Override
-    public void fetchPartiallyWithCriteria(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {
+    public void fetchPartially(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/repository/JpaDynamicQueryRepository.java b/src/main/java/com/beyt/repository/JpaDynamicQueryRepository.java
@@ -17,52 +17,52 @@
 @NoRepositoryBean
 public interface JpaDynamicQueryRepository<T, ID> extends DynamicSpecificationRepository<T, ID> {
 
-    default List<T> findAllWithCriteria(List<Criteria> criteriaList) {
+    default List<T> findAll(List<Criteria> criteriaList) {
         return DynamicQueryManager.findAll(this, criteriaList);
     }
 
-    default List<T> findAllWithSearchQuery(DynamicQuery dynamicQuery) {
+    default List<T> findAll(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery);
     }
 
-    default Page<T> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery) {
+    default Page<T> findAllPage(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);
     }
 
-    default List<Tuple> findAllWithSearchQueryWithTuple(DynamicQuery dynamicQuery) {
+    default List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);
     }
 
-    default Page<Tuple> findAllWithSearchQueryWithTupleAsPage(DynamicQuery dynamicQuery) {
+    default Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);
     }
 
-    default <ResultType> List<ResultType> findAllWithSearchQuery(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
+    default <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsList(this, dynamicQuery, resultTypeClass);
     }
 
-    default <ResultType> Page<ResultType> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
+    default <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {
         return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);
     }
 
-    default QueryBuilder<T, ID> query() {
+    default QueryBuilder<T, ID> queryBuilder() {
         return new QueryBuilder<T, ID>(this);
     }
 
-    default Page<T> findAllWithCriteria(List<Criteria> criteriaList, Pageable pageable) {
+    default Page<T> findAll(List<Criteria> criteriaList, Pageable pageable) {
         return DynamicQueryManager.findAll(this, criteriaList, pageable);
     }
 
     static <T> Specification<T> getSpecificationWithCriteria(List<Criteria> criteriaList) {
         return DynamicQueryManager.getSpecification(criteriaList);
     }
 
-    default long countWithCriteria(List<Criteria> criteriaList) {
+    default long count(List<Criteria> criteriaList) {
         return DynamicQueryManager.count(this, criteriaList);
     }
 
     default void fetchPartially(ListConsumer<T> processor, int pageSize) {
-        fetchPartially(null, processor, pageSize);
+        fetchPartially((Specification<T>) null, processor, pageSize);
     }
 
     default void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {
@@ -75,7 +75,7 @@ default void fetchPartially(Specification<T> specification, ListConsumer<T> proc
         }
     }
 
-    default void fetchPartiallyWithCriteria(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {
+    default void fetchPartially(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/query/DynamicQueryManagerTest.java b/src/test/java/com/beyt/query/DynamicQueryManagerTest.java
diff --git a/src/test/java/com/beyt/testenv/controller/TestController.java b/src/test/java/com/beyt/testenv/controller/TestController.java

Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,8 @@ protected static <Entity, ResultType> Iterable<ResultType> getEntityListWithRetu`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`if (isPage) {`
`221`		`- Specification<Entity> finalSpecification = specification;`
`222`	`221`	`return PageableExecutionUtils.getPage(typedQuery.getResultList(), pageable,`
`223`		`- () -> executeCountQuery(getCountQuery(finalSpecification, entityClass)));`
	`222`	`+ () -> executeCountQuery(getCountQuery(specification, entityClass)));`
`224`	`223`	`} else {`
`225`	`224`	`return typedQuery.getResultList();`
`226`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,47 +33,47 @@ public DynamicSpecificationRepositoryImpl(JpaEntityInformation<T, ?> entityInfor`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
`36`		`- public List<T> findAllWithCriteria(List<Criteria> criteriaList) {`
	`36`	`+ public List<T> findAll(List<Criteria> criteriaList) {`
`37`	`37`	`return DynamicQueryManager.findAll(this, criteriaList);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public List<T> findAllWithSearchQuery(DynamicQuery dynamicQuery) {`
	`41`	`+ public List<T> findAll(DynamicQuery dynamicQuery) {`
`42`	`42`	`return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public Page<T> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery) {`
	`46`	`+ public Page<T> findAllPage(DynamicQuery dynamicQuery) {`
`47`	`47`	`return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public List<Tuple> findAllWithSearchQueryWithTuple(DynamicQuery dynamicQuery) {`
	`51`	`+ public List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {`
`52`	`52`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public Page<Tuple> findAllWithSearchQueryWithTupleAsPage(DynamicQuery dynamicQuery) {`
	`56`	`+ public Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {`
`57`	`57`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public <ResultType> List<ResultType> findAllWithSearchQuery(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
	`61`	`+ public <ResultType> List<ResultType> findAll(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
`62`	`62`	`return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsList(this, dynamicQuery, resultTypeClass);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public <ResultType> Page<ResultType> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
	`66`	`+ public <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
`67`	`67`	`return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@Override`
`71`		`- public QueryBuilder<T, ID> query() {`
	`71`	`+ public QueryBuilder<T, ID> queryBuilder() {`
`72`	`72`	`return new QueryBuilder<>(this);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@Override`
`76`		`- public Page<T> findAllWithCriteria(List<Criteria> criteriaList, Pageable pageable) {`
	`76`	`+ public Page<T> findAll(List<Criteria> criteriaList, Pageable pageable) {`
`77`	`77`	`return DynamicQueryManager.findAll(this, criteriaList, pageable);`
`78`	`78`	`}`
`79`	`79`
`@@ -86,13 +86,13 @@ public Class<T> getDomainClass() {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public long countWithCriteria(List<Criteria> criteriaList) {`
	`89`	`+ public long count(List<Criteria> criteriaList) {`
`90`	`90`	`return DynamicQueryManager.count(this, criteriaList);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Override`
`94`	`94`	`public void fetchPartially(ListConsumer<T> processor, int pageSize) {`
`95`		`- fetchPartially(null, processor, pageSize);`
	`95`	`+ fetchPartially((Specification<T>) null, processor, pageSize);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
`@@ -107,7 +107,7 @@ public void fetchPartially(Specification<T> specification, ListConsumer<T> proce`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`@Override`
`110`		`- public void fetchPartiallyWithCriteria(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {`
	`110`	`+ public void fetchPartially(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
`@@ -17,52 +17,52 @@`
`17`	`17`	`@NoRepositoryBean`
`18`	`18`	`public interface JpaDynamicQueryRepository<T, ID> extends DynamicSpecificationRepository<T, ID> {`
`19`	`19`
`20`		`- default List<T> findAllWithCriteria(List<Criteria> criteriaList) {`
	`20`	`+ default List<T> findAll(List<Criteria> criteriaList) {`
`21`	`21`	`return DynamicQueryManager.findAll(this, criteriaList);`
`22`	`22`	`}`
`23`	`23`
`24`		`- default List<T> findAllWithSearchQuery(DynamicQuery dynamicQuery) {`
	`24`	`+ default List<T> findAll(DynamicQuery dynamicQuery) {`
`25`	`25`	`return DynamicQueryManager.getEntityListBySelectableFilterAsList(this, dynamicQuery);`
`26`	`26`	`}`
`27`	`27`
`28`		`- default Page<T> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery) {`
	`28`	`+ default Page<T> findAllPage(DynamicQuery dynamicQuery) {`
`29`	`29`	`return DynamicQueryManager.getEntityListBySelectableFilterAsPage(this, dynamicQuery);`
`30`	`30`	`}`
`31`	`31`
`32`		`- default List<Tuple> findAllWithSearchQueryWithTuple(DynamicQuery dynamicQuery) {`
	`32`	`+ default List<Tuple> findAllTuple(DynamicQuery dynamicQuery) {`
`33`	`33`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsList(this, dynamicQuery);`
`34`	`34`	`}`
`35`	`35`
`36`		`- default Page<Tuple> findAllWithSearchQueryWithTupleAsPage(DynamicQuery dynamicQuery) {`
	`36`	`+ default Page<Tuple> findAllPageTuple(DynamicQuery dynamicQuery) {`
`37`	`37`	`return DynamicQueryManager.getEntityListBySelectableFilterWithTupleAsPage(this, dynamicQuery);`
`38`	`38`	`}`
`39`	`39`
`40`		`- default <ResultType> List<ResultType> findAllWithSearchQuery(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
	`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> findAllWithSearchQueryAsPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
	`44`	`+ default <ResultType> Page<ResultType> findAllPage(DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass) {`
`45`	`45`	`return DynamicQueryManager.getEntityListBySelectableFilterWithReturnTypeAsPage(this, dynamicQuery, resultTypeClass);`
`46`	`46`	`}`
`47`	`47`
`48`		`- default QueryBuilder<T, ID> query() {`
	`48`	`+ default QueryBuilder<T, ID> queryBuilder() {`
`49`	`49`	`return new QueryBuilder<T, ID>(this);`
`50`	`50`	`}`
`51`	`51`
`52`		`- default Page<T> findAllWithCriteria(List<Criteria> criteriaList, Pageable pageable) {`
	`52`	`+ default Page<T> findAll(List<Criteria> criteriaList, Pageable pageable) {`
`53`	`53`	`return DynamicQueryManager.findAll(this, criteriaList, pageable);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`static <T> Specification<T> getSpecificationWithCriteria(List<Criteria> criteriaList) {`
`57`	`57`	`return DynamicQueryManager.getSpecification(criteriaList);`
`58`	`58`	`}`
`59`	`59`
`60`		`- default long countWithCriteria(List<Criteria> criteriaList) {`
	`60`	`+ default long count(List<Criteria> criteriaList) {`
`61`	`61`	`return DynamicQueryManager.count(this, criteriaList);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`default void fetchPartially(ListConsumer<T> processor, int pageSize) {`
`65`		`- fetchPartially(null, processor, pageSize);`
	`65`	`+ fetchPartially((Specification<T>) null, processor, pageSize);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`default void fetchPartially(Specification<T> specification, ListConsumer<T> processor, int pageSize) {`
`@@ -75,7 +75,7 @@ default void fetchPartially(Specification<T> specification, ListConsumer<T> proc`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`- default void fetchPartiallyWithCriteria(List<Criteria> criteriaList, ListConsumer<T> processor, int pageSize) {`
	`78`	`+ default void fetchPartially(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++) {`