refactored

application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java

@@ -26,13 +26,13 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClasspathSuite.ClassnameFilters({
-//        "org.thingsboard.server.transport.*.rpc.sql.*Test",
-//        "org.thingsboard.server.transport.*.telemetry.timeseries.sql.*Test",
-//        "org.thingsboard.server.transport.*.telemetry.attributes.sql.*Test",
-//        "org.thingsboard.server.transport.*.attributes.updates.sql.*Test",
-//        "org.thingsboard.server.transport.*.attributes.request.sql.*Test",
-//        "org.thingsboard.server.transport.*.claim.sql.*Test",
-//        "org.thingsboard.server.transport.*.provision.sql.*Test",
+        "org.thingsboard.server.transport.*.rpc.sql.*Test",
+        "org.thingsboard.server.transport.*.telemetry.timeseries.sql.*Test",
+        "org.thingsboard.server.transport.*.telemetry.attributes.sql.*Test",
+        "org.thingsboard.server.transport.*.attributes.updates.sql.*Test",
+        "org.thingsboard.server.transport.*.attributes.request.sql.*Test",
+        "org.thingsboard.server.transport.*.claim.sql.*Test",
+        "org.thingsboard.server.transport.*.provision.sql.*Test",
         "org.thingsboard.server.transport.lwm2m.*Test"
 })
 public class TransportSqlTestSuite {

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

@@ -17,19 +17,14 @@ package org.thingsboard.server.transport.lwm2m.server.store;
 
 import org.eclipse.leshan.server.californium.registration.CaliforniumRegistrationStore;
 import org.eclipse.leshan.server.californium.registration.InMemoryRegistrationStore;
-import org.eclipse.leshan.server.security.EditableSecurityStore;
-import org.eclipse.leshan.server.security.InMemorySecurityStore;
-import org.eclipse.leshan.server.security.SecurityStore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.cache.TBRedisCacheConfiguration;
 import org.thingsboard.server.queue.util.TbLwM2mTransportComponent;
 import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig;
 import org.thingsboard.server.transport.lwm2m.secure.LwM2mCredentialsSecurityInfoValidator;
-import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext;
 
 import java.util.Optional;
 
@@ -56,7 +51,7 @@ public class TbLwM2mStoreFactory {
     }
 
     @Bean
-    private TbSecurityStore securityStore() {
+    private TbEditableSecurityStore securityStore() {
         return new TbLwM2mSecurityStore(redisConfiguration.isPresent() && useRedis ?
                 new TbLwM2mRedisSecurityStore(redisConfiguration.get().redisConnectionFactory()) : new TbInMemorySecurityStore(), validator);
     }