dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lwm2m: comments (why full import?)

Browse Source
This commit is contained in:
nick 2023-12-28 15:50:47 +02:00
parent 38fc45ffc1
commit a97f52c698
7 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/FwLwM2MDevice.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.node.LwM2mResource; import org.eclipse.leshan.core.node.LwM2mResource;
import org.eclipse.leshan.core.request.argument.Arguments; import org.eclipse.leshan.core.request.argument.Arguments;
@ -45,7 +46,7 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
private final AtomicInteger updateResult = new AtomicInteger(0); private final AtomicInteger updateResult = new AtomicInteger(0);
@Override @Override
public ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId) { public ReadResponse read(LwM2mServer identity, int resourceId) {
if (!identity.isSystem()) if (!identity.isSystem())
log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId); log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
@ -65,7 +66,7 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
} }
@Override @Override
public ExecuteResponse execute(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId, Arguments arguments) { public ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
String withArguments = ""; String withArguments = "";
if (!arguments.isEmpty()) if (!arguments.isEmpty())
withArguments = " with arguments " + arguments; withArguments = " with arguments " + arguments;
@ -82,7 +83,7 @@ public class FwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
} }
@Override @Override
public WriteResponse write(org.eclipse.leshan.client.servers.LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) { public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId); log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {

5
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mBinaryAppDataContainer.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.model.ResourceModel; import org.eclipse.leshan.core.model.ResourceModel;
import org.eclipse.leshan.core.node.LwM2mMultipleResource; import org.eclipse.leshan.core.node.LwM2mMultipleResource;
@ -92,7 +93,7 @@ public class LwM2mBinaryAppDataContainer extends BaseInstanceEnabler implements
} }
@Override @Override
public ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId) { public ReadResponse read(LwM2mServer identity, int resourceId) {
try { try {
switch (resourceId) { switch (resourceId) {
case 0: case 0:
@ -117,7 +118,7 @@ public class LwM2mBinaryAppDataContainer extends BaseInstanceEnabler implements
} }
@Override @Override
public WriteResponse write(org.eclipse.leshan.client.servers.LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) { public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
log.info("Write on Device resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId); log.info("Write on Device resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
case 0: case 0:

3
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mLocation.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.response.ReadResponse; import org.eclipse.leshan.core.response.ReadResponse;
@ -84,7 +85,7 @@ public class LwM2mLocation extends BaseInstanceEnabler implements Destroyable {
} }
@Override @Override
public ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId) { public ReadResponse read(LwM2mServer identity, int resourceId) {
log.info("Read on Location resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId); log.info("Read on Location resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
case 0: case 0:

5
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/LwM2mTemperatureSensor.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.request.argument.Arguments; import org.eclipse.leshan.core.request.argument.Arguments;
import org.eclipse.leshan.core.response.ExecuteResponse; import org.eclipse.leshan.core.response.ExecuteResponse;
@ -56,7 +57,7 @@ public class LwM2mTemperatureSensor extends BaseInstanceEnabler implements Destr
} }
@Override @Override
public synchronized ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId) { public synchronized ReadResponse read(LwM2mServer identity, int resourceId) {
log.info("Read on Temperature resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId); log.info("Read on Temperature resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
case 5601: case 5601:
@ -73,7 +74,7 @@ public class LwM2mTemperatureSensor extends BaseInstanceEnabler implements Destr
} }
@Override @Override
public synchronized ExecuteResponse execute(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId, Arguments arguments) { public synchronized ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
log.info("Execute on Temperature resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId); log.info("Execute on Temperature resource /[{}]/[{}]/[{}]", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
case 5605: case 5605:

7
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/Lwm2mServer.java
View File

@ -18,6 +18,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.resource.LwM2mInstanceEnabler; import org.eclipse.leshan.client.resource.LwM2mInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.model.ResourceModel.Type; import org.eclipse.leshan.core.model.ResourceModel.Type;
import org.eclipse.leshan.core.node.LwM2mResource; import org.eclipse.leshan.core.node.LwM2mResource;
@ -70,7 +71,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
} }
@Override @Override
public ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceid) { public ReadResponse read(LwM2mServer identity, int resourceid) {
if (!identity.isSystem()) if (!identity.isSystem())
LOG.debug("Read on Server resource /{}/{}/{}", getModel().id, getId(), resourceid); LOG.debug("Read on Server resource /{}/{}/{}", getModel().id, getId(), resourceid);
@ -108,7 +109,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
} }
@Override @Override
public WriteResponse write(org.eclipse.leshan.client.servers.LwM2mServer identity, boolean replace, int resourceid, LwM2mResource value) { public WriteResponse write(LwM2mServer identity, boolean replace, int resourceid, LwM2mResource value) {
if (!identity.isSystem()) if (!identity.isSystem())
log.debug("Write on Server resource /{}/{}/{}", getModel().id, getId(), resourceid); log.debug("Write on Server resource /{}/{}/{}", getModel().id, getId(), resourceid);
@ -195,7 +196,7 @@ public class Lwm2mServer extends BaseInstanceEnabler {
} }
} }
public ExecuteResponse execute(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceid, Arguments arguments) { public ExecuteResponse execute(LwM2mServer identity, int resourceid, Arguments arguments) {
log.info("Execute on Server resource /{}/{}/{}", getModel().id, getId(), resourceid); log.info("Execute on Server resource /{}/{}/{}", getModel().id, getId(), resourceid);
if (resourceid == 8) { if (resourceid == 8) {
getLwM2mClient().triggerRegistrationUpdate(identity); getLwM2mClient().triggerRegistrationUpdate(identity);

7
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SimpleLwM2MDevice.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.Destroyable; import org.eclipse.leshan.core.Destroyable;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.model.ResourceModel; import org.eclipse.leshan.core.model.ResourceModel;
@ -66,7 +67,7 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
@Override @Override
public ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId) { public ReadResponse read(LwM2mServer identity, int resourceId) {
if (!identity.isSystem()) if (!identity.isSystem())
log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId); log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
@ -108,7 +109,7 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
} }
@Override @Override
public ExecuteResponse execute(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId, Arguments arguments) { public ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
String withArguments = ""; String withArguments = "";
if (!arguments.isEmpty()) if (!arguments.isEmpty())
withArguments = " with arguments " + arguments; withArguments = " with arguments " + arguments;
@ -117,7 +118,7 @@ public class SimpleLwM2MDevice extends BaseInstanceEnabler implements Destroyabl
} }
@Override @Override
public WriteResponse write(org.eclipse.leshan.client.servers.LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) { public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId); log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {

7
application/src/test/java/org/thingsboard/server/transport/lwm2m/client/SwLwM2MDevice.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.transport.lwm2m.client;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.eclipse.leshan.client.resource.BaseInstanceEnabler; import org.eclipse.leshan.client.resource.BaseInstanceEnabler;
import org.eclipse.leshan.client.servers.LwM2mServer;
import org.eclipse.leshan.core.model.ObjectModel; import org.eclipse.leshan.core.model.ObjectModel;
import org.eclipse.leshan.core.node.LwM2mResource; import org.eclipse.leshan.core.node.LwM2mResource;
import org.eclipse.leshan.core.request.argument.Arguments; import org.eclipse.leshan.core.request.argument.Arguments;
@ -45,7 +46,7 @@ public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
private final AtomicInteger updateResult = new AtomicInteger(0); private final AtomicInteger updateResult = new AtomicInteger(0);
@Override @Override
public ReadResponse read(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId) { public ReadResponse read(LwM2mServer identity, int resourceId) {
if (!identity.isSystem()) if (!identity.isSystem())
log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId); log.info("Read on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {
@ -63,7 +64,7 @@ public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
} }
@Override @Override
public ExecuteResponse execute(org.eclipse.leshan.client.servers.LwM2mServer identity, int resourceId, Arguments arguments) { public ExecuteResponse execute(LwM2mServer identity, int resourceId, Arguments arguments) {
String withArguments = ""; String withArguments = "";
if (!arguments.isEmpty()) if (!arguments.isEmpty())
withArguments = " with arguments " + arguments; withArguments = " with arguments " + arguments;
@ -81,7 +82,7 @@ public class SwLwM2MDevice extends BaseInstanceEnabler implements Destroyable {
} }
@Override @Override
public WriteResponse write(org.eclipse.leshan.client.servers.LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) { public WriteResponse write(LwM2mServer identity, boolean replace, int resourceId, LwM2mResource value) {
log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId); log.info("Write on Device resource /{}/{}/{}", getModel().id, getId(), resourceId);
switch (resourceId) { switch (resourceId) {