org.springframework
spring-context-support
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServerConfiguration.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServerConfiguration.java
index 757b91956b..e531de3628 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServerConfiguration.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServerConfiguration.java
@@ -17,7 +17,6 @@ package org.thingsboard.server.transport.lwm2m.bootstrap;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
-import org.eclipse.leshan.core.model.StaticModel;
import org.eclipse.leshan.core.util.Hex;
import org.eclipse.leshan.server.bootstrap.BootstrapSessionManager;
import org.eclipse.leshan.server.californium.bootstrap.LeshanBootstrapServer;
@@ -94,7 +93,7 @@ public class LwM2MTransportBootstrapServerConfiguration {
builder.setCoapConfig(getCoapConfig(bootstrapPortNoSec, bootstrapSecurePort));
/** Define model provider (Create Models )*/
- builder.setModel(new StaticModel(contextS.getLwM2MTransportConfigServer().getModelsValue()));
+// builder.setModel(new StaticModel(contextS.getLwM2MTransportConfigServer().getModelsValueCommon()));
/** Create credentials */
this.setServerWithCredentials(builder);
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2MBootstrapSecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2MBootstrapSecurityStore.java
index 8e266a2638..ee2b3bac20 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2MBootstrapSecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/secure/LwM2MBootstrapSecurityStore.java
@@ -166,13 +166,13 @@ public class LwM2MBootstrapSecurityStore implements BootstrapSecurityStore {
lwM2MBootstrapConfig.bootstrapServer = new LwM2MServerBootstrap(lwM2MBootstrapConfig.bootstrapServer, profileServerBootstrap);
lwM2MBootstrapConfig.lwm2mServer = new LwM2MServerBootstrap(lwM2MBootstrapConfig.lwm2mServer, profileLwm2mServer);
String logMsg = String.format("%s: getParametersBootstrap: %s Access connect client with bootstrap server.", LOG_LW2M_INFO, store.getEndPoint());
- context.sentParametersOnThingsboard(context.getTelemetryMsgObject(logMsg), LwM2mTransportHandler.DEVICE_TELEMETRY_TOPIC, sessionInfo);
+ context.sendParametersOnThingsboard(context.getTelemetryMsgObject(logMsg), LwM2mTransportHandler.DEVICE_TELEMETRY_TOPIC, sessionInfo);
return lwM2MBootstrapConfig;
} else {
log.error(" [{}] Different values SecurityMode between of client and profile.", store.getEndPoint());
log.error("{} getParametersBootstrap: [{}] Different values SecurityMode between of client and profile.", LOG_LW2M_ERROR, store.getEndPoint());
String logMsg = String.format("%s: getParametersBootstrap: %s Different values SecurityMode between of client and profile.", LOG_LW2M_ERROR, store.getEndPoint());
- context.sentParametersOnThingsboard(context.getTelemetryMsgObject(logMsg), LwM2mTransportHandler.DEVICE_TELEMETRY_TOPIC, sessionInfo);
+ context.sendParametersOnThingsboard(context.getTelemetryMsgObject(logMsg), LwM2mTransportHandler.DEVICE_TELEMETRY_TOPIC, sessionInfo);
return null;
}
}
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 f89f7ec952..ffe2f76602 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
@@ -26,6 +26,8 @@ import org.eclipse.leshan.server.registration.RegistrationUpdate;
import java.util.Collection;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.convertToIdVerFromObjectId;
+
@Slf4j
public class LwM2mServerListener {
@@ -90,7 +92,7 @@ public class LwM2mServerListener {
public void onResponse(Observation observation, Registration registration, ObserveResponse response) {
if (registration != null) {
try {
- service.onObservationResponse(registration, observation.getPath().toString(), response);
+ service.onObservationResponse(registration, convertToIdVerFromObjectId(observation.getPath().toString(), registration), response);
} catch (Exception e) {
log.error("[{}] onResponse", e.toString());
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContextServer.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContextServer.java
index 062c0f1148..170530f084 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContextServer.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportContextServer.java
@@ -16,13 +16,13 @@
package org.thingsboard.server.transport.lwm2m.server;
/**
* Copyright © 2016-2020 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.
@@ -34,16 +34,27 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import org.eclipse.leshan.core.model.DDFFileParser;
+import org.eclipse.leshan.core.model.DefaultDDFFileValidator;
+import org.eclipse.leshan.core.model.InvalidDDFFileException;
+import org.eclipse.leshan.core.model.ObjectModel;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.transport.TransportContext;
+import org.thingsboard.server.common.transport.TransportResourceCache;
import org.thingsboard.server.common.transport.TransportService;
import org.thingsboard.server.common.transport.TransportServiceCallback;
import org.thingsboard.server.common.transport.adaptor.AdaptorException;
import org.thingsboard.server.common.transport.lwm2m.LwM2MTransportConfigServer;
-import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.gen.transport.TransportProtos.PostAttributeMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.PostTelemetryMsg;
+import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
+import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceCredentialsResponseMsg;
import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
import org.thingsboard.server.transport.lwm2m.server.adaptors.LwM2MJsonAdaptor;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.LOG_LW2M_TELEMETRY;
@Slf4j
@@ -56,12 +67,16 @@ public class LwM2mTransportContextServer extends TransportContext {
private final TransportService transportService;
+ private final TransportResourceCache transportResourceCache;
+
+
@Getter
private final LwM2MJsonAdaptor adaptor;
- public LwM2mTransportContextServer(LwM2MTransportConfigServer lwM2MTransportConfigServer, TransportService transportService, LwM2MJsonAdaptor adaptor) {
+ public LwM2mTransportContextServer(LwM2MTransportConfigServer lwM2MTransportConfigServer, TransportService transportService, TransportResourceCache transportResourceCache, LwM2MJsonAdaptor adaptor) {
this.lwM2MTransportConfigServer = lwM2MTransportConfigServer;
this.transportService = transportService;
+ this.transportResourceCache = transportResourceCache;
this.adaptor = adaptor;
}
@@ -69,13 +84,17 @@ public class LwM2mTransportContextServer extends TransportContext {
return this.lwM2MTransportConfigServer;
}
+ public TransportResourceCache getTransportResourceCache() {
+ return this.transportResourceCache;
+ }
+
/**
- * Sent to Thingsboard Attribute || Telemetry
+ * send to Thingsboard Attribute || Telemetry
*
* @param msg - JsonObject: [{name: value}]
* @return - dummy
*/
- private TransportServiceCallback getPubAckCallbackSentAttrTelemetry(final T msg) {
+ private TransportServiceCallback getPubAckCallbackSendAttrTelemetry(final T msg) {
return new TransportServiceCallback<>() {
@Override
public void onSuccess(Void dummy) {
@@ -89,16 +108,16 @@ public class LwM2mTransportContextServer extends TransportContext {
};
}
- public void sentParametersOnThingsboard(JsonElement msg, String topicName, TransportProtos.SessionInfoProto sessionInfo) {
+ public void sendParametersOnThingsboard(JsonElement msg, String topicName, SessionInfoProto sessionInfo) {
try {
if (topicName.equals(LwM2mTransportHandler.DEVICE_ATTRIBUTES_TOPIC)) {
- TransportProtos.PostAttributeMsg postAttributeMsg = adaptor.convertToPostAttributes(msg);
- TransportServiceCallback call = this.getPubAckCallbackSentAttrTelemetry(postAttributeMsg);
- transportService.process(sessionInfo, postAttributeMsg, this.getPubAckCallbackSentAttrTelemetry(call));
+ PostAttributeMsg postAttributeMsg = adaptor.convertToPostAttributes(msg);
+ TransportServiceCallback call = this.getPubAckCallbackSendAttrTelemetry(postAttributeMsg);
+ transportService.process(sessionInfo, postAttributeMsg, this.getPubAckCallbackSendAttrTelemetry(call));
} else if (topicName.equals(LwM2mTransportHandler.DEVICE_TELEMETRY_TOPIC)) {
- TransportProtos.PostTelemetryMsg postTelemetryMsg = adaptor.convertToPostTelemetry(msg);
- TransportServiceCallback call = this.getPubAckCallbackSentAttrTelemetry(postTelemetryMsg);
- transportService.process(sessionInfo, postTelemetryMsg, this.getPubAckCallbackSentAttrTelemetry(call));
+ PostTelemetryMsg postTelemetryMsg = adaptor.convertToPostTelemetry(msg);
+ TransportServiceCallback call = this.getPubAckCallbackSendAttrTelemetry(postTelemetryMsg);
+ transportService.process(sessionInfo, postTelemetryMsg, this.getPubAckCallbackSendAttrTelemetry(call));
}
} catch (AdaptorException e) {
log.error("[{}] Failed to process publish msg [{}]", topicName, e);
@@ -115,8 +134,8 @@ public class LwM2mTransportContextServer extends TransportContext {
/**
* @return - sessionInfo after access connect client
*/
- public TransportProtos.SessionInfoProto getValidateSessionInfo(TransportProtos.ValidateDeviceCredentialsResponseMsg msg, long mostSignificantBits, long leastSignificantBits) {
- return TransportProtos.SessionInfoProto.newBuilder()
+ public SessionInfoProto getValidateSessionInfo(ValidateDeviceCredentialsResponseMsg msg, long mostSignificantBits, long leastSignificantBits) {
+ return SessionInfoProto.newBuilder()
.setNodeId(this.getNodeId())
.setSessionIdMSB(mostSignificantBits)
.setSessionIdLSB(leastSignificantBits)
@@ -131,4 +150,13 @@ public class LwM2mTransportContextServer extends TransportContext {
.build();
}
+ public ObjectModel parseFromXmlToObjectModel(byte[] xmlByte, String streamName, DefaultDDFFileValidator ddfValidator) {
+ try {
+ DDFFileParser ddfFileParser = new DDFFileParser(ddfValidator);
+ return ddfFileParser.parseEx(new ByteArrayInputStream(xmlByte), streamName).get(0);
+ } catch (IOException | InvalidDDFFileException e) {
+ log.error("Could not parse the XML file [{}]", streamName, e);
+ return null;
+ }
+ }
}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportHandler.java
index a62bdf2a49..0f0707ddf8 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportHandler.java
@@ -22,6 +22,7 @@ import com.google.gson.JsonSyntaxException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.californium.core.network.config.NetworkConfig;
+import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.model.ResourceModel;
import org.eclipse.leshan.core.node.LwM2mMultipleResource;
import org.eclipse.leshan.core.node.LwM2mNode;
@@ -32,9 +33,11 @@ import org.eclipse.leshan.core.node.LwM2mSingleResource;
import org.eclipse.leshan.core.node.codec.CodecException;
import org.eclipse.leshan.core.util.Hex;
import org.eclipse.leshan.server.californium.LeshanServerBuilder;
+import org.eclipse.leshan.server.registration.Registration;
import org.nustaq.serialization.FSTConfiguration;
import org.thingsboard.server.common.data.DeviceProfile;
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.transport.TransportServiceCallback;
import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientProfile;
@@ -46,14 +49,12 @@ import java.util.Date;
import java.util.LinkedList;
import java.util.Optional;
+import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_KEY;
+import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_PATH;
+
@Slf4j
-//@Component("LwM2MTransportHandler")
-//@ConditionalOnExpression("('${service.type:null}'=='tb-transport' && '${transport.lwm2m.enabled:false}'=='true' )|| ('${service.type:null}'=='monolith' && '${transport.lwm2m.enabled}'=='true')")
public class LwM2mTransportHandler {
- // We choose a default timeout a bit higher to the MAX_TRANSMIT_WAIT(62-93s) which is the time from starting to
- // send a Confirmable message to the time when an acknowledgement is no longer expected.
-
public static final String BASE_DEVICE_API_TOPIC = "v1/devices/me";
public static final String ATTRIBUTE = "attribute";
public static final String TELEMETRY = "telemetry";
@@ -83,6 +84,8 @@ public class LwM2mTransportHandler {
public static final String LOG_LW2M_ERROR = "error";
public static final String LOG_LW2M_WARN = "warn";
+ public static final int LWM2M_STRATEGY_1 = 1;
+ public static final int LWM2M_STRATEGY_2 = 2;
public static final String CLIENT_NOT_AUTHORIZED = "Client not authorized";
@@ -109,39 +112,6 @@ public class LwM2mTransportHandler {
public static final String SERVICE_CHANNEL = "SERVICE";
public static final String RESPONSE_CHANNEL = "RESP";
-// @Autowired
-// @Qualifier("LeshanServerCert")
-// private LeshanServer lhServerCert;
-//
-// @Autowired
-// @Qualifier("LeshanServerNoSecPskRpk")
-// private LeshanServer lhServerNoSecPskRpk;
-
-// @Autowired
-// @Qualifier("ServerListenerCert")
-// private LwM2mServerListener serverListenerCert;
-//
-// @Autowired
-// @Qualifier("ServerListenerNoSecPskRpk")
-// private LwM2mServerListener serverListenerNoSecPskRpk;
-
-
-// @PostConstruct
-// public void init() {
-// try {
-// serverListenerCert.init(lhServerCert);
-// this.lhServerCert.getRegistrationService().addListener(serverListenerCert.registrationListener);
-// this.lhServerCert.getPresenceService().addListener(serverListenerCert.presenceListener);
-// this.lhServerCert.getObservationService().addListener(serverListenerCert.observationListener);
-// serverListenerNoSecPskRpk.init(lhServerNoSecPskRpk);
-// this.lhServerNoSecPskRpk.getRegistrationService().addListener(serverListenerNoSecPskRpk.registrationListener);
-// this.lhServerNoSecPskRpk.getPresenceService().addListener(serverListenerNoSecPskRpk.presenceListener);
-// this.lhServerNoSecPskRpk.getObservationService().addListener(serverListenerNoSecPskRpk.observationListener);
-// } catch (Exception e) {
-// log.error("init [{}]", e.toString());
-// }
-// }
-
public static NetworkConfig getCoapConfig(Integer serverPortNoSec, Integer serverSecurePort) {
NetworkConfig coapConfig;
File configFile = new File(NetworkConfig.DEFAULT_FILE_NAME);
@@ -188,8 +158,9 @@ public class LwM2mTransportHandler {
return null;
}
- public static LwM2mClientProfile getNewProfileParameters(JsonObject profilesConfigData) {
+ public static LwM2mClientProfile getNewProfileParameters(JsonObject profilesConfigData, TenantId tenantId) {
LwM2mClientProfile lwM2MClientProfile = new LwM2mClientProfile();
+ lwM2MClientProfile.setTenantId(tenantId);
lwM2MClientProfile.setPostClientLwM2mSettings(profilesConfigData.get(CLIENT_LWM2M_SETTINGS).getAsJsonObject());
lwM2MClientProfile.setPostKeyNameProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(KEY_NAME).getAsJsonObject());
lwM2MClientProfile.setPostAttributeProfile(profilesConfigData.get(OBSERVE_ATTRIBUTE_TELEMETRY).getAsJsonObject().get(ATTRIBUTE).getAsJsonArray());
@@ -200,10 +171,10 @@ public class LwM2mTransportHandler {
/**
* @return deviceProfileBody with Observe&Attribute&Telemetry From Thingsboard
- * Example:
+ * Example:
* property: {"clientLwM2mSettings": {
- * clientUpdateValueAfterConnect: false;
- * }
+ * clientUpdateValueAfterConnect: false;
+ * }
* property: "observeAttr"
* {"keyName": {
* "/3/0/1": "modelNumber",
@@ -220,8 +191,8 @@ public class LwM2mTransportHandler {
try {
ObjectMapper mapper = new ObjectMapper();
String profileStr = mapper.writeValueAsString(profile);
- JsonObject profileJson = (profileStr != null) ? validateJson(profileStr) : null;
- return (getValidateCredentialsBodyFromThingsboard(profileJson)) ? LwM2mTransportHandler.getNewProfileParameters(profileJson) : null;
+ JsonObject profileJson = (profileStr != null) ? validateJson(profileStr) : null;
+ return (getValidateCredentialsBodyFromThingsboard(profileJson)) ? LwM2mTransportHandler.getNewProfileParameters(profileJson, deviceProfile.getTenantId()) : null;
} catch (IOException e) {
log.error("", e);
}
@@ -244,9 +215,9 @@ public class LwM2mTransportHandler {
return null;
}
- public static boolean getClientOnlyObserveAfterConnect (LwM2mClientProfile profile) {
- return profile.getPostClientLwM2mSettings().getAsJsonObject().has("clientOnlyObserveAfterConnect") &&
- profile.getPostClientLwM2mSettings().getAsJsonObject().get("clientOnlyObserveAfterConnect").getAsBoolean();
+ public static int getClientOnlyObserveAfterConnect(LwM2mClientProfile profile) {
+ return profile.getPostClientLwM2mSettings().getAsJsonObject().has("clientOnlyObserveAfterConnect") ?
+ profile.getPostClientLwM2mSettings().getAsJsonObject().get("clientOnlyObserveAfterConnect").getAsInt() : 1;
}
private static boolean getValidateCredentialsBodyFromThingsboard(JsonObject objectMsg) {
@@ -344,4 +315,49 @@ public class LwM2mTransportHandler {
}
};
}
+
+ public static String convertToObjectIdFromIdVer(String key) {
+ try {
+ String[] keyArray = key.split(LWM2M_SEPARATOR_PATH);
+ if (keyArray.length > 1 && keyArray[1].split(LWM2M_SEPARATOR_KEY).length == 2) {
+ keyArray[1] = keyArray[1].split(LWM2M_SEPARATOR_KEY)[0];
+ return StringUtils.join(keyArray, LWM2M_SEPARATOR_PATH);
+ } else {
+ return key;
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public static String convertToIdVerFromObjectId(String path, Registration registration) {
+ String ver = registration.getSupportedObject().get(new LwM2mPath(path).getObjectId());
+ try {
+ String[] keyArray = path.split(LWM2M_SEPARATOR_PATH);
+ if (keyArray.length > 1) {
+ keyArray[1] = keyArray[1] + LWM2M_SEPARATOR_KEY + ver;
+ return StringUtils.join(keyArray, LWM2M_SEPARATOR_PATH);
+ } else {
+ return path;
+ }
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public static Integer validateObjectIdFromKey(String key) {
+ try {
+ return Integer.parseInt(key.split(LWM2M_SEPARATOR_PATH)[1].split(LWM2M_SEPARATOR_KEY)[0]);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ public static String validateObjectVerFromKey(String key) {
+ try {
+ return (key.split(LWM2M_SEPARATOR_PATH)[1].split(LWM2M_SEPARATOR_KEY)[1]);
+ } catch (Exception e) {
+ return ObjectModel.DEFAULT_VERSION;
+ }
+ }
}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportRequest.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportRequest.java
index b05c79d6db..cae3eeb05d 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportRequest.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportRequest.java
@@ -47,7 +47,6 @@ import org.eclipse.leshan.core.util.Hex;
import org.eclipse.leshan.core.util.NamedThreadFactory;
import org.eclipse.leshan.server.californium.LeshanServer;
import org.eclipse.leshan.server.registration.Registration;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient;
@@ -73,6 +72,8 @@ import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandle
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.PUT_TYPE_OPER_WRITE_ATTRIBUTES;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.PUT_TYPE_OPER_WRITE_UPDATE;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.RESPONSE_CHANNEL;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.convertToIdVerFromObjectId;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.convertToObjectIdFromIdVer;
@Slf4j
@Service
@@ -88,13 +89,13 @@ public class LwM2mTransportRequest {
private final LeshanServer leshanServer;
- @Autowired
- private LwM2mTransportServiceImpl serviceImpl;
+ private final LwM2mTransportServiceImpl serviceImpl;
- public LwM2mTransportRequest(LwM2mTransportContextServer context, LwM2mClientContext lwM2mClientContext, LeshanServer leshanServer) {
+ public LwM2mTransportRequest(LwM2mTransportContextServer context, LwM2mClientContext lwM2mClientContext, LeshanServer leshanServer, LwM2mTransportServiceImpl serviceImpl) {
this.context = context;
this.lwM2mClientContext = lwM2mClientContext;
this.leshanServer = leshanServer;
+ this.serviceImpl = serviceImpl;
}
@PostConstruct
@@ -115,7 +116,7 @@ public class LwM2mTransportRequest {
*/
public void sendAllRequest(Registration registration, String target, String typeOper,
String contentFormatParam, Observation observation, Object params, long timeoutInMs) {
- LwM2mPath resultIds = new LwM2mPath(target);
+ LwM2mPath resultIds = new LwM2mPath(convertToObjectIdFromIdVer(target));
if (registration != null && resultIds.getObjectId() >= 0) {
DownlinkRequest request = null;
ContentFormat contentFormat = contentFormatParam != null ? ContentFormat.fromName(contentFormatParam.toUpperCase()) : null;
@@ -150,11 +151,13 @@ public class LwM2mTransportRequest {
case POST_TYPE_OPER_WRITE_REPLACE:
// Request to write a String Single-Instance Resource using the TLV content format.
if (resource != null && contentFormat != null) {
- if (contentFormat.equals(ContentFormat.TLV) && !resource.multiple) {
+// if (contentFormat.equals(ContentFormat.TLV) && !resource.multiple) {
+ if (contentFormat.equals(ContentFormat.TLV)) {
request = this.getWriteRequestSingleResource(null, resultIds.getObjectId(), resultIds.getObjectInstanceId(), resultIds.getResourceId(), params, resource.type, registration);
}
// Mode.REPLACE && Request to write a String Single-Instance Resource using the given content format (TEXT, TLV, JSON)
- else if (!contentFormat.equals(ContentFormat.TLV) && !resource.multiple) {
+// else if (!contentFormat.equals(ContentFormat.TLV) && !resource.multiple) {
+ else if (!contentFormat.equals(ContentFormat.TLV)) {
request = this.getWriteRequestSingleResource(contentFormat, resultIds.getObjectId(), resultIds.getObjectInstanceId(), resultIds.getResourceId(), params, resource.type, registration);
}
}
@@ -231,7 +234,7 @@ public class LwM2mTransportRequest {
LwM2mClient lwM2MClient = lwM2mClientContext.getLwM2mClientWithReg(registration, null);
leshanServer.send(registration, request, timeoutInMs, (ResponseCallback) response -> {
if (!lwM2MClient.isInit()) {
- lwM2MClient.initValue(this.serviceImpl, request.getPath().toString());
+ lwM2MClient.initValue(this.serviceImpl, convertToIdVerFromObjectId(request.getPath().toString(), registration));
}
if (isSuccess(((Response) response.getCoapResponse()).getCode())) {
this.handleResponse(registration, request.getPath().toString(), response, request);
@@ -239,23 +242,23 @@ public class LwM2mTransportRequest {
String msg = String.format("%s: sendRequest Replace: CoapCde - %s Lwm2m code - %d name - %s Resource path - %s value - %s SendRequest to Client",
LOG_LW2M_INFO, ((Response) response.getCoapResponse()).getCode(), response.getCode().getCode(), response.getCode().getName(), request.getPath().toString(),
((LwM2mSingleResource) ((WriteRequest) request).getNode()).getValue().toString());
- serviceImpl.sentLogsToThingsboard(msg, registration);
+ serviceImpl.sendLogsToThingsboard(msg, registration);
log.info("[{}] [{}] - [{}] [{}] Update SendRequest[{}]", registration.getEndpoint(), ((Response) response.getCoapResponse()).getCode(), response.getCode(), request.getPath().toString(),
((LwM2mSingleResource) ((WriteRequest) request).getNode()).getValue());
}
} else {
String msg = String.format("%s: sendRequest: CoapCode - %s Lwm2m code - %d name - %s Resource path - %s SendRequest to Client", LOG_LW2M_ERROR,
((Response) response.getCoapResponse()).getCode(), response.getCode().getCode(), response.getCode().getName(), request.getPath().toString());
- serviceImpl.sentLogsToThingsboard(msg, registration);
+ serviceImpl.sendLogsToThingsboard(msg, registration);
log.error("[{}], [{}] - [{}] [{}] error SendRequest", registration.getEndpoint(), ((Response) response.getCoapResponse()).getCode(), response.getCode(), request.getPath().toString());
}
}, e -> {
if (!lwM2MClient.isInit()) {
- lwM2MClient.initValue(this.serviceImpl, request.getPath().toString());
+ lwM2MClient.initValue(this.serviceImpl, convertToIdVerFromObjectId(request.getPath().toString(), registration));
}
String msg = String.format("%s: sendRequest: Resource path - %s msg error - %s SendRequest to Client",
LOG_LW2M_ERROR, request.getPath().toString(), e.toString());
- serviceImpl.sentLogsToThingsboard(msg, registration);
+ serviceImpl.sendLogsToThingsboard(msg, registration);
log.error("[{}] - [{}] error SendRequest", request.getPath().toString(), e.toString());
});
@@ -287,7 +290,7 @@ public class LwM2mTransportRequest {
String patn = "/" + objectId + "/" + instanceId + "/" + resourceId;
String msg = String.format(LOG_LW2M_ERROR + ": NumberFormatException: Resource path - %s type - %s value - %s msg error - %s SendRequest to Client",
patn, type, value, e.toString());
- serviceImpl.sentLogsToThingsboard(msg, registration);
+ serviceImpl.sendLogsToThingsboard(msg, registration);
log.error("Path: [{}] type: [{}] value: [{}] errorMsg: [{}]]", patn, type, value, e.toString());
return null;
}
@@ -310,21 +313,22 @@ public class LwM2mTransportRequest {
* @param response -
*/
private void sendResponse(Registration registration, String path, LwM2mResponse response, DownlinkRequest request) {
+ String pathIdVer = convertToIdVerFromObjectId(path, registration);
if (response instanceof ReadResponse) {
- serviceImpl.onObservationResponse(registration, path, (ReadResponse) response);
+ serviceImpl.onObservationResponse(registration, pathIdVer, (ReadResponse) response);
} else if (response instanceof CancelObservationResponse) {
- log.info("[{}] Path [{}] CancelObservationResponse 3_Send", path, response);
+ log.info("[{}] Path [{}] CancelObservationResponse 3_Send", pathIdVer, response);
} else if (response instanceof DeleteResponse) {
- log.info("[{}] Path [{}] DeleteResponse 5_Send", path, response);
+ log.info("[{}] Path [{}] DeleteResponse 5_Send", pathIdVer, response);
} else if (response instanceof DiscoverResponse) {
- log.info("[{}] Path [{}] DiscoverResponse 6_Send", path, response);
+ log.info("[{}] Path [{}] DiscoverResponse 6_Send", pathIdVer, response);
} else if (response instanceof ExecuteResponse) {
- log.info("[{}] Path [{}] ExecuteResponse 7_Send", path, response);
+ log.info("[{}] Path [{}] ExecuteResponse 7_Send", pathIdVer, response);
} else if (response instanceof WriteAttributesResponse) {
- log.info("[{}] Path [{}] WriteAttributesResponse 8_Send", path, response);
+ log.info("[{}] Path [{}] WriteAttributesResponse 8_Send", pathIdVer, response);
} else if (response instanceof WriteResponse) {
- log.info("[{}] Path [{}] WriteAttributesResponse 9_Send", path, response);
- serviceImpl.onWriteResponseOk(registration, path, (WriteRequest) request);
+ log.info("[{}] Path [{}] WriteAttributesResponse 9_Send", pathIdVer, response);
+ serviceImpl.onWriteResponseOk(registration, pathIdVer, (WriteRequest) request);
}
}
}
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerConfiguration.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerConfiguration.java
index ace2fb4896..0af20b3e51 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerConfiguration.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServerConfiguration.java
@@ -24,14 +24,13 @@ import org.eclipse.leshan.server.californium.LeshanServer;
import org.eclipse.leshan.server.californium.LeshanServerBuilder;
import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
import org.eclipse.leshan.server.model.LwM2mModelProvider;
-import org.eclipse.leshan.server.model.VersionedModelProvider;
import org.eclipse.leshan.server.security.DefaultAuthorizer;
import org.eclipse.leshan.server.security.EditableSecurityStore;
import org.eclipse.leshan.server.security.SecurityChecker;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
+import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
import java.math.BigInteger;
@@ -61,21 +60,23 @@ import static org.eclipse.californium.scandium.dtls.cipher.CipherSuite.TLS_PSK_W
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.getCoapConfig;
@Slf4j
-@Component("LwM2MTransportServerConfiguration")
+@Component
@TbLwM2mTransportComponent
public class LwM2mTransportServerConfiguration {
private PublicKey publicKey;
private PrivateKey privateKey;
private boolean pskMode = false;
+ private final LwM2mTransportContextServer context;
+ private final CaliforniumRegistrationStore registrationStore;
+ private final EditableSecurityStore securityStore;
+ private final LwM2mClientContext lwM2mClientContext;
- @Autowired
- private LwM2mTransportContextServer context;
-
- @Autowired
- private CaliforniumRegistrationStore registrationStore;
-
- @Autowired
- private EditableSecurityStore securityStore;
+ public LwM2mTransportServerConfiguration(LwM2mTransportContextServer context, CaliforniumRegistrationStore registrationStore, EditableSecurityStore securityStore, LwM2mClientContext lwM2mClientContext) {
+ this.context = context;
+ this.registrationStore = registrationStore;
+ this.securityStore = securityStore;
+ this.lwM2mClientContext = lwM2mClientContext;
+ }
@Bean
public LeshanServer getLeshanServer() {
@@ -95,7 +96,8 @@ public class LwM2mTransportServerConfiguration {
builder.setCoapConfig(getCoapConfig(serverPortNoSec, serverSecurePort));
/** Define model provider (Create Models )*/
- LwM2mModelProvider modelProvider = new VersionedModelProvider(this.context.getLwM2MTransportConfigServer().getModelsValue());
+ LwM2mModelProvider modelProvider = new LwM2mVersionedModelProvider(this.lwM2mClientContext, this.context);
+ this.context.getLwM2MTransportConfigServer().setModelProvider(modelProvider);
builder.setObjectModelProvider(modelProvider);
/** Create credentials */
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
index bae6a0af1d..4ca6fb4f34 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
@@ -89,10 +89,15 @@ import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandle
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.LOG_LW2M_ERROR;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.LOG_LW2M_INFO;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.LOG_LW2M_TELEMETRY;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.LWM2M_STRATEGY_2;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.POST_TYPE_OPER_EXECUTE;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.POST_TYPE_OPER_WRITE_REPLACE;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.SERVICE_CHANNEL;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.convertToIdVerFromObjectId;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.convertToObjectIdFromIdVer;
import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.getAckCallback;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.validateObjectIdFromKey;
+import static org.thingsboard.server.transport.lwm2m.server.LwM2mTransportHandler.validateObjectVerFromKey;
@Slf4j
@Service
@@ -158,15 +163,12 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
if (lwM2MClient != null) {
SessionInfoProto sessionInfo = this.getValidateSessionInfo(registration);
if (sessionInfo != null) {
- lwM2MClient.setDeviceId(new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB()));
- lwM2MClient.setProfileId(new UUID(sessionInfo.getDeviceProfileIdMSB(), sessionInfo.getDeviceProfileIdLSB()));
- lwM2MClient.setDeviceName(sessionInfo.getDeviceName());
- lwM2MClient.setDeviceProfileName(sessionInfo.getDeviceType());
+ this.initLwM2mClient (lwM2MClient, sessionInfo);
transportService.registerAsyncSession(sessionInfo, new LwM2mSessionMsgListener(this, sessionInfo));
transportService.process(sessionInfo, DefaultTransportService.getSessionEventMsg(SessionEvent.OPEN), null);
transportService.process(sessionInfo, TransportProtos.SubscribeToAttributeUpdatesMsg.newBuilder().build(), null);
- this.sentLogsToThingsboard(LOG_LW2M_INFO + ": Client create after Registration", registration);
this.initLwM2mFromClientValue(registration, lwM2MClient);
+ this.sendLogsToThingsboard(LOG_LW2M_INFO + ": Client create after Registration", registration);
} else {
log.error("Client: [{}] onRegistered [{}] name [{}] sessionInfo ", registration.getId(), registration.getEndpoint(), null);
}
@@ -190,6 +192,11 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
SessionInfoProto sessionInfo = this.getValidateSessionInfo(registration);
if (sessionInfo != null) {
this.checkInactivity(sessionInfo);
+ LwM2mClient lwM2MClient = this.lwM2mClientContext.getLwM2MClient(sessionInfo);
+ if (lwM2MClient.getDeviceId() == null && lwM2MClient.getProfileId() == null) {
+ initLwM2mClient(lwM2MClient, sessionInfo);
+ }
+
log.info("Client: [{}] updatedReg [{}] name [{}] profile ", registration.getId(), registration.getEndpoint(), sessionInfo.getDeviceType());
} else {
log.error("Client: [{}] updatedReg [{}] name [{}] sessionInfo ", registration.getId(), registration.getEndpoint(), null);
@@ -209,7 +216,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
executorUnRegistered.submit(() -> {
try {
this.setCancelObservations(registration);
- this.sentLogsToThingsboard(LOG_LW2M_INFO + ": Client unRegistration", registration);
+ this.sendLogsToThingsboard(LOG_LW2M_INFO + ": Client unRegistration", registration);
this.closeClientSession(registration);
} catch (Throwable t) {
log.error("[{}] endpoint [{}] error Unable un registration.", registration.getEndpoint(), t);
@@ -217,6 +224,13 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
});
}
+ private void initLwM2mClient (LwM2mClient lwM2MClient, SessionInfoProto sessionInfo) {
+ lwM2MClient.setDeviceId(new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB()));
+ lwM2MClient.setProfileId(new UUID(sessionInfo.getDeviceProfileIdMSB(), sessionInfo.getDeviceProfileIdLSB()));
+ lwM2MClient.setDeviceName(sessionInfo.getDeviceName());
+ lwM2MClient.setDeviceProfileName(sessionInfo.getDeviceType());
+ }
+
private void closeClientSession(Registration registration) {
SessionInfoProto sessionInfo = this.getValidateSessionInfo(registration);
if (sessionInfo != null) {
@@ -279,7 +293,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
}
/**
- * Update - sent request in change value resources in Client
+ * Update - send request in change value resources in Client
* Path to resources from profile equal keyName or from ModelObject equal name
* Only for resources: isWritable && isPresent as attribute in profile -> LwM2MClientProfile (format: CamelCase)
* Delete - nothing *
@@ -291,26 +305,26 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
if (msg.getSharedUpdatedCount() > 0) {
JsonElement el = JsonConverter.toJson(msg);
el.getAsJsonObject().entrySet().forEach(de -> {
- String path = this.getPathAttributeUpdate(sessionInfo, de.getKey());
+ String pathIdVer = this.getPathAttributeUpdate(sessionInfo, de.getKey());
String value = de.getValue().getAsString();
LwM2mClient lwM2MClient = lwM2mClientContext.getLwM2mClient(new UUID(sessionInfo.getSessionIdMSB(), sessionInfo.getSessionIdLSB()));
LwM2mClientProfile clientProfile = lwM2mClientContext.getProfile(new UUID(sessionInfo.getDeviceProfileIdMSB(), sessionInfo.getDeviceProfileIdLSB()));
- if (path != null && !path.isEmpty() && (this.validatePathInAttrProfile(clientProfile, path) || this.validatePathInTelemetryProfile(clientProfile, path))) {
- ResourceModel resourceModel = lwM2mTransportContextServer.getLwM2MTransportConfigServer().getResourceModel(lwM2MClient.getRegistration(), new LwM2mPath(path));
+ if (pathIdVer != null && !pathIdVer.isEmpty() && (this.validatePathInAttrProfile(clientProfile, pathIdVer) || this.validatePathInTelemetryProfile(clientProfile, pathIdVer))) {
+ ResourceModel resourceModel = lwM2mTransportContextServer.getLwM2MTransportConfigServer().getResourceModel(lwM2MClient.getRegistration(), new LwM2mPath(convertToObjectIdFromIdVer(pathIdVer)));
if (resourceModel != null && resourceModel.operations.isWritable()) {
- lwM2mTransportRequest.sendAllRequest(lwM2MClient.getRegistration(), path, POST_TYPE_OPER_WRITE_REPLACE,
+ lwM2mTransportRequest.sendAllRequest(lwM2MClient.getRegistration(), pathIdVer, POST_TYPE_OPER_WRITE_REPLACE,
ContentFormat.TLV.getName(), null, value, this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getTimeout());
} else {
- log.error("Resource path - [{}] value - [{}] is not Writable and cannot be updated", path, value);
+ log.error("Resource path - [{}] value - [{}] is not Writable and cannot be updated", pathIdVer, value);
String logMsg = String.format("%s: attributeUpdate: Resource path - %s value - %s is not Writable and cannot be updated",
- LOG_LW2M_ERROR, path, value);
- this.sentLogsToThingsboard(logMsg, lwM2MClient.getRegistration());
+ LOG_LW2M_ERROR, pathIdVer, value);
+ this.sendLogsToThingsboard(logMsg, lwM2MClient.getRegistration());
}
} else {
log.error("Attribute name - [{}] value - [{}] is not present as attribute in profile and cannot be updated", de.getKey(), value);
String logMsg = String.format("%s: attributeUpdate: attribute name - %s value - %s is not present as attribute in profile and cannot be updated",
LOG_LW2M_ERROR, de.getKey(), value);
- this.sentLogsToThingsboard(logMsg, lwM2MClient.getRegistration());
+ this.sendLogsToThingsboard(logMsg, lwM2MClient.getRegistration());
}
});
} else if (msg.getSharedDeletedCount() > 0) {
@@ -349,7 +363,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
/**
* Trigger Server path = "/1/0/8"
- *
+ *
* Trigger bootStrap path = "/1/0/9" - have to implemented on client
*/
@Override
@@ -418,7 +432,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
* @param msg - text msg
* @param registration - Id of Registration LwM2M Client
*/
- public void sentLogsToThingsboard(String msg, Registration registration) {
+ public void sendLogsToThingsboard(String msg, Registration registration) {
if (msg != null) {
JsonObject telemetries = new JsonObject();
telemetries.addProperty(LOG_LW2M_TELEMETRY, msg);
@@ -429,7 +443,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
/**
* // !!! Ok
- * Prepare Sent to Thigsboard callback - Attribute or Telemetry
+ * Prepare send to Thigsboard callback - Attribute or Telemetry
*
* @param msg - JsonArray: [{name: value}]
* @param topicName - Api Attribute or Telemetry
@@ -438,7 +452,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
public void updateParametersOnThingsboard(JsonElement msg, String topicName, Registration registration) {
SessionInfoProto sessionInfo = this.getValidateSessionInfo(registration);
if (sessionInfo != null) {
- lwM2mTransportContextServer.sentParametersOnThingsboard(msg, topicName, sessionInfo);
+ lwM2mTransportContextServer.sendParametersOnThingsboard(msg, topicName, sessionInfo);
} else {
log.error("Client: [{}] updateParametersOnThingsboard [{}] sessionInfo ", registration, null);
}
@@ -459,7 +473,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
private void initLwM2mFromClientValue(Registration registration, LwM2mClient lwM2MClient) {
LwM2mClientProfile lwM2MClientProfile = lwM2mClientContext.getProfile(registration);
Set clientObjects = this.getAllOjectsInClient(registration);
- if (clientObjects != null && !LwM2mTransportHandler.getClientOnlyObserveAfterConnect(lwM2MClientProfile)) {
+ if (clientObjects != null && LWM2M_STRATEGY_2 == LwM2mTransportHandler.getClientOnlyObserveAfterConnect(lwM2MClientProfile)) {
// #2
lwM2MClient.getPendingRequests().addAll(clientObjects);
clientObjects.forEach(path -> lwM2mTransportRequest.sendAllRequest(registration, path, GET_TYPE_OPER_READ, ContentFormat.TLV.getName(),
@@ -500,9 +514,9 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
* #1 Return old Value Resource from LwM2MClient
* #2 Update new Resources (replace old Resource Value on new Resource Value)
*
- * @param registration - Registration LwM2M Client
+ * @param registration - Registration LwM2M Client
* @param lwM2mResource - LwM2mSingleResource response.getContent()
- * @param path - resource
+ * @param path - resource
*/
private void updateResourcesValue(Registration registration, LwM2mResource lwM2mResource, String path) {
LwM2mClient lwM2MClient = lwM2mClientContext.getLwM2mClientWithReg(registration, null);
@@ -513,7 +527,7 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
}
/**
- * Sent Attribute and Telemetry to Thingsboard
+ * send Attribute and Telemetry to Thingsboard
* #1 - get AttrName/TelemetryName with value from LwM2MClient:
* -- resourceId == path from LwM2MClientProfile.postAttributeProfile/postTelemetryProfile/postObserveProfile
* -- AttrName/TelemetryName == resourceName from ModelObject.objectModel, value from ModelObject.instance.resource(resourceId)
@@ -540,12 +554,12 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
/**
* @param clientProfile -
- * @param path -
+ * @param path -
* @return true if path isPresent in postAttributeProfile
*/
private boolean validatePathInAttrProfile(LwM2mClientProfile clientProfile, String path) {
try {
- List attributesSet = new Gson().fromJson(clientProfile.getPostAttributeProfile(), new TypeToken<>() {
+ List attributesSet = new Gson().fromJson(clientProfile.getPostAttributeProfile(), new TypeToken>() {
}.getType());
return attributesSet.stream().anyMatch(p -> p.equals(path));
} catch (Exception e) {
@@ -556,12 +570,12 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
/**
* @param clientProfile -
- * @param path -
+ * @param path -
* @return true if path isPresent in postAttributeProfile
*/
private boolean validatePathInTelemetryProfile(LwM2mClientProfile clientProfile, String path) {
try {
- List telemetriesSet = new Gson().fromJson(clientProfile.getPostTelemetryProfile(), new TypeToken<>() {
+ List telemetriesSet = new Gson().fromJson(clientProfile.getPostTelemetryProfile(), new TypeToken>() {
}.getType());
return telemetriesSet.stream().anyMatch(p -> p.equals(path));
} catch (Exception e) {
@@ -582,22 +596,25 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
Set clientInstances = this.getAllInstancesInClient(registration);
Set result;
if (GET_TYPE_OPER_READ.equals(typeOper)) {
- result = JacksonUtil.fromString(lwM2MClientProfile.getPostAttributeProfile().toString(), new TypeReference<>() {});
- result.addAll(JacksonUtil.fromString(lwM2MClientProfile.getPostTelemetryProfile().toString(), new TypeReference<>() {}));
+ result = JacksonUtil.fromString(lwM2MClientProfile.getPostAttributeProfile().toString(), new TypeReference<>() {
+ });
+ result.addAll(JacksonUtil.fromString(lwM2MClientProfile.getPostTelemetryProfile().toString(), new TypeReference<>() {
+ }));
} else {
- result = JacksonUtil.fromString(lwM2MClientProfile.getPostObserveProfile().toString(), new TypeReference<>() {});
+ result = JacksonUtil.fromString(lwM2MClientProfile.getPostObserveProfile().toString(), new TypeReference<>() {
+ });
}
- Set pathSent = ConcurrentHashMap.newKeySet();
+ Set pathSend = ConcurrentHashMap.newKeySet();
result.forEach(target -> {
// #1.1
String[] resPath = target.split("/");
String instance = "/" + resPath[1] + "/" + resPath[2];
if (clientInstances != null && clientInstances.size() > 0 && clientInstances.contains(instance)) {
- pathSent.add(target);
+ pathSend.add(target);
}
});
- lwM2MClient.getPendingRequests().addAll(pathSent);
- pathSent.forEach(target -> lwM2mTransportRequest.sendAllRequest(registration, target, typeOper, ContentFormat.TLV.getName(),
+ lwM2MClient.getPendingRequests().addAll(pathSend);
+ pathSend.forEach(target -> lwM2mTransportRequest.sendAllRequest(registration, target, typeOper, ContentFormat.TLV.getName(),
null, null, this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getTimeout()));
if (GET_TYPE_OPER_OBSERVE.equals(typeOper)) {
lwM2MClient.initValue(this, null);
@@ -647,51 +664,32 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
Arrays.stream(registration.getObjectLinks()).forEach(url -> {
LwM2mPath pathIds = new LwM2mPath(url.getUrl());
if (pathIds.isObjectInstance()) {
- clientInstances.add(url.getUrl());
+ clientInstances.add(convertToIdVerFromObjectId(url.getUrl(), registration));
}
});
return (clientInstances.size() > 0) ? clientInstances : null;
}
-// /**
-// * get AttrName/TelemetryName with value from Client
-// *
-// * @param registration -
-// * @return - JsonObject, format: {name: value}}
-// */
-// private JsonObject getAttributeClient(Registration registration) {
-// if (registration.getAdditionalRegistrationAttributes().size() > 0) {
-// JsonObject resNameValues = new JsonObject();
-// registration.getAdditionalRegistrationAttributes().forEach(resNameValues::addProperty);
-// return resNameValues;
-// }
-// return null;
-// }
-
/**
* @param attributes - new JsonObject
* @param telemetry - new JsonObject
* @param registration - Registration LwM2M Client
- * @param path -
+ * @param path -
*/
private void getParametersFromProfile(JsonObject attributes, JsonObject telemetry, Registration registration, Set path) {
- LwM2mClientProfile lwM2MClientProfile = lwM2mClientContext.getProfile(registration);
- lwM2MClientProfile.getPostAttributeProfile().forEach(p -> {
- LwM2mPath pathIds = new LwM2mPath(p.getAsString());
- if (pathIds.isResource()) {
- if (path == null || path.contains(p.getAsString())) {
- this.addParameters(p.getAsString(), attributes, registration);
+ if (path != null && path.size() > 0) {
+ LwM2mClientProfile lwM2MClientProfile = lwM2mClientContext.getProfile(registration);
+ lwM2MClientProfile.getPostAttributeProfile().forEach(idVer -> {
+ if (path.contains(idVer.getAsString())) {
+ this.addParameters(idVer.getAsString(), attributes, registration);
}
- }
- });
- lwM2MClientProfile.getPostTelemetryProfile().forEach(p -> {
- LwM2mPath pathIds = new LwM2mPath(p.getAsString());
- if (pathIds.isResource()) {
- if (path == null || path.contains(p.getAsString())) {
- this.addParameters(p.getAsString(), telemetry, registration);
+ });
+ lwM2MClientProfile.getPostTelemetryProfile().forEach(idVer -> {
+ if (path.contains(idVer.getAsString())) {
+ this.addParameters(idVer.getAsString(), telemetry, registration);
}
- }
- });
+ });
+ }
}
/**
@@ -719,22 +717,21 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
* @return - value of Resource or null
*/
private String getResourceValueToString(LwM2mClient lwM2MClient, String path) {
- LwM2mPath pathIds = new LwM2mPath(path);
- ResourceValue resourceValue = this.returnResourceValueFromLwM2MClient(lwM2MClient, pathIds);
+ LwM2mPath pathIds =new LwM2mPath(convertToObjectIdFromIdVer(path));
+ ResourceValue resourceValue = this.returnResourceValueFromLwM2MClient(lwM2MClient, path);
return resourceValue == null ? null :
this.converter.convertValue(resourceValue.getResourceValue(), this.lwM2mTransportContextServer.getLwM2MTransportConfigServer().getResourceModelType(lwM2MClient.getRegistration(), pathIds), ResourceModel.Type.STRING, pathIds).toString();
}
/**
- *
* @param lwM2MClient -
- * @param pathIds -
+ * @param path -
* @return - return value of Resource by idPath
*/
- private ResourceValue returnResourceValueFromLwM2MClient(LwM2mClient lwM2MClient, LwM2mPath pathIds) {
+ private ResourceValue returnResourceValueFromLwM2MClient(LwM2mClient lwM2MClient, String path) {
ResourceValue resourceValue = null;
- if (pathIds.isResource()) {
- resourceValue = lwM2MClient.getResources().get(pathIds.toString());
+ if (new LwM2mPath(convertToObjectIdFromIdVer(path)).isResource()) {
+ resourceValue = lwM2MClient.getResources().get(path);
}
return resourceValue;
}
@@ -758,15 +755,15 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
* #3.2 Telemetry isChange (add&del)
* #3.3 KeyName isChange (add)
* #4 update
- * #4.1 add If #3 isChange, then analyze and update Value in Transport form Client and sent Value to thingsboard
+ * #4.1 add If #3 isChange, then analyze and update Value in Transport form Client and send Value to thingsboard
* #4.2 del
* -- if add attributes includes del telemetry - result del for observe
* #5
* #5.1 Observe isChange (add&del)
* #5.2 Observe.add
- * -- path Attr/Telemetry includes newObserve and does not include oldObserve: sent Request observe to Client
+ * -- path Attr/Telemetry includes newObserve and does not include oldObserve: send Request observe to Client
* #5.3 Observe.del
- * -- different between newObserve and oldObserve: sent Request cancel observe to client
+ * -- different between newObserve and oldObserve: send Request cancel observe to client
*
* @param registrationIds -
* @param deviceProfile -
@@ -791,20 +788,20 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
JsonObject keyNameNew = lwM2MClientProfileNew.getPostKeyNameProfile();
// #3
- ResultsAnalyzerParameters sentAttrToThingsboard = new ResultsAnalyzerParameters();
+ ResultsAnalyzerParameters sendAttrToThingsboard = new ResultsAnalyzerParameters();
// #3.1
if (!attributeOld.equals(attributeNew)) {
ResultsAnalyzerParameters postAttributeAnalyzer = this.getAnalyzerParameters(new Gson().fromJson(attributeOld, new TypeToken>() {
}.getType()), attributeSetNew);
- sentAttrToThingsboard.getPathPostParametersAdd().addAll(postAttributeAnalyzer.getPathPostParametersAdd());
- sentAttrToThingsboard.getPathPostParametersDel().addAll(postAttributeAnalyzer.getPathPostParametersDel());
+ sendAttrToThingsboard.getPathPostParametersAdd().addAll(postAttributeAnalyzer.getPathPostParametersAdd());
+ sendAttrToThingsboard.getPathPostParametersDel().addAll(postAttributeAnalyzer.getPathPostParametersDel());
}
// #3.2
if (!telemetryOld.equals(telemetryNew)) {
ResultsAnalyzerParameters postTelemetryAnalyzer = this.getAnalyzerParameters(new Gson().fromJson(telemetryOld, new TypeToken>() {
}.getType()), telemetrySetNew);
- sentAttrToThingsboard.getPathPostParametersAdd().addAll(postTelemetryAnalyzer.getPathPostParametersAdd());
- sentAttrToThingsboard.getPathPostParametersDel().addAll(postTelemetryAnalyzer.getPathPostParametersDel());
+ sendAttrToThingsboard.getPathPostParametersAdd().addAll(postTelemetryAnalyzer.getPathPostParametersAdd());
+ sendAttrToThingsboard.getPathPostParametersDel().addAll(postTelemetryAnalyzer.getPathPostParametersDel());
}
// #3.3
if (!keyNameOld.equals(keyNameNew)) {
@@ -812,52 +809,52 @@ public class LwM2mTransportServiceImpl implements LwM2mTransportService {
}.getType()),
new Gson().fromJson(keyNameNew.toString(), new TypeToken>() {
}.getType()));
- sentAttrToThingsboard.getPathPostParametersAdd().addAll(keyNameChange.getPathPostParametersAdd());
+ sendAttrToThingsboard.getPathPostParametersAdd().addAll(keyNameChange.getPathPostParametersAdd());
}
// #4.1 add
- if (sentAttrToThingsboard.getPathPostParametersAdd().size() > 0) {
+ if (sendAttrToThingsboard.getPathPostParametersAdd().size() > 0) {
// update value in Resources
registrationIds.forEach(registrationId -> {
// LeshanServer lwServer = leshanServer;
Registration registration = lwM2mClientContext.getRegistration(registrationId);
- this.readResourceValueObserve(registration, sentAttrToThingsboard.getPathPostParametersAdd(), GET_TYPE_OPER_READ);
- // sent attr/telemetry to tingsboard for new path
- this.updateAttrTelemetry(registration, sentAttrToThingsboard.getPathPostParametersAdd());
+ this.readResourceValueObserve(registration, sendAttrToThingsboard.getPathPostParametersAdd(), GET_TYPE_OPER_READ);
+ // send attr/telemetry to tingsboard for new path
+ this.updateAttrTelemetry(registration, sendAttrToThingsboard.getPathPostParametersAdd());
});
}
// #4.2 del
- if (sentAttrToThingsboard.getPathPostParametersDel().size() > 0) {
- ResultsAnalyzerParameters sentAttrToThingsboardDel = this.getAnalyzerParameters(sentAttrToThingsboard.getPathPostParametersAdd(), sentAttrToThingsboard.getPathPostParametersDel());
- sentAttrToThingsboard.setPathPostParametersDel(sentAttrToThingsboardDel.getPathPostParametersDel());
+ if (sendAttrToThingsboard.getPathPostParametersDel().size() > 0) {
+ ResultsAnalyzerParameters sendAttrToThingsboardDel = this.getAnalyzerParameters(sendAttrToThingsboard.getPathPostParametersAdd(), sendAttrToThingsboard.getPathPostParametersDel());
+ sendAttrToThingsboard.setPathPostParametersDel(sendAttrToThingsboardDel.getPathPostParametersDel());
}
// #5.1
if (!observeOld.equals(observeNew)) {
- Set observeSetOld = new Gson().fromJson(observeOld, new TypeToken<>() {}.getType());
- Set observeSetNew = new Gson().fromJson(observeNew, new TypeToken<>() {}.getType());
+ Set observeSetOld = new Gson().fromJson(observeOld, new TypeToken>() {}.getType());
+ Set observeSetNew = new Gson().fromJson(observeNew, new TypeToken>() {}.getType());
//#5.2 add
// path Attr/Telemetry includes newObserve
attributeSetOld.addAll(telemetrySetOld);
- ResultsAnalyzerParameters sentObserveToClientOld = this.getAnalyzerParametersIn(attributeSetOld, observeSetOld); // add observe
+ ResultsAnalyzerParameters sendObserveToClientOld = this.getAnalyzerParametersIn(attributeSetOld, observeSetOld); // add observe
attributeSetNew.addAll(telemetrySetNew);
- ResultsAnalyzerParameters sentObserveToClientNew = this.getAnalyzerParametersIn(attributeSetNew, observeSetNew); // add observe
+ ResultsAnalyzerParameters sendObserveToClientNew = this.getAnalyzerParametersIn(attributeSetNew, observeSetNew); // add observe
// does not include oldObserve
- ResultsAnalyzerParameters postObserveAnalyzer = this.getAnalyzerParameters(sentObserveToClientOld.getPathPostParametersAdd(), sentObserveToClientNew.getPathPostParametersAdd());
- // sent Request observe to Client
+ ResultsAnalyzerParameters postObserveAnalyzer = this.getAnalyzerParameters(sendObserveToClientOld.getPathPostParametersAdd(), sendObserveToClientNew.getPathPostParametersAdd());
+ // send Request observe to Client
registrationIds.forEach(registrationId -> {
Registration registration = lwM2mClientContext.getRegistration(registrationId);
this.readResourceValueObserve(registration, postObserveAnalyzer.getPathPostParametersAdd(), GET_TYPE_OPER_OBSERVE);
// 5.3 del
- // sent Request cancel observe to Client
+ // send Request cancel observe to Client
this.cancelObserveIsValue(registration, postObserveAnalyzer.getPathPostParametersDel());
});
}
}
}
- private Set