Allow to use null value to omit filter

uwburn · Jun 29, 2021 · 0b52166 · 0b52166
1 parent c990bdb
commit 0b52166
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>it.mgt.util</groupId>
     <artifactId>jpa-json-search</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearchFilterCondition.java b/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearchFilterCondition.java
@@ -86,6 +86,7 @@ static public Operator parse(String placeholder) {
 
     private String name;
     private Operator operator;
+    private boolean omit = false;
     private JpaJsonSearchParameter parameter;
     private Object value;
 
@@ -114,6 +115,9 @@ static public Operator parse(String placeholder) {
     JpaJsonSearchJpqlAndParams buildJpql() {
         logger.trace("Building JPQL");
 
+        if (omit)
+            return new JpaJsonSearchJpqlAndParams();
+
         StringBuilder jpql = new StringBuilder();
 
         switch (operator) {
@@ -188,6 +192,12 @@ else if (jsonNode.size() == 1) {
             Map.Entry<String, JsonNode> child = jsonNode.fields().next();
 
             operator = Operator.parse(child.getKey());
+
+            if (child.getValue().isNull()) {
+                this.omit = true;
+                return this;
+            }
+
             if (child.getValue().isArray()) {
                 ArrayNode arrayNode = (ArrayNode) child.getValue();
                 value = StreamSupport.stream(arrayNode.spliterator(), false)

diff --git a/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearchFilterLogical.java b/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearchFilterLogical.java
@@ -60,12 +60,17 @@ JpaJsonSearchJpqlAndParams buildJpql() {
 
         boolean first = true;
         for (JpaJsonSearchFilter filter : filters) {
+            JpaJsonSearchJpqlAndParams filterJpqlAndParams = filter.buildJpql();
+
+            if (filterJpqlAndParams.isEmpty())
+                continue;
+
             if (first)
                 first = false;
             else
                 jpqlAndParams.append(conjunction.jpql);
 
-            jpqlAndParams.append(filter.buildJpql());
+            jpqlAndParams.append(filterJpqlAndParams);
         }
 
         jpqlAndParams.append(JpaJsonSearch.CLOSE_PARENTHESIS);

diff --git a/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearchJpqlAndParams.java b/src/main/java/it/mgt/uti/jpajsonsearch/JpaJsonSearchJpqlAndParams.java
@@ -50,4 +50,8 @@ JpaJsonSearchJpqlAndParams append(JpaJsonSearchJpqlAndParams jpqlAndParams) {
         return this;
     }
 
+    boolean isEmpty() {
+        return this.jpql.length() == 0 && this.params.size() == 0;
+    }
+
 }