Merge remote-tracking branch 'origin/3.x' into 3.x

Author: xlorne

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

@@ -76,7 +76,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]);
@@ -176,7 +176,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

@@ -72,7 +72,7 @@ void pageRequest() {
         PageRequest request = new PageRequest();
         request.setCurrent(1);
         request.setPageSize(10);
-        request.addFilter("name", Relation.LIKE, "%2%");
+        request.andFilter("name", Relation.LIKE, "%2%");
 
         Page<Demo> page = demoRepository.pageRequest(request);
         assertEquals(1, page.getTotalElements());
@@ -94,7 +94,7 @@ void customInSearch() {
         request.setCurrent(1);
         request.setPageSize(10);
 
-        request.addFilter("id", Relation.IN, 1, 2, 3);
+        request.andFilter("id", Relation.IN, 1, 2, 3);
 
         Page<Demo> page = demoRepository.pageRequest(request);
         log.info("demo:{}", page.getContent());

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

@@ -8,7 +8,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;
@@ -37,7 +37,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) {
@@ -64,8 +64,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

@@ -162,7 +162,7 @@ public void addSort(Sort sort) {
         }
     }
 
-    public PageRequest addFilter(String key, Relation relation, Object... value) {
+    public PageRequest andFilter(String key, Relation relation, Object... value) {
         requestFilter.addFilter(key, relation, value);
         return this;
     }
@@ -172,6 +172,11 @@ public PageRequest addFilter(String key, Object... value) {
         return this;
     }
 
+    public PageRequest andFilter(Filter... value) {
+        requestFilter.andFilters(value);
+        return this;
+    }
+
     public PageRequest orFilters(Filter... filters) {
         requestFilter.orFilters(filters);
         return this;

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

@@ -20,8 +20,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;
     }