ResourceValue is serializable

@@ -29,7 +29,6 @@ import org.eclipse.leshan.core.node.codec.LwM2mValueConverter;
 import org.eclipse.leshan.core.request.ContentFormat;
 import org.eclipse.leshan.core.request.ContentFormat;
 import org.eclipse.leshan.server.model.LwM2mModelProvider;
 import org.eclipse.leshan.server.model.LwM2mModelProvider;
 import org.eclipse.leshan.server.registration.Registration;
 import org.eclipse.leshan.server.registration.Registration;
-import org.eclipse.leshan.server.security.SecurityInfo;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.data.Lwm2mDeviceTransportConfiguration;
 import org.thingsboard.server.common.data.device.data.Lwm2mDeviceTransportConfiguration;
@@ -39,6 +38,8 @@ import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsRes
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsKvProto;
 
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map;
@@ -66,10 +67,10 @@ public class LwM2mClient implements Serializable {
     @Getter
     @Getter
     private final String endpoint;
     private final String endpoint;
 
 
-    private transient final Lock lock = new ReentrantLock();
-    //TODO: define custom serialization of those fields.
+    private transient Lock lock;
+
     @Getter
     @Getter
-    private transient final Map<String, ResourceValue> resources;
+    private final Map<String, ResourceValue> resources;
     @Getter
     @Getter
     private final Map<String, TsKvProto> sharedAttributes;
     private final Map<String, TsKvProto> sharedAttributes;
 
 
@@ -100,6 +101,7 @@ public class LwM2mClient implements Serializable {
         this.sharedAttributes = new ConcurrentHashMap<>();
         this.sharedAttributes = new ConcurrentHashMap<>();
         this.resources = new ConcurrentHashMap<>();
         this.resources = new ConcurrentHashMap<>();
         this.state = LwM2MClientState.CREATED;
         this.state = LwM2MClientState.CREATED;
+        this.lock = new ReentrantLock();
     }
     }
 
 
     public void init(ValidateDeviceCredentialsResponse credentials, UUID sessionId) {
     public void init(ValidateDeviceCredentialsResponse credentials, UUID sessionId) {
@@ -353,5 +355,10 @@ public class LwM2mClient implements Serializable {
         }
         }
     }
     }
 
 
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        this.lock = new ReentrantLock();
+    }
+
 }
 }
 
 

@@ -18,14 +18,46 @@ package org.thingsboard.server.transport.lwm2m.server.client;
 import lombok.Data;
 import lombok.Data;
 import org.eclipse.leshan.core.model.ResourceModel;
 import org.eclipse.leshan.core.model.ResourceModel;
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.node.LwM2mResourceInstance;
+
+import java.io.Serializable;
 
 
 @Data
 @Data
-public class ResourceValue {
-    private LwM2mResource lwM2mResource;
-    private ResourceModel resourceModel;
+public class ResourceValue implements Serializable {
+
+    private static final long serialVersionUID = -228268906779089402L;
+
+    private TbLwM2MResource lwM2mResource;
+    private TbResourceModel resourceModel;
 
 
     public ResourceValue(LwM2mResource lwM2mResource, ResourceModel resourceModel) {
     public ResourceValue(LwM2mResource lwM2mResource, ResourceModel resourceModel) {
-        this.lwM2mResource = lwM2mResource;
-        this.resourceModel = resourceModel;
+        this.lwM2mResource = toTbLwM2MResource(lwM2mResource);
+        this.resourceModel = toTbResourceModel(resourceModel);
+    }
+
+    public void setLwM2mResource(LwM2mResource lwM2mResource) {
+        this.lwM2mResource = toTbLwM2MResource(lwM2mResource);
+    }
+
+    public void setResourceModel(ResourceModel resourceModel) {
+        this.resourceModel = toTbResourceModel(resourceModel);
+    }
+
+    private static TbLwM2MResource toTbLwM2MResource(LwM2mResource lwM2mResource) {
+        if (lwM2mResource.isMultiInstances()) {
+            TbLwM2MResourceInstance[] instances = (TbLwM2MResourceInstance[]) lwM2mResource.getInstances().values().stream().map(ResourceValue::toTbLwM2MResourceInstance).toArray();
+            return new TbLwM2MMultipleResource(lwM2mResource.getId(), lwM2mResource.getType(), instances);
+        } else {
+            return new TbLwM2MSingleResource(lwM2mResource.getId(), lwM2mResource.getValue(), lwM2mResource.getType());
+        }
+    }
+
+    private static TbLwM2MResourceInstance toTbLwM2MResourceInstance(LwM2mResourceInstance instance) {
+        return new TbLwM2MResourceInstance(instance.getId(), instance.getValue(), instance.getType());
+    }
+
+    private static TbResourceModel toTbResourceModel(ResourceModel resourceModel) {
+        return new TbResourceModel(resourceModel.id, resourceModel.name, resourceModel.operations, resourceModel.multiple,
+                resourceModel.mandatory, resourceModel.type, resourceModel.rangeEnumeration, resourceModel.units, resourceModel.description);
     }
     }
 }
 }

+/**
+ * Copyright © 2016-2021 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.model.ResourceModel;
+import org.eclipse.leshan.core.node.LwM2mMultipleResource;
+import org.eclipse.leshan.core.node.LwM2mResourceInstance;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+public class TbLwM2MMultipleResource extends LwM2mMultipleResource implements TbLwM2MResource, Serializable {
+
+    private static final long serialVersionUID = 4658477128628087186L;
+
+    public TbLwM2MMultipleResource(int id, ResourceModel.Type type, TbLwM2MResourceInstance... instances) {
+        super(id, type, instances);
+    }
+}

+/**
+ * Copyright © 2016-2021 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.node.LwM2mResource;
+
+public interface TbLwM2MResource extends LwM2mResource {
+}

+/**
+ * Copyright © 2016-2021 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.model.ResourceModel;
+import org.eclipse.leshan.core.node.LwM2mResourceInstance;
+
+import java.io.Serializable;
+
+public class TbLwM2MResourceInstance extends LwM2mResourceInstance implements Serializable {
+
+    private static final long serialVersionUID = -8322290426892538345L;
+
+    protected TbLwM2MResourceInstance(int id, Object value, ResourceModel.Type type) {
+        super(id, value, type);
+    }
+}

+/**
+ * Copyright © 2016-2021 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.model.ResourceModel;
+import org.eclipse.leshan.core.node.LwM2mSingleResource;
+
+import java.io.Serializable;
+
+public class TbLwM2MSingleResource extends LwM2mSingleResource implements TbLwM2MResource, Serializable {
+
+    private static final long serialVersionUID = -878078368245340809L;
+
+    public TbLwM2MSingleResource(int id, Object value, ResourceModel.Type type) {
+        super(id, value, type);
+    }
+}

+/**
+ * Copyright © 2016-2021 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.model.ResourceModel;
+
+import java.io.Serializable;
+
+public class TbResourceModel extends ResourceModel implements Serializable {
+
+    private static final long serialVersionUID = -2082846558899793932L;
+
+    public TbResourceModel(Integer id, String name, Operations operations, Boolean multiple, Boolean mandatory, Type type, String rangeEnumeration, String units, String description) {
+        super(id, name, operations, multiple, mandatory, type, rangeEnumeration, units, description);
+    }
+}