From 4e1cbf5c1ebd741842e3b1ccd6d5e48837c17cd8 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 19 Jan 2022 12:50:22 +0200 Subject: [PATCH 1/3] Code review minor misc fixes --- .../server/service/ttl/EdgeEventsCleanUpService.java | 5 ++++- .../java/org/thingsboard/server/common/data/id/EdgeId.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java index 6ffe4324a0..c4ce4e49b2 100644 --- a/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java +++ b/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java @@ -28,6 +28,9 @@ import org.thingsboard.server.queue.util.TbCoreComponent; @Service public class EdgeEventsCleanUpService extends AbstractCleanUpService { + public static final String RANDOM_DELAY_INTERVAL_MS_EXPRESSION = + "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.edge_events.execution_interval_ms})}"; + @Value("${sql.ttl.edge_events.edge_events_ttl}") private long ttl; @@ -41,7 +44,7 @@ public class EdgeEventsCleanUpService extends AbstractCleanUpService { this.edgeEventService = edgeEventService; } - @Scheduled(initialDelayString = "${sql.ttl.edge_events.execution_interval_ms}", fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}") + @Scheduled(initialDelayString = RANDOM_DELAY_INTERVAL_MS_EXPRESSION, fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}") public void cleanUp() { if (ttlTaskExecutionEnabled && isSystemTenantPartitionMine()) { edgeEventService.cleanupEvents(ttl); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java index c0fd1e529b..ff975059a1 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java @@ -32,8 +32,8 @@ public class EdgeId extends UUIDBased implements EntityId { super(id); } - public static EdgeId fromString(String integrationId) { - return new EdgeId(UUID.fromString(integrationId)); + public static EdgeId fromString(String edgeId) { + return new EdgeId(UUID.fromString(edgeId)); } @ApiModelProperty(position = 2, required = true, value = "string", example = "EDGE", allowableValues = "EDGE") From 0ba7b962830636525667c4f0d30150ffe0c94a7f Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 19 Jan 2022 13:15:08 +0200 Subject: [PATCH 2/3] Added @EqualsAndHashCode(callSuper = true) to @Data filter classes that exends --- .../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 ac97ab6d8a..ce20d367e3 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 @@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.query; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; import org.thingsboard.server.common.data.alarm.AlarmSeverity; @@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus; import java.util.List; @Data +@EqualsAndHashCode(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 e2db80d9b9..a79066c6c5 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 @@ -16,10 +16,12 @@ package org.thingsboard.server.common.data.query; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(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 d6428ae72c..8c2b31a99f 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 @@ -16,10 +16,12 @@ package org.thingsboard.server.common.data.query; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(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 81daff3ef5..6988537d92 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 @@ -16,10 +16,12 @@ package org.thingsboard.server.common.data.query; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(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 86974d14be..501200db7c 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 @@ -16,10 +16,12 @@ package org.thingsboard.server.common.data.query; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = true) public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter { @Override From f907ac16364cb92d51dafa97c8d93c211d279f7f Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 19 Jan 2022 15:07:25 +0200 Subject: [PATCH 3/3] 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