From 0501e9d4b4b4e3a3ec15bf1241ac50550481fff8 Mon Sep 17 00:00:00 2001 From: viktorbasanets Date: Mon, 10 Sep 2018 19:53:29 +0300 Subject: [PATCH] Was modified addLocalWsSubscription(...) --- .../DefaultTelemetrySubscriptionService.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 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 ed9e5bc641..9551f9fe9f 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 @@ -132,14 +132,8 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio @Override public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) { - String familyName = ModelConstants.DEVICE_FAMILY_NAME; - - //To do - if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) { - familyName = ModelConstants.ENTITY_VIEW_FAMILY_NAME; - //EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId) - } - + String familyName = entityId.getEntityType().equals(EntityType.ENTITY_VIEW) + ? ModelConstants.ENTITY_VIEW_FAMILY_NAME : ModelConstants.DEVICE_FAMILY_NAME; Optional server = routingService.resolveById(entityId); Subscription subscription; if (server.isPresent()) { @@ -151,10 +145,6 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio log.trace("[{}] Registering local subscription [{}] for " + familyName + " [{}]", sessionId, sub.getSubscriptionId(), entityId); subscription = new Subscription(sub, true); } - - /*if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) { - registerSubscription(sessionId, entityId, subscription); - }*/ registerSubscription(sessionId, entityId, subscription); }