Merge pull request #25 from hivemq/release/bump-version

Release / Bump Version
hivemq · Apr 30, 2024 · bc308f1 · bc308f1
2 parents cfae0f9 + 5ca4366
commit bc308f1
Show file tree

Hide file tree

Showing 13 changed files with 1,211 additions and 24 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,6 +20,8 @@ hivemqExtension {
 }
 
 dependencies {
+    compileOnly(libs.jetbrains.annotations)
+
     implementation(libs.metrics.influxdb)
     implementation(libs.commonsLang)
 }
@@ -32,6 +34,7 @@ testing {
         }
         "test"(JvmTestSuite::class) {
             dependencies {
+                compileOnly(libs.jetbrains.annotations)
                 implementation(libs.mockito)
                 implementation(libs.wiremock)
                 runtimeOnly(libs.logback.classic)

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=4.1.2
+version=4.1.3
diff --git a/src/main/java/com/hivemq/extensions/influxdb/InfluxDbCloudSender.java b/src/main/java/com/hivemq/extensions/influxdb/InfluxDbCloudSender.java
@@ -15,9 +15,9 @@
  */
 package com.hivemq.extensions.influxdb;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.izettle.metrics.influxdb.InfluxDbHttpSender;
 import com.izettle.metrics.influxdb.utils.TimeUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/src/main/java/com/hivemq/extensions/influxdb/InfluxDbExtensionMain.java b/src/main/java/com/hivemq/extensions/influxdb/InfluxDbExtensionMain.java
@@ -19,8 +19,6 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.ScheduledReporter;
 import com.hivemq.extension.sdk.api.ExtensionMain;
-import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopInput;
@@ -32,6 +30,8 @@
 import com.izettle.metrics.influxdb.InfluxDbSender;
 import com.izettle.metrics.influxdb.InfluxDbTcpSender;
 import com.izettle.metrics.influxdb.InfluxDbUdpSender;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,8 +51,17 @@ public class InfluxDbExtensionMain implements ExtensionMain {
 
     private static final @NotNull HashSet<String> METER_FIELDS =
             newHashSet("count", "m1_rate", "m5_rate", "m15_rate", "mean_rate");
-    private static final @NotNull HashSet<String> TIMER_FIELDS =
-            newHashSet("count", "min", "max", "mean", "stddev", "p50", "p75", "p95", "p98", "p99", "p999",
+    private static final @NotNull HashSet<String> TIMER_FIELDS = newHashSet("count",
+            "min",
+            "max",
+            "mean",
+            "stddev",
+            "p50",
+            "p75",
+            "p95",
+            "p98",
+            "p99",
+            "p999",
             "m1_rate",
             "m5_rate",
             "m15_rate",

diff --git a/src/main/java/com/hivemq/extensions/influxdb/configuration/InfluxDbConfiguration.java b/src/main/java/com/hivemq/extensions/influxdb/configuration/InfluxDbConfiguration.java
@@ -15,9 +15,9 @@
  */
 package com.hivemq.extensions.influxdb.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extension.sdk.api.annotations.Nullable;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -185,7 +185,7 @@ public int getConnectTimeout() {
 
         for (final String tag : split) {
             final String[] tagPair = StringUtils.split(tag, "=");
-            if (tagPair.length != 2 || tagPair[0].length() < 1 || tagPair[1].length() < 1) {
+            if (tagPair.length != 2 || tagPair[0].isEmpty() || tagPair[1].isEmpty()) {
                 LOG.warn("Invalid tag format {} for InfluxDB", tag);
                 continue;
             }
@@ -277,4 +277,4 @@ private int validateIntProperty(
 
         return valueAsInt;
     }
-}
+}
diff --git a/src/main/java/com/hivemq/extensions/influxdb/configuration/PropertiesReader.java b/src/main/java/com/hivemq/extensions/influxdb/configuration/PropertiesReader.java
@@ -15,8 +15,8 @@
  */
 package com.hivemq.extensions.influxdb.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extension.sdk.api.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -101,4 +101,4 @@ private void loadProperties(final @NotNull File file) throws IOException {
     }
 
     public abstract @NotNull String getFilename();
-}
+}
diff --git a/src/test/java/com/hivemq/extensions/influxdb/InfluxDbCloudSenderTest.java b/src/test/java/com/hivemq/extensions/influxdb/InfluxDbCloudSenderTest.java
@@ -17,12 +17,19 @@
 
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
-import com.hivemq.extension.sdk.api.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 
 /**
  * @author Christoph Schäbel
@@ -43,13 +50,12 @@ void test_write_data(final @NotNull WireMockRuntimeInfo wireMockRuntimeInfo) thr
                 "testorg",
                 "testbucket");
 
-        stubFor(post(urlPathEqualTo("/api/v2/write")).willReturn(aResponse().withStatus(200)
-                .withBody("")));
+        stubFor(post(urlPathEqualTo("/api/v2/write")).willReturn(aResponse().withStatus(200).withBody("")));
 
         sender.writeData("line=line".getBytes());
 
         verify(postRequestedFor(urlEqualTo("/api/v2/write?precision=ms&org=testorg&bucket=testbucket")).withHeader(
                 "Authorization",
                 equalTo("Token token")).withRequestBody(equalTo("line=line")));
     }
-}
+}
diff --git a/src/test/java/com/hivemq/extensions/influxdb/InfluxDbExtensionMainTest.java b/src/test/java/com/hivemq/extensions/influxdb/InfluxDbExtensionMainTest.java
@@ -15,10 +15,10 @@
  */
 package com.hivemq.extensions.influxdb;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.parameter.ExtensionInformation;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartInput;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStartOutput;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -66,4 +66,4 @@ void extensionStart_whenConfigurationFileNotValid_thenPreventStartup() throws IO
         main.extensionStart(extensionStartInput, extensionStartOutput);
         verify(extensionStartOutput).preventExtensionStartup(anyString());
     }
-}
+}
diff --git a/src/test/java/com/hivemq/extensions/influxdb/configuration/InfluxDbConfigurationTest.java b/src/test/java/com/hivemq/extensions/influxdb/configuration/InfluxDbConfigurationTest.java
@@ -15,7 +15,7 @@
  */
 package com.hivemq.extensions.influxdb.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;

diff --git a/src/test/java/com/hivemq/extensions/influxdb/configuration/PropertiesReaderTest.java b/src/test/java/com/hivemq/extensions/influxdb/configuration/PropertiesReaderTest.java
@@ -15,7 +15,7 @@
  */
 package com.hivemq.extensions.influxdb.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -34,6 +34,7 @@ class PropertiesReaderTest {
 
     @Test
     void readPropertiesFromFile_file_null() {
+        //noinspection DataFlowIssue
         assertThrows(NullPointerException.class, () -> new PropertiesReader(null) {
             @Override
             public @NotNull String getFilename() {
@@ -81,6 +82,7 @@ void getProperty_key_null(final @TempDir @NotNull Path tempDir) throws IOExcepti
         assertTrue(propertiesReader.readPropertiesFromFile());
         assertEquals("value", propertiesReader.getProperty("key"));
 
+        //noinspection DataFlowIssue
         assertThrows(NullPointerException.class, () -> propertiesReader.getProperty(null));
     }
 
@@ -132,4 +134,4 @@ void getProperty_before_loading_properties(final @TempDir @NotNull Path tempDir)
         };
         assertNull(propertiesReader.getProperty("key"));
     }
-}
+}