Skip to content

Commit d05d0e1

Browse files
author
talhadilber
committed
All directories moved to JDQ folder it means base package changed
1 parent 3def772 commit d05d0e1

File tree

88 files changed

+819
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+819
-819
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
<groupId>io.github.tdilber</groupId>
1515
<artifactId>spring-jpa-dynamic-query</artifactId>
16-
<version>0.3.1</version>
16+
<version>0.3.2</version>
1717
<packaging>jar</packaging>
1818
<name>Spring Jpa Dynamic Query</name>
19-
<description>Spring Jpa Dynamic Query Project</description>
19+
<description>Spring Jpa Dynamic Query (JDQ) Project</description>
2020
<url>https://github.com/tdilber/spring-jpa-generic-criteria</url>
2121

2222
<licenses>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.beyt.annotation;
1+
package com.beyt.jdq.annotation;
22

3-
import com.beyt.config.DeserializerConfig;
4-
import com.beyt.config.EntityManagerProviderConfig;
5-
import com.beyt.util.ApplicationContextUtil;
3+
import com.beyt.jdq.config.DeserializerConfig;
4+
import com.beyt.jdq.config.EntityManagerProviderConfig;
5+
import com.beyt.jdq.util.ApplicationContextUtil;
66
import org.springframework.context.annotation.Import;
77

88
import java.lang.annotation.ElementType;

src/main/java/com/beyt/annotation/EnableJpaDynamicQueryArgumentResolvers.java renamed to src/main/java/com/beyt/jdq/annotation/EnableJpaDynamicQueryArgumentResolvers.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.beyt.annotation;
1+
package com.beyt.jdq.annotation;
22

3-
import com.beyt.config.ArgumentResolversInitConfig;
4-
import com.beyt.resolver.CriteriaListArgumentResolver;
5-
import com.beyt.resolver.DynamicQueryArgumentResolver;
3+
import com.beyt.jdq.config.ArgumentResolversInitConfig;
4+
import com.beyt.jdq.resolver.CriteriaListArgumentResolver;
5+
import com.beyt.jdq.resolver.DynamicQueryArgumentResolver;
66
import org.springframework.context.annotation.Import;
77

88
import java.lang.annotation.ElementType;

src/main/java/com/beyt/config/ArgumentResolversInitConfig.java renamed to src/main/java/com/beyt/jdq/config/ArgumentResolversInitConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.beyt.config;
1+
package com.beyt.jdq.config;
22

3-
import com.beyt.resolver.CriteriaListArgumentResolver;
4-
import com.beyt.resolver.DynamicQueryArgumentResolver;
3+
import com.beyt.jdq.resolver.CriteriaListArgumentResolver;
4+
import com.beyt.jdq.resolver.DynamicQueryArgumentResolver;
55
import org.springframework.beans.factory.config.BeanDefinition;
66
import org.springframework.context.annotation.Configuration;
77
import org.springframework.context.annotation.Role;

src/main/java/com/beyt/config/DeserializerConfig.java renamed to src/main/java/com/beyt/jdq/config/DeserializerConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.beyt.config;
1+
package com.beyt.jdq.config;
22

3-
import com.beyt.deserializer.BasicDeserializer;
4-
import com.beyt.deserializer.IDeserializer;
3+
import com.beyt.jdq.deserializer.BasicDeserializer;
4+
import com.beyt.jdq.deserializer.IDeserializer;
55
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
66
import org.springframework.context.annotation.Bean;
77
import org.springframework.context.annotation.Configuration;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.beyt.config;
1+
package com.beyt.jdq.config;
22

3-
import com.beyt.provider.IEntityManagerProvider;
3+
import com.beyt.jdq.provider.IEntityManagerProvider;
44
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;

src/main/java/com/beyt/deserializer/BasicDeserializer.java renamed to src/main/java/com/beyt/jdq/deserializer/BasicDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.beyt.deserializer;
1+
package com.beyt.jdq.deserializer;
22

3-
import com.beyt.util.ReflectionUtil;
3+
import com.beyt.jdq.util.ReflectionUtil;
44

