From 2aaa51fe8670284e7e7c30e574e76a4c11a2d854 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 19 Jun 2020 20:40:41 +0300 Subject: [PATCH] Data query serialization improvements --- .../server/service/telemetry/cmd/v2/LatestValueCmd.java | 2 ++ .../server/service/telemetry/cmd/v2/TimeSeriesCmd.java | 3 +++ .../org/thingsboard/server/common/data/query/EntityFilter.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/LatestValueCmd.java b/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/LatestValueCmd.java index 48ca784d11..5e7a65b5c6 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/LatestValueCmd.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/LatestValueCmd.java @@ -15,10 +15,12 @@ */ package org.thingsboard.server.service.telemetry.cmd.v2; +import lombok.Data; import org.thingsboard.server.common.data.query.EntityKey; import java.util.List; +@Data public class LatestValueCmd { private List keys; diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/TimeSeriesCmd.java b/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/TimeSeriesCmd.java index 2eb03402de..336c40ac97 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/TimeSeriesCmd.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/TimeSeriesCmd.java @@ -15,8 +15,11 @@ */ package org.thingsboard.server.service.telemetry.cmd.v2; +import lombok.Data; + import java.util.List; +@Data public class TimeSeriesCmd { private List keys; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilter.java index bca83f863a..d3b9c39530 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilter.java @@ -16,9 +16,11 @@ package org.thingsboard.server.common.data.query; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; +@JsonIgnoreProperties(ignoreUnknown = true) @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY,