dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
desoliture 2021-12-29 17:22:32 +02:00
parent b53746bda6
commit 2f5648c400
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/adaptors/JsonMqttAdaptor.java
View File

@ -43,6 +43,7 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import static org.thingsboard.server.common.data.device.profile.MqttTopics.DEVICE_SOFTWARE_FIRMWARE_RESPONSES_TOPIC_FORMAT; import static org.thingsboard.server.common.data.device.profile.MqttTopics.DEVICE_SOFTWARE_FIRMWARE_RESPONSES_TOPIC_FORMAT;
@ -124,11 +125,12 @@ public class JsonMqttAdaptor implements MqttTransportAdaptor {
@Override @Override
public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException { public Optional<MqttMessage> convertToGatewayPublish(MqttDeviceAwareSessionContext ctx, String deviceName, TransportProtos.GetAttributeResponseMsg responseMsg) throws AdaptorException {
JsonObject request = ((GatewayDeviceSessionCtx) ctx) Map<Integer, JsonObject> pendingAttributesRequests = ((GatewayDeviceSessionCtx) ctx).getPendingAttributesRequests();
.getPendingAttributesRequests() int requestId = responseMsg.getRequestId();
.getOrDefault(responseMsg.getRequestId(), new JsonObject()); JsonObject request = pendingAttributesRequests.getOrDefault(requestId, new JsonObject());
boolean multipleAttrKeysRequested = boolean multipleAttrKeysRequested =
request.has("keys") && request.get("keys").getAsJsonArray().size() > 1; request.has("keys") && request.get("keys").getAsJsonArray().size() > 1;
pendingAttributesRequests.remove(requestId);
return processConvertFromGatewayAttributeResponseMsg(ctx, deviceName, responseMsg, multipleAttrKeysRequested); return processConvertFromGatewayAttributeResponseMsg(ctx, deviceName, responseMsg, multipleAttrKeysRequested);
} }