From 429b3535cd6c019146f4aace70f4479a41fffacf Mon Sep 17 00:00:00 2001
From: Viacheslav Kukhtyn <vkukhtyn@thingsboard.io>
Date: Mon, 4 Jan 2021 11:15:24 +0200
Subject: [PATCH] Refactoring: use default method for MQTT client credentials

---
 .../rule/engine/mqtt/azure/AzureIotHubSasCredentials.java   | 5 -----
 .../rule/engine/mqtt/credentials/AnonymousCredentials.java  | 6 ------
 .../engine/mqtt/credentials/CertPemClientCredentials.java   | 6 ------
 .../rule/engine/mqtt/credentials/MqttClientCredentials.java | 3 ++-
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
index f04e0fec96..5d7f475bec 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
@@ -24,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.thingsboard.common.util.AzureIotHubUtil;
-import org.thingsboard.mqtt.MqttClientConfig;
 import org.thingsboard.rule.engine.mqtt.credentials.MqttClientCredentials;
 
 import javax.net.ssl.TrustManagerFactory;
@@ -59,10 +58,6 @@ public class AzureIotHubSasCredentials implements MqttClientCredentials {
         }
     }
 
-    @Override
-    public void configure(MqttClientConfig config) {
-    }
-
     private TrustManagerFactory createAndInitTrustManagerFactory() throws Exception {
         X509Certificate caCertHolder;
         caCertHolder = readCertFile(caCert);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/AnonymousCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/AnonymousCredentials.java
index 6a2302aff5..856682ba8c 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/AnonymousCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/AnonymousCredentials.java
@@ -16,7 +16,6 @@
 package org.thingsboard.rule.engine.mqtt.credentials;
 
 import io.netty.handler.ssl.SslContext;
-import org.thingsboard.mqtt.MqttClientConfig;
 
 import java.util.Optional;
 
@@ -26,10 +25,5 @@ public class AnonymousCredentials implements MqttClientCredentials {
     public Optional<SslContext> initSslContext() {
         return Optional.empty();
     }
-
-    @Override
-    public void configure(MqttClientConfig config) {
-
-    }
 }
 
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/CertPemClientCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/CertPemClientCredentials.java
index 3dcfc2dff8..df9f9f8275 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/CertPemClientCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/CertPemClientCredentials.java
@@ -29,7 +29,6 @@ import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
 import org.springframework.util.StringUtils;
-import org.thingsboard.mqtt.MqttClientConfig;
 
 import javax.crypto.Cipher;
 import javax.crypto.EncryptedPrivateKeyInfo;
@@ -80,11 +79,6 @@ public class CertPemClientCredentials implements MqttClientCredentials {
         }
     }
 
-    @Override
-    public void configure(MqttClientConfig config) {
-
-    }
-
     private KeyManagerFactory createAndInitKeyManagerFactory() throws Exception {
         X509Certificate certHolder = readCertFile(cert);
         Object keyObject = readPrivateKeyFile(privateKey);
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/MqttClientCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/MqttClientCredentials.java
index 1c397614ea..4814fb3afb 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/MqttClientCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/credentials/MqttClientCredentials.java
@@ -36,6 +36,7 @@ public interface MqttClientCredentials {
 
     Optional<SslContext> initSslContext();
 
-    void configure(MqttClientConfig config);
+    default void configure(MqttClientConfig config) {
+    }
 }