From 8decadf4e543388964759dbec654a1082344562a Mon Sep 17 00:00:00 2001 From: nickAS21 Date: Mon, 8 Aug 2022 09:39:34 +0300 Subject: [PATCH] fix_bug: lwm2mClient registration log.warn --- .../lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java | 10 +++++----- .../transport/lwm2m/server/LwM2mServerListener.java | 1 + .../server/uplink/DefaultLwM2mUplinkMsgHandler.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java index 8390e94ed7..819c6b9159 100644 --- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java +++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationObserveTest.java @@ -167,18 +167,18 @@ public class RpcLwm2mIntegrationObserveTest extends AbstractRpcLwM2MIntegrationT */ @Test public void testObserveReadAll_Result_CONTENT_Value_Contains_Paths_Count_ObserveReadAll() throws Exception { + String idVer_3_0_0 = objectInstanceIdVer_3 + "/" + RESOURCE_ID_0; + sendObserve("Observe", fromVersionedIdToObjectId(idVer_3_0_0)); String actualResultCancel = sendObserve("ObserveCancelAll", null); ObjectNode rpcActualResultCancel = JacksonUtil.fromString(actualResultCancel, ObjectNode.class); assertEquals(ResponseCode.CONTENT.getName(), rpcActualResultCancel.get("result").asText()); - sendObserve("Observe",idVer_19_0_0); - sendObserve("Observe", idVer_3_0_9); + sendObserve("Observe", fromVersionedIdToObjectId(idVer_3_0_0)); String actualResult = sendObserve("ObserveReadAll", null); ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class); assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText()); String actualValues = rpcActualResult.get("value").asText(); - assertTrue(actualValues.contains(fromVersionedIdToObjectId(idVer_19_0_0))); - assertTrue(actualValues.contains(fromVersionedIdToObjectId(idVer_3_0_9))); - assertEquals(2, actualValues.split(",").length); + assertTrue(actualValues.contains(fromVersionedIdToObjectId(idVer_3_0_0))); + assertEquals(1, actualValues.split(",").length); } diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java index 4d4af68fad..546620b119 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mServerListener.java @@ -52,6 +52,7 @@ public class LwM2mServerListener { @Override public void registered(Registration registration, Registration previousReg, Collection previousObservations) { + log.warn("Client: registered: [{}]", registration.getEndpoint()); service.onRegistered(registration, previousObservations); } diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java index d73bd646c3..01745d90db 100644 --- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java +++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/uplink/DefaultLwM2mUplinkMsgHandler.java @@ -216,7 +216,7 @@ public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService impl executor.submit(() -> { LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint()); try { - log.debug("[{}] [{{}] Client: create after Registration", registration.getEndpoint(), registration.getId()); + log.warn("[{}] [{{}] Client: create after Registration", registration.getEndpoint(), registration.getId()); Optional oldSessionInfo = this.clientContext.register(lwM2MClient, registration); if (oldSessionInfo.isPresent()) { log.info("[{}] Closing old session: {}", registration.getEndpoint(), new UUID(oldSessionInfo.get().getSessionIdMSB(), oldSessionInfo.get().getSessionIdLSB()));