From 799fa019c7cd6086e97e834a4838f1a942e711b6 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 7 Feb 2022 17:16:22 +0200 Subject: [PATCH 1/4] fixed sending shared attributes after sleeping --- .../DefaultLwM2MAttributesService.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java index c35a288c6b..1ca8cb204b 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/attributes/DefaultLwM2MAttributesService.java @@ -24,6 +24,8 @@ import org.eclipse.leshan.core.model.ResourceModel; import org.eclipse.leshan.core.node.LwM2mPath; import org.eclipse.leshan.core.node.LwM2mResource; import org.eclipse.leshan.core.node.LwM2mResourceInstance; +import org.eclipse.leshan.core.request.WriteRequest; +import org.eclipse.leshan.core.response.WriteResponse; import org.eclipse.leshan.server.model.LwM2mModelProvider; import org.springframework.stereotype.Service; import org.thingsboard.server.common.transport.TransportService; @@ -199,11 +201,9 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService { // #1.1 if (lwM2MClient.getSharedAttributes().containsKey(pathIdVer)) { if (tsKvProto.getTs() > lwM2MClient.getSharedAttributes().get(pathIdVer).getTs()) { - lwM2MClient.getSharedAttributes().put(pathIdVer, tsKvProto); attributesUpdate.put(pathIdVer, tsKvProto); } } else { - lwM2MClient.getSharedAttributes().put(pathIdVer, tsKvProto); attributesUpdate.put(pathIdVer, tsKvProto); } } @@ -221,11 +221,11 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService { Object newValProto = getValueFromKvProto(tsKvProto.getKv()); Object oldResourceValue = this.getResourceValueFormatKv(lwM2MClient, pathIdVer); if (!resourceModel.multiple || !(newValProto instanceof JsonElement)) { - this.pushUpdateToClientIfNeeded(lwM2MClient, oldResourceValue, newValProto, pathIdVer, logFailedUpdateOfNonChangedValue); + this.pushUpdateToClientIfNeeded(lwM2MClient, oldResourceValue, newValProto, pathIdVer, tsKvProto, logFailedUpdateOfNonChangedValue); } else { try { pushUpdateMultiToClientIfNeeded(lwM2MClient, resourceModel, (JsonElement) newValProto, - (Map) oldResourceValue, pathIdVer, logFailedUpdateOfNonChangedValue); + (Map) oldResourceValue, pathIdVer, tsKvProto, logFailedUpdateOfNonChangedValue); } catch (Exception e) { log.error("Failed update resource [" + lwM2MClient.getEndpoint() + "] onAttributesUpdate:", e); String logMsg = String.format("%s: Failed update resource onAttributesUpdate %s.", @@ -237,7 +237,7 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService { } private void pushUpdateToClientIfNeeded(LwM2mClient lwM2MClient, Object oldValue, Object newValue, - String versionedId, boolean logFailedUpdateOfNonChangedValue) { + String versionedId, TransportProtos.TsKvProto tsKvProto, boolean logFailedUpdateOfNonChangedValue) { if (newValue == null) { String logMsg = String.format("%s: Failed update resource versionedId - %s value - %s. New value is bad", LOG_LWM2M_ERROR, versionedId, "null"); @@ -245,7 +245,13 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService { log.error("Failed update resource [{}] [{}]", versionedId, "null"); } else if ((oldValue == null) || !valueEquals(newValue, oldValue)) { TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId).value(newValue).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); - downlinkHandler.sendWriteReplaceRequest(lwM2MClient, request, new TbLwM2MWriteResponseCallback(uplinkHandler, logService, lwM2MClient, versionedId)); + downlinkHandler.sendWriteReplaceRequest(lwM2MClient, request, new TbLwM2MWriteResponseCallback(uplinkHandler, logService, lwM2MClient, versionedId) { + @Override + public void onSuccess(WriteRequest request, WriteResponse response) { + client.getSharedAttributes().put(versionedId, tsKvProto); + super.onSuccess(request, response); + } + }); } else if (logFailedUpdateOfNonChangedValue) { String logMsg = String.format("%s: Didn't update the versionedId resource - %s value - %s. Value is not changed", LOG_LWM2M_WARN, versionedId, newValue); @@ -256,7 +262,7 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService { private void pushUpdateMultiToClientIfNeeded(LwM2mClient client, ResourceModel resourceModel, JsonElement newValProto, Map valueOld, String versionedId, - boolean logFailedUpdateOfNonChangedValue) { + TransportProtos.TsKvProto tsKvProto, boolean logFailedUpdateOfNonChangedValue) { Map newValues = convertMultiResourceValuesFromJson(newValProto, resourceModel.type, versionedId); if (newValues.size() > 0 && valueOld != null && valueOld.size() > 0) { valueOld.values().forEach((v) -> { @@ -270,7 +276,13 @@ public class DefaultLwM2MAttributesService implements LwM2MAttributesService { if (newValues.size() > 0) { TbLwM2MWriteReplaceRequest request = TbLwM2MWriteReplaceRequest.builder().versionedId(versionedId).value(newValues).timeout(this.config.getTimeout()).build(); - downlinkHandler.sendWriteReplaceRequest(client, request, new TbLwM2MWriteResponseCallback(uplinkHandler, logService, client, versionedId)); + downlinkHandler.sendWriteReplaceRequest(client, request, new TbLwM2MWriteResponseCallback(uplinkHandler, logService, client, versionedId) { + @Override + public void onSuccess(WriteRequest request, WriteResponse response) { + client.getSharedAttributes().put(versionedId, tsKvProto); + super.onSuccess(request, response); + } + }); } else if (logFailedUpdateOfNonChangedValue) { log.warn("Didn't update resource [{}] [{}]", versionedId, newValProto); String logMsg = String.format("%s: Didn't update resource versionedId - %s value - %s. Value is not changed", From ad541703ce4a4423828e3bd75ff56c996c3f677c Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Mon, 7 Feb 2022 17:53:28 +0200 Subject: [PATCH 2/4] fixed read/observe "dataRead" object 19 --- .../transport/lwm2m/server/client/LwM2mClient.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java index 9b04efa646..5462152b1d 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java @@ -228,14 +228,13 @@ public class LwM2mClient implements Serializable { } public boolean saveResourceValue(String pathRezIdVer, LwM2mResource resource, LwM2mModelProvider modelProvider, Mode mode) { - if (this.resources.get(pathRezIdVer) != null && this.resources.get(pathRezIdVer).getResourceModel() != null && - resourceEqualsModel(resource, this.resources.get(pathRezIdVer).getResourceModel())) { + if (this.resources.get(pathRezIdVer) != null && this.resources.get(pathRezIdVer).getResourceModel() != null) { this.resources.get(pathRezIdVer).updateLwM2mResource(resource, mode); return true; } else { LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathRezIdVer)); ResourceModel resourceModel = modelProvider.getObjectModel(registration).getResourceModel(pathIds.getObjectId(), pathIds.getResourceId()); - if (resourceModel != null && resourceEqualsModel(resource, resourceModel)) { + if (resourceModel != null) { this.resources.put(pathRezIdVer, new ResourceValue(resource, resourceModel)); return true; } else { @@ -244,11 +243,6 @@ public class LwM2mClient implements Serializable { } } - private boolean resourceEqualsModel(LwM2mResource resource, ResourceModel resourceModel) { - return ((!resourceModel.multiple && resource instanceof LwM2mSingleResource) || - (resourceModel.multiple && resource instanceof LwM2mMultipleResource)); - } - public Object getResourceValue(String pathRezIdVer, String pathRezId) { String pathRez = pathRezIdVer == null ? convertObjectIdToVersionedId(pathRezId, this.registration) : pathRezIdVer; if (this.resources.get(pathRez) != null) { From a0b4f7c38e261d0d0356e325dddb8b3e1620a455 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Tue, 8 Feb 2022 14:00:38 +0200 Subject: [PATCH 3/4] fixed "No value present" --- .../transport/lwm2m/server/client/LwM2mClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java index 9b04efa646..96464cd7ba 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java @@ -423,15 +423,18 @@ public class LwM2mClient implements Serializable { private ContentFormat calculateDefaultContentFormat(Registration registration) { if (registration == null) { return ContentFormat.DEFAULT; - } else{ + } else { return TbLwM2mVersion.fromVersion(registration.getLwM2mVersion()).getContentFormat(); } } - static private Set clientSupportContentFormat(Registration registration) { + private static Set clientSupportContentFormat(Registration registration) { Set contentFormats = new HashSet<>(); contentFormats.add(ContentFormat.DEFAULT); - LinkParamValue ct = Arrays.stream(registration.getObjectLinks()).filter(link -> link.getUriReference().equals("/")).findFirst().get().getLinkParams().get("ct"); + LinkParamValue ct = Arrays.stream(registration.getObjectLinks()) + .filter(link -> link.getUriReference().equals("/")) + .findFirst() + .map(link -> link.getLinkParams().get("ct")).orElse(null); if (ct != null) { Set codes = Stream.of(ct.getUnquoted().replaceAll("\"", "").split(" ", -1)) .map(String::trim) From f1f0ea4edfc1d7989b368f4f4082c3815d1d443e Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Tue, 8 Feb 2022 16:55:19 +0200 Subject: [PATCH 4/4] added test for LwM2mClient --- .../lwm2m/server/client/LwM2mClientTest.java | 38 +++++++++++++++++++ .../store/util/LwM2MClientSerDesTest.java | 6 +-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java diff --git a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java new file mode 100644 index 0000000000..8e2ebd1521 --- /dev/null +++ b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientTest.java @@ -0,0 +1,38 @@ +/** + * Copyright © 2016-2022 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.lwm2m.server.client; + +import org.eclipse.leshan.core.link.Link; +import org.eclipse.leshan.core.request.Identity; +import org.eclipse.leshan.server.registration.Registration; +import org.junit.Test; +import org.junit.jupiter.api.Assertions; + +import java.net.InetSocketAddress; + +public class LwM2mClientTest { + + @Test + public void setRegistration() { + LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint"); + Registration registration = new Registration + .Builder("test", "testEndpoint", Identity.unsecure(new InetSocketAddress(1000))) + .objectLinks(new Link[0]) + .build(); + + Assertions.assertDoesNotThrow(() -> client.setRegistration(registration)); + } +} \ No newline at end of file diff --git a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java index 70e8bb905e..002ad055d3 100644 --- a/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java +++ b/common/transport/lwm2m/src/test/org/thingsboard/server/transport/lwm2m/server/store/util/LwM2MClientSerDesTest.java @@ -19,7 +19,7 @@ import org.eclipse.leshan.core.link.Link; import org.eclipse.leshan.core.request.Identity; import org.eclipse.leshan.server.registration.Registration; import org.junit.Assert; -import org.junit.jupiter.api.Test; +import org.junit.Test; import org.thingsboard.server.common.data.device.data.PowerMode; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; @@ -34,10 +34,10 @@ import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient; import java.net.InetSocketAddress; import java.util.UUID; -class LwM2MClientSerDesTest { +public class LwM2MClientSerDesTest { @Test - void serializeDeserialize() { + public void serializeDeserialize() { LwM2mClient client = new LwM2mClient("nodeId", "testEndpoint"); TransportDeviceInfo tdi = new TransportDeviceInfo();