Lwm2m: backEnd: refactoring start server/bootstrap without different secure

application/src/main/resources/thingsboard.yml

@@ -635,7 +635,7 @@ transport:
         private_s: "${LWM2M_SERVER_PRIVATE_S_BS:9dbdbb073fc63570693a9aaf1013414e261c571f27e27fc6a8c1c2ad9347875a}"
         # Only Certificate_x509:
         alias: "${LWM2M_KEYSTORE_ALIAS_BOOTSTRAP:bootstrap}"
-      # Redis
+    # Redis
     redis_url: "${LWM2M_REDIS_URL:''}"
 
 swagger:

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServerConfiguration.java

@@ -61,7 +61,7 @@ import static org.thingsboard.server.transport.lwm2m.server.LwM2MTransportHandle
 
 @Slf4j
 @Component
-@ConditionalOnExpression("('${service.type:null}'=='tb-transport' && '${transport.lwm2m.enabled:false}'=='true'&& '${transport.lwm2m.bootstrap.enable:false}'=='true') || ('${service.type:null}'=='monolith' && '${transport.lwm2m.enabled}'=='true'&& '${transport.lwm2m.bootstrap.enable}'=='true')")
+@ConditionalOnExpression("('${service.type:null}'=='tb-transport' && '${transport.lwm2m.enabled:false}'=='true'&& '${transport.lwm2m.bootstrap.enable:false}'=='true') || ('${service.type:null}'=='monolith' && '${transport.lwm2m.enabled:false}'=='true'&& '${transport.lwm2m.bootstrap.enable:false}'=='true')")
 public class LwM2MTransportBootstrapServerConfiguration {
     private PublicKey publicKey;
     private PrivateKey privateKey;
@@ -80,18 +80,21 @@ public class LwM2MTransportBootstrapServerConfiguration {
 
     @Primary
     @Bean(name = "leshanBootstrapX509")
+    @ConditionalOnExpression("('${transport.lwm2m.bootstrap.secure.start_x509:false}'=='true')")
     public LeshanBootstrapServer getLeshanBootstrapServerX509() {
         log.info("Prepare and start BootstrapServerX509... PostConstruct");
         return getLeshanBootstrapServer(this.contextBs.getCtxBootStrap().getBootstrapPortNoSecX509(), this.contextBs.getCtxBootStrap().getBootstrapSecurePortX509(), X509);
     }
 
     @Bean(name = "leshanBootstrapPsk")
+    @ConditionalOnExpression("('${transport.lwm2m.bootstrap.secure.start_psk:false}'=='true')")
     public LeshanBootstrapServer getLeshanBootstrapServerPsk() {
         log.info("Prepare and start BootstrapServerRsk... PostConstruct");
         return getLeshanBootstrapServer(this.contextBs.getCtxBootStrap().getBootstrapPortNoSecPsk(), this.contextBs.getCtxBootStrap().getBootstrapSecurePortPsk(), PSK);
     }
 
     @Bean(name = "leshanBootstrapRpk")
+    @ConditionalOnExpression("('${transport.lwm2m.bootstrap.secure.start_rpk:false}'=='true')")
     public LeshanBootstrapServer getLeshanBootstrapServerRpk() {
         log.info("Prepare and start BootstrapServerRpk... PostConstruct");
         return getLeshanBootstrapServer(this.contextBs.getCtxBootStrap().getBootstrapPortNoSecRpk(), this.contextBs.getCtxBootStrap().getBootstrapSecurePortRpk(), RPK);

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapServerInitializer.java

@@ -27,18 +27,18 @@ import javax.annotation.PreDestroy;
 
 @Slf4j
 @Service
-@ConditionalOnExpression("('${service.type:null}'=='tb-transport' && '${transport.lwm2m.enabled}'=='true'&& '${transport.lwm2m.bootstrap.enable}'=='true') || ('${service.type:null}'=='monolith' && '${transport.lwm2m.enabled}'=='true'&& '${transport.lwm2m.bootstrap.enable}'=='true')")
+@ConditionalOnExpression("('${service.type:null}'=='tb-transport' && '${transport.lwm2m.enabled:false}'=='true'&& '${transport.lwm2m.bootstrap.enable:false}'=='true') || ('${service.type:null}'=='monolith' && '${transport.lwm2m.enabled:false}'=='true'&& '${transport.lwm2m.bootstrap.enable:false}'=='true')")
 public class LwM2MTransportBootstrapServerInitializer {
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("leshanBootstrapX509")
     private LeshanBootstrapServer lhBServerCert;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("leshanBootstrapPsk")
     private LeshanBootstrapServer lhBServerPsk;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("leshanBootstrapRpk")
     private LeshanBootstrapServer lhBServerRpk;
 

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2MTransportServerConfiguration.java

@@ -85,24 +85,27 @@ public class LwM2MTransportServerConfiguration {
     private LwM2mInMemorySecurityStore lwM2mInMemorySecurityStore;
 
     @Primary
-    @Bean(name = "leshanServerX509")
-    public LeshanServer getLeshanServerX509() {
-        log.info("Starting LwM2M transport ServerX509... PostConstruct");
-        return getLeshanServer(this.context.getCtxServer().getServerPortNoSecX509(), this.context.getCtxServer().getServerPortX509(), X509);
-    }
-
     @Bean(name = "leshanServerPsk")
+    @ConditionalOnExpression("('${transport.lwm2m.server.secure.start_psk:false}'=='true')")
     public LeshanServer getLeshanServerPsk() {
         log.info("Starting LwM2M transport ServerPsk... PostConstruct");
         return getLeshanServer(this.context.getCtxServer().getServerPortNoSecPsk(), this.context.getCtxServer().getServerPortPsk(), PSK);
     }
 
     @Bean(name = "leshanServerRpk")
+    @ConditionalOnExpression("('${transport.lwm2m.server.secure.start_rpk:false}'=='true')")
     public LeshanServer getLeshanServerRpk() {
         log.info("Starting LwM2M transport ServerRpk... PostConstruct");
         return getLeshanServer(this.context.getCtxServer().getServerPortNoSecRpk(), this.context.getCtxServer().getServerPortRpk(), RPK);
     }
 
+    @Bean(name = "leshanServerX509")
+    @ConditionalOnExpression("('${transport.lwm2m.server.secure.start_x509:false}'=='true')")
+    public LeshanServer getLeshanServerX509() {
+        log.info("Starting LwM2M transport ServerX509... PostConstruct");
+        return getLeshanServer(this.context.getCtxServer().getServerPortNoSecX509(), this.context.getCtxServer().getServerPortX509(), X509);
+    }
+
     private LeshanServer getLeshanServer(Integer serverPortNoSec, Integer serverSecurePort, LwM2MSecurityMode dtlsMode) {
         LeshanServerBuilder builder = new LeshanServerBuilder();
         builder.setLocalAddress(this.context.getCtxServer().getServerHost(), serverPortNoSec);

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2MTransportServerInitializer.java

@@ -35,15 +35,15 @@ public class LwM2MTransportServerInitializer {
     @Autowired
     private LwM2MTransportServiceImpl service;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("leshanServerX509")
     private LeshanServer lhServerX509;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("leshanServerPsk")
     private LeshanServer lhServerPsk;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("leshanServerRpk")
     private LeshanServer lhServerRpk;