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

lwm2m: fix bug test by ver Object, fix buf test: TbLwM2mStoreFactory.class "NetworkConfig must not be null"

Browse Source
This commit is contained in:
nick 2024-01-18 13:31:28 +02:00
parent ad46f3bb2b
commit a74640a1d8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
View File

@ -687,7 +687,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
List<TbResource> resources = loadLwm2mResources(); List<TbResource> resources = loadLwm2mResources();
List<LwM2mObject> objects = List<LwM2mObject> objects =
doGetTyped("/api/resource/lwm2m?sortProperty=id&sortOrder=ASC&objectIds=3_1.0,5_1.0,19_1.1", new TypeReference<>() {}); doGetTyped("/api/resource/lwm2m?sortProperty=id&sortOrder=ASC&objectIds=3_1.2,5_1.2,19_1.1", new TypeReference<>() {});
Assert.assertNotNull(objects); Assert.assertNotNull(objects);
Assert.assertEquals(3, objects.size()); Assert.assertEquals(3, objects.size());

5
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mStoreFactory.java
View File

@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor;
import org.eclipse.californium.core.network.RandomTokenGenerator; import org.eclipse.californium.core.network.RandomTokenGenerator;
import org.eclipse.leshan.server.registration.RegistrationStore; import org.eclipse.leshan.server.registration.RegistrationStore;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.thingsboard.server.cache.TBRedisCacheConfiguration; import org.thingsboard.server.cache.TBRedisCacheConfiguration;
@ -35,6 +36,7 @@ import java.util.Optional;
public class TbLwM2mStoreFactory { public class TbLwM2mStoreFactory {
private final Optional<TBRedisCacheConfiguration> redisConfiguration; private final Optional<TBRedisCacheConfiguration> redisConfiguration;
@Lazy
private final LwM2MTransportServerConfig config; private final LwM2MTransportServerConfig config;
private final LwM2mCredentialsSecurityInfoValidator validator; private final LwM2mCredentialsSecurityInfoValidator validator;
@ -43,7 +45,8 @@ public class TbLwM2mStoreFactory {
@Bean @Bean
private RegistrationStore registrationStore() { private RegistrationStore registrationStore() {
return redisConfiguration.isPresent() ? return redisConfiguration.isPresent() ?
new TbLwM2mRedisRegistrationStore(new RandomTokenGenerator(config.getCoapConfig()), getConnectionFactory(), modelProvider) : new TbInMemoryRegistrationStore(new RandomTokenGenerator(config.getCoapConfig()), config.getCleanPeriodInSec(), modelProvider); new TbLwM2mRedisRegistrationStore(new RandomTokenGenerator(config.getCoapConfig()), getConnectionFactory(), modelProvider) :
new TbInMemoryRegistrationStore(new RandomTokenGenerator(config.getCoapConfig()), config.getCleanPeriodInSec(), modelProvider);
} }
@Bean @Bean