Browse Source

Merge pull request #14654 from smatvienko-tb/TbMqttSslTransportComponent

TbMqttSslTransportComponent condition for both tb-transport and monolith mode
pull/14658/head
Viacheslav Klimov 8 months ago
committed by GitHub
parent
commit
5de60c3865
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/TbMqttSslTransportComponent.java

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/TbMqttSslTransportComponent.java

@ -27,5 +27,5 @@ import java.lang.annotation.RetentionPolicy;
@Inherited
@Retention(RetentionPolicy.RUNTIME)
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.mqtt.enabled:true}'=='true' && '${transport.mqtt.ssl.enabled:false}'=='true')")
@ConditionalOnExpression("'${transport.mqtt.ssl.enabled:false}'=='true' && ('${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.mqtt.enabled:true}'=='true'))")
public @interface TbMqttSslTransportComponent {}

Loading…
Cancel
Save