From 4e1cbf5c1ebd741842e3b1ccd6d5e48837c17cd8 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 19 Jan 2022 12:50:22 +0200 Subject: [PATCH] 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")