Allow user to redefine uri-scheme and port for MQTT connection

sebastienvermeille · Aug 11, 2023 · 8d5a153 · 8d5a153
1 parent f0a8c78
commit 8d5a153
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/bridge/src/main/resources/application.yml b/bridge/src/main/resources/application.yml
@@ -3,12 +3,12 @@ rika:
   password: ${RIKA_PASSWORD}
   keepAliveTimeout: PT60S
 mqtt:
-  uri-scheme: ${MQTT_URI_SCHEME}
+  uri-scheme: ${MQTT_URI_SCHEME:tcp://}
   host: ${MQTT_HOST}
-  port: ${MQTT_PORT}
-  username: ${MQTT_USERNAME}
-  password: ${MQTT_PASSWORD}
-  telemetry-report-topic-name: ${MQTT_TELEMETRY_REPORT_TOPIC_NAME}
-  command-topic-name: ${MQTT_COMMAND_TOPIC_NAME}
+  port: ${MQTT_PORT:1883}
+  username: ${MQTT_USERNAME:""}
+  password: ${MQTT_PASSWORD:""}
+  telemetry-report-topic-name: ${MQTT_TELEMETRY_REPORT_TOPIC_NAME:tele/rika2mqtt}
+  command-topic-name: ${MQTT_COMMAND_TOPIC_NAME:cmnd/rika2mqtt}
 bridge:
   reportInterval: PT60S
diff --git a/.../src/main/java/dev/cookiecode/rika2mqtt/rika/mqtt/configuration/MqttConfigProperties.java b/.../src/main/java/dev/cookiecode/rika2mqtt/rika/mqtt/configuration/MqttConfigProperties.java
@@ -24,21 +24,21 @@
 @Validated
 public class MqttConfigProperties {
 
-  private String uriScheme = "tcp://";
+  private String uriScheme;
 
   @NotEmpty
   private String host;
 
   @NotNull
-  private Integer port = 1883;
+  private Integer port;
 
   private String username;
 
   private String password;
 
   private String clientName = "rika2mqtt";
 
-  private String telemetryReportTopicName = "tele/rika2mqtt";
+  private String telemetryReportTopicName;
 
-  private String commandTopicName = "cmnd/rika2mqtt";
+  private String commandTopicName;
 }