mqtt related services not require the core mqtts properties to be set

Author: atimgraves

IoTSonnenUploader/src/main/java/com/oracle/demo/timg/iot/iotsonnenuploader/mqtt/MqttCommandHandler.java

@@ -49,8 +49,6 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.mqtt.annotation.MqttSubscriber;
 import io.micronaut.mqtt.annotation.Topic;
-import io.micronaut.mqtt.annotation.v5.MqttProperties;
-import io.micronaut.mqtt.annotation.v5.MqttProperty;
 import io.micronaut.scheduling.TaskExecutors;
 import io.micronaut.scheduling.annotation.ExecuteOn;
 import io.micronaut.serde.ObjectMapper;
@@ -59,10 +57,13 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 
 @Log
 @MqttSubscriber
-@MqttProperties({ @MqttProperty(name = "username", value = "${device.id}"),
-		@MqttProperty(name = "password", value = "ExamplePassword") })
+
 @Requires(property = DeviceSettings.PREFIX + ".id")
 @Requires(property = "mqtt.commandhandler.enabled", value = "true", defaultValue = "true")
+@Requires(property = "mqtt.client.client-id")
+@Requires(property = "mqtt.client.user-name")
+@Requires(property = "mqtt.client.password")
+@Requires(property = "mqtt.client.server-uri")
 public class MqttCommandHandler {
 	@Inject
 	public MqttCommandResponsePublisher responsePublisher;

IoTSonnenUploader/src/main/java/com/oracle/demo/timg/iot/iotsonnenuploader/mqtt/MqttCommandResponsePublisher.java

@@ -49,6 +49,10 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 
 @MqttPublisher
 @Requires(property = DeviceSettings.PREFIX + ".id")
+@Requires(property = "mqtt.client.client-id")
+@Requires(property = "mqtt.client.user-name")
+@Requires(property = "mqtt.client.password")
+@Requires(property = "mqtt.client.server-uri")
 public interface MqttCommandResponsePublisher {
 	@Topic("house/sonnencommandresponse/${" + DeviceSettings.PREFIX + ".id}")
 	@ExecuteOn(TaskExecutors.IO)

IoTSonnenUploader/src/main/java/com/oracle/demo/timg/iot/iotsonnenuploader/mqtt/MqttReferenceMonitor.java

@@ -47,6 +47,10 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 @MqttSubscriber
 @Requires(property = DeviceSettings.PREFIX + ".id")
 @Requires(property = "mqtt.monitorreference.enabled", value = "true", defaultValue = "false")
+@Requires(property = "mqtt.client.client-id")
+@Requires(property = "mqtt.client.user-name")
+@Requires(property = "mqtt.client.password")
+@Requires(property = "mqtt.client.server-uri")
 /*
  * get the data sent to the topics as a string, this means you can then use it
  * for examples entries in the IoT adaptors

IoTSonnenUploader/src/main/java/com/oracle/demo/timg/iot/iotsonnenuploader/mqtt/MqttSonnenBatteryPublisher.java

@@ -50,6 +50,10 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 
 @MqttPublisher
 @Requires(property = DeviceSettings.PREFIX + ".id")
+@Requires(property = "mqtt.client.client-id")
+@Requires(property = "mqtt.client.user-name")
+@Requires(property = "mqtt.client.password")
+@Requires(property = "mqtt.client.server-uri")
 public interface MqttSonnenBatteryPublisher {
 	@Topic("house/sonnenconfiguration/${" + DeviceSettings.PREFIX + ".id}")
 	@ExecuteOn(TaskExecutors.IO)

IoTSonnenUploader/src/main/java/com/oracle/demo/timg/iot/iotsonnenuploader/mqtt/MqttUploadMonitor.java

@@ -48,6 +48,10 @@ Software and the Larger Work(s), and to sublicense the foregoing rights on
 @Log
 @MqttSubscriber
 @Requires(property = "mqtt.monitoruploads.enabled", value = "true", defaultValue = "false")
+@Requires(property = "mqtt.client.client-id")
+@Requires(property = "mqtt.client.user-name")
+@Requires(property = "mqtt.client.password")
+@Requires(property = "mqtt.client.server-uri")
 public class MqttUploadMonitor {
 	@Topic("house/sonnenconfiguration/${" + DeviceSettings.PREFIX + ".id}")
 	public void receiveConfig(SonnenConfiguration config) {