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

Release / Bump Version
hivemq · Apr 30, 2024 · da35923 · da35923
2 parents f6fa6f2 + 0f12299
commit da35923
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 23 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1072,9 +1072,9 @@ ij_kotlin_method_call_chain_wrap = normal
 ij_kotlin_method_parameters_new_line_after_left_paren = true
 ij_kotlin_method_parameters_right_paren_on_new_line = true
 ij_kotlin_method_parameters_wrap = on_every_item
-ij_kotlin_name_count_to_use_star_import = 5
-ij_kotlin_name_count_to_use_star_import_for_members = 3
-ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.**, io.ktor.**
+ij_kotlin_name_count_to_use_star_import = 2147483647
+ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
+ij_kotlin_packages_to_use_import_on_demand =
 ij_kotlin_parameter_annotation_wrap = off
 ij_kotlin_space_after_comma = true
 ij_kotlin_space_after_extend_colon = true

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.commonsLang)
     implementation(libs.commonsText)
 
@@ -38,6 +40,7 @@ testing {
         }
         "test"(JvmTestSuite::class) {
             dependencies {
+                compileOnly(libs.jetbrains.annotations)
                 implementation(libs.mockito)
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=1.0.4
+version=1.0.5
diff --git a/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java b/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
@@ -16,15 +16,15 @@
 package com.hivemq.extensions.heartbeat;
 
 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;
 import com.hivemq.extension.sdk.api.parameter.ExtensionStopOutput;
 import com.hivemq.extensions.heartbeat.configuration.ExtensionConfiguration;
 import com.hivemq.extensions.heartbeat.service.HTTPService;
 import com.hivemq.extensions.heartbeat.servlet.HiveMQHeartbeatServlet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,27 +41,36 @@
  *
  * @author Anja Helmbrecht-Schaar
  */
+@SuppressWarnings("unused")
 public class HeartbeatMain implements ExtensionMain {
 
     private static final @NotNull Logger LOG = LoggerFactory.getLogger(HeartbeatMain.class);
     private static @Nullable HTTPService httpService;
 
     @Override
-    public final void extensionStart(final @NotNull ExtensionStartInput extensionStartInput, final @NotNull ExtensionStartOutput extensionStartOutput) {
+    public final void extensionStart(
+            final @NotNull ExtensionStartInput extensionStartInput,
+            final @NotNull ExtensionStartOutput extensionStartOutput) {
         try {
-            final @NotNull File extensionHomeFolder = extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
-            final @NotNull ExtensionConfiguration extensionConfiguration = new ExtensionConfiguration(extensionHomeFolder);
+            final @NotNull File extensionHomeFolder =
+                    extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
+            final @NotNull ExtensionConfiguration extensionConfiguration =
+                    new ExtensionConfiguration(extensionHomeFolder);
 
             startRestService(extensionConfiguration);
 
         } catch (Exception e) {
             extensionStartOutput.preventExtensionStartup("Heartbeat Extension cannot be started.");
-            LOG.error("{} extension could not be started. An exception was thrown while starting!", extensionStartInput.getExtensionInformation().getName(), e);
+            LOG.error("{} extension could not be started. An exception was thrown while starting!",
+                    extensionStartInput.getExtensionInformation().getName(),
+                    e);
         }
     }
 
     @Override
-    public final void extensionStop(final @NotNull ExtensionStopInput extensionStopInput, final @NotNull ExtensionStopOutput extensionStopOutput) {
+    public final void extensionStop(
+            final @NotNull ExtensionStopInput extensionStopInput,
+            final @NotNull ExtensionStopOutput extensionStopOutput) {
         if (httpService != null) {
             httpService.stopHTTPServer();
         }

diff --git a/src/main/java/com/hivemq/extensions/heartbeat/configuration/ConfigurationXmlParser.java b/src/main/java/com/hivemq/extensions/heartbeat/configuration/ConfigurationXmlParser.java
@@ -15,9 +15,9 @@
  */
 package com.hivemq.extensions.heartbeat.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.annotations.ThreadSafe;
 import com.hivemq.extensions.heartbeat.configuration.entities.Heartbeat;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/hivemq/extensions/heartbeat/configuration/ExtensionConfiguration.java b/src/main/java/com/hivemq/extensions/heartbeat/configuration/ExtensionConfiguration.java
@@ -15,9 +15,9 @@
  */
 package com.hivemq.extensions.heartbeat.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extensions.heartbeat.configuration.entities.Heartbeat;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/hivemq/extensions/heartbeat/configuration/entities/Heartbeat.java b/src/main/java/com/hivemq/extensions/heartbeat/configuration/entities/Heartbeat.java
@@ -15,7 +15,7 @@
  */
 package com.hivemq.extensions.heartbeat.configuration.entities;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
+import org.jetbrains.annotations.NotNull;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

diff --git a/src/main/java/com/hivemq/extensions/heartbeat/service/HTTPService.java b/src/main/java/com/hivemq/extensions/heartbeat/service/HTTPService.java
@@ -15,13 +15,13 @@
  */
 package com.hivemq.extensions.heartbeat.service;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
-import com.hivemq.extension.sdk.api.annotations.Nullable;
 import com.hivemq.extensions.heartbeat.configuration.entities.Heartbeat;
 import com.hivemq.extensions.heartbeat.servlet.HiveMQHeartbeatServlet;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,7 +50,8 @@ public void startHttpServer() {
 
         LOG.info("Initializing Heartbeat HTTP service");
         try {
-            final @NotNull ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+            final @NotNull ServletContextHandler servletContextHandler =
+                    new ServletContextHandler(ServletContextHandler.SESSIONS);
             servletContextHandler.setContextPath("/");
 
             final InetSocketAddress address = new InetSocketAddress(heartbeat.getBindAddress(), heartbeat.getPort());

diff --git a/src/main/java/com/hivemq/extensions/heartbeat/servlet/HiveMQHeartbeatServlet.java b/src/main/java/com/hivemq/extensions/heartbeat/servlet/HiveMQHeartbeatServlet.java
@@ -15,12 +15,12 @@
  */
 package com.hivemq.extensions.heartbeat.servlet;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extension.sdk.api.services.Services;
 import com.hivemq.extension.sdk.api.services.admin.LifecycleStage;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/test/java/com/hivemq/extensions/heartbeat/configuration/ExtensionConfigurationTest.java b/src/test/java/com/hivemq/extensions/heartbeat/configuration/ExtensionConfigurationTest.java
@@ -15,8 +15,8 @@
  */
 package com.hivemq.extensions.heartbeat.configuration;
 
-import com.hivemq.extension.sdk.api.annotations.NotNull;
 import com.hivemq.extensions.heartbeat.configuration.entities.Heartbeat;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;