简柏林 / thingskit · Commits

Commit 2211cff1e9e35e3a98a5d4fa4cf52e1a0c6193c4

Authored by YevhenBondarenko
Committed by Andrew Shvayka
1 parent a0d39a3e

revert DefaultTransportService

Inline Side-by-side
Showing 1 changed file with 53 additions and 79 deletions
... ... @@ -57,41 +57,15 @@ import org.thingsboard.server.common.transport.limits.TransportRateLimitType;
57 57 import org.thingsboard.server.common.transport.profile.TenantProfileUpdateResult;
58 58 import org.thingsboard.server.common.transport.util.DataDecodingEncodingService;
59 59 import org.thingsboard.server.common.transport.util.JsonUtils;
60   -import org.thingsboard.server.gen.transport.TransportProtos.ClaimDeviceMsg;
61   -import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
62   -import org.thingsboard.server.gen.transport.TransportProtos.EntityDeleteMsg;
63   -import org.thingsboard.server.gen.transport.TransportProtos.EntityUpdateMsg;
64   -import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeRequestMsg;
65   -import org.thingsboard.server.gen.transport.TransportProtos.GetEntityProfileRequestMsg;
66   -import org.thingsboard.server.gen.transport.TransportProtos.GetEntityProfileResponseMsg;
67   -import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg;
68   -import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayResponseMsg;
69   -import org.thingsboard.server.gen.transport.TransportProtos.PostAttributeMsg;
70   -import org.thingsboard.server.gen.transport.TransportProtos.PostTelemetryMsg;
  60 +import org.thingsboard.server.gen.transport.TransportProtos;
