new test added and one bug fixed

Author: talhadilber

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>io.github.tdilber</groupId>
     <artifactId>spring-jpa-dynamic-query</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <packaging>jar</packaging>
     <name>Spring Jpa Dynamic Query</name>
     <description>Spring Jpa Dynamic Query (JDQ) Project</description>

src/main/java/com/beyt/jdq/query/DynamicQueryManager.java

@@ -142,7 +142,7 @@ public static <Entity, ResultType> Page<ResultType> getEntityListBySelectableFil
     protected static <Entity, ResultType> Iterable<ResultType> getEntityListBySelectableFilterWithReturnType(JpaSpecificationExecutor<Entity> repositoryExecutor, DynamicQuery dynamicQuery, Class<ResultType> resultTypeClass, boolean isPage) {
         Class<Entity> entityClass = getEntityClass(repositoryExecutor);
         if (resultTypeClass.equals(entityClass) && CollectionUtils.isEmpty(dynamicQuery.getSelect())) {
-            return (List<ResultType>) getEntityListWithReturnClass(repositoryExecutor, dynamicQuery, resultTypeClass, isPage);
+            return getEntityListWithReturnClass(repositoryExecutor, dynamicQuery, resultTypeClass, isPage);
         } else {
             Iterable<Tuple> entityListBySelectableFilter = getEntityListWithReturnClass(repositoryExecutor, dynamicQuery, Tuple.class, isPage);
 

src/test/java/com/beyt/jdq/query/DynamicQueryManagerTest.java

@@ -10,6 +10,8 @@
 import com.beyt.jdq.exception.DynamicQueryNoAvailableOrOperationUsageException;
 import com.beyt.jdq.testenv.entity.Customer;
 import com.beyt.jdq.testenv.entity.User;
+import lombok.Getter;
+import lombok.Setter;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -18,6 +20,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.util.Pair;
 
+import javax.persistence.Tuple;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
@@ -265,4 +268,25 @@ void queryBuilderTests() {
         assertEquals(toList(user7, user6, user4, user2),
                 userRepository.queryBuilder().where(Field("status").eq(User.Status.ACTIVE)).orderBy(OrderBy("id", Order.DESC)).getResult());
     }
+
+    public static class UserName {
+        @Getter
+        @Setter
+        private String name;
+    }
+
+    @Test
+    void page() {
+        DynamicQuery dynamicQuery = new DynamicQuery();
+        dynamicQuery.setWhere(CriteriaList.of(Criteria.of("id", CriteriaOperator.GREATER_THAN, 3)));
+        dynamicQuery.setPageSize(2);
+        dynamicQuery.setPageNumber(1);
+        Page<User> result = userRepository.findAllAsPage(dynamicQuery);
+        assertEquals(toList(user6, user7), result.getContent());
+        dynamicQuery.getSelect().add(Pair.of("name", "name"));
+        Page<UserName> result2 = userRepository.findAllAsPage(dynamicQuery, UserName.class);
+        assertEquals(toList(user6.getName(), user7.getName()), result2.getContent().stream().map(UserName::getName).toList());
+        List<Tuple> allAsTuple = userRepository.findAllAsTuple(dynamicQuery);
+        Page<Tuple> allAsTuplePage = userRepository.findAllAsTuplePage(dynamicQuery);
+    }
 }