From ae647024a5e53dab6962cb571914b32cb74b6890 Mon Sep 17 00:00:00 2001 From: viktorbasanets Date: Fri, 7 Sep 2018 17:34:44 +0300 Subject: [PATCH] Was refactored --- .../java/org/thingsboard/server/common/data/EntityView.java | 4 ++-- .../server/common/data/objects/AttributesEntityView.java | 5 ----- .../server/common/data/objects/TelemetryEntityView.java | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java index 813a9acd08..49dd20959f 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java @@ -39,8 +39,8 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo private CustomerId customerId; private String name; private TelemetryEntityView keys; - private Long tsBegin; - private Long tsEnd; + private long startTs; + private long endTs; public EntityView() { super(); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java index b1d270c934..1c32579b72 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/AttributesEntityView.java @@ -44,9 +44,4 @@ public class AttributesEntityView { public AttributesEntityView(AttributesEntityView obj) { this(obj.getCs(), obj.getSs(), obj.getSh()); } - - @Override - public String toString() { - return "{cs=" + cs + ", ss=" + ss + ", sh=" + sh + '}'; - } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java index e7398e6500..c899c65590 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/objects/TelemetryEntityView.java @@ -40,9 +40,4 @@ public class TelemetryEntityView { public TelemetryEntityView(TelemetryEntityView obj) { this(obj.getTimeseries(), obj.getAttributes()); } - - @Override - public String toString() { - return "{timeseries=" + timeseries + ", attributes=" + attributes + '}'; - } }