71 61 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
72 62 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceResponseMsg;
73   -import org.thingsboard.server.gen.transport.TransportProtos.SessionCloseNotificationProto;
74   -import org.thingsboard.server.gen.transport.TransportProtos.SessionEvent;
75   -import org.thingsboard.server.gen.transport.TransportProtos.SessionEventMsg;
76   -import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
77   -import org.thingsboard.server.gen.transport.TransportProtos.SessionType;
78   -import org.thingsboard.server.gen.transport.TransportProtos.SubscribeToAttributeUpdatesMsg;
79   -import org.thingsboard.server.gen.transport.TransportProtos.SubscribeToRPCMsg;
80   -import org.thingsboard.server.gen.transport.TransportProtos.SubscriptionInfoProto;
81 63 import org.thingsboard.server.gen.transport.TransportProtos.ToCoreMsg;
82   -import org.thingsboard.server.gen.transport.TransportProtos.ToDeviceRpcResponseMsg;
83 64 import org.thingsboard.server.gen.transport.TransportProtos.ToRuleEngineMsg;
84   -import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcRequestMsg;
85   -import org.thingsboard.server.gen.transport.TransportProtos.ToServerRpcResponseMsg;
86 65 import org.thingsboard.server.gen.transport.TransportProtos.ToTransportMsg;
87 66 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
88 67 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
89 68 import org.thingsboard.server.gen.transport.TransportProtos.TransportToDeviceActorMsg;
90   -import org.thingsboard.server.gen.transport.TransportProtos.TsKvListProto;
91   -import org.thingsboard.server.gen.transport.TransportProtos.ValidateBasicMqttCredRequestMsg;
92   -import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceCredentialsResponseMsg;
93   -import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceTokenRequestMsg;
94   -import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509CertRequestMsg;
95 69 import org.thingsboard.server.queue.TbQueueCallback;
96 70 import org.thingsboard.server.queue.TbQueueConsumer;
97 71 import org.thingsboard.server.queue.TbQueueMsgMetadata;
... ... @@ -261,14 +235,14 @@ public class DefaultTransportService implements TransportService {
261 235 }
262 236
263 237 @Override
264   - public void registerAsyncSession(SessionInfoProto sessionInfo, SessionMsgListener listener) {
265   - sessions.putIfAbsent(toSessionId(sessionInfo), new SessionMetaData(sessionInfo, SessionType.ASYNC, listener));
  238 + public void registerAsyncSession(TransportProtos.SessionInfoProto sessionInfo, SessionMsgListener listener) {
  239 + sessions.putIfAbsent(toSessionId(sessionInfo), new SessionMetaData(sessionInfo, TransportProtos.SessionType.ASYNC, listener));
266 240 }
267 241
268 242 @Override
269   - public GetEntityProfileResponseMsg getRoutingInfo(GetEntityProfileRequestMsg msg) {
270   - TbProtoQueueMsg<TransportApiRequestMsg> protoMsg =
271   - new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setEntityProfileRequestMsg(msg).build());
  243 + public TransportProtos.GetEntityProfileResponseMsg getRoutingInfo(TransportProtos.GetEntityProfileRequestMsg msg) {
  244 + TbProtoQueueMsg<TransportProtos.TransportApiRequestMsg> protoMsg =
  245 + new TbProtoQueueMsg<>(UUID.randomUUID(), TransportProtos.TransportApiRequestMsg.newBuilder().setEntityProfileRequestMsg(msg).build());
272 246 try {
273 247 TbProtoQueueMsg<TransportApiResponseMsg> response = transportApiRequestTemplate.send(protoMsg).get();
274 248 return response.getValue().getEntityProfileResponseMsg();
... ... @@ -278,7 +252,7 @@ public class DefaultTransportService implements TransportService {
278 252 }
279 253
280 254 @Override
281   - public void process(DeviceTransportType transportType, ValidateDeviceTokenRequestMsg msg,
  255 + public void process(DeviceTransportType transportType, TransportProtos.ValidateDeviceTokenRequestMsg msg,
282 256 TransportServiceCallback<ValidateDeviceCredentialsResponse> callback) {
283 257 log.trace("Processing msg: {}", msg);
284 258 TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(UUID.randomUUID(),
... ... @@ -287,7 +261,7 @@ public class DefaultTransportService implements TransportService {
287 261 }
288 262
289 263 @Override
290   - public void process(DeviceTransportType transportType, ValidateBasicMqttCredRequestMsg msg,
  264 + public void process(DeviceTransportType transportType, TransportProtos.ValidateBasicMqttCredRequestMsg msg,
291 265 TransportServiceCallback<ValidateDeviceCredentialsResponse> callback) {
292 266 log.trace("Processing msg: {}", msg);
293 267 TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(UUID.randomUUID(),
... ... @@ -296,7 +270,7 @@ public class DefaultTransportService implements TransportService {
296 270 }
297 271
298 272 @Override
299   - public void process(DeviceTransportType transportType, ValidateDeviceX509CertRequestMsg msg, TransportServiceCallback<ValidateDeviceCredentialsResponse> callback) {
  273 + public void process(DeviceTransportType transportType, TransportProtos.ValidateDeviceX509CertRequestMsg msg, TransportServiceCallback<ValidateDeviceCredentialsResponse> callback) {
300 274 log.trace("Processing msg: {}", msg);
301 275 TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setValidateX509CertRequestMsg(msg).build());
302 276 doProcess(transportType, protoMsg, callback);
... ... @@ -305,7 +279,7 @@ public class DefaultTransportService implements TransportService {
305 279 private void doProcess(DeviceTransportType transportType, TbProtoQueueMsg<TransportApiRequestMsg> protoMsg,
306 280 TransportServiceCallback<ValidateDeviceCredentialsResponse> callback) {
307 281 ListenableFuture<ValidateDeviceCredentialsResponse> response = Futures.transform(transportApiRequestTemplate.send(protoMsg), tmp -> {
308   - ValidateDeviceCredentialsResponseMsg msg = tmp.getValue().getValidateCredResponseMsg();
  282 + TransportProtos.ValidateDeviceCredentialsResponseMsg msg = tmp.getValue().getValidateCredResponseMsg();
309 283 ValidateDeviceCredentialsResponse.ValidateDeviceCredentialsResponseBuilder result = ValidateDeviceCredentialsResponse.builder();
310 284 if (msg.hasDeviceInfo()) {
311 285 result.credentials(msg.getCredentialsBody());
... ... @@ -328,11 +302,11 @@ public class DefaultTransportService implements TransportService {
328 302 }
329 303
330 304 @Override
331   - public void process(GetOrCreateDeviceFromGatewayRequestMsg requestMsg, TransportServiceCallback<GetOrCreateDeviceFromGatewayResponse> callback) {
  305 + public void process(TransportProtos.GetOrCreateDeviceFromGatewayRequestMsg requestMsg, TransportServiceCallback<GetOrCreateDeviceFromGatewayResponse> callback) {
332 306 TbProtoQueueMsg<TransportApiRequestMsg> protoMsg = new TbProtoQueueMsg<>(UUID.randomUUID(), TransportApiRequestMsg.newBuilder().setGetOrCreateDeviceRequestMsg(requestMsg).build());
333 307 log.trace("Processing msg: {}", requestMsg);
334 308 ListenableFuture<GetOrCreateDeviceFromGatewayResponse> response = Futures.transform(transportApiRequestTemplate.send(protoMsg), tmp -> {
335   - GetOrCreateDeviceFromGatewayResponseMsg msg = tmp.getValue().getGetOrCreateDeviceResponseMsg();
  309 + TransportProtos.GetOrCreateDeviceFromGatewayResponseMsg msg = tmp.getValue().getGetOrCreateDeviceResponseMsg();
336 310 GetOrCreateDeviceFromGatewayResponse.GetOrCreateDeviceFromGatewayResponseBuilder result = GetOrCreateDeviceFromGatewayResponse.builder();
337 311 if (msg.hasDeviceInfo()) {
338 312 TransportDeviceInfo tdi = getTransportDeviceInfo(msg.getDeviceInfo());
... ... @@ -347,7 +321,7 @@ public class DefaultTransportService implements TransportService {
347 321 AsyncCallbackTemplate.withCallback(response, callback::onSuccess, callback::onError, transportCallbackExecutor);
348 322 }
349 323
350   - private TransportDeviceInfo getTransportDeviceInfo(DeviceInfoProto di) {
  324 + private TransportDeviceInfo getTransportDeviceInfo(TransportProtos.DeviceInfoProto di) {
351 325 TransportDeviceInfo tdi = new TransportDeviceInfo();
352 326 tdi.setTenantId(new TenantId(new UUID(di.getTenantIdMSB(), di.getTenantIdLSB())));
353 327 tdi.setDeviceId(new DeviceId(new UUID(di.getDeviceIdMSB(), di.getDeviceIdLSB())));
... ... @@ -369,7 +343,7 @@ public class DefaultTransportService implements TransportService {
369 343 }
370 344
371 345 @Override
372   - public void process(SessionInfoProto sessionInfo, SubscriptionInfoProto msg, TransportServiceCallback<Void> callback) {
  346 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.SubscriptionInfoProto msg, TransportServiceCallback<Void> callback) {
373 347 if (log.isTraceEnabled()) {
374 348 log.trace("[{}] Processing msg: {}", toSessionId(sessionInfo), msg);
375 349 }
... ... @@ -378,7 +352,7 @@ public class DefaultTransportService implements TransportService {
378 352 }
379 353
380 354 @Override
381   - public void process(SessionInfoProto sessionInfo, SessionEventMsg msg, TransportServiceCallback<Void> callback) {
  355 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.SessionEventMsg msg, TransportServiceCallback<Void> callback) {
382 356 if (checkLimits(sessionInfo, msg, callback)) {
383 357 reportActivityInternal(sessionInfo);
384 358 sendToDeviceActor(sessionInfo, TransportToDeviceActorMsg.newBuilder().setSessionInfo(sessionInfo)
... ... @@ -387,9 +361,9 @@ public class DefaultTransportService implements TransportService {
387 361 }
388 362
389 363 @Override
390   - public void process(SessionInfoProto sessionInfo, PostTelemetryMsg msg, TransportServiceCallback<Void> callback) {
  364 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.PostTelemetryMsg msg, TransportServiceCallback<Void> callback) {
391 365 int dataPoints = 0;
392   - for (TsKvListProto tsKv : msg.getTsKvListList()) {
  366 + for (TransportProtos.TsKvListProto tsKv : msg.getTsKvListList()) {
393 367 dataPoints += tsKv.getKvCount();
394 368 }
395 369 if (checkLimits(sessionInfo, msg, callback, dataPoints, TELEMETRY)) {
... ... @@ -397,19 +371,20 @@ public class DefaultTransportService implements TransportService {
397 371 TenantId tenantId = new TenantId(new UUID(sessionInfo.getTenantIdMSB(), sessionInfo.getTenantIdLSB()));
398 372 DeviceId deviceId = new DeviceId(new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB()));
399 373 MsgPackCallback packCallback = new MsgPackCallback(msg.getTsKvListCount(), callback);
400   - for (TsKvListProto tsKv : msg.getTsKvListList()) {
  374 + for (TransportProtos.TsKvListProto tsKv : msg.getTsKvListList()) {
401 375 TbMsgMetaData metaData = new TbMsgMetaData();
402 376 metaData.putValue("deviceName", sessionInfo.getDeviceName());
403 377 metaData.putValue("deviceType", sessionInfo.getDeviceType());
404 378 metaData.putValue("ts", tsKv.getTs() + "");
405 379 JsonObject json = JsonUtils.getJsonObject(tsKv.getKvList());
406 380 sendToRuleEngine(tenantId, deviceId, sessionInfo, json, metaData, SessionMsgType.POST_TELEMETRY_REQUEST, packCallback);
  381 +
407 382 }
408 383 }
409 384 }
410 385
411 386 @Override
412   - public void process(SessionInfoProto sessionInfo, PostAttributeMsg msg, TransportServiceCallback<Void> callback) {
  387 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.PostAttributeMsg msg, TransportServiceCallback<Void> callback) {
413 388 if (checkLimits(sessionInfo, msg, callback, msg.getKvCount(), TELEMETRY)) {
414 389 reportActivityInternal(sessionInfo);
415 390 TenantId tenantId = new TenantId(new UUID(sessionInfo.getTenantIdMSB(), sessionInfo.getTenantIdLSB()));
... ... @@ -424,7 +399,7 @@ public class DefaultTransportService implements TransportService {
424 399 }
425 400
426 401 @Override
427   - public void process(SessionInfoProto sessionInfo, GetAttributeRequestMsg msg, TransportServiceCallback<Void> callback) {
  402 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.GetAttributeRequestMsg msg, TransportServiceCallback<Void> callback) {
428 403 if (checkLimits(sessionInfo, msg, callback)) {
429 404 reportActivityInternal(sessionInfo);
430 405 sendToDeviceActor(sessionInfo, TransportToDeviceActorMsg.newBuilder().setSessionInfo(sessionInfo)
... ... @@ -433,7 +408,7 @@ public class DefaultTransportService implements TransportService {
433 408 }
434 409
435 410 @Override
436   - public void process(SessionInfoProto sessionInfo, SubscribeToAttributeUpdatesMsg msg, TransportServiceCallback<Void> callback) {
  411 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.SubscribeToAttributeUpdatesMsg msg, TransportServiceCallback<Void> callback) {
437 412 if (checkLimits(sessionInfo, msg, callback)) {
438 413 SessionMetaData sessionMetaData = reportActivityInternal(sessionInfo);
439 414 sessionMetaData.setSubscribedToAttributes(!msg.getUnsubscribe());
... ... @@ -443,7 +418,7 @@ public class DefaultTransportService implements TransportService {
443 418 }
444 419
445 420 @Override
446   - public void process(SessionInfoProto sessionInfo, SubscribeToRPCMsg msg, TransportServiceCallback<Void> callback) {
  421 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.SubscribeToRPCMsg msg, TransportServiceCallback<Void> callback) {
447 422 if (checkLimits(sessionInfo, msg, callback)) {
448 423 SessionMetaData sessionMetaData = reportActivityInternal(sessionInfo);
449 424 sessionMetaData.setSubscribedToRPC(!msg.getUnsubscribe());
... ... @@ -453,7 +428,7 @@ public class DefaultTransportService implements TransportService {
453 428 }
454 429
455 430 @Override
456   - public void process(SessionInfoProto sessionInfo, ToDeviceRpcResponseMsg msg, TransportServiceCallback<Void> callback) {
  431 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.ToDeviceRpcResponseMsg msg, TransportServiceCallback<Void> callback) {
457 432 if (checkLimits(sessionInfo, msg, callback)) {
458 433 reportActivityInternal(sessionInfo);
459 434 sendToDeviceActor(sessionInfo, TransportToDeviceActorMsg.newBuilder().setSessionInfo(sessionInfo)
... ... @@ -468,13 +443,13 @@ public class DefaultTransportService implements TransportService {
468 443 if (md != null) {
469 444 SessionMsgListener listener = md.getListener();
470 445 transportCallbackExecutor.submit(() -> {
471   - ToServerRpcResponseMsg responseMsg =
472   - ToServerRpcResponseMsg.newBuilder()
  446 + TransportProtos.ToServerRpcResponseMsg responseMsg =
  447 + TransportProtos.ToServerRpcResponseMsg.newBuilder()
473 448 .setRequestId(data.getRequestId())
474 449 .setError("timeout").build();
475 450 listener.onToServerRpcResponse(responseMsg);
476 451 });
477   - if (md.getSessionType() == SessionType.SYNC) {
  452 + if (md.getSessionType() == TransportProtos.SessionType.SYNC) {
478 453 deregisterSession(md.getSessionInfo());
479 454 }
480 455 } else {
... ... @@ -484,7 +459,7 @@ public class DefaultTransportService implements TransportService {
484 459 }
485 460
486 461 @Override
487   - public void process(SessionInfoProto sessionInfo, ToServerRpcRequestMsg msg, TransportServiceCallback<Void> callback) {
  462 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.ToServerRpcRequestMsg msg, TransportServiceCallback<Void> callback) {
488 463 if (checkLimits(sessionInfo, msg, callback)) {
489 464 reportActivityInternal(sessionInfo);
490 465 UUID sessionId = toSessionId(sessionInfo);
... ... @@ -500,7 +475,6 @@ public class DefaultTransportService implements TransportService {
500 475 metaData.putValue("requestId", Integer.toString(msg.getRequestId()));
501 476 metaData.putValue("serviceId", serviceInfoProvider.getServiceId());
502 477 metaData.putValue("sessionId", sessionId.toString());
503   -
504 478 sendToRuleEngine(tenantId, deviceId, sessionInfo, json, metaData,
505 479 SessionMsgType.TO_SERVER_RPC_REQUEST, new TransportTbQueueCallback(callback));
506 480 String requestId = sessionId + "-" + msg.getRequestId();
... ... @@ -510,7 +484,7 @@ public class DefaultTransportService implements TransportService {
510 484 }
511 485
512 486 @Override
513   - public void process(SessionInfoProto sessionInfo, ClaimDeviceMsg msg, TransportServiceCallback<Void> callback) {
  487 + public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.ClaimDeviceMsg msg, TransportServiceCallback<Void> callback) {
514 488 if (checkLimits(sessionInfo, msg, callback)) {
515 489 reportActivityInternal(sessionInfo);
516 490 sendToDeviceActor(sessionInfo, TransportToDeviceActorMsg.newBuilder().setSessionInfo(sessionInfo)
... ... @@ -519,11 +493,11 @@ public class DefaultTransportService implements TransportService {
519 493 }
520 494
521 495 @Override
522   - public void reportActivity(SessionInfoProto sessionInfo) {
  496 + public void reportActivity(TransportProtos.SessionInfoProto sessionInfo) {
523 497 reportActivityInternal(sessionInfo);
524 498 }
525 499
526   - private SessionMetaData reportActivityInternal(SessionInfoProto sessionInfo) {
  500 + private SessionMetaData reportActivityInternal(TransportProtos.SessionInfoProto sessionInfo) {
527 501 UUID sessionId = toSessionId(sessionInfo);
528 502 SessionMetaData sessionMetaData = sessions.get(sessionId);
529 503 if (sessionMetaData != null) {
... ... @@ -536,7 +510,7 @@ public class DefaultTransportService implements TransportService {
536 510 long expTime = System.currentTimeMillis() - sessionInactivityTimeout;
537 511 sessions.forEach((uuid, sessionMD) -> {
538 512 long lastActivityTime = sessionMD.getLastActivityTime();
539   - SessionInfoProto sessionInfo = sessionMD.getSessionInfo();
  513 + TransportProtos.SessionInfoProto sessionInfo = sessionMD.getSessionInfo();
540 514 if (sessionInfo.getGwSessionIdMSB() > 0 &&
541 515 sessionInfo.getGwSessionIdLSB() > 0) {
542 516 SessionMetaData gwMetaData = sessions.get(new UUID(sessionInfo.getGwSessionIdMSB(), sessionInfo.getGwSessionIdLSB()));
... ... @@ -548,13 +522,13 @@ public class DefaultTransportService implements TransportService {
548 522 if (log.isDebugEnabled()) {
549 523 log.debug("[{}] Session has expired due to last activity time: {}", toSessionId(sessionInfo), lastActivityTime);
550 524 }
551   - process(sessionInfo, getSessionEventMsg(SessionEvent.CLOSED), null);
  525 + process(sessionInfo, getSessionEventMsg(TransportProtos.SessionEvent.CLOSED), null);
552 526 sessions.remove(uuid);
553   - sessionMD.getListener().onRemoteSessionCloseCommand(SessionCloseNotificationProto.getDefaultInstance());
  527 + sessionMD.getListener().onRemoteSessionCloseCommand(TransportProtos.SessionCloseNotificationProto.getDefaultInstance());
554 528 } else {
555 529 if (lastActivityTime > sessionMD.getLastReportedActivityTime()) {
556 530 final long lastActivityTimeFinal = lastActivityTime;
557   - process(sessionInfo, SubscriptionInfoProto.newBuilder()
  531 + process(sessionInfo, TransportProtos.SubscriptionInfoProto.newBuilder()
558 532 .setAttributeSubscription(sessionMD.isSubscribedToAttributes())
559 533 .setRpcSubscription(sessionMD.isSubscribedToRPC())
560 534 .setLastActivityTime(lastActivityTime).build(), new TransportServiceCallback<Void>() {
... ... @@ -574,12 +548,12 @@ public class DefaultTransportService implements TransportService {
574 548 }
575 549
576 550 @Override
577   - public void registerSyncSession(SessionInfoProto sessionInfo, SessionMsgListener listener, long timeout) {
578   - SessionMetaData currentSession = new SessionMetaData(sessionInfo, SessionType.SYNC, listener);
  551 + public void registerSyncSession(TransportProtos.SessionInfoProto sessionInfo, SessionMsgListener listener, long timeout) {
  552 + SessionMetaData currentSession = new SessionMetaData(sessionInfo, TransportProtos.SessionType.SYNC, listener);
579 553 sessions.putIfAbsent(toSessionId(sessionInfo), currentSession);
580 554
581 555 ScheduledFuture executorFuture = schedulerExecutor.schedule(() -> {
582   - listener.onRemoteSessionCloseCommand(SessionCloseNotificationProto.getDefaultInstance());
  556 + listener.onRemoteSessionCloseCommand(TransportProtos.SessionCloseNotificationProto.getDefaultInstance());
583 557 deregisterSession(sessionInfo);
584 558 }, timeout, TimeUnit.MILLISECONDS);
585 559
... ... @@ -587,7 +561,7 @@ public class DefaultTransportService implements TransportService {
587 561 }
588 562
589 563 @Override
590   - public void deregisterSession(SessionInfoProto sessionInfo) {
  564 + public void deregisterSession(TransportProtos.SessionInfoProto sessionInfo) {
591 565 SessionMetaData currentSession = sessions.get(toSessionId(sessionInfo));
592 566 if (currentSession != null && currentSession.hasScheduledFuture()) {
593 567 log.debug("Stopping scheduler to avoid resending response if request has been ack.");
... ... @@ -600,12 +574,12 @@ public class DefaultTransportService implements TransportService {
600 574 private TransportRateLimitType[] TELEMETRY = TransportRateLimitType.values();
601 575
602 576 @Override
603   - public boolean checkLimits(SessionInfoProto sessionInfo, Object msg, TransportServiceCallback<Void> callback) {
  577 + public boolean checkLimits(TransportProtos.SessionInfoProto sessionInfo, Object msg, TransportServiceCallback<Void> callback) {
604 578 return checkLimits(sessionInfo, msg, callback, 0, DEFAULT);
605 579 }
606 580
607 581 @Override
608   - public boolean checkLimits(SessionInfoProto sessionInfo, Object msg, TransportServiceCallback<Void> callback, int dataPoints, TransportRateLimitType... limits) {
  582 + public boolean checkLimits(TransportProtos.SessionInfoProto sessionInfo, Object msg, TransportServiceCallback<Void> callback, int dataPoints, TransportRateLimitType... limits) {
609 583 if (log.isTraceEnabled()) {
610 584 log.trace("[{}] Processing msg: {}", toSessionId(sessionInfo), msg);
611 585 }
... ... @@ -626,7 +600,7 @@ public class DefaultTransportService implements TransportService {
626 600 }
627 601 }
628 602
629   - protected void processToTransportMsg(ToTransportMsg toSessionMsg) {
  603 + protected void processToTransportMsg(TransportProtos.ToTransportMsg toSessionMsg) {
630 604 UUID sessionId = new UUID(toSessionMsg.getSessionIdMSB(), toSessionMsg.getSessionIdLSB());
631 605 SessionMetaData md = sessions.get(sessionId);
632 606 if (md != null) {
... ... @@ -650,12 +624,12 @@ public class DefaultTransportService implements TransportService {
650 624 listener.onToServerRpcResponse(toSessionMsg.getToServerResponse());
651 625 }
652 626 });
653   - if (md.getSessionType() == SessionType.SYNC) {
  627 + if (md.getSessionType() == TransportProtos.SessionType.SYNC) {
654 628 deregisterSession(md.getSessionInfo());
655 629 }
656 630 } else {
657 631 if (toSessionMsg.hasEntityUpdateMsg()) {
658   - EntityUpdateMsg msg = toSessionMsg.getEntityUpdateMsg();
  632 + TransportProtos.EntityUpdateMsg msg = toSessionMsg.getEntityUpdateMsg();
659 633 EntityType entityType = EntityType.valueOf(msg.getEntityType());
660 634 if (EntityType.DEVICE_PROFILE.equals(entityType)) {
661 635 DeviceProfile deviceProfile = deviceProfileCache.put(msg.getData());
... ... @@ -676,7 +650,7 @@ public class DefaultTransportService implements TransportService {
676 650 }
677 651 }
678 652 } else if (toSessionMsg.hasEntityDeleteMsg()) {
679   - EntityDeleteMsg msg = toSessionMsg.getEntityDeleteMsg();
  653 + TransportProtos.EntityDeleteMsg msg = toSessionMsg.getEntityDeleteMsg();
680 654 EntityType entityType = EntityType.valueOf(msg.getEntityType());
681 655 UUID entityUuid = new UUID(msg.getEntityIdMSB(), msg.getEntityIdLSB());
682 656 if (EntityType.DEVICE_PROFILE.equals(entityType)) {
... ... @@ -707,29 +681,29 @@ public class DefaultTransportService implements TransportService {
707 681 });
708 682 }
709 683
710   - protected UUID toSessionId(SessionInfoProto sessionInfo) {
  684 + protected UUID toSessionId(TransportProtos.SessionInfoProto sessionInfo) {
711 685 return new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB());
712 686 }
713 687
714   - protected UUID getRoutingKey(SessionInfoProto sessionInfo) {
  688 + protected UUID getRoutingKey(TransportProtos.SessionInfoProto sessionInfo) {
715 689 return new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB());
716 690 }
717 691
718   - protected TenantId getTenantId(SessionInfoProto sessionInfo) {
  692 + protected TenantId getTenantId(TransportProtos.SessionInfoProto sessionInfo) {
719 693 return new TenantId(new UUID(sessionInfo.getTenantIdMSB(), sessionInfo.getTenantIdLSB()));
720 694 }
721 695
722   - protected DeviceId getDeviceId(SessionInfoProto sessionInfo) {
  696 + protected DeviceId getDeviceId(TransportProtos.SessionInfoProto sessionInfo) {
723 697 return new DeviceId(new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB()));
724 698 }
725 699
726   - public static SessionEventMsg getSessionEventMsg(SessionEvent event) {
727   - return SessionEventMsg.newBuilder()
728   - .setSessionType(SessionType.ASYNC)
  700 + public static TransportProtos.SessionEventMsg getSessionEventMsg(TransportProtos.SessionEvent event) {
  701 + return TransportProtos.SessionEventMsg.newBuilder()
  702 + .setSessionType(TransportProtos.SessionType.ASYNC)
729 703 .setEvent(event).build();
730 704 }
731 705
732   - protected void sendToDeviceActor(SessionInfoProto sessionInfo, TransportToDeviceActorMsg toDeviceActorMsg, TransportServiceCallback<Void> callback) {
  706 + protected void sendToDeviceActor(TransportProtos.SessionInfoProto sessionInfo, TransportToDeviceActorMsg toDeviceActorMsg, TransportServiceCallback<Void> callback) {
733 707 TopicPartitionInfo tpi = partitionService.resolve(ServiceType.TB_CORE, getTenantId(sessionInfo), getDeviceId(sessionInfo));
734 708 if (log.isTraceEnabled()) {
735 709 log.trace("[{}][{}] Pushing to topic {} message {}", getTenantId(sessionInfo), getDeviceId(sessionInfo), tpi.getFullTopicName(), toDeviceActorMsg);
... ...