added convenience methods for working with filter expressions

kumuluz · Mar 19, 2021 · 8561656 · 8561656
1 parent f464d06
commit 8561656
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/core/src/main/java/com/kumuluz/ee/rest/beans/QueryFilterExpression.java b/core/src/main/java/com/kumuluz/ee/rest/beans/QueryFilterExpression.java
@@ -48,6 +48,18 @@ public QueryFilterExpression(QueryFilter value) {
         right = null;
     }
 
+    public QueryFilterExpression(FilterExpressionOperation operation, QueryFilter left, QueryFilter right) {
+        this(operation, new QueryFilterExpression(left), new QueryFilterExpression(right));
+    }
+
+    public QueryFilterExpression(FilterExpressionOperation operation, QueryFilterExpression left, QueryFilter right) {
+        this(operation, left, new QueryFilterExpression(right));
+    }
+
+    public QueryFilterExpression(FilterExpressionOperation operation, QueryFilter left, QueryFilterExpression right) {
+        this(operation, new QueryFilterExpression(left), right);
+    }
+
     public QueryFilterExpression(FilterExpressionOperation operation, QueryFilterExpression left, QueryFilterExpression right) {
         value = null;
         this.operation = operation;

diff --git a/core/src/main/java/com/kumuluz/ee/rest/beans/QueryParameters.java b/core/src/main/java/com/kumuluz/ee/rest/beans/QueryParameters.java
@@ -20,6 +20,7 @@
  */
 package com.kumuluz.ee.rest.beans;
 
+import com.kumuluz.ee.rest.enums.FilterExpressionOperation;
 import com.kumuluz.ee.rest.utils.QueryStringBuilder;
 
 import java.io.Serializable;
@@ -105,8 +106,8 @@ public void setFields(List<String> fields) {
     }
 
     /**
-     * @deprecated Will be removed in future releases. Use {@link #getFilterExpression()} ()} and
-     * {@link #setFilterExpression(QueryFilterExpression)} ()} instead.
+     * @deprecated Will be removed in future releases. Use
+     * {@link #addFilterExpression(FilterExpressionOperation, QueryFilterExpression)} ()} instead.
      */
     public void addFilter(QueryFilter filter) {
         if(filter != null) {
@@ -115,7 +116,8 @@ public void addFilter(QueryFilter filter) {
     }
 
     /**
-     * @deprecated Will be removed in future releases. Use {@link #setFilterExpression(QueryFilterExpression)} ()} instead.
+     * @deprecated Will be removed in future releases. Use {@link #setFilterExpression(QueryFilterExpression)} ()}
+     * instead.
      */
     @Deprecated
     public void setFilters(List<QueryFilter> filters) {
@@ -134,6 +136,11 @@ public List<QueryFilter> getFilters() {
         return filters;
     }
 
+    public QueryFilterExpression addFilterExpression(FilterExpressionOperation operation, QueryFilterExpression queryFilterExpression) {
+        filterExpression = new QueryFilterExpression(operation, filterExpression, queryFilterExpression);
+        return filterExpression;
+    }
+
     public QueryFilterExpression getFilterExpression() {
         return filterExpression;
     }