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

CoAP ack/confirmable mess fixing

pull/5503/head
Andrii Shvaika 5 years ago
committed by Andrew Shvayka
parent
4c275888ec
commit
de1a56a488
8 changed files with 27 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
  2. 8
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/CoapTransportAdaptor.java
  3. 18
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java
  4. 18
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/ProtoCoapAdaptor.java
  5. 4
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapOkCallback.java
  6. 2
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/GetAttributesSyncSessionCallback.java
  7. 2
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/ToServerRpcSyncSessionCallback.java
  8. 9
      common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java

4
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportResource.java
View File

@ -223,9 +223,7 @@ public class CoapTransportResource extends AbstractCoapTransportResource {
return; return;
} }
transportService.process(DeviceTransportType.COAP, TransportProtos.ValidateDeviceTokenRequestMsg.newBuilder().setToken(credentials.get().getCredentialsId()).build(), transportService.process(DeviceTransportType.COAP, TransportProtos.ValidateDeviceTokenRequestMsg.newBuilder().setToken(credentials.get().getCredentialsId()).build(),
new CoapDeviceAuthCallback(exchange, (deviceCredentials, deviceProfile) -> { new CoapDeviceAuthCallback(exchange, (deviceCredentials, deviceProfile) -> processRequest(exchange, type, request, deviceCredentials, deviceProfile)));
processRequest(exchange, type, request, deviceCredentials, deviceProfile);
}));
} }
private void processRequest(CoapExchange exchange, SessionMsgType type, Request request, ValidateDeviceCredentialsResponse deviceCredentials, DeviceProfile deviceProfile) { private void processRequest(CoapExchange exchange, SessionMsgType type, Request request, ValidateDeviceCredentialsResponse deviceCredentials, DeviceProfile deviceProfile) {

8
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/CoapTransportAdaptor.java
View File

@ -39,13 +39,13 @@ public interface CoapTransportAdaptor {
TransportProtos.ClaimDeviceMsg convertToClaimDevice(UUID sessionId, Request inbound, TransportProtos.SessionInfoProto sessionInfo) throws AdaptorException; TransportProtos.ClaimDeviceMsg convertToClaimDevice(UUID sessionId, Request inbound, TransportProtos.SessionInfoProto sessionInfo) throws AdaptorException;
Response convertToPublish(boolean isConfirmable, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException; Response convertToPublish(TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException;
Response convertToPublish(boolean isConfirmable, TransportProtos.AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException; Response convertToPublish(TransportProtos.AttributeUpdateNotificationMsg notificationMsg) throws AdaptorException;
Response convertToPublish(boolean isConfirmable, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException; Response convertToPublish(TransportProtos.ToDeviceRpcRequestMsg rpcRequest, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException;
Response convertToPublish(boolean isConfirmable, TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException; Response convertToPublish(TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException;
ProvisionDeviceRequestMsg convertToProvisionRequestMsg(UUID sessionId, Request inbound) throws AdaptorException; ProvisionDeviceRequestMsg convertToProvisionRequestMsg(UUID sessionId, Request inbound) throws AdaptorException;

18
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/JsonCoapAdaptor.java
View File

@ -93,21 +93,20 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.AttributeUpdateNotificationMsg msg) throws AdaptorException { public Response convertToPublish(TransportProtos.AttributeUpdateNotificationMsg msg) throws AdaptorException {
return getObserveNotification(isConfirmable, JsonConverter.toJson(msg)); return getObserveNotification(JsonConverter.toJson(msg));
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.ToDeviceRpcRequestMsg msg, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException { public Response convertToPublish(TransportProtos.ToDeviceRpcRequestMsg msg, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException {
return getObserveNotification(isConfirmable, JsonConverter.toJson(msg, true)); return getObserveNotification(JsonConverter.toJson(msg, true));
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException { public Response convertToPublish(TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
JsonElement result = JsonConverter.toJson(msg); JsonElement result = JsonConverter.toJson(msg);
response.setPayload(result.toString()); response.setPayload(result.toString());
response.setConfirmable(isConfirmable);
return response; return response;
} }
@ -122,11 +121,10 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.GetAttributeResponseMsg msg) throws AdaptorException { public Response convertToPublish(TransportProtos.GetAttributeResponseMsg msg) throws AdaptorException {
if (msg.getSharedStateMsg()) { if (msg.getSharedStateMsg()) {
if (StringUtils.isEmpty(msg.getError())) { if (StringUtils.isEmpty(msg.getError())) {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setConfirmable(isConfirmable);
TransportProtos.AttributeUpdateNotificationMsg notificationMsg = TransportProtos.AttributeUpdateNotificationMsg.newBuilder().addAllSharedUpdated(msg.getSharedAttributeListList()).build(); TransportProtos.AttributeUpdateNotificationMsg notificationMsg = TransportProtos.AttributeUpdateNotificationMsg.newBuilder().addAllSharedUpdated(msg.getSharedAttributeListList()).build();
JsonObject result = JsonConverter.toJson(notificationMsg); JsonObject result = JsonConverter.toJson(notificationMsg);
response.setPayload(result.toString()); response.setPayload(result.toString());
@ -139,7 +137,6 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
return new Response(CoAP.ResponseCode.NOT_FOUND); return new Response(CoAP.ResponseCode.NOT_FOUND);
} else { } else {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setConfirmable(isConfirmable);
JsonObject result = JsonConverter.toJson(msg); JsonObject result = JsonConverter.toJson(msg);
response.setPayload(result.toString()); response.setPayload(result.toString());
return response; return response;
@ -147,10 +144,9 @@ public class JsonCoapAdaptor implements CoapTransportAdaptor {
} }
} }
private Response getObserveNotification(boolean confirmable, JsonElement json) { private Response getObserveNotification(JsonElement json) {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setPayload(json.toString()); response.setPayload(json.toString());
response.setConfirmable(confirmable);
return response; return response;
} }

18
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/adaptors/ProtoCoapAdaptor.java
View File

@ -113,29 +113,27 @@ public class ProtoCoapAdaptor implements CoapTransportAdaptor {
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.AttributeUpdateNotificationMsg msg) throws AdaptorException { public Response convertToPublish(TransportProtos.AttributeUpdateNotificationMsg msg) throws AdaptorException {
return getObserveNotification(isConfirmable, msg.toByteArray()); return getObserveNotification(msg.toByteArray());
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.ToDeviceRpcRequestMsg rpcRequest, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException { public Response convertToPublish(TransportProtos.ToDeviceRpcRequestMsg rpcRequest, DynamicMessage.Builder rpcRequestDynamicMessageBuilder) throws AdaptorException {
return getObserveNotification(isConfirmable, ProtoConverter.convertToRpcRequest(rpcRequest, rpcRequestDynamicMessageBuilder)); return getObserveNotification(ProtoConverter.convertToRpcRequest(rpcRequest, rpcRequestDynamicMessageBuilder));
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException { public Response convertToPublish(TransportProtos.ToServerRpcResponseMsg msg) throws AdaptorException {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setConfirmable(isConfirmable);
response.setPayload(msg.toByteArray()); response.setPayload(msg.toByteArray());
return response; return response;
} }
@Override @Override
public Response convertToPublish(boolean isConfirmable, TransportProtos.GetAttributeResponseMsg msg) throws AdaptorException { public Response convertToPublish(TransportProtos.GetAttributeResponseMsg msg) throws AdaptorException {
if (msg.getSharedStateMsg()) { if (msg.getSharedStateMsg()) {
if (StringUtils.isEmpty(msg.getError())) { if (StringUtils.isEmpty(msg.getError())) {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setConfirmable(isConfirmable);
TransportProtos.AttributeUpdateNotificationMsg notificationMsg = TransportProtos.AttributeUpdateNotificationMsg.newBuilder().addAllSharedUpdated(msg.getSharedAttributeListList()).build(); TransportProtos.AttributeUpdateNotificationMsg notificationMsg = TransportProtos.AttributeUpdateNotificationMsg.newBuilder().addAllSharedUpdated(msg.getSharedAttributeListList()).build();
response.setPayload(notificationMsg.toByteArray()); response.setPayload(notificationMsg.toByteArray());
return response; return response;
@ -147,17 +145,15 @@ public class ProtoCoapAdaptor implements CoapTransportAdaptor {
return new Response(CoAP.ResponseCode.NOT_FOUND); return new Response(CoAP.ResponseCode.NOT_FOUND);
} else { } else {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setConfirmable(isConfirmable);
response.setPayload(msg.toByteArray()); response.setPayload(msg.toByteArray());
return response; return response;
} }
} }
} }
private Response getObserveNotification(boolean confirmable, byte[] notification) { private Response getObserveNotification(byte[] notification) {
Response response = new Response(CoAP.ResponseCode.CONTENT); Response response = new Response(CoAP.ResponseCode.CONTENT);
response.setPayload(notification); response.setPayload(notification);
response.setConfirmable(confirmable);
return response; return response;
} }

4
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/CoapOkCallback.java
View File

@ -34,9 +34,7 @@ public class CoapOkCallback implements TransportServiceCallback<Void> {
@Override @Override
public void onSuccess(Void msg) { public void onSuccess(Void msg) {
Response response = new Response(onSuccessResponse); exchange.respond(new Response(onSuccessResponse));
response.setConfirmable(isConRequest());
exchange.respond(response);
} }
@Override @Override

2
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/GetAttributesSyncSessionCallback.java
View File

@ -34,7 +34,7 @@ public class GetAttributesSyncSessionCallback extends AbstractSyncSessionCallbac
@Override @Override
public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg msg) { public void onGetAttributesResponse(TransportProtos.GetAttributeResponseMsg msg) {
try { try {
respond(state.getAdaptor().convertToPublish(request.isConfirmable(), msg)); respond(state.getAdaptor().convertToPublish(msg));
} catch (AdaptorException e) { } catch (AdaptorException e) {
log.trace("[{}] Failed to reply due to error", state.getDeviceId(), e); log.trace("[{}] Failed to reply due to error", state.getDeviceId(), e);
exchange.respond(new Response(CoAP.ResponseCode.INTERNAL_SERVER_ERROR)); exchange.respond(new Response(CoAP.ResponseCode.INTERNAL_SERVER_ERROR));

2
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/callback/ToServerRpcSyncSessionCallback.java
View File

@ -33,7 +33,7 @@ public class ToServerRpcSyncSessionCallback extends AbstractSyncSessionCallback
@Override @Override
public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg toServerResponse) { public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg toServerResponse) {
try { try {
respond(state.getAdaptor().convertToPublish(request.isConfirmable(), toServerResponse)); respond(state.getAdaptor().convertToPublish(toServerResponse));
} catch (AdaptorException e) { } catch (AdaptorException e) {
log.trace("Failed to reply due to error", e); log.trace("Failed to reply due to error", e);
exchange.respond(CoAP.ResponseCode.INTERNAL_SERVER_ERROR); exchange.respond(CoAP.ResponseCode.INTERNAL_SERVER_ERROR);

9
common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/client/DefaultCoapClientContext.java
View File

@ -435,8 +435,7 @@ public class DefaultCoapClientContext implements CoapClientContext {
TbCoapObservationState attrs = state.getAttrs(); TbCoapObservationState attrs = state.getAttrs();
if (attrs != null) { if (attrs != null) {
try { try {
boolean conRequest = AbstractSyncSessionCallback.isConRequest(state.getAttrs()); Response response = state.getAdaptor().convertToPublish(msg);
Response response = state.getAdaptor().convertToPublish(conRequest, msg);
respond(attrs.getExchange(), response, state.getContentFormat()); respond(attrs.getExchange(), response, state.getContentFormat());
} catch (AdaptorException e) { } catch (AdaptorException e) {
log.trace("Failed to reply due to error", e); log.trace("Failed to reply due to error", e);
@ -466,7 +465,8 @@ public class DefaultCoapClientContext implements CoapClientContext {
try { try {
boolean conRequest = AbstractSyncSessionCallback.isConRequest(state.getAttrs()); boolean conRequest = AbstractSyncSessionCallback.isConRequest(state.getAttrs());
int requestId = getNextMsgId(); int requestId = getNextMsgId();
Response response = state.getAdaptor().convertToPublish(conRequest, msg); Response response = state.getAdaptor().convertToPublish(msg);
response.setConfirmable(conRequest);
response.setMID(requestId); response.setMID(requestId);
if (conRequest) { if (conRequest) {
response.addMessageObserver(new TbCoapMessageObserver(requestId, id -> awake(state), id -> asleep(state))); response.addMessageObserver(new TbCoapMessageObserver(requestId, id -> awake(state), id -> asleep(state)));
@ -527,7 +527,8 @@ public class DefaultCoapClientContext implements CoapClientContext {
String error = null; String error = null;
boolean conRequest = AbstractSyncSessionCallback.isConRequest(state.getRpc()); boolean conRequest = AbstractSyncSessionCallback.isConRequest(state.getRpc());
try { try {
Response response = state.getAdaptor().convertToPublish(conRequest, msg, state.getConfiguration().getRpcRequestDynamicMessageBuilder()); Response response = state.getAdaptor().convertToPublish(msg, state.getConfiguration().getRpcRequestDynamicMessageBuilder());
response.setConfirmable(conRequest);
int requestId = getNextMsgId(); int requestId = getNextMsgId();
response.setMID(requestId); response.setMID(requestId);
if (conRequest) { if (conRequest) {

Write Preview
Loading…
Cancel
Save