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

Minor refactoring of the PR #6198

Browse Source
This commit is contained in:
Andrii Shvaika 2022-03-10 11:59:41 +02:00
parent f976490721
commit c813d41abe
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java
View File

@ -334,12 +334,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
this.updateResourcesValue(lwM2MClient, lwM2mResource, path, Mode.UPDATE, responseCode); this.updateResourcesValue(lwM2MClient, lwM2mResource, path, Mode.UPDATE, responseCode);
} }
} }
if (clientContext.awake(lwM2MClient)) { tryAwake(lwM2MClient);
// clientContext.awake calls clientContext.update
log.debug("[{}] Device is awake", lwM2MClient.getEndpoint());
} else {
clientContext.update(lwM2MClient);
}
} }
} }
@ -360,12 +355,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
} }
}); });
clientContext.update(lwM2MClient); clientContext.update(lwM2MClient);
if (clientContext.awake(lwM2MClient)) { tryAwake(lwM2MClient);
// clientContext.awake calls clientContext.update
log.debug("[{}] Device is awake", lwM2MClient.getEndpoint());
} else {
clientContext.update(lwM2MClient);
}
} }
} }
@ -377,11 +367,9 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
*/ */
@Override @Override
public void onUpdateValueWithSendRequest(Registration registration, SendRequest sendRequest) { public void onUpdateValueWithSendRequest(Registration registration, SendRequest sendRequest) {
Iterator i$ = sendRequest.getNodes().entrySet().iterator(); for(var entry : sendRequest.getNodes().entrySet()) {
if (i$.hasNext()) { LwM2mPath path = entry.getKey();
Map.Entry<LwM2mPath, LwM2mNode> entry = (Map.Entry) i$.next(); LwM2mNode node = entry.getValue();
LwM2mPath path = (LwM2mPath) entry.getKey();
LwM2mNode node = (LwM2mNode) entry.getValue();
LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint());
String stringPath = convertObjectIdToVersionedId(path.toString(), registration); String stringPath = convertObjectIdToVersionedId(path.toString(), registration);
ObjectModel objectModelVersion = lwM2MClient.getObjectModel(stringPath, modelProvider); ObjectModel objectModelVersion = lwM2MClient.getObjectModel(stringPath, modelProvider);
@ -397,12 +385,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
this.updateResourcesValue(lwM2MClient, lwM2mResource, stringPath, Mode.UPDATE, 0); this.updateResourcesValue(lwM2MClient, lwM2mResource, stringPath, Mode.UPDATE, 0);
} }
} }
if (clientContext.awake(lwM2MClient)) { tryAwake(lwM2MClient);
// clientContext.awake calls clientContext.update
log.debug("[{}] Device is awake", lwM2MClient.getEndpoint());
} else {
clientContext.update(lwM2MClient);
}
} }
} }
@ -1013,4 +996,14 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl
client.unlock(); client.unlock();
} }
} }
private void tryAwake(LwM2mClient lwM2MClient) {
if (clientContext.awake(lwM2MClient)) {
// clientContext.awake calls clientContext.update
log.debug("[{}] Device is awake", lwM2MClient.getEndpoint());
} else {
clientContext.update(lwM2MClient);
}
}
} }