From f907ac16364cb92d51dafa97c8d93c211d279f7f Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 19 Jan 2022 15:07:25 +0200 Subject: [PATCH] Added @ToString(callSuper = true) to filter classes for correct log output --- .../thingsboard/server/common/data/query/AlarmDataPageLink.java | 2 ++ .../server/common/data/query/AssetSearchQueryFilter.java | 2 ++ .../server/common/data/query/DeviceSearchQueryFilter.java | 2 ++ .../server/common/data/query/EdgeSearchQueryFilter.java | 2 ++ .../server/common/data/query/EntityViewSearchQueryFilter.java | 2 ++ 5 files changed, 10 insertions(+) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java index ce20d367e3..9f41b1a6bc 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java @@ -20,6 +20,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.ToString; import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmStatus; @@ -28,6 +29,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) @AllArgsConstructor public class AlarmDataPageLink extends EntityDataPageLink { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java index a79066c6c5..951bbac030 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java @@ -17,11 +17,13 @@ package org.thingsboard.server.common.data.query; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.List; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class AssetSearchQueryFilter extends EntitySearchQueryFilter { @Override diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java index 8c2b31a99f..ff93d31856 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java @@ -17,11 +17,13 @@ package org.thingsboard.server.common.data.query; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.List; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class DeviceSearchQueryFilter extends EntitySearchQueryFilter { @Override diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java index 6988537d92..25b87629ee 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java @@ -17,11 +17,13 @@ package org.thingsboard.server.common.data.query; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.List; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class EdgeSearchQueryFilter extends EntitySearchQueryFilter { @Override diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java index 501200db7c..47ff69c091 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java @@ -17,11 +17,13 @@ package org.thingsboard.server.common.data.query; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.List; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter { @Override