Merge branch 'spring-boot-2.x' of https://github.com/tdilber/spring-jpa-dynamic-query into spring-boot-3.x

# Conflicts:
#	pom.xml
#	src/main/java/com/beyt/jdq/config/EntityManagerProviderConfig.java
#	src/main/java/com/beyt/jdq/provider/IEntityManagerProvider.java
#	src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepository.java
#	src/main/java/com/beyt/jdq/repository/DynamicSpecificationRepositoryFactoryBean.java
#	src/main/java/com/beyt/jdq/util/ApplicationContextUtil.java
#	src/test/java/com/beyt/jdq/testenv/entity/Customer.java
#	src/test/java/com/beyt/jdq/testenv/entity/User.java
#	src/test/java/com/beyt/jdq/testenv/entity/school/Address.java

Author: talhadilber

README.md

@@ -108,7 +108,7 @@ You can find the sample code from: https://github.com/tdilber/spring-jpa-dynamic
 <dependency>
     <groupId>io.github.tdilber</groupId>
     <artifactId>spring-jpa-dynamic-query</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.1</version>
 </dependency>
 ```
 

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>io.github.tdilber</groupId>
     <artifactId>spring-boot-starter-jpa-dynamic-query</artifactId>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
     <packaging>jar</packaging>
     <name>Spring Jpa Dynamic Query</name>
     <description>Spring Jpa Dynamic Query (JDQ) Project</description>
@@ -79,11 +79,6 @@
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>

src/main/java/com/beyt/jdq/annotation/EnableJpaDynamicQuery.java

@@ -1,9 +1,10 @@
 package com.beyt.jdq.annotation;
 
 import com.beyt.jdq.config.DeserializerConfig;
-import com.beyt.jdq.config.EntityManagerProviderConfig;
-import com.beyt.jdq.util.ApplicationContextUtil;
+import com.beyt.jdq.repository.JpaDynamicQueryRepositoryFactoryBean;
+import com.beyt.jdq.repository.JpaDynamicQueryRepositoryImpl;
 import org.springframework.context.annotation.Import;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -12,6 +13,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
-@Import({ApplicationContextUtil.class, EntityManagerProviderConfig.class, DeserializerConfig.class})
+@Import({DeserializerConfig.class})
+@EnableJpaRepositories(repositoryBaseClass = JpaDynamicQueryRepositoryImpl.class, repositoryFactoryBeanClass = JpaDynamicQueryRepositoryFactoryBean.class)
 public @interface EnableJpaDynamicQuery {
 }

src/main/java/com/beyt/jdq/config/EntityManagerProviderConfig.java

@@ -1,18 +0,0 @@
-package com.beyt.jdq.config;
-
-import com.beyt.jdq.provider.IEntityManagerProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import jakarta.persistence.EntityManager;
-
-@Configuration
-public class EntityManagerProviderConfig {
-
-    @Bean
-    @ConditionalOnMissingBean
-    public IEntityManagerProvider entityManagerProvider(EntityManager entityManager) {
-        return () -> entityManager;
-    }
-}

src/main/java/com/beyt/jdq/dto/Criteria.java

@@ -2,8 +2,6 @@
 
 
 import com.beyt.jdq.dto.enums.CriteriaOperator;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -13,8 +11,6 @@
 /**
  * Created by tdilber at 24-Aug-19
  */
-@Getter
-@Setter
 public class Criteria implements Serializable {
     protected String key;
     protected CriteriaOperator operation;
@@ -42,6 +38,30 @@ public Criteria() {
 
     }
 
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public CriteriaOperator getOperation() {
+        return operation;
+    }
+
+    public void setOperation(CriteriaOperator operation) {
+        this.operation = operation;
+    }
+
+    public List<Object> getValues() {
+        return values;
+    }
+
+    public void setValues(List<Object> values) {
+        this.values = values;
+    }
+
     @Override
     public String toString() {
         StringBuilder result = new StringBuilder("key: " + key + " Criteria Operation: " + operation.name() + " ");

src/main/java/com/beyt/jdq/dto/CriteriaList.java

@@ -1,7 +1,6 @@
 package com.beyt.jdq.dto;
 
 import com.beyt.jdq.dto.enums.CriteriaOperator;
-import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -12,7 +11,6 @@
 /**
  * Created by tdilber at 11/18/2020
  */
-@Slf4j
 public class CriteriaList extends ArrayList<Criteria> implements Serializable {
 
     public static CriteriaList of(Criteria... criteria) {

src/main/java/com/beyt/jdq/dto/DynamicQuery.java

@@ -1,7 +1,6 @@
 package com.beyt.jdq.dto;
 
 import com.beyt.jdq.dto.enums.Order;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.util.Pair;
 
 import java.io.Serializable;
@@ -11,7 +10,6 @@
 /**
  * Created by tdilber at 30-Dec-20
  */
-@Slf4j
 public class DynamicQuery implements Serializable {
 
     protected boolean distinct = false;
@@ -21,6 +19,13 @@ public class DynamicQuery implements Serializable {
     protected List<Criteria> where = new CriteriaList();
     protected List<Pair<String, Order>> orderBy = new ArrayList<>();
 
+
+    public static DynamicQuery of(List<Criteria> where) {
+        DynamicQuery dynamicQuery = new DynamicQuery();
+        dynamicQuery.getWhere().addAll(where);
+        return dynamicQuery;
+    }
+
     public boolean isDistinct() {
         return distinct;
     }

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

@@ -1,20 +1,15 @@
 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/exception/DynamicQueryNoAvailableEnumException.java

@@ -1,20 +1,15 @@
 package com.beyt.jdq.exception;
 
-import lombok.extern.slf4j.Slf4j;
-
 /**
  * Created by tdilber at 24-Aug-19
  */
-@Slf4j
 public class DynamicQueryNoAvailableEnumException extends RuntimeException {
 
     public DynamicQueryNoAvailableEnumException(String errorMessage) {
         super(errorMessage);
-        log.error(errorMessage, this);
     }
 
     public DynamicQueryNoAvailableEnumException(String errorMessage, Throwable err) {
         super(errorMessage, err);
-        log.error(errorMessage, err);
     }
 }

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

@@ -1,20 +1,16 @@
 package com.beyt.jdq.exception;
 
-import lombok.extern.slf4j.Slf4j;
 
 /**
  * Created by tdilber at 24-Aug-19
  */
-@Slf4j
 public class DynamicQueryNoAvailableOperationException extends RuntimeException {
 
     public DynamicQueryNoAvailableOperationException(String errorMessage) {
         super(errorMessage);
-        log.error(errorMessage, this);
     }
 
     public DynamicQueryNoAvailableOperationException(String errorMessage, Throwable err) {
         super(errorMessage, err);
-        log.error(errorMessage, err);
     }
 }