Merge branch 'spring-boot-2.x' of https://github.com/tdilber/jpa-generic-criteria-extension into spring-boot-3.x

# Conflicts:
#	src/test/resources/config/application.yml

Author: talhadilber

README.md

@@ -169,7 +169,7 @@ more multi value operators with java code touches.
 
 #### Comparable Operators
 
-This operator is used to compare numbers and dates. Available Java Types are **Date, Double, Long, LocalDate,
+This operator is used to compare numbers and dates. Available Java Types are **Timestamp,  Date, Double, Long, LocalDate,
 ZonedDateTime, Instant, Integer**.
 
 The following operators are available:

pom.xml

@@ -71,8 +71,8 @@
             <artifactId>spring-data-jpa</artifactId>
         </dependency>
         <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

src/main/java/com/beyt/jdq/exception/DynamicQueryIllegalArgumentException.java

@@ -0,0 +1,20 @@
+package com.beyt.jdq.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Created by tdilber at 14-Seo-2024
+ */
+@Slf4j
+public class DynamicQueryIllegalArgumentException extends IllegalArgumentException {
+
+    public DynamicQueryIllegalArgumentException(String errorMessage) {
+        super(errorMessage);
+        log.error(errorMessage, this);
+    }
+
+    public DynamicQueryIllegalArgumentException(String errorMessage, Throwable err) {
+        super(errorMessage, err);
+        log.error(errorMessage, err);
+    }
+}

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

@@ -6,6 +6,7 @@
 import com.beyt.jdq.dto.Criteria;
 import com.beyt.jdq.dto.DynamicQuery;
 import com.beyt.jdq.dto.enums.CriteriaOperator;
+import com.beyt.jdq.exception.DynamicQueryIllegalArgumentException;
 import com.beyt.jdq.query.rule.specification.*;
 import com.beyt.jdq.repository.DynamicSpecificationRepositoryImpl;
 import com.beyt.jdq.util.ApplicationContextUtil;
