From a0b4f7c38e261d0d0356e325dddb8b3e1620a455 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Tue, 8 Feb 2022 14:00:38 +0200 Subject: [PATCH 1/2] 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 2/2] 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();