Fixed group filter parsing in boolean filters. (#395)

geosolutions-it · Jan 24, 2025 · c1a6147 · c1a6147
1 parent 4686c46
commit c1a6147
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...re/services-api/src/main/java/it/geosolutions/geostore/services/dto/search/AndFilter.java b/...re/services-api/src/main/java/it/geosolutions/geostore/services/dto/search/AndFilter.java
@@ -36,10 +36,9 @@
 @XmlRootElement(name = "AND")
 public class AndFilter extends SearchFilter {
 
-    /** The Constant serialVersionUID. */
     private static final long serialVersionUID = -4055325472578322312L;
 
-    private List<SearchFilter> filters = new ArrayList<SearchFilter>();
+    private List<SearchFilter> filters = new ArrayList<>();
 
     public AndFilter() {}
 
@@ -55,7 +54,8 @@ public AndFilter(SearchFilter f1, SearchFilter f2, SearchFilter... other) {
         @XmlElement(name = "OR", type = OrFilter.class),
         @XmlElement(name = "AND", type = AndFilter.class),
         @XmlElement(name = "FIELD", type = FieldFilter.class),
-        @XmlElement(name = "CATEGORY", type = CategoryFilter.class)
+        @XmlElement(name = "CATEGORY", type = CategoryFilter.class),
+        @XmlElement(name = "GROUP", type = GroupFilter.class)
     })
     public List<SearchFilter> getFilters() {
         return filters;
@@ -76,6 +76,6 @@ public void accept(FilterVisitor visitor) throws BadRequestServiceEx, InternalEr
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "[" + filters + '}';
+        return getClass().getSimpleName() + "[" + filters + ']';
     }
 }
diff --git a/...ore/services-api/src/main/java/it/geosolutions/geostore/services/dto/search/OrFilter.java b/...ore/services-api/src/main/java/it/geosolutions/geostore/services/dto/search/OrFilter.java
@@ -36,10 +36,9 @@
 @XmlRootElement(name = "OR")
 public class OrFilter extends SearchFilter {
 
-    /** The Constant serialVersionUID. */
     private static final long serialVersionUID = -1319295933578215551L;
 
-    private List<SearchFilter> filters = new ArrayList<SearchFilter>();
+    private List<SearchFilter> filters = new ArrayList<>();
 
     public OrFilter() {}
 
@@ -55,7 +54,8 @@ public OrFilter(SearchFilter f1, SearchFilter f2, SearchFilter... other) {
         @XmlElement(name = "OR", type = OrFilter.class),
         @XmlElement(name = "AND", type = AndFilter.class),
         @XmlElement(name = "FIELD", type = FieldFilter.class),
-        @XmlElement(name = "CATEGORY", type = CategoryFilter.class)
+        @XmlElement(name = "CATEGORY", type = CategoryFilter.class),
+        @XmlElement(name = "GROUP", type = GroupFilter.class)
     })
     public List<SearchFilter> getFilters() {
         return filters;
@@ -76,6 +76,6 @@ public void accept(FilterVisitor visitor) throws BadRequestServiceEx, InternalEr
 
     @Override
     public String toString() {
-        return getClass().getSimpleName() + "[" + filters + '}';
+        return getClass().getSimpleName() + "[" + filters + ']';
     }
 }