tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

BugFix for Gateway API and concurrent device creation

pull/1166/head
Andrew Shvayka 8 years ago
parent
52ef95ac1b
commit
c6800dbd03
10 changed files with 197 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      application/pom.xml
  2. 4
      application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
  3. 28
      application/src/main/java/org/thingsboard/server/service/transport/RemoteTransportApiService.java
  4. 32
      transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
  5. 246
      transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionCtx.java
  6. 35
      transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionId.java
  7. 24
      transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
  8. 4
      transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
  9. 15
      transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
  10. 2
      transport/pom.xml

16
application/pom.xml
View File

@ -60,14 +60,14 @@
<groupId>org.thingsboard.common</groupId>
<artifactId>transport</artifactId>
</dependency>
<dependency>
<groupId>org.thingsboard.transport</groupId>
<artifactId>http</artifactId>
</dependency>
<dependency>
<groupId>org.thingsboard.transport</groupId>
<artifactId>coap</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.thingsboard.transport</groupId>-->
<!--<artifactId>http</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.thingsboard.transport</groupId>-->
<!--<artifactId>coap</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>org.thingsboard.transport</groupId>
<artifactId>mqtt-common</artifactId>

4
application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View File

@ -455,6 +455,10 @@ public class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcesso
private void processSessionStateMsgs(SessionInfoProto sessionInfo, SessionEventMsg msg) {
UUID sessionId = getSessionId(sessionInfo);
if (msg.getEvent() == SessionEvent.OPEN) {
if(sessions.containsKey(sessionId)){
logger.debug("[{}] Received duplicate session open event [{}]", deviceId, sessionId);
return;
}
logger.debug("[{}] Processing new session [{}]", deviceId, sessionId);
if (sessions.size() >= systemContext.getMaxConcurrentSessionsPerDevice()) {
UUID sessionIdToRemove = sessions.keySet().stream().findFirst().orElse(null);

28
application/src/main/java/org/thingsboard/server/service/transport/RemoteTransportApiService.java
View File

@ -51,6 +51,7 @@ import javax.annotation.PostConstruct;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.locks.ReentrantLock;
/**
* Created by ashvayka on 05.10.18.
@ -97,6 +98,8 @@ public class RemoteTransportApiService implements TransportApiService {
private TbKafkaResponseTemplate<TransportApiRequestMsg, TransportApiResponseMsg> transportApiTemplate;
private ReentrantLock deviceCreationLock = new ReentrantLock();
@PostConstruct
public void init() {
this.transportCallbackExecutor = Executors.newCachedThreadPool();
@ -156,23 +159,26 @@ public class RemoteTransportApiService implements TransportApiService {
DeviceId gatewayId = new DeviceId(new UUID(requestMsg.getGatewayIdMSB(), requestMsg.getGatewayIdLSB()));
ListenableFuture<Device> gatewayFuture = deviceService.findDeviceByIdAsync(gatewayId);
return Futures.transform(gatewayFuture, gateway -> {
Device device = deviceService.findDeviceByTenantIdAndName(gateway.getTenantId(), gateway.getName());
if (device == null) {
device = new Device();
device.setTenantId(gateway.getTenantId());
device.setName(requestMsg.getDeviceName());
device.setType(requestMsg.getDeviceType());
device.setCustomerId(gateway.getCustomerId());
device = deviceService.saveDevice(device);
relationService.saveRelationAsync(new EntityRelation(gateway.getId(), device.getId(), "Created"));
deviceStateService.onDeviceAdded(device);
}
deviceCreationLock.lock();
try {
Device device = deviceService.findDeviceByTenantIdAndName(gateway.getTenantId(), requestMsg.getDeviceName());
if (device == null) {
device = new Device();
device.setTenantId(gateway.getTenantId());
device.setName(requestMsg.getDeviceName());
device.setType(requestMsg.getDeviceType());
device.setCustomerId(gateway.getCustomerId());
device = deviceService.saveDevice(device);
relationService.saveRelationAsync(new EntityRelation(gateway.getId(), device.getId(), "Created"));
deviceStateService.onDeviceAdded(device);
}
return TransportApiResponseMsg.newBuilder()
.setGetOrCreateDeviceResponseMsg(GetOrCreateDeviceFromGatewayResponseMsg.newBuilder().setDeviceInfo(getDeviceInfoProto(device)).build()).build();
} catch (JsonProcessingException e) {
log.warn("[{}] Failed to lookup device by gateway id and name", gatewayId, requestMsg.getDeviceName(), e);
throw new RuntimeException(e);
} finally {
deviceCreationLock.unlock();
}
}, transportCallbackExecutor);
}

32
transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
View File

@ -122,7 +122,8 @@ public class DeviceApiController {
@RequestParam(value = "timeout", required = false, defaultValue = "0") long timeout,
HttpServletRequest request) {
return subscribe(deviceToken, timeout, new RpcSubscribeMsg(), request);
// return subscribe(deviceToken, timeout, new RpcSubscribeMsg(), request);
return null;
}
@RequestMapping(value = "/{deviceToken}/rpc/{requestId}", method = RequestMethod.POST)
@ -174,15 +175,15 @@ public class DeviceApiController {
public DeferredResult<ResponseEntity> subscribeToAttributes(@PathVariable("deviceToken") String deviceToken,
@RequestParam(value = "timeout", required = false, defaultValue = "0") long timeout,
HttpServletRequest httpRequest) {
return subscribe(deviceToken, timeout, new AttributesSubscribeMsg(), httpRequest);
return null;
// return subscribe(deviceToken, timeout, new AttributesSubscribeMsg(), httpRequest);
}
private DeferredResult<ResponseEntity> subscribe(String deviceToken, long timeout, FromDeviceMsg msg, HttpServletRequest httpRequest) {
DeferredResult<ResponseEntity> responseWriter = new DeferredResult<ResponseEntity>();
if (quotaExceeded(httpRequest, responseWriter)) {
return responseWriter;
}
// private DeferredResult<ResponseEntity> subscribe(String deviceToken, long timeout, FromDeviceMsg msg, HttpServletRequest httpRequest) {
// DeferredResult<ResponseEntity> responseWriter = new DeferredResult<ResponseEntity>();
// if (quotaExceeded(httpRequest, responseWriter)) {
// return responseWriter;
// }
// HttpSessionCtx ctx = getHttpSessionCtx(responseWriter, timeout);
// if (ctx.login(new DeviceTokenCredentials(deviceToken))) {
// try {
@ -193,21 +194,22 @@ public class DeviceApiController {
// } else {
// responseWriter.setResult(new ResponseEntity<>(HttpStatus.UNAUTHORIZED));
// }
return responseWriter;
}
// return responseWriter;
// }
private HttpSessionCtx getHttpSessionCtx(DeferredResult<ResponseEntity> responseWriter) {
return getHttpSessionCtx(responseWriter, defaultTimeout);
}
private HttpSessionCtx getHttpSessionCtx(DeferredResult<ResponseEntity> responseWriter, long timeout) {
return new HttpSessionCtx(processor, authService, responseWriter, timeout != 0 ? timeout : defaultTimeout);
return null;
// return new HttpSessionCtx(processor, authService, responseWriter, timeout != 0 ? timeout : defaultTimeout);
}
private void process(HttpSessionCtx ctx, FromDeviceMsg request) {
AdaptorToSessionActorMsg msg = new BasicAdaptorToSessionActorMsg(ctx, request);
// processor.process(new BasicTransportToDeviceSessionActorMsg(ctx.getDevice(), msg));
}
// private void process(HttpSessionCtx ctx, FromDeviceMsg request) {
// AdaptorToSessionActorMsg msg = new BasicAdaptorToSessionActorMsg(ctx, request);
//// processor.process(new BasicTransportToDeviceSessionActorMsg(ctx.getDevice(), msg));
// }
private boolean quotaExceeded(HttpServletRequest request, DeferredResult<ResponseEntity> responseWriter) {
if (quotaService.isQuotaExceeded(request.getRemoteAddr())) {

246
transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionCtx.java
View File

@ -29,6 +29,7 @@ import org.thingsboard.server.common.transport.auth.DeviceAuthService;
import org.thingsboard.server.common.transport.session.DeviceAwareSessionContext;
import java.util.Optional;
import java.util.UUID;
import java.util.function.Consumer;
/**
@ -37,127 +38,136 @@ import java.util.function.Consumer;
@Slf4j
public class HttpSessionCtx extends DeviceAwareSessionContext {
private final SessionId sessionId;
private final long timeout;
private final DeferredResult<ResponseEntity> responseWriter;
public HttpSessionCtx(SessionMsgProcessor processor, DeviceAuthService authService, DeferredResult<ResponseEntity> responseWriter, long timeout) {
super();
this.sessionId = new HttpSessionId();
this.responseWriter = responseWriter;
this.timeout = timeout;
}
@Override
public SessionType getSessionType() {
return SessionType.SYNC;
public HttpSessionCtx(UUID sessionId) {
super(sessionId);
}
@Override
public void onMsg(SessionActorToAdaptorMsg source) throws SessionException {
ToDeviceMsg msg = source.getMsg();
switch (msg.getSessionMsgType()) {
case GET_ATTRIBUTES_RESPONSE:
reply((GetAttributesResponse) msg);
return;
case STATUS_CODE_RESPONSE:
reply((StatusCodeResponse) msg);
return;
case ATTRIBUTES_UPDATE_NOTIFICATION:
reply((AttributesUpdateNotification) msg);
return;
case TO_DEVICE_RPC_REQUEST:
reply((ToDeviceRpcRequestMsg) msg);
return;
case TO_SERVER_RPC_RESPONSE:
reply((ToServerRpcResponseMsg) msg);
return;
case RULE_ENGINE_ERROR:
reply((RuleEngineErrorMsg) msg);
return;
default:
break;
}
}
private void reply(RuleEngineErrorMsg msg) {
HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR;
switch (msg.getError()) {
case QUEUE_PUT_TIMEOUT:
status = HttpStatus.REQUEST_TIMEOUT;
break;
default:
if (msg.getInSessionMsgType() == SessionMsgType.TO_SERVER_RPC_REQUEST) {
status = HttpStatus.BAD_REQUEST;
}
break;
}
responseWriter.setResult(new ResponseEntity<>(JsonConverter.toErrorJson(msg.getErrorMsg()).toString(), status));
}
private <T> void reply(ResponseMsg<? extends T> msg, Consumer<T> f) {
Optional<Exception> msgError = msg.getError();
if (!msgError.isPresent()) {
Optional<? extends T> msgData = msg.getData();
if (msgData.isPresent()) {
f.accept(msgData.get());
}
} else {
Exception e = msgError.get();
responseWriter.setResult(new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR));
}
public int nextMsgId() {
return 0;
}
private void reply(ToDeviceRpcRequestMsg msg) {
responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg, true).toString(), HttpStatus.OK));
}
private void reply(ToServerRpcResponseMsg msg) {
// responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg).toString(), HttpStatus.OK));
}
private void reply(AttributesUpdateNotification msg) {
responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg.getData(), false).toString(), HttpStatus.OK));
}
private void reply(GetAttributesResponse msg) {
reply(msg, payload -> {
if (payload.getClientAttributes().isEmpty() && payload.getSharedAttributes().isEmpty()) {
responseWriter.setResult(new ResponseEntity<>(HttpStatus.NOT_FOUND));
} else {
JsonObject result = JsonConverter.toJson(payload, false);
responseWriter.setResult(new ResponseEntity<>(result.toString(), HttpStatus.OK));
}
});
}
private void reply(StatusCodeResponse msg) {
reply(msg, payload -> {
if (payload == 0) {
responseWriter.setResult(new ResponseEntity<>(HttpStatus.OK));
} else {
responseWriter.setResult(new ResponseEntity<>(HttpStatus.valueOf(payload)));
}
});
}
@Override
public void onMsg(SessionCtrlMsg msg) throws SessionException {
//Do nothing
}
@Override
public boolean isClosed() {
return false;
}
@Override
public long getTimeout() {
return timeout;
}
@Override
public SessionId getSessionId() {
return sessionId;
}
// private final SessionId sessionId;
// private final long timeout;
// private final DeferredResult<ResponseEntity> responseWriter;
//
// public HttpSessionCtx(SessionMsgProcessor processor, DeviceAuthService authService, DeferredResult<ResponseEntity> responseWriter, long timeout) {
// super();
// this.sessionId = new HttpSessionId();
// this.responseWriter = responseWriter;
// this.timeout = timeout;
// }
//
// @Override
// public SessionType getSessionType() {
// return SessionType.SYNC;
// }
//
// @Override
// public void onMsg(SessionActorToAdaptorMsg source) throws SessionException {
// ToDeviceMsg msg = source.getMsg();
// switch (msg.getSessionMsgType()) {
// case GET_ATTRIBUTES_RESPONSE:
// reply((GetAttributesResponse) msg);
// return;
// case STATUS_CODE_RESPONSE:
// reply((StatusCodeResponse) msg);
// return;
// case ATTRIBUTES_UPDATE_NOTIFICATION:
// reply((AttributesUpdateNotification) msg);
// return;
// case TO_DEVICE_RPC_REQUEST:
// reply((ToDeviceRpcRequestMsg) msg);
// return;
// case TO_SERVER_RPC_RESPONSE:
// reply((ToServerRpcResponseMsg) msg);
// return;
// case RULE_ENGINE_ERROR:
// reply((RuleEngineErrorMsg) msg);
// return;
// default:
// break;
// }
// }
//
// private void reply(RuleEngineErrorMsg msg) {
// HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR;
// switch (msg.getError()) {
// case QUEUE_PUT_TIMEOUT:
// status = HttpStatus.REQUEST_TIMEOUT;
// break;
// default:
// if (msg.getInSessionMsgType() == SessionMsgType.TO_SERVER_RPC_REQUEST) {
// status = HttpStatus.BAD_REQUEST;
// }
// break;
// }
// responseWriter.setResult(new ResponseEntity<>(JsonConverter.toErrorJson(msg.getErrorMsg()).toString(), status));
// }
//
// private <T> void reply(ResponseMsg<? extends T> msg, Consumer<T> f) {
// Optional<Exception> msgError = msg.getError();
// if (!msgError.isPresent()) {
// Optional<? extends T> msgData = msg.getData();
// if (msgData.isPresent()) {
// f.accept(msgData.get());
// }
// } else {
// Exception e = msgError.get();
// responseWriter.setResult(new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR));
// }
// }
//
// private void reply(ToDeviceRpcRequestMsg msg) {
// responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg, true).toString(), HttpStatus.OK));
// }
//
// private void reply(ToServerRpcResponseMsg msg) {
//// responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg).toString(), HttpStatus.OK));
// }
//
// private void reply(AttributesUpdateNotification msg) {
// responseWriter.setResult(new ResponseEntity<>(JsonConverter.toJson(msg.getData(), false).toString(), HttpStatus.OK));
// }
//
// private void reply(GetAttributesResponse msg) {
// reply(msg, payload -> {
// if (payload.getClientAttributes().isEmpty() && payload.getSharedAttributes().isEmpty()) {
// responseWriter.setResult(new ResponseEntity<>(HttpStatus.NOT_FOUND));
// } else {
// JsonObject result = JsonConverter.toJson(payload, false);
// responseWriter.setResult(new ResponseEntity<>(result.toString(), HttpStatus.OK));
// }
// });
// }
//
// private void reply(StatusCodeResponse msg) {
// reply(msg, payload -> {
// if (payload == 0) {
// responseWriter.setResult(new ResponseEntity<>(HttpStatus.OK));
// } else {
// responseWriter.setResult(new ResponseEntity<>(HttpStatus.valueOf(payload)));
// }
// });
// }
//
// @Override
// public void onMsg(SessionCtrlMsg msg) throws SessionException {
// //Do nothing
// }
//
// @Override
// public boolean isClosed() {
// return false;
// }
//
// @Override
// public long getTimeout() {
// return timeout;
// }
//
// @Override
// public SessionId getSessionId() {
// return sessionId;
// }
}

35
transport/http/src/main/java/org/thingsboard/server/transport/http/session/HttpSessionId.java
View File

@ -1,35 +0,0 @@
/**
* Copyright © 2016-2018 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.transport.http.session;
import java.util.UUID;
/**
* @author Andrew Shvayka
*/
public class HttpSessionId implements SessionId {
private final UUID id;
public HttpSessionId() {
this.id = UUID.randomUUID();
}
@Override
public String toUidStr() {
return id.toString();
}
}

24
transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
View File

@ -54,7 +54,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceTokenR
import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceX509CertRequestMsg;
import org.thingsboard.server.transport.mqtt.adaptors.MqttTransportAdaptor;
import org.thingsboard.server.transport.mqtt.session.DeviceSessionCtx;
import org.thingsboard.server.transport.mqtt.session.GatewaySessionCtx;
import org.thingsboard.server.transport.mqtt.session.GatewaySessionHandler;
import org.thingsboard.server.transport.mqtt.util.SslUtil;
import javax.net.ssl.SSLPeerUnverifiedException;
@ -98,7 +98,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
private volatile SessionInfoProto sessionInfo;
private volatile InetSocketAddress address;
private volatile DeviceSessionCtx deviceSessionCtx;
private volatile GatewaySessionCtx gatewaySessionCtx;
private volatile GatewaySessionHandler gatewaySessionHandler;
MqttTransportHandler(MqttTransportContext context) {
this.sessionId = UUID.randomUUID();
@ -175,7 +175,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
log.trace("[{}] Processing publish msg [{}][{}]!", sessionId, topicName, msgId);
if (topicName.startsWith(MqttTopics.BASE_GATEWAY_API_TOPIC)) {
if (gatewaySessionCtx != null) {
if (gatewaySessionHandler != null) {
handleGatewayPublishMsg(topicName, msgId, mqttMsg);
}
} else {
@ -187,22 +187,22 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
try {
switch (topicName) {
case MqttTopics.GATEWAY_TELEMETRY_TOPIC:
gatewaySessionCtx.onDeviceTelemetry(mqttMsg);
gatewaySessionHandler.onDeviceTelemetry(mqttMsg);
break;
case MqttTopics.GATEWAY_ATTRIBUTES_TOPIC:
gatewaySessionCtx.onDeviceAttributes(mqttMsg);
gatewaySessionHandler.onDeviceAttributes(mqttMsg);
break;
case MqttTopics.GATEWAY_ATTRIBUTES_REQUEST_TOPIC:
gatewaySessionCtx.onDeviceAttributesRequest(mqttMsg);
gatewaySessionHandler.onDeviceAttributesRequest(mqttMsg);
break;
case MqttTopics.GATEWAY_RPC_TOPIC:
gatewaySessionCtx.onDeviceRpcResponse(mqttMsg);
gatewaySessionHandler.onDeviceRpcResponse(mqttMsg);
break;
case MqttTopics.GATEWAY_CONNECT_TOPIC:
gatewaySessionCtx.onDeviceConnect(mqttMsg);
gatewaySessionHandler.onDeviceConnect(mqttMsg);
break;
case MqttTopics.GATEWAY_DISCONNECT_TOPIC:
gatewaySessionCtx.onDeviceDisconnect(mqttMsg);
gatewaySessionHandler.onDeviceDisconnect(mqttMsg);
break;
}
} catch (RuntimeException | AdaptorException e) {
@ -405,8 +405,8 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
if (deviceSessionCtx.isConnected()) {
transportService.process(sessionInfo, getSessionEventMsg(SessionEvent.CLOSED), null);
transportService.deregisterSession(sessionInfo);
if (gatewaySessionCtx != null) {
gatewaySessionCtx.onGatewayDisconnect();
if (gatewaySessionHandler != null) {
gatewaySessionHandler.onGatewayDisconnect();
}
}
}
@ -467,7 +467,7 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
if (infoNode != null) {
JsonNode gatewayNode = infoNode.get("gateway");
if (gatewayNode != null && gatewayNode.asBoolean()) {
gatewaySessionCtx = new GatewaySessionCtx(context, deviceSessionCtx, sessionId);
gatewaySessionHandler = new GatewaySessionHandler(context, deviceSessionCtx, sessionId);
}
}
} catch (IOException e) {

4
transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
View File

@ -30,10 +30,10 @@ import java.util.concurrent.ConcurrentMap;
@Slf4j
public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext implements SessionMsgListener {
private final GatewaySessionCtx parent;
private final GatewaySessionHandler parent;
private final SessionInfoProto sessionInfo;
public GatewayDeviceSessionCtx(GatewaySessionCtx parent, DeviceInfoProto deviceInfo, ConcurrentMap<String, Integer> mqttQoSMap) {
public GatewayDeviceSessionCtx(GatewaySessionHandler parent, DeviceInfoProto deviceInfo, ConcurrentMap<String, Integer> mqttQoSMap) {
super(UUID.randomUUID(), mqttQoSMap);
this.parent = parent;
this.sessionInfo = SessionInfoProto.newBuilder()

15
transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionCtx.java → transport/mqtt-common/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandler.java
View File

@ -52,13 +52,12 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
/**
* Created by ashvayka on 19.01.17.
*/
@Slf4j
public class GatewaySessionCtx {
public class GatewaySessionHandler {
private static final String DEFAULT_DEVICE_TYPE = "default";
private static final String CAN_T_PARSE_VALUE = "Can't parse value: ";
@ -73,7 +72,7 @@ public class GatewaySessionCtx {
private final ChannelHandlerContext channel;
private final DeviceSessionCtx deviceSessionCtx;
public GatewaySessionCtx(MqttTransportContext context, DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
public GatewaySessionHandler(MqttTransportContext context, DeviceSessionCtx deviceSessionCtx, UUID sessionId) {
this.context = context;
this.transportService = context.getTransportService();
this.deviceSessionCtx = deviceSessionCtx;
@ -114,10 +113,12 @@ public class GatewaySessionCtx {
new TransportServiceCallback<GetOrCreateDeviceFromGatewayResponseMsg>() {
@Override
public void onSuccess(GetOrCreateDeviceFromGatewayResponseMsg msg) {
GatewayDeviceSessionCtx deviceSessionCtx = new GatewayDeviceSessionCtx(GatewaySessionCtx.this, msg.getDeviceInfo(), mqttQoSMap);
GatewayDeviceSessionCtx deviceSessionCtx = new GatewayDeviceSessionCtx(GatewaySessionHandler.this, msg.getDeviceInfo(), mqttQoSMap);
if (devices.putIfAbsent(deviceName, deviceSessionCtx) == null) {
SessionInfoProto deviceSessionInfo = deviceSessionCtx.getSessionInfo();
transportService.process(deviceSessionInfo, MqttTransportHandler.getSessionEventMsg(TransportProtos.SessionEvent.OPEN), null);
transportService.process(deviceSessionInfo, TransportProtos.SubscribeToRPCMsg.getDefaultInstance(), null);
transportService.process(deviceSessionInfo, TransportProtos.SubscribeToAttributeUpdatesMsg.getDefaultInstance(), null);
transportService.registerSession(deviceSessionInfo, deviceSessionCtx);
}
future.set(devices.get(deviceName));
@ -203,7 +204,7 @@ public class GatewaySessionCtx {
@Override
public void onFailure(Throwable t) {
log.debug("[{}] Failed to process device teleemtry command: {}", sessionId, deviceName, t);
log.debug("[{}] Failed to process device attributes command: {}", sessionId, deviceName, t);
}
}, context.getExecutor());
}
@ -264,8 +265,8 @@ public class GatewaySessionCtx {
} else {
result.addAllSharedAttributeNames(keys);
}
int msgId = msg.variableHeader().packetId();
TransportProtos.GetAttributeRequestMsg requestMsg = result.build();
int msgId = msg.variableHeader().packetId();
Futures.addCallback(checkDeviceConnected(deviceName),
new FutureCallback<GatewayDeviceSessionCtx>() {
@Override
@ -275,7 +276,7 @@ public class GatewaySessionCtx {
@Override
public void onFailure(Throwable t) {
log.debug("[{}] Failed to process device teleemtry command: {}", sessionId, deviceName, t);
log.debug("[{}] Failed to process device attributes request command: {}", sessionId, deviceName, t);
}
}, context.getExecutor());
ack(msg);

2
transport/pom.xml
View File

@ -35,7 +35,7 @@
</properties>
<modules>
<!--<module>http</module>-->
<module>http</module>
<!--<module>coap</module>-->
<module>mqtt-common</module>
<module>mqtt-transport</module>

Write Preview
Loading…
Cancel
Save