55
public class BasicDeserializer implements IDeserializer {
66
@Override

src/main/java/com/beyt/deserializer/IDeserializer.java renamed to src/main/java/com/beyt/jdq/deserializer/IDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.beyt.deserializer;
1+
package com.beyt.jdq.deserializer;
22

33
public interface IDeserializer {
44
<T> T deserialize(Object value, Class<T> clazz) throws Exception;

src/main/java/com/beyt/deserializer/JacksonDeserializer.java renamed to src/main/java/com/beyt/jdq/deserializer/JacksonDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.beyt.deserializer;
1+
package com.beyt.jdq.deserializer;
22

33
import com.fasterxml.jackson.databind.DeserializationFeature;
44
import com.fasterxml.jackson.databind.MapperFeature;
Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
package com.beyt.dto;
2-
3-
4-
import com.beyt.dto.enums.CriteriaOperator;
5-
import lombok.Getter;
6-
import lombok.Setter;
7-
8-
import java.io.Serializable;
9-
import java.util.Arrays;
10-
import java.util.Collection;
11-
import java.util.List;
12-
13-
/**
14-
* Created by tdilber at 24-Aug-19
15-
*/
16-
@Getter
17-
@Setter
18-
public class Criteria implements Serializable {
19-
protected String key;
20-
protected CriteriaOperator operation;
21-
protected List<Object> values;
22-
23-
public static Criteria of(String key, CriteriaOperator operation, Collection<Object> values) {
24-
return new Criteria(key, operation, values);
25-
}
26-
27-
public static Criteria of(String key, CriteriaOperator operation, Object... values) {
28-
return new Criteria(key, operation, values);
29-
}
30-
31-
public Criteria(String key, CriteriaOperator operation, Object... values) {
32-
this.key = key;
33-
this.operation = operation;
34-
this.values = values != null ? Arrays.asList(values) : null;
35-
}
36-
37-
public static Criteria OR() {
38-
return Criteria.of("", CriteriaOperator.OR);
39-
}
40-
41-
public Criteria() {
42-
43-
}
44-
45-
@Override
46-
public String toString() {
47-
StringBuilder result = new StringBuilder("key: " + key + " Criteria Operation: " + operation.name() + " ");
48-
for (int i = 0; i < values.size(); i++) {
49-
result.append("value").append(i).append(": ").append(values.get(i));
50-
}
51-
return result.toString();
52-
}
53-
}
1+
package com.beyt.jdq.dto;
2+
3+
4+
import com.beyt.jdq.dto.enums.CriteriaOperator;
5+
import lombok.Getter;
6+
import lombok.Setter;
7+
8+
import java.io.Serializable;
9+
import java.util.Arrays;
10+
import java.util.Collection;
11+
import java.util.List;
12+
13+
/**
14+
* Created by tdilber at 24-Aug-19
15+
*/
16+
@Getter
17+
@Setter
18+
public class Criteria implements Serializable {
19+
protected String key;
20+
protected CriteriaOperator operation;
21+
protected List<Object> values;
22+
23+
public static Criteria of(String key, CriteriaOperator operation, Collection<Object> values) {
24+
return new Criteria(key, operation, values);
25+
}
26+
27+
public static Criteria of(String key, CriteriaOperator operation, Object... values) {
28+
return new Criteria(key, operation, values);
29+
}
30+
31+
public Criteria(String key, CriteriaOperator operation, Object... values) {
32+
this.key = key;
33+
this.operation = operation;
34+
this.values = values != null ? Arrays.asList(values) : null;
35+
}
36+
37+
public static Criteria OR() {
38+
return Criteria.of("", CriteriaOperator.OR);
39+
}
40+
41+
public Criteria() {
42+
43+
}
44+
45+
@Override
46+
public String toString() {
47+
StringBuilder result = new StringBuilder("key: " + key + " Criteria Operation: " + operation.name() + " ");
48+
for (int i = 0; i < values.size(); i++) {
49+
result.append("value").append(i).append(": ").append(values.get(i));
50+
}
51+
return result.toString();
52+
}
53+
}

0 commit comments

Comments
 (0)