improve default protocol handling

Author: yannick

src/main/java/com/hivemq/extensions/influxdb/InfluxDbExtensionMain.java

@@ -116,7 +116,6 @@ private InfluxDbSender setupSender(@NotNull final InfluxDbConfiguration configur
 
         final String host = configuration.getHost();
         final int port = configuration.getPort();
-        final String protocol = configuration.getProtocol();
         final String database = configuration.getDatabase();
         final String auth = configuration.getAuth();
         final int connectTimeout = configuration.getConnectTimeout();
@@ -132,7 +131,7 @@ private InfluxDbSender setupSender(@NotNull final InfluxDbConfiguration configur
             switch (configuration.getMode()) {
                 case "http":
                     log.info("Creating InfluxDB HTTP sender for server {}:{} and database {}", host, port, database);
-                    sender = new InfluxDbHttpSender(protocol, host, port, database, auth, TimeUnit.SECONDS, connectTimeout, connectTimeout, prefix);
+                    sender = new InfluxDbHttpSender(configuration.getProtocolOrDefault("http"), host, port, database, auth, TimeUnit.SECONDS, connectTimeout, connectTimeout, prefix);
                     break;
                 case "tcp":
                     log.info("Creating InfluxDB TCP sender for server {}:{} and database {}", host, port, database);
@@ -146,7 +145,7 @@ private InfluxDbSender setupSender(@NotNull final InfluxDbConfiguration configur
                     log.info("Creating InfluxDB Cloud sender for endpoint {}, bucket {}, organization {}", host, bucket, organization);
                     checkNotNull(bucket, "Bucket name must be defined in cloud mode");
                     checkNotNull(organization, "Organization must be defined in cloud mode");
-                    sender = new InfluxDbCloudSender(protocol, host, port, auth, TimeUnit.SECONDS, connectTimeout, connectTimeout, prefix, organization, bucket);
+                    sender = new InfluxDbCloudSender(configuration.getProtocolOrDefault("https"), host, port, auth, TimeUnit.SECONDS, connectTimeout, connectTimeout, prefix, organization, bucket);
                     break;
 
             }

src/main/java/com/hivemq/extensions/influxdb/configuration/InfluxDbConfiguration.java

@@ -44,7 +44,6 @@ public class InfluxDbConfiguration extends PropertiesReader {
     private static final String MODE = "mode";
     private static final String MODE_DEFAULT = "http";
     private static final String PROTOCOL = "protocol";
-    private static final String PROTOCOL_DEFAULT = "http";
     private static final String REPORTING_INTERVAL = "reportingInterval";
     private static final int REPORTING_INTERVAL_DEFAULT = 1;
     private static final String PREFIX = "prefix";
@@ -77,7 +76,7 @@ public boolean validateConfiguration() {
         countError += checkMandatoryProperty(HOST);
         countError += checkMandatoryProperty(PORT);
 
-        if (countError != 0){
+        if (countError != 0) {
             return false;
         }
 
@@ -164,13 +163,11 @@ public int getConnectTimeout() {
     }
 
     @NotNull
-    public String getProtocol() {
+    public String getProtocolOrDefault(final @NotNull String defaultProtocol) {
         final String protocol = getProperty(PROTOCOL);
         if (protocol == null) {
-            if (getMode().equals("http")) {
-                log.warn("No protocol configured for InfluxDb, using default: {}", PROTOCOL_DEFAULT);
-                return PROTOCOL_DEFAULT;
-            }
+            log.warn("No protocol configured for InfluxDb in mode '{}', using default: '{}'", getMode(), defaultProtocol);
+            return defaultProtocol;
         }
         return protocol;
     }

src/test/java/com/hivemq/extensions/influxdb/configuration/InfluxDbConfigurationTest.java

@@ -111,7 +111,7 @@ void all_properties_empty() throws IOException {
         assertEquals("http", influxDbConfiguration.getMode());
         assertTrue(influxDbConfiguration.getTags().isEmpty());
         assertEquals("", influxDbConfiguration.getPrefix());
-        assertEquals("http", influxDbConfiguration.getProtocol());
+        assertEquals("http", influxDbConfiguration.getProtocolOrDefault("http"));
         assertEquals("hivemq", influxDbConfiguration.getDatabase());
         assertEquals(5000, influxDbConfiguration.getConnectTimeout());
         assertEquals(1, influxDbConfiguration.getReportingInterval());
@@ -130,7 +130,7 @@ void all_properties_null() throws IOException {
         assertEquals("http", influxDbConfiguration.getMode());
         assertTrue(influxDbConfiguration.getTags().isEmpty());
         assertEquals("", influxDbConfiguration.getPrefix());
-        assertEquals("http", influxDbConfiguration.getProtocol());
+        assertEquals("http", influxDbConfiguration.getProtocolOrDefault("http"));
         assertEquals("hivemq", influxDbConfiguration.getDatabase());
         assertEquals(5000, influxDbConfiguration.getConnectTimeout());
         assertEquals(1, influxDbConfiguration.getReportingInterval());
@@ -162,7 +162,7 @@ void all_properties_have_correct_values() throws IOException {
         assertEquals("hivemq1", tags.get("host"));
         assertEquals("3.4.1", tags.get("version"));
         assertEquals("node1", influxDbConfiguration.getPrefix());
-        assertEquals("tcp", influxDbConfiguration.getProtocol());
+        assertEquals("tcp", influxDbConfiguration.getProtocolOrDefault("default"));
         assertEquals("test-hivemq", influxDbConfiguration.getDatabase());
         assertEquals(10000, influxDbConfiguration.getConnectTimeout());
         assertEquals(5, influxDbConfiguration.getReportingInterval());