From f0186c9084c21c1a9081d1b6c6b643bad437d755 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 6 Nov 2018 10:13:29 +0200 Subject: [PATCH] Telemetry subscription service methods typo fix. --- .../telemetry/DefaultTelemetrySubscriptionService.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java index 6e0657d347..30299ee59e 100644 --- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java @@ -40,7 +40,6 @@ import org.thingsboard.server.common.msg.cluster.SendToClusterMsg; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.entityview.EntityViewService; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.timeseries.TimeseriesService; import org.thingsboard.server.gen.cluster.ClusterAPIProtos; import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; @@ -57,7 +56,6 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -328,9 +326,9 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio Set subscriptions = e.getValue(); Optional newAddressOptional = routingService.resolveById(e.getKey()); if (newAddressOptional.isPresent()) { - newAddressOptional.ifPresent(serverAddress -> checkSubsciptionsNewAddress(serverAddress, subscriptions)); + newAddressOptional.ifPresent(serverAddress -> checkSubscriptionsNewAddress(serverAddress, subscriptions)); } else { - checkSubsciptionsPrevAddress(subscriptions); + checkSubscriptionsPrevAddress(subscriptions); } if (subscriptions.size() == 0) { log.trace("[{}] No more subscriptions for this device on current server.", e.getKey()); @@ -339,7 +337,7 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio } } - private void checkSubsciptionsNewAddress(ServerAddress newAddress, Set subscriptions) { + private void checkSubscriptionsNewAddress(ServerAddress newAddress, Set subscriptions) { Iterator subscriptionIterator = subscriptions.iterator(); while (subscriptionIterator.hasNext()) { Subscription s = subscriptionIterator.next(); @@ -357,7 +355,7 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio } } - private void checkSubsciptionsPrevAddress(Set subscriptions) { + private void checkSubscriptionsPrevAddress(Set subscriptions) { for (Subscription s : subscriptions) { if (s.isLocal() && s.getServer() != null) { log.trace("[{}] Local subscription is no longer handled on remote server address [{}]", s.getWsSessionId(), s.getServer());