@@ -33,6 +34,7 @@
 import jakarta.persistence.criteria.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.RecordComponent;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -171,6 +173,9 @@ private static <ResultType> void extractIfJdqModel(DynamicQuery dynamicQuery, Cl
             List<Pair<String, String>> select = new ArrayList<>();
             for (Field declaredField : resultTypeClass.getDeclaredFields()) {
                 if (declaredField.isAnnotationPresent(JdqIgnoreField.class)) {
+                    if (resultTypeClass.isRecord()) {
+                        throw new DynamicQueryIllegalArgumentException("Record class can not have @JdqIgnoreField annotation");
+                    }
                     continue;
                 }
 
@@ -307,27 +312,38 @@ protected static long executeCountQuery(TypedQuery<Long> query) {
 
     protected static <ResultType> Iterable<ResultType> convertResultToResultTypeList(List<Pair<String, String>> querySelects, Class<ResultType> resultTypeClass, Iterable<Tuple> entityListBySelectableFilter, boolean isPage) {
         Map<Integer, Method> setterMethods = new HashMap<>();
-        for (int i = 0; i < querySelects.size(); i++) {
-            String select = querySelects.get(i).getSecond();
+        if (!resultTypeClass.isRecord()) {
+            for (int i = 0; i < querySelects.size(); i++) {
+                String select = querySelects.get(i).getSecond();
 
-            Optional<Method> methodOptional = Arrays.stream(resultTypeClass.getMethods())
-                    .filter(c -> c.getName().equalsIgnoreCase("set" + select)
-                            && c.getParameterCount() == 1).findFirst();
+                Optional<Method> methodOptional = Arrays.stream(resultTypeClass.getMethods())
+                        .filter(c -> c.getName().equalsIgnoreCase("set" + select)
+                                && c.getParameterCount() == 1).findFirst();
 
-            if (methodOptional.isPresent()) {
-                setterMethods.put(i, methodOptional.get());
+                if (methodOptional.isPresent()) {
+                    setterMethods.put(i, methodOptional.get());
+                }
             }
         }
         Stream<Tuple> stream = isPage ? ((Page<Tuple>) entityListBySelectableFilter).stream() : ((List<Tuple>) entityListBySelectableFilter).stream();
 
         List<ResultType> resultTypeList = stream.map(t -> {
             try {
-                ResultType resultObj = resultTypeClass.getConstructor().newInstance();
-
-                for (Map.Entry<Integer, Method> entry : setterMethods.entrySet()) {
-                    entry.getValue().invoke(resultObj, t.get(entry.getKey()));
+                if (resultTypeClass.isRecord()) {
+                    Object[] args = new Object[querySelects.size()];
+                    for (int i = 0; i < querySelects.size(); i++) {
+                        args[i] = t.get(i);
+                    }
+                    return resultTypeClass.getDeclaredConstructor(Arrays.stream(resultTypeClass.getRecordComponents())
+                            .map(RecordComponent::getType)
+                            .toArray(Class[]::new)).newInstance(args);
+                } else {
+                    ResultType resultObj = resultTypeClass.getConstructor().newInstance();
+                    for (Map.Entry<Integer, Method> entry : setterMethods.entrySet()) {
+                        entry.getValue().invoke(resultObj, t.get(entry.getKey()));
+                    }
+                    return resultObj;
                 }
-                return resultObj;
             } catch (Exception e) {
                 return null;
             }

src/main/java/com/beyt/jdq/util/ApplicationContextUtil.java

@@ -10,25 +10,20 @@
 
 public class ApplicationContextUtil implements ApplicationContextAware {
  private static ApplicationContext applicationContext;
-    private static IEntityManagerProvider entityManagerProvider;
-    private static IDeserializer deserializer;
-
   @Override
   public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
       ApplicationContextUtil.applicationContext = applicationContext;
-      ApplicationContextUtil.entityManagerProvider = applicationContext.getBean(IEntityManagerProvider.class);
-      ApplicationContextUtil.deserializer = applicationContext.getBean(IDeserializer.class);
   }
 
   public static ApplicationContext getApplicationContext() {
     return applicationContext;
   }
 
   public static EntityManager getEntityManager(){
-      return entityManagerProvider.provide();
+      return applicationContext.getBean(IEntityManagerProvider.class).provide();
   }
 
     public static IDeserializer getDeserializer() {
-        return deserializer;
+        return applicationContext.getBean(IDeserializer.class);
     }
 }

src/main/java/com/beyt/jdq/util/field/FieldUtil.java

@@ -9,6 +9,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.sql.Timestamp;
 
 /**
  * Created by tdilber at 11/17/2020
@@ -25,6 +26,7 @@ private FieldUtil() {
         fieldHelperMap.put(String.class, new StringFieldHelper());
         fieldHelperMap.put(Boolean.class, new BooleanFieldHelper());
         fieldHelperMap.put(Date.class, new DateFieldHelper());
+        fieldHelperMap.put(Timestamp.class, new TimestampFieldHelper());
         fieldHelperMap.put(Double.class, new DoubleFieldHelper());
         fieldHelperMap.put(Long.class, new LongFieldHelper());
         fieldHelperMap.put(LocalDate.class, new LocalDateFieldHelper());

src/main/java/com/beyt/jdq/util/field/helper/TimestampFieldHelper.java

@@ -0,0 +1,34 @@
+package com.beyt.jdq.util.field.helper;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.sql.Timestamp;
+
+/**
+ * Created by tdilber at 11/17/2020
+ */
+@Slf4j
+public class TimestampFieldHelper implements IFieldHelper<Timestamp> {
+    @Override
+    public Timestamp fillRandom() {
+        return new Timestamp(System.currentTimeMillis() + random.nextInt(1000000000));
+    }
+
+    @Override
+    public Timestamp fillValue(String value) {
+        DateFormat dateFormat = new SimpleDateFormat();
+        try {
+            return new Timestamp(dateFormat.parse(value).getTime());
+        } catch (ParseException e) {
+            throw new IllegalStateException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public String createGeneratorCode(String value) {
+        return "new Timestamp(" + fillValue(value).getTime() + "L)";
+    }
+}

src/test/java/com/beyt/jdq/BaseTestInstance.java

@@ -2,12 +2,20 @@
 
 import com.beyt.jdq.testenv.entity.Customer;
 import com.beyt.jdq.testenv.entity.User;
-import com.beyt.jdq.testenv.repository.CustomerRepository;
-import com.beyt.jdq.testenv.repository.UserRepository;
+import com.beyt.jdq.testenv.entity.authorization.*;
+import com.beyt.jdq.testenv.entity.school.Address;
+import com.beyt.jdq.testenv.entity.school.Course;
+import com.beyt.jdq.testenv.entity.school.Department;
+import com.beyt.jdq.testenv.entity.school.Student;
+import com.beyt.jdq.testenv.repository.*;
+import org.junit.jupiter.api.BeforeAll;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import jakarta.persistence.EntityManager;
 import java.util.Calendar;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Set;
 
 public abstract class BaseTestInstance {
 
@@ -17,6 +25,31 @@ public abstract class BaseTestInstance {
     @Autowired
     protected UserRepository userRepository;
 
+    @Autowired
+    protected AddressRepository addressRepository;
+
+    @Autowired
+    protected RoleRepository roleRepository;
+
+    @Autowired
+    protected DepartmentRepository departmentRepository;
+
+    @Autowired
+    protected CourseRepository courseRepository;
+
+    @Autowired
+    protected StudentRepository studentRepository;
+
+    @Autowired
+    protected AuthorizationRepository authorizationRepository;
+
+    @Autowired
+    protected RoleAuthorizationRepository roleAuthorizationRepository;
+
+    @Autowired
+    protected AdminUserRepository adminUserRepository;
+
+
     @Autowired
     protected EntityManager entityManager;
 
@@ -39,6 +72,77 @@ public abstract class BaseTestInstance {
     public final Customer customer8;
     public static final Calendar INSTANCE = Calendar.getInstance();
 
+    protected Address address1 = new Address(1L, "123 Main St", "New York", "NY", "10001");
+    protected Address address2 = new Address(2L, "456 Park Ave", "Chicago", "IL", "60605");
+    protected Address address3 = new Address(3L, "789 Broadway", "Los Angeles", "CA", "90001");
+    protected Address address4 = new Address(4L, "321 Market St", "San Francisco", "CA", "94105");
+    protected Address address5 = new Address(5L, "654 Elm St", "Dallas", "TX", "75001");
+    protected Address address6 = new Address(6L, "987 Oak St", "Houston", "TX", "77002");
+    protected Address address7 = new Address(7L, "345 Pine St", "Philadelphia", "PA", "19019");
+    protected Address address8 = new Address(8L, "678 Maple St", "Phoenix", "AZ", "85001");
+    protected Address address9 = new Address(9L, "102 Beach St", "Miami", "FL", "33101");
+    protected Address address10 = new Address(10L, "567 Hill St", "Atlanta", "GA", "30301");
+
+
+    protected Department department1 = new Department(1L, "Computer Science");
+    protected Department department2 = new Department(2L, "Mathematics");
+    protected Department department3 = new Department(3L, "Physics");
+    protected Department department4 = new Department(4L, "Chemistry");
+    protected Department department5 = new Department(5L, "Biology");
+    protected Department department6 = new Department(6L, "English Literature");
+    protected Department department7 = new Department(7L, "History");
+    protected Department department8 = new Department(8L, "Geography");
+    protected Department department9 = new Department(9L, "Political Science");
+    protected Department department10 = new Department(10L, "Economics");
+
+    protected Course course1 = new Course(1L, "Introduction to Computer Science", Timestamp.valueOf("2016-06-18 00:00:00"), 50, true, "Introduction to fundamental concepts of computer science.");
+    protected Course course2 = new Course(2L, "Calculus I", Timestamp.valueOf("2017-06-18 00:00:00"), 60, true, "Introduction to fundamental concepts of calculus.");
+    protected Course course3 = new Course(3L, "Calculus II", Timestamp.valueOf("2018-06-18 00:00:00"), 250, null, "Advanced topics in calculus including integrals and series.");
+    protected Course course4 = new Course(4L, "Physics I", Timestamp.valueOf("2019-06-18 00:00:00"), 250, null, "Introduction to classical mechanics and Newtonian physics.");
+    protected Course course5 = new Course(5L, "Physics II", Timestamp.valueOf("2020-06-18 00:00:00"), 250, null, "Advanced topics in physics including electromagnetism and thermodynamics.");
+    protected Course course6 = new Course(6L, "Chemistry I", Timestamp.valueOf("2021-06-18 00:00:00"), 40, null, "Basic principles of chemistry including atomic structure and chemical bonding.");
+    protected Course course7 = new Course(7L, "Chemistry II", Timestamp.valueOf("2022-06-18 00:00:00"), 30, null, "Continuation of chemistry studies covering topics like kinetics and equilibrium.");
+    protected Course course8 = new Course(8L, "Biology I", Timestamp.valueOf("2015-06-18 00:00:00"), 20, true, "Introduction to cellular biology and genetics.");
+    protected Course course9 = new Course(9L, "Biology II", Timestamp.valueOf("2013-06-18 00:00:00"), 54, true, "Advanced topics in biology including evolution and ecology.");
+    protected Course course10 = new Course(10L, "English Literature I", Timestamp.valueOf("2025-06-18 00:00:00"), 10, false, "Exploration of classic works of English literature and literary analysis.");
+
+    protected Student student1 = new Student(1L, "John Doe", address1, department1, List.of(course1, course2));
+    protected Student student2 = new Student(2L, "Jane Smith", address2, department2, List.of(course2, course4));
+    protected Student student3 = new Student(3L, "Robert Johnson", address3, department3, List.of(course3));
+    protected Student student4 = new Student(4L, "Emily Davis", address4, department4, List.of(course4));
+    protected Student student5 = new Student(5L, "Michael Miller", address5, department5, List.of(course5));
+    protected Student student6 = new Student(6L, "Sarah Wilson", address6, department6, List.of(course6));
+    protected Student student7 = new Student(7L, "David Moore", address7, department7, List.of(course7));
+    protected Student student8 = new Student(8L, "Jessica Taylor", address8, department8, List.of(course8));
+    protected Student student9 = new Student(9L, "Daniel Anderson", address9, department9, List.of(course9));
+    protected Student student10 = new Student(10L, "Jennifer Thomas", address10, department10, List.of(course10));
+    protected Student student11 = new Student(11L, "Talha Dilber", null, null, List.of());
+
+    protected Authorization authorization1 = new Authorization(1L, "auth1", "/url1", "icon1");
+    protected Authorization authorization2 = new Authorization(2L, "auth2", "/url2", "icon2");
+    protected Authorization authorization3 = new Authorization(3L, "auth3", "/url3", "icon3");
+    protected Authorization authorization4 = new Authorization(4L, "auth4", "/url4", "icon4");
+    protected Authorization authorization5 = new Authorization(5L, "auth5", "/url5", "icon5");
+
+    protected Role role1 = new Role(1L, "role1", "description1");
+    protected Role role2 = new Role(2L, "role2", "description2");
+    protected Role role3 = new Role(3L, "role3", "description3");
+    protected Role role4 = new Role(4L, "role4", "description4");
+    protected Role role5 = new Role(5L, "role5", "description5");
+
+    protected RoleAuthorization roleAuthorization1 = new RoleAuthorization(1L, role1, authorization1);
+    protected RoleAuthorization roleAuthorization2 = new RoleAuthorization(2L, role2, authorization2);
+    protected RoleAuthorization roleAuthorization3 = new RoleAuthorization(3L, role3, authorization3);
+    protected RoleAuthorization roleAuthorization4 = new RoleAuthorization(4L, role4, authorization4);
+    protected RoleAuthorization roleAuthorization5 = new RoleAuthorization(5L, role5, authorization5);
+
+
+    protected AdminUser adminUser1 = new AdminUser(1L, "admin1", "password1", List.of(role1));
+    protected AdminUser adminUser2 = new AdminUser(2L, "admin2", "password2", List.of(role2));
+    protected AdminUser adminUser3 = new AdminUser(3L, "admin3", "password3", List.of(role3));
+    protected AdminUser adminUser4 = new AdminUser(4L, "admin4", "password4", List.of(role4));
+    protected AdminUser adminUser5 = new AdminUser(5L, "admin5", "password5", List.of(role5));
+
     public BaseTestInstance() {
         user1 = new User(null, "Name 1", "Surname 1", 35, INSTANCE.toInstant(), User.Status.PASSIVE, User.Type.USER);
         customer1 = new Customer(null, "Customer 1", 20, INSTANCE.toInstant(), user1);
@@ -65,4 +169,55 @@ public BaseTestInstance() {
         customer8 = new Customer(null, null, 27, INSTANCE.toInstant(), user8);
 
     }
+
+
+    @BeforeAll
+    public void init() {
+        if (userRepository.count() != 0) {
+            return;
+        }
+        userRepository.save(user1);
+        userRepository.save(user2);
+        userRepository.save(user3);
+        userRepository.save(user4);
+        userRepository.save(user5);
+        userRepository.save(user6);
+        userRepository.save(user7);
+        userRepository.save(user8);
+
+        if (customerRepository.count() != 0) {
+            return;
+        }
+        customerRepository.save(customer1);
+        customerRepository.save(customer2);
+        customerRepository.save(customer3);
+        customerRepository.save(customer4);
+        customerRepository.save(customer5);
+        customerRepository.save(customer6);
+        customerRepository.save(customer7);
+        customerRepository.save(customer8);
+
+        if (addressRepository.count() != 0) {
+            return;
+        }
+        addressRepository.saveAllAndFlush(List.of(address1, address2, address3, address4, address5, address6, address7, address8, address9, address10));
+
+        departmentRepository.saveAllAndFlush(List.of(department1, department2, department3, department4, department5, department6, department7, department8, department9, department10));
+
+        courseRepository.saveAllAndFlush(List.of(course1, course2, course3, course4, course5, course6, course7, course8, course9, course10));
+
+        studentRepository.saveAllAndFlush(List.of(student1, student2, student3, student4, student5, student6, student7, student8, student9, student10, student11));
+
+        if (authorizationRepository.count() != 0) {
+            return;
+        }
+        authorizationRepository.saveAllAndFlush(List.of(authorization1, authorization2, authorization3, authorization4, authorization5));
+
+        roleRepository.saveAllAndFlush(List.of(role1, role2, role3, role4, role5));
+
+        roleAuthorizationRepository.saveAllAndFlush(List.of(roleAuthorization1, roleAuthorization2, roleAuthorization3, roleAuthorization4, roleAuthorization5));
+
+        adminUserRepository.saveAllAndFlush(List.of(adminUser1, adminUser2, adminUser3, adminUser4, adminUser5));
+    }
+
 }