From b8378bedd78bad936a5b6b210b7ce28532899348 Mon Sep 17 00:00:00 2001
From: Lukas Brand <lukas.brand@hivemq.com>
Date: Thu, 25 Apr 2024 12:21:00 +0200
Subject: [PATCH 1/5] Update code styles to current versions

---
 .editorconfig                                |  6 +++---
 .gitignore                                   |  1 +
 .idea/codeStyles/Project.xml                 |  2 ++
 .idea/inspectionProfiles/Project_Default.xml | 12 +++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 491cde9..0247435 100644
--- 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/.gitignore b/.gitignore
index a5b3e62..fea2b0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ build/
 # IntelliJ
 out/
 *.iml
+*.patch
 .idea/*
 !.idea/codeStyles
 !.idea/inspectionProfiles
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e36465a..0b667b3 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -11,6 +11,8 @@
       <option name="JD_INDENT_ON_CONTINUATION" value="true" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="true" />
       <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="true" />
       <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="true" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 769a78f..d778993 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,8 +1,14 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="JavadocDeclaration" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ADDITIONAL_TAGS" value="Author" />
+    <inspection_tool class="FallthruInSwitchStatement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="REPORT_VARIABLES" value="true" />
+      <option name="REPORT_PARAMETERS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="NewClassNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">
+      <extension name="JUnitTestClassNamingConvention" enabled="false" />
     </inspection_tool>
   </profile>
-</component>
\ No newline at end of file
+</component>

From c81be61164ae384c6eed58a2978d9878bf134111 Mon Sep 17 00:00:00 2001
From: Lukas Brand <lukas.brand@hivemq.com>
Date: Thu, 25 Apr 2024 13:39:30 +0200
Subject: [PATCH 2/5] Switch to Jetbrains Annotations Reformat star imports

---
 build.gradle.kts                              |  3 +++
 .../extensions/heartbeat/HeartbeatMain.java   | 22 +++++++++++++------
 .../configuration/ConfigurationXmlParser.java |  2 +-
 .../configuration/ExtensionConfiguration.java |  4 ++--
 .../configuration/entities/Heartbeat.java     |  2 +-
 .../heartbeat/service/HTTPService.java        |  7 +++---
 .../servlet/HiveMQHeartbeatServlet.java       |  2 +-
 .../ExtensionConfigurationTest.java           |  2 +-
 8 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2b1aeff..ae64cbf 100644
--- 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/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java b/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
index 97a90af..78bf899 100644
--- a/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
+++ b/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
@@ -16,8 +16,6 @@
 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;
@@ -25,6 +23,8 @@
 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;
 
@@ -47,21 +47,29 @@ public class HeartbeatMain implements ExtensionMain {
     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
index 0641c71..e57e10a 100644
--- 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
index b6c0c53..f4b5fd3 100644
--- 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
index 14febac..049709d 100644
--- 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
index bbb446b..bb08b10 100644
--- 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
index 5643ad7..4bb0834 100755
--- 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
index f24c3eb..c1a6455 100644
--- 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;
 

From 12f541a8d6b766523a366831eb6ab24d2100d2d5 Mon Sep 17 00:00:00 2001
From: Lukas Brand <lukas.brand@hivemq.com>
Date: Thu, 25 Apr 2024 13:57:06 +0200
Subject: [PATCH 3/5] Fix minor issues

---
 src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java b/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
index 78bf899..6096e4b 100644
--- a/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
+++ b/src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java
@@ -41,6 +41,7 @@
  *
  * @author Anja Helmbrecht-Schaar
  */
+@SuppressWarnings("unused")
 public class HeartbeatMain implements ExtensionMain {
 
     private static final @NotNull Logger LOG = LoggerFactory.getLogger(HeartbeatMain.class);

From 30e639563c9ab5845d0058e9ea01ed6ad2ad6495 Mon Sep 17 00:00:00 2001
From: Lukas Brand <lukas.brand@hivemq.com>
Date: Thu, 25 Apr 2024 15:09:49 +0200
Subject: [PATCH 4/5] Bump version. Prepare for release

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 89429d7..5011a7f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=1.0.4
+version=1.0.5

From 54326cd094743f6479f35eb758610da7d1f0c7aa Mon Sep 17 00:00:00 2001
From: Lukas Brand <lukas.brand@hivemq.com>
Date: Fri, 26 Apr 2024 09:54:56 +0200
Subject: [PATCH 5/5] Remove *.patch

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fea2b0a..a5b3e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ build/
 # IntelliJ
 out/
 *.iml
-*.patch
 .idea/*
 !.idea/codeStyles
 !.idea/inspectionProfiles