Skip to content

Commit 855e46a

Browse files
author
talhadilber
committed
Remove Lombok and replace with explicit methods
Eliminated Lombok annotations such as @Getter, @Setter, @NoArgsConstructor, @AllArgsConstructor, and others across multiple classes. Added manual implementations of constructors, getters, setters, equals, hashCode, and toString methods for better clarity, maintainability, and control over code behavior. Updated the pom.xml to remove Lombok dependency and adjusted respective references.
1 parent 1c9aeb6 commit 855e46a

File tree

62 files changed

+1386
-364
lines changed

Some content is hidden

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

62 files changed

+1386
-364
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ You can find the sample code from: https://github.com/tdilber/spring-jpa-dynamic
9898
<dependency>
9999
<groupId>io.github.tdilber</groupId>
100100
<artifactId>spring-jpa-dynamic-query</artifactId>
101-
<version>0.7.0</version>
101+
<version>0.7.1</version>
102102
</dependency>
103103
```
104104

pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>io.github.tdilber</groupId>
1515
<artifactId>spring-jpa-dynamic-query</artifactId>
16-
<version>0.7.0</version>
16+
<version>0.7.1</version>
1717
<packaging>jar</packaging>
1818
<name>Spring Jpa Dynamic Query</name>
1919
<description>Spring Jpa Dynamic Query (JDQ) Project</description>
@@ -79,11 +79,6 @@
7979
<artifactId>hibernate-core</artifactId>
8080
<version>${hibernate.version}</version>
8181
</dependency>
82-
<dependency>
83-
<groupId>org.projectlombok</groupId>
84-
<artifactId>lombok</artifactId>
85-
<optional>true</optional>
86-
</dependency>
8782
<dependency>
8883
<groupId>org.apache.commons</groupId>
8984
<artifactId>commons-collections4</artifactId>

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33

44
import com.beyt.jdq.dto.enums.CriteriaOperator;
5-
import lombok.Getter;
6-
import lombok.Setter;
75

86
import java.io.Serializable;
97
import java.util.Arrays;
@@ -13,8 +11,6 @@
1311
/**
1412
* Created by tdilber at 24-Aug-19
1513
*/
16-
@Getter
17-
@Setter
1814
public class Criteria implements Serializable {
1915
protected String key;
2016
protected CriteriaOperator operation;
@@ -42,6 +38,30 @@ public Criteria() {
4238

4339
}
4440

41+
public String getKey() {
42+
return key;
43+
}
44+
45+
public void setKey(String key) {
46+
this.key = key;
47+
}
48+
49+
public CriteriaOperator getOperation() {
50+
return operation;
51+
}
52+
53+
public void setOperation(CriteriaOperator operation) {
54+
this.operation = operation;
55+
}
56+
57+
public List<Object> getValues() {
58+
return values;
59+
}
60+
61+
public void setValues(List<Object> values) {
62+
this.values = values;
63+
}
64+
4565
@Override
4666
public String toString() {
4767
StringBuilder result = new StringBuilder("key: " + key + " Criteria Operation: " + operation.name() + " ");

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

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

33
import com.beyt.jdq.dto.enums.CriteriaOperator;
4-
import lombok.extern.slf4j.Slf4j;
54

65
import java.io.Serializable;
76
import java.util.ArrayList;
@@ -12,7 +11,6 @@
1211
/**
1312
* Created by tdilber at 11/18/2020
1413
*/
15-
@Slf4j
1614
public class CriteriaList extends ArrayList<Criteria> implements Serializable {
1715

1816
public static CriteriaList of(Criteria... criteria) {

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

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

33
import com.beyt.jdq.dto.enums.Order;
4-
import lombok.extern.slf4j.Slf4j;
54
import org.springframework.data.util.Pair;
65

76
import java.io.Serializable;
@@ -11,7 +10,6 @@
1110
/**
1211
* Created by tdilber at 30-Dec-20
1312
*/
14-
@Slf4j
1513
public class DynamicQuery implements Serializable {
1614

1715
protected boolean distinct = false;
@@ -21,6 +19,13 @@ public class DynamicQuery implements Serializable {
2119
protected List<Criteria> where = new CriteriaList();
2220
protected List<Pair<String, Order>> orderBy = new ArrayList<>();
2321

22+
23+
public static DynamicQuery of(List<Criteria> where) {
24+
DynamicQuery dynamicQuery = new DynamicQuery();
25+
dynamicQuery.getWhere().addAll(where);
26+
return dynamicQuery;
27+
}
28+
2429
public boolean isDistinct() {
2530
return distinct;
2631
}
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package com.beyt.jdq.exception;
22

3-
import lombok.extern.slf4j.Slf4j;
4-
53
/**
64
* Created by tdilber at 14-Seo-2024
75
*/
8-
@Slf4j
96
public class DynamicQueryIllegalArgumentException extends IllegalArgumentException {
107

118
public DynamicQueryIllegalArgumentException(String errorMessage) {
129
super(errorMessage);
13-
log.error(errorMessage, this);
1410
}
1511

1612
public DynamicQueryIllegalArgumentException(String errorMessage, Throwable err) {
1713
super(errorMessage, err);
18-
log.error(errorMessage, err);
1914
}
2015
}
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package com.beyt.jdq.exception;
22

3-
import lombok.extern.slf4j.Slf4j;
4-
53
/**
64
* Created by tdilber at 24-Aug-19
75
*/
8-
@Slf4j
96
public class DynamicQueryNoAvailableEnumException extends RuntimeException {
107

118
public DynamicQueryNoAvailableEnumException(String errorMessage) {
129
super(errorMessage);
13-
log.error(errorMessage, this);
1410
}
1511

1612
public DynamicQueryNoAvailableEnumException(String errorMessage, Throwable err) {
1713
super(errorMessage, err);
18-
log.error(errorMessage, err);
1914
}
2015
}
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package com.beyt.jdq.exception;
22

3-
import lombok.extern.slf4j.Slf4j;
43

54
/**
65
* Created by tdilber at 24-Aug-19
76
*/
8-
@Slf4j
97
public class DynamicQueryNoAvailableOperationException extends RuntimeException {
108

119
public DynamicQueryNoAvailableOperationException(String errorMessage) {
1210
super(errorMessage);
13-
log.error(errorMessage, this);
1411
}
1512

1613
public DynamicQueryNoAvailableOperationException(String errorMessage, Throwable err) {
1714
super(errorMessage, err);
18-
log.error(errorMessage, err);
1915
}
2016
}
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package com.beyt.jdq.exception;
22

3-
import lombok.extern.slf4j.Slf4j;
43

54
/**
65
* Created by tdilber at 24-Aug-19
76
*/
8-
@Slf4j
97
public class DynamicQueryNoAvailableOrOperationUsageException extends RuntimeException {
108

119
public DynamicQueryNoAvailableOrOperationUsageException(String errorMessage) {
1210
super(errorMessage);
13-
log.error(errorMessage, this);
1411
}
1512

1613
public DynamicQueryNoAvailableOrOperationUsageException(String errorMessage, Throwable err) {
1714
super(errorMessage, err);
18-
log.error(errorMessage, err);
1915
}
2016
}
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package com.beyt.jdq.exception;
22

3-
import lombok.extern.slf4j.Slf4j;
43

54
/**
65
* Created by tdilber at 24-Aug-19
76
*/
8-
@Slf4j
97
public class DynamicQueryNoAvailableParenthesesOperationUsageException extends RuntimeException {
108

119
public DynamicQueryNoAvailableParenthesesOperationUsageException(String errorMessage) {
1210
super(errorMessage);
13-
log.error(errorMessage, this);
1411
}
1512

1613
public DynamicQueryNoAvailableParenthesesOperationUsageException(String errorMessage, Throwable err) {
1714
super(errorMessage, err);
18-
log.error(errorMessage, err);
1915
}
2016
}

0 commit comments

Comments
 (0)