rpcSubscriptionsToRemove = rpcSubscriptions.entrySet().stream().filter(kv -> System.currentTimeMillis() > kv.getValue()).map(Map.Entry::getKey).collect(Collectors.toSet());
+ log.warn("4.2) System.currentTimeMillis(): [{}]", System.currentTimeMillis());
+ log.warn("4.3) rpcSubscriptionsToRemove: [{}]", rpcSubscriptionsToRemove);
+ rpcSubscriptionsToRemove.forEach(rpcSubscriptions::remove);
+ }
+ log.warn("4.4) after rpcSubscriptions.size(): [{}]", rpcSubscriptions.size());
}
- public void sentRpcRequest(Lwm2mClientRpcRequest rpcRequest, String requestCode, String msg, String typeMsg) {
+ public void sentRpcResponse(LwM2mClientRpcRequest rpcRequest, String requestCode, String msg, String typeMsg) {
rpcRequest.setResponseCode(requestCode);
if (LOG_LW2M_ERROR.equals(typeMsg)) {
rpcRequest.setInfoMsg(null);
@@ -502,6 +531,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
@Override
public void onToDeviceRpcResponse(TransportProtos.ToDeviceRpcResponseMsg toDeviceResponse, SessionInfoProto sessionInfo) {
+ log.warn("5) onToDeviceRpcResponse: [{}], sessionUUID: [{}]", toDeviceResponse, new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB()));
transportService.process(sessionInfo, toDeviceResponse, null);
}
@@ -509,17 +539,6 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
log.info("[{}] toServerRpcResponse", toServerResponse);
}
- /**
- * Trigger Server path = "/1/0/8"
- *
- * Trigger bootStrap path = "/1/0/9" - have to implemented on client
- */
- @Override
- public void doTrigger(Registration registration, String path) {
- lwM2mTransportRequest.sendAllRequest(registration, path, EXECUTE,
- ContentFormat.TLV.getName(), null, this.config.getTimeout(), null);
- }
-
/**
* Deregister session in transport
*
@@ -553,7 +572,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
@Override
public void onAwakeDev(Registration registration) {
log.trace("[{}] [{}] Received endpoint Awake version event", registration.getId(), registration.getEndpoint());
- this.sendLogsToThingsboard(LOG_LW2M_INFO + ": Client is awake!", registration.getId());
+ this.sendLogsToThingsboard(clientContext.getClientByEndpoint(registration.getEndpoint()), LOG_LW2M_INFO + ": Client is awake!");
//TODO: associate endpointId with device information.
}
@@ -562,13 +581,17 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
* @param registrationId - Id of Registration LwM2M Client
*/
@Override
- public void sendLogsToThingsboard(String logMsg, String registrationId) {
- SessionInfoProto sessionInfo = this.getSessionInfoOrCloseSession(registrationId);
- if (logMsg != null && sessionInfo != null) {
+ public void sendLogsToThingsboard(String registrationId, String logMsg) {
+ sendLogsToThingsboard(clientContext.getClientByRegistrationId(registrationId), logMsg);
+ }
+
+ @Override
+ public void sendLogsToThingsboard(LwM2mClient client, String logMsg) {
+ if (logMsg != null && client != null && client.getSession() != null) {
if (logMsg.length() > 1024) {
logMsg = logMsg.substring(0, 1024);
}
- this.helper.sendParametersOnThingsboardTelemetry(this.helper.getKvStringtoThingsboard(LOG_LW2M_TELEMETRY, logMsg), sessionInfo);
+ this.helper.sendParametersOnThingsboardTelemetry(this.helper.getKvStringtoThingsboard(LOG_LW2M_TELEMETRY, logMsg), client.getSession());
}
}
@@ -581,24 +604,23 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
* - Read Request to the client after registration to read all resource values for all objects
* - then Observe Request to the client marked as observe from the profile configuration.
*
- * @param registration - Registration LwM2M Client
- * @param lwM2MClient - object with All parameters off client
+ * @param lwM2MClient - object with All parameters off client
*/
- private void initLwM2mFromClientValue(Registration registration, LwM2mClient lwM2MClient) {
- LwM2mClientProfile lwM2MClientProfile = clientContext.getProfile(registration);
- Set clientObjects = clientContext.getSupportedIdVerInClient(registration);
+ private void initClientTelemetry(LwM2mClient lwM2MClient) {
+ LwM2mClientProfile lwM2MClientProfile = clientContext.getProfile(lwM2MClient.getProfileId());
+ Set clientObjects = clientContext.getSupportedIdVerInClient(lwM2MClient);
if (clientObjects != null && clientObjects.size() > 0) {
- if (LWM2M_STRATEGY_2 == LwM2mTransportUtil.getClientOnlyObserveAfterConnect(lwM2MClientProfile)) {
+ if (LwM2mTransportUtil.LwM2MClientStrategy.CLIENT_STRATEGY_2.code == lwM2MClientProfile.getClientStrategy()) {
// #2
lwM2MClient.getPendingReadRequests().addAll(clientObjects);
- clientObjects.forEach(path -> lwM2mTransportRequest.sendAllRequest(registration, path, READ, ContentFormat.TLV.getName(),
+ clientObjects.forEach(path -> lwM2mTransportRequest.sendAllRequest(lwM2MClient, path, READ,
null, this.config.getTimeout(), null));
}
// #1
- this.initReadAttrTelemetryObserveToClient(registration, lwM2MClient, READ, clientObjects);
- this.initReadAttrTelemetryObserveToClient(registration, lwM2MClient, OBSERVE, clientObjects);
- this.initReadAttrTelemetryObserveToClient(registration, lwM2MClient, WRITE_ATTRIBUTES, clientObjects);
- this.initReadAttrTelemetryObserveToClient(registration, lwM2MClient, DISCOVER, clientObjects);
+ this.initReadAttrTelemetryObserveToClient(lwM2MClient, READ, clientObjects);
+ this.initReadAttrTelemetryObserveToClient(lwM2MClient, OBSERVE, clientObjects);
+ this.initReadAttrTelemetryObserveToClient(lwM2MClient, WRITE_ATTRIBUTES, clientObjects);
+ this.initReadAttrTelemetryObserveToClient(lwM2MClient, DISCOVER, clientObjects);
}
}
@@ -640,65 +662,23 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
* @param path - resource
*/
private void updateResourcesValue(Registration registration, LwM2mResource lwM2mResource, String path) {
- LwM2mClient lwM2MClient = clientContext.getOrRegister(registration);
+ LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint());
if (lwM2MClient.saveResourceValue(path, lwM2mResource, this.config.getModelProvider())) {
/** version != null
* set setClient_fw_info... = value
**/
- if (lwM2MClient.getFwUpdate().isInfoFwSwUpdate()) {
+ if (lwM2MClient.getFwUpdate() != null && lwM2MClient.getFwUpdate().isInfoFwSwUpdate()) {
lwM2MClient.getFwUpdate().initReadValue(this, this.lwM2mTransportRequest, path);
}
- if (lwM2MClient.getSwUpdate().isInfoFwSwUpdate()) {
+ if (lwM2MClient.getSwUpdate() != null && lwM2MClient.getSwUpdate().isInfoFwSwUpdate()) {
lwM2MClient.getSwUpdate().initReadValue(this, this.lwM2mTransportRequest, path);
}
- /**
- * Before operation Execute (FwUpdate) inspection Update Result :
- * - after finished operation Write result: success (FwUpdate): fw_state = DOWNLOADED
- * - before start operation Execute (FwUpdate) Update Result = 0 - Initial value
- * - start Execute (FwUpdate)
- * After finished operation Execute (FwUpdate) inspection Update Result :
- * - after start operation Execute (FwUpdate): fw_state = UPDATING
- * - after success finished operation Execute (FwUpdate) Update Result == 1 ("Firmware updated successfully")
- * - finished operation Execute (FwUpdate)
- */
- if (lwM2MClient.getFwUpdate() != null
- && (convertPathFromObjectIdToIdVer(FW_RESULT_ID, registration).equals(path))) {
- if (DOWNLOADED.name().equals(lwM2MClient.getFwUpdate().getStateUpdate())
- && lwM2MClient.getFwUpdate().conditionalFwExecuteStart()) {
- lwM2MClient.getFwUpdate().executeFwSwWare(this, this.lwM2mTransportRequest);
- } else if (UPDATING.name().equals(lwM2MClient.getFwUpdate().getStateUpdate())
- && lwM2MClient.getFwUpdate().conditionalFwExecuteAfterSuccess()) {
- lwM2MClient.getFwUpdate().finishFwSwUpdate(this, true);
- } else if (UPDATING.name().equals(lwM2MClient.getFwUpdate().getStateUpdate())
- && lwM2MClient.getFwUpdate().conditionalFwExecuteAfterError()) {
- lwM2MClient.getFwUpdate().finishFwSwUpdate(this, false);
- }
- }
-
- /**
- * Before operation Execute (SwUpdate) inspection Update Result :
- * - after finished operation Write result: success (SwUpdate): fw_state = DOWNLOADED
- * - before operation Execute (SwUpdate) Update Result = 3 - Successfully Downloaded and package integrity verified
- * - start Execute (SwUpdate)
- * After finished operation Execute (SwUpdate) inspection Update Result :
- * - after start operation Execute (SwUpdate): fw_state = UPDATING
- * - after success finished operation Execute (SwUpdate) Update Result == 2 "Software successfully installed.""
- * - after success finished operation Execute (SwUpdate) Update Result == 2 "Software successfully installed.""
- * - finished operation Execute (SwUpdate)
- */
- if (lwM2MClient.getSwUpdate() != null
- && (convertPathFromObjectIdToIdVer(SW_RESULT_ID, registration).equals(path))) {
- if (DOWNLOADED.name().equals(lwM2MClient.getSwUpdate().getStateUpdate())
- && lwM2MClient.getSwUpdate().conditionalSwUpdateExecute()) {
- lwM2MClient.getSwUpdate().executeFwSwWare(this, this.lwM2mTransportRequest);
- } else if (UPDATING.name().equals(lwM2MClient.getSwUpdate().getStateUpdate())
- && lwM2MClient.getSwUpdate().conditionalSwExecuteAfterSuccess()) {
- lwM2MClient.getSwUpdate().finishFwSwUpdate(this, true);
- } else if (UPDATING.name().equals(lwM2MClient.getSwUpdate().getStateUpdate())
- && lwM2MClient.getSwUpdate().conditionalSwExecuteAfterError()) {
- lwM2MClient.getSwUpdate().finishFwSwUpdate(this, false);
- }
+ if ((convertPathFromObjectIdToIdVer(FW_RESULT_ID, registration).equals(path)) ||
+ (convertPathFromObjectIdToIdVer(FW_STATE_ID, registration).equals(path))) {
+ LwM2mFwSwUpdate fwUpdate = lwM2MClient.getFwUpdate(clientContext);
+ log.warn("93) path: [{}] value: [{}]", path, lwM2mResource.getValue());
+ fwUpdate.updateStateOta(this, lwM2mTransportRequest, registration, path, ((Long) lwM2mResource.getValue()).intValue());
}
Set paths = new HashSet<>();
paths.add(path);
@@ -735,15 +715,8 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
}
}
- /**
- * Start observe/read: Attr/Telemetry
- * #1 - Analyze: path in resource profile == client resource
- *
- * @param registration -
- */
- private void initReadAttrTelemetryObserveToClient(Registration registration, LwM2mClient lwM2MClient,
- LwM2mTypeOper typeOper, Set clientObjects) {
- LwM2mClientProfile lwM2MClientProfile = clientContext.getProfile(registration);
+ private void initReadAttrTelemetryObserveToClient(LwM2mClient lwM2MClient, LwM2mTypeOper typeOper, Set clientObjects) {
+ LwM2mClientProfile lwM2MClientProfile = clientContext.getProfile(lwM2MClient.getProfileId());
Set result = null;
ConcurrentHashMap params = null;
if (READ.equals(typeOper)) {
@@ -763,28 +736,42 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
params = this.getPathForWriteAttributes(lwM2MClientProfile.getPostAttributeLwm2mProfile());
result = params.keySet();
}
- if (result != null && !result.isEmpty()) {
- // #1
- Set pathSend = result.stream().filter(target -> {
- return target.split(LWM2M_SEPARATOR_PATH).length < 3 ?
- clientObjects.contains("/" + target.split(LWM2M_SEPARATOR_PATH)[1]) :
- clientObjects.contains("/" + target.split(LWM2M_SEPARATOR_PATH)[1] + "/" + target.split(LWM2M_SEPARATOR_PATH)[2]);
- }
+ sendRequestsToClient(lwM2MClient, typeOper, clientObjects, result, params);
+ }
+
+ private void sendRequestsToClient(LwM2mClient lwM2MClient, LwM2mTypeOper operationType, Set supportedObjectIds, Set desiredObjectIds, ConcurrentHashMap params) {
+ if (desiredObjectIds != null && !desiredObjectIds.isEmpty()) {
+ Set targetObjectIds = desiredObjectIds.stream().filter(target -> isSupportedTargetId(supportedObjectIds, target)
).collect(Collectors.toUnmodifiableSet());
- if (!pathSend.isEmpty()) {
- lwM2MClient.getPendingReadRequests().addAll(pathSend);
- ConcurrentHashMap finalParams = params;
- pathSend.forEach(target -> {
- lwM2mTransportRequest.sendAllRequest(registration, target, typeOper, ContentFormat.TLV.getName(),
- finalParams != null ? finalParams.get(target) : null, this.config.getTimeout(), null);
+ if (!targetObjectIds.isEmpty()) {
+ //TODO: remove this side effect?
+ lwM2MClient.getPendingReadRequests().addAll(targetObjectIds);
+ targetObjectIds.forEach(target -> {
+ Object additionalParams = params != null ? params.get(target) : null;
+ lwM2mTransportRequest.sendAllRequest(lwM2MClient, target, operationType, additionalParams, this.config.getTimeout(), null);
});
- if (OBSERVE.equals(typeOper)) {
+ if (OBSERVE.equals(operationType)) {
lwM2MClient.initReadValue(this, null);
}
}
}
}
+ private boolean isSupportedTargetId(Set supportedIds, String targetId) {
+ String[] targetIdParts = targetId.split(LWM2M_SEPARATOR_PATH);
+ if (targetIdParts.length <= 1) {
+ return false;
+ }
+ String targetIdSearch = targetIdParts[0];
+ for (int i = 1; i < targetIdParts.length; i++) {
+ targetIdSearch += "/" + targetIdParts[i];
+ if (supportedIds.contains(targetIdSearch)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private ConcurrentHashMap getPathForWriteAttributes(JsonObject objectJson) {
ConcurrentHashMap pathAttributes = new Gson().fromJson(objectJson.toString(),
new TypeToken>() {
@@ -793,7 +780,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
}
private void onDeviceUpdate(LwM2mClient lwM2MClient, Device device, Optional deviceProfileOpt) {
- deviceProfileOpt.ifPresent(deviceProfile -> this.onDeviceProfileUpdate(Collections.singleton(lwM2MClient.getRegistration().getId()), deviceProfile));
+ deviceProfileOpt.ifPresent(deviceProfile -> this.onDeviceProfileUpdate(Collections.singletonList(lwM2MClient), deviceProfile));
lwM2MClient.onDeviceUpdate(device, deviceProfileOpt);
}
@@ -838,7 +825,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
}
private TransportProtos.KeyValueProto getKvToThingsboard(String pathIdVer, Registration registration) {
- LwM2mClient lwM2MClient = this.clientContext.getClientByRegistrationId(registration.getId());
+ LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint());
JsonObject names = clientContext.getProfiles().get(lwM2MClient.getProfileId()).getPostKeyNameProfile();
if (names != null && names.has(pathIdVer)) {
String resourceName = names.get(pathIdVer).getAsString();
@@ -853,8 +840,9 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
valueKvProto = new JsonObject();
Object finalvalueKvProto = valueKvProto;
Gson gson = new GsonBuilder().create();
- resourceValue.getValues().forEach((k, v) -> {
- Object val = this.converter.convertValue(v, currentType, expectedType,
+ ResourceModel.Type finalCurrentType = currentType;
+ resourceValue.getInstances().forEach((k, v) -> {
+ Object val = this.converter.convertValue(v, finalCurrentType, expectedType,
new LwM2mPath(convertPathFromIdVerToObjectId(pathIdVer)));
JsonElement element = gson.toJsonTree(val, val.getClass());
((JsonObject) finalvalueKvProto).add(String.valueOf(k), element);
@@ -864,6 +852,9 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
valueKvProto = this.converter.convertValue(resourceValue.getValue(), currentType, expectedType,
new LwM2mPath(convertPathFromIdVerToObjectId(pathIdVer)));
}
+ LwM2mOtaConvert lwM2mOtaConvert = convertOtaUpdateValueToString(pathIdVer, valueKvProto, currentType);
+ valueKvProto = lwM2mOtaConvert.getValue();
+ currentType = lwM2mOtaConvert.getCurrentType();
return valueKvProto != null ? this.helper.getKvAttrTelemetryToThingsboard(currentType, resourceName, valueKvProto, resourceValue.isMultiInstances()) : null;
}
} catch (Exception e) {
@@ -882,10 +873,14 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
*/
private Object getResourceValueFormatKv(LwM2mClient lwM2MClient, String pathIdVer) {
LwM2mResource resourceValue = this.getResourceValueFromLwM2MClient(lwM2MClient, pathIdVer);
- ResourceModel.Type currentType = resourceValue.getType();
- ResourceModel.Type expectedType = this.helper.getResourceModelTypeEqualsKvProtoValueType(currentType, pathIdVer);
- return this.converter.convertValue(resourceValue.getValue(), currentType, expectedType,
- new LwM2mPath(convertPathFromIdVerToObjectId(pathIdVer)));
+ if (resourceValue != null) {
+ ResourceModel.Type currentType = resourceValue.getType();
+ ResourceModel.Type expectedType = this.helper.getResourceModelTypeEqualsKvProtoValueType(currentType, pathIdVer);
+ return this.converter.convertValue(resourceValue.getValue(), currentType, expectedType,
+ new LwM2mPath(convertPathFromIdVerToObjectId(pathIdVer)));
+ } else {
+ return null;
+ }
}
/**
@@ -944,10 +939,10 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
* #6.1 - update WriteAttribute
* #6.2 - del WriteAttribute
*
- * @param registrationIds -
- * @param deviceProfile -
+ * @param clients -
+ * @param deviceProfile -
*/
- private void onDeviceProfileUpdate(Set registrationIds, DeviceProfile deviceProfile) {
+ private void onDeviceProfileUpdate(List clients, DeviceProfile deviceProfile) {
LwM2mClientProfile lwM2MClientProfileOld = clientContext.getProfiles().get(deviceProfile.getUuidId()).clone();
if (clientContext.profileUpdate(deviceProfile) != null) {
// #1
@@ -998,15 +993,14 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
// #3.4, #6
if (!attributeLwm2mOld.equals(attributeLwm2mNew)) {
- this.getAnalyzerAttributeLwm2m(registrationIds, attributeLwm2mOld, attributeLwm2mNew);
+ this.getAnalyzerAttributeLwm2m(clients, attributeLwm2mOld, attributeLwm2mNew);
}
// #4.1 add
if (sendAttrToThingsboard.getPathPostParametersAdd().size() > 0) {
// update value in Resources
- registrationIds.forEach(registrationId -> {
- Registration registration = clientContext.getRegistration(registrationId);
- this.readObserveFromProfile(registration, sendAttrToThingsboard.getPathPostParametersAdd(), READ);
+ clients.forEach(client -> {
+ this.readObserveFromProfile(client, sendAttrToThingsboard.getPathPostParametersAdd(), READ);
});
}
// #4.2 del
@@ -1030,15 +1024,15 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
// does not include oldObserve
ResultsAnalyzerParameters postObserveAnalyzer = this.getAnalyzerParameters(sendObserveToClientOld.getPathPostParametersAdd(), sendObserveToClientNew.getPathPostParametersAdd());
// send Request observe to Client
- registrationIds.forEach(registrationId -> {
- Registration registration = clientContext.getRegistration(registrationId);
+ clients.forEach(client -> {
+ Registration registration = client.getRegistration();
if (postObserveAnalyzer.getPathPostParametersAdd().size() > 0) {
- this.readObserveFromProfile(registration, postObserveAnalyzer.getPathPostParametersAdd(), OBSERVE);
+ this.readObserveFromProfile(client, postObserveAnalyzer.getPathPostParametersAdd(), OBSERVE);
}
// 5.3 del
// send Request cancel observe to Client
if (postObserveAnalyzer.getPathPostParametersDel().size() > 0) {
- this.cancelObserveFromProfile(registration, postObserveAnalyzer.getPathPostParametersDel());
+ this.cancelObserveFromProfile(client, postObserveAnalyzer.getPathPostParametersDel());
}
});
}
@@ -1075,19 +1069,18 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
* Update Resource value after change RezAttrTelemetry in config Profile
* send response Read to Client and add path to pathResAttrTelemetry in LwM2MClient.getAttrTelemetryObserveValue()
*
- * @param registration - Registration LwM2M Client
- * @param targets - path Resources == [ "/2/0/0", "/2/0/1"]
+ * @param targets - path Resources == [ "/2/0/0", "/2/0/1"]
*/
- private void readObserveFromProfile(Registration registration, Set targets, LwM2mTypeOper typeOper) {
+ private void readObserveFromProfile(LwM2mClient client, Set targets, LwM2mTypeOper typeOper) {
targets.forEach(target -> {
LwM2mPath pathIds = new LwM2mPath(convertPathFromIdVerToObjectId(target));
if (pathIds.isResource()) {
if (READ.equals(typeOper)) {
- lwM2mTransportRequest.sendAllRequest(registration, target, typeOper,
- ContentFormat.TLV.getName(), null, this.config.getTimeout(), null);
+ lwM2mTransportRequest.sendAllRequest(client, target, typeOper,
+ null, this.config.getTimeout(), null);
} else if (OBSERVE.equals(typeOper)) {
- lwM2mTransportRequest.sendAllRequest(registration, target, typeOper,
- null, null, this.config.getTimeout(), null);
+ lwM2mTransportRequest.sendAllRequest(client, target, typeOper,
+ null, this.config.getTimeout(), null);
}
}
});
@@ -1113,7 +1106,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
* @param attributeLwm2mNew -
* @return
*/
- private void getAnalyzerAttributeLwm2m(Set registrationIds, JsonObject attributeLwm2mOld, JsonObject attributeLwm2mNew) {
+ private void getAnalyzerAttributeLwm2m(List clients, JsonObject attributeLwm2mOld, JsonObject attributeLwm2mNew) {
ResultsAnalyzerParameters analyzerParameters = new ResultsAnalyzerParameters();
ConcurrentHashMap lwm2mAttributesOld = new Gson().fromJson(attributeLwm2mOld.toString(),
new TypeToken>() {
@@ -1135,23 +1128,22 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
// #6
// #6.2
if (analyzerParameters.getPathPostParametersAdd().size() > 0) {
- registrationIds.forEach(registrationId -> {
- Registration registration = this.clientContext.getRegistration(registrationId);
- Set clientObjects = clientContext.getSupportedIdVerInClient(registration);
+ clients.forEach(client -> {
+ Set clientObjects = clientContext.getSupportedIdVerInClient(client);
Set pathSend = analyzerParameters.getPathPostParametersAdd().stream().filter(target -> clientObjects.contains("/" + target.split(LWM2M_SEPARATOR_PATH)[1]))
.collect(Collectors.toUnmodifiableSet());
if (!pathSend.isEmpty()) {
ConcurrentHashMap finalParams = lwm2mAttributesNew;
- pathSend.forEach(target -> lwM2mTransportRequest.sendAllRequest(registration, target, WRITE_ATTRIBUTES, ContentFormat.TLV.getName(),
+ pathSend.forEach(target -> lwM2mTransportRequest.sendAllRequest(client, target, WRITE_ATTRIBUTES,
finalParams.get(target), this.config.getTimeout(), null));
}
});
}
// #6.2
if (analyzerParameters.getPathPostParametersDel().size() > 0) {
- registrationIds.forEach(registrationId -> {
- Registration registration = this.clientContext.getRegistration(registrationId);
- Set clientObjects = clientContext.getSupportedIdVerInClient(registration);
+ clients.forEach(client -> {
+ Registration registration = client.getRegistration();
+ Set clientObjects = clientContext.getSupportedIdVerInClient(client);
Set pathSend = analyzerParameters.getPathPostParametersDel().stream().filter(target -> clientObjects.contains("/" + target.split(LWM2M_SEPARATOR_PATH)[1]))
.collect(Collectors.toUnmodifiableSet());
if (!pathSend.isEmpty()) {
@@ -1159,8 +1151,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
Map params = (Map) lwm2mAttributesOld.get(target);
params.clear();
params.put(OBJECT_VERSION, "");
- lwM2mTransportRequest.sendAllRequest(registration, target, WRITE_ATTRIBUTES, ContentFormat.TLV.getName(),
- params, this.config.getTimeout(), null);
+ lwM2mTransportRequest.sendAllRequest(client, target, WRITE_ATTRIBUTES, params, this.config.getTimeout(), null);
});
}
});
@@ -1168,12 +1159,10 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
}
- private void cancelObserveFromProfile(Registration registration, Set
![](data:image/svg+xml;utf8,<svg width=\"24\" height=\"40\" viewBox=\"0 0 24 40\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n<path d=\"M0 0V12H0.0200005L0 12.02L8 20L0 28L0.0200005 28.02H0V40H24V28.02H23.98L24 28L16 20L24 12.02L23.98 12H24V0H0ZM20 29V36H4V29L12 21L20 29ZM12 19L4 11V4H20V11L12 19Z\" fill=\"black\"/>\n</svg>\n)
\n ![](data:image/svg+xml;utf8,<svg width=\"36\" height=\"36\" viewBox=\"0 0 36 36\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n<path d=\"M36 14.24H22.44L27.92 8.6C22.46 3.2 13.62 3 8.16001 8.4C2.70001 13.82 2.70001 22.56 8.16001 27.98C13.62 33.4 22.46 33.4 27.92 27.98C30.64 25.3 32 22.16 32 18.2H36C36 22.16 34.24 27.3 30.72 30.78C23.7 37.74 12.3 37.74 5.28001 30.78C-1.71999 23.84 -1.77999 12.56 5.24001 5.62C12.26 -1.32 23.52 -1.32 30.54 5.62L36 0V14.24ZM19 10V18.5L26 22.66L24.56 25.08L16 20V10H19Z\" fill=\"black\"/>\n</svg>)
\n ![](data:image/svg+xml;utf8,<svg width=\"34\" height=\"32\" viewBox=\"0 0 34 32\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n<path d=\"M33.26 2.82L30.44 0L12.06 18.38L3.55999 9.9L0.73999 12.72L12.06 24.04L33.26 2.82Z\" fill=\"black\"/>\n<path d=\"M31 28H3V32H31V28Z\" fill=\"black\"/>\n</svg>)
\n