From 08220759138cfff71c46feef3ab77e7cae2f2e03 Mon Sep 17 00:00:00 2001 From: Vadim Guenther Date: Thu, 8 Apr 2021 14:29:31 +0200 Subject: [PATCH] #1021: Add comments and test for Last Will config Signed-off-by: Vadim Guenther --- .../messaging/mqtt/MqttSpecificConfig.java | 8 ++++---- .../messaging/mqtt/MqttSpecificConfigTest.java | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfig.java b/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfig.java index bdceb9c83a..7162d3265b 100644 --- a/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfig.java +++ b/services/connectivity/messaging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfig.java @@ -125,28 +125,28 @@ public Optional getMqttPublisherId() { /** - * @return the optional publisherId which should be used as the client ID of the publisher actor. + * @return the optional topic which should be used on Last Will message. */ public Optional getMqttWillTopic() { return getStringOptional(LAST_WILL_TOPIC); } /** - * @return the optional publisherId which should be used as the client ID of the publisher actor. + * @return the Qos which should be used on Last Will message. */ public String getMqttWillQos() { return getSafely(() -> specificConfig.getString(LAST_WILL_QOS), DEFAULT_LAST_WILL_QOS); } /** - * @return the optional publisherId which should be used as the client ID of the publisher actor. + * @return the optional message which should be used on Last Will message. */ public Optional getMqttWillMessage() { return getStringOptional(LAST_WILL_MESSAGE); } /** - * @return the optional publisherId which should be used as the client ID of the publisher actor. + * @return the retain flag which should be used on Last Will message. */ public boolean getMqttWillRetain() { return getSafely(() -> specificConfig.getBoolean(LAST_WILL_RETAIN), DEFAULT_LAST_WILL_RETAIN); diff --git a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfigTest.java b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfigTest.java index 98fa2067f8..ab13cc60ce 100644 --- a/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfigTest.java +++ b/services/connectivity/messaging/src/test/java/org/eclipse/ditto/services/connectivity/messaging/mqtt/MqttSpecificConfigTest.java @@ -34,6 +34,10 @@ public void parseMqttSpecificConfig() { configuredSpecificConfig.put("clientId", "consumer-client-id"); configuredSpecificConfig.put("publisherId", "publisher-client-id"); configuredSpecificConfig.put("reconnectForRedeliveryDelay", "4m"); + configuredSpecificConfig.put("lastWillTopic", "lastWillTopic"); + configuredSpecificConfig.put("lastWillQos", "EXACTLY_ONCE"); + configuredSpecificConfig.put("lastWillMessage", "last will message"); + configuredSpecificConfig.put("lastWillRetain", "true"); final MqttSpecificConfig specificConfig = new MqttSpecificConfig(configuredSpecificConfig); assertThat(specificConfig.reconnectForRedelivery()).isFalse(); assertThat(specificConfig.separatePublisherClient()).isFalse(); @@ -50,5 +54,9 @@ public void defaultConfig() { assertThat(specificConfig.getMqttClientId()).isEmpty(); assertThat(specificConfig.getMqttPublisherId()).isEmpty(); assertThat(specificConfig.getReconnectForDeliveryDelay()).isEqualTo(Duration.ofSeconds(2L)); + assertThat(specificConfig.getMqttWillTopic()).isEmpty(); + assertThat(specificConfig.getMqttWillQos()).isEqualTo("AT_MOST_ONCE"); + assertThat(specificConfig.getMqttWillMessage()).isEmpty(); + assertThat(specificConfig.getMqttWillRetain()).isFalse(); } -} \ No newline at end of file +}