fix broker startup if ssl is enabled (mqtts/https/wss)

thingsboard · Mar 26, 2024 · aa42ad9 · aa42ad9
1 parent e093e82
commit aa42ad9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/server/tls/MqttSslHandlerProvider.java b/application/src/main/java/org/thingsboard/mqtt/broker/server/tls/MqttSslHandlerProvider.java
@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.thingsboard.mqtt.broker.server.AbstractMqttHandlerProvider;
 import org.thingsboard.mqtt.broker.ssl.config.SslCredentials;
@@ -42,6 +43,7 @@ public SslCredentialsConfig mqttSslCredentials() {
  }
 
  @Autowired(required = false)
+ @Lazy
  @Qualifier("mqttSslCredentials")
  private SslCredentialsConfig mqttSslCredentialsConfig;
 

diff --git a/application/src/main/java/org/thingsboard/mqtt/broker/server/wss/MqttWssHandlerProvider.java b/application/src/main/java/org/thingsboard/mqtt/broker/server/wss/MqttWssHandlerProvider.java
@@ -22,6 +22,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.thingsboard.mqtt.broker.server.AbstractMqttHandlerProvider;
 import org.thingsboard.mqtt.broker.ssl.config.SslCredentials;
@@ -42,8 +43,9 @@ public SslCredentialsConfig mqttWssCredentials() {
  }
 
  @Autowired(required = false)
+ @Lazy
  @Qualifier("mqttWssCredentials")
- private SslCredentialsConfig mqttSslCredentialsConfig;
+ private SslCredentialsConfig mqttWssCredentialsConfig;
 
  @Override
  protected String getSslProtocol() {
@@ -52,7 +54,7 @@ protected String getSslProtocol() {
 
  @Override
  protected SslCredentials getSslCredentials() {
- return this.mqttSslCredentialsConfig.getCredentials();
+ return this.mqttWssCredentialsConfig.getCredentials();
  }
 
 }
diff --git a/...tion/src/main/java/org/thingsboard/mqtt/broker/ssl/SslCredentialsWebServerCustomizer.java b/...tion/src/main/java/org/thingsboard/mqtt/broker/ssl/SslCredentialsWebServerCustomizer.java
@@ -25,6 +25,7 @@
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.thingsboard.mqtt.broker.ssl.config.SslCredentials;
 import org.thingsboard.mqtt.broker.ssl.config.SslCredentialsConfig;
@@ -42,6 +43,7 @@ public SslCredentialsConfig httpServerSslCredentials() {
  }
 
  @Autowired
+ @Lazy
  @Qualifier("httpServerSslCredentials")
  private SslCredentialsConfig httpServerSslCredentialsConfig;