update 2.7.2

Author: xlorne

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/query/QueryRequest.java

@@ -77,7 +77,7 @@ public <T> List<Order> getOrder(Root<T> root, CriteriaBuilder criteriaBuilder) {
 
     private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder, Root<T> root, List<String> properties) {
         String key = filter.getKey();
-        if (filter.isAddFilters() || filter.isOrFilters() || properties.contains(key)) {
+        if (filter.isAndFilters() || filter.isOrFilters() || properties.contains(key)) {
 
             if (filter.isEqual()) {
                 return criteriaBuilder.equal(root.get(key), filter.getValue()[0]);
@@ -177,7 +177,7 @@ private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder
                 return criteriaBuilder.or(orPredicates.toArray(new Predicate[0]));
             }
 
-            if (filter.isAddFilters()) {
+            if (filter.isAndFilters()) {
                 Filter[] orFilters = (Filter[]) filter.getValue();
                 List<Predicate> addPredicates = new ArrayList<>();
                 for (Filter orFilter : orFilters) {

springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/DemoRepositoryTest.java

@@ -113,7 +113,7 @@ void customSearchAddFilters() {
         request.setPageSize(10);
 
 //        request.addFilters(Filter.as("id", Relation.IN, 1),Filter.as("id", Relation.IN, 2),Filter.as("id", Relation.IN, 3),Filter.as("id", Relation.IN, 4));
-        request.addFilters(Filter.as("name", Relation.LIKE, "%2%"), Filter.and(Filter.as("id", Relation.IN, 1), Filter.as("id", Relation.IN, 2)));
+        request.andFilters(Filter.as("name", Relation.LIKE, "%2%"), Filter.and(Filter.as("id", Relation.IN, 1), Filter.as("id", Relation.IN, 2)));
         Page<Demo> page = demoRepository.pageRequest(request);
         assertEquals(0, page.getTotalElements());
     }

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Filter.java

@@ -9,7 +9,7 @@
 public class Filter {
 
     public static final String FILTER_OR_KEY = "FILTER_OR_KEY";
-    public static final String FILTER_ADD_KEY = "FILTER_ADD_KEY";
+    public static final String FILTER_AND_KEY = "FILTER_AND_KEY";
 
     private String key;
     private Object[] value;
@@ -38,7 +38,7 @@ public static Filter as(String key, Object... value) {
     }
 
     public static Filter and(Filter... value) {
-        return new Filter(FILTER_ADD_KEY, value);
+        return new Filter(FILTER_AND_KEY, value);
     }
 
     public static Filter or(Filter... value) {
@@ -65,8 +65,8 @@ public boolean isOrFilters() {
         return FILTER_OR_KEY.equals(key);
     }
 
-    public boolean isAddFilters() {
-        return FILTER_ADD_KEY.equals(key);
+    public boolean isAndFilters() {
+        return FILTER_AND_KEY.equals(key);
     }
 
     public boolean isGreaterThan() {

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java

@@ -172,8 +172,8 @@ public PageRequest addFilter(String key, Object... value) {
         return this;
     }
 
-    public PageRequest addFilters(Filter... filters) {
-        requestFilter.addFilters(filters);
+    public PageRequest andFilters(Filter... filters) {
+        requestFilter.andFilters(filters);
         return this;
     }
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/RequestFilter.java

@@ -21,8 +21,8 @@ public RequestFilter addFilter(String key, Object... value) {
         return this;
     }
 
-    public RequestFilter addFilters(Filter... value) {
-        this.pushFilter(new Filter(Filter.FILTER_ADD_KEY, value));
+    public RequestFilter andFilters(Filter... value) {
+        this.pushFilter(new Filter(Filter.FILTER_AND_KEY, value));
         return this;
     }