Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Model fix for GWT jackson

Rich Turner0d6db5b0ef30
diff --git a/model/src/main/java/org/openremote/model/query/LogicGroup.java b/model/src/main/java/org/openremote/model/query/LogicGroup.java
index 4d5f5315d..097e7c454 100644
--- a/model/src/main/java/org/openremote/model/query/LogicGroup.java
+++ b/model/src/main/java/org/openremote/model/query/LogicGroup.java
@@ -19,7 +19,9 @@
*/
package org.openremote.model.query;
-import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import java.util.Arrays;
import java.util.List;
@@ -51,13 +53,35 @@ public class LogicGroup<T> {
/**
* Defines the items that the {@link #operator} should be applied to
*/
+ @JsonIgnore
public T[] items;
/**
* Nested groups allow for more complex logic with a mix of operators
*/
+ @JsonIgnore
public LogicGroup<T>[] groups;
+ @JsonProperty("items")
+ public T[] getItems() {
+ return items;
+ }
+
+ @JsonProperty("items")
+ public void setItems(List<T> items) {
+ this.items = items == null ? null : items.toArray((T[])new Object[0]);
+ }
+
+ @JsonProperty("groups")
+ public LogicGroup<T>[] getGroups() {
+ return groups;
+ }
+
+ @JsonProperty("groups")
+ public void setGroups(List<LogicGroup<T>> groups) {
+ this.groups = groups == null ? null : groups.toArray((LogicGroup<T>[])new Object[0]);
+ }
+
@Override
public String toString() {
return LogicGroup.class.getSimpleName() + "{" +