Cleanup the project

Author: Donnerbart

.editorconfig

@@ -2,23 +2,23 @@ name: CI Check
 
 on:
   push:
-    branches: [ "**" ]
+    branches: ["**"]
 
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Setup Java
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
-        with:
-          distribution: temurin
-          java-version: 11
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4
-      - name: Check
-        run: ./gradlew check
-        env:
-          ORG_GRADLE_PROJECT_dockerHubUsername: ${{ secrets.DOCKER_USERNAME }}
-          ORG_GRADLE_PROJECT_dockerHubPassword: ${{ secrets.DOCKER_TOKEN }}
+    - name: Checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - name: Setup Java
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
+      with:
+        distribution: temurin
+        java-version: 11
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4
+    - name: Check
+      run: ./gradlew check
+      env:
+        ORG_GRADLE_PROJECT_dockerHubUsername: ${{ secrets.DOCKER_USERNAME }}
+        ORG_GRADLE_PROJECT_dockerHubPassword: ${{ secrets.DOCKER_TOKEN }}

.github/workflows/check.yml

@@ -21,7 +21,7 @@ This database can be used as the data source for a monitoring dashboard to monit
 
 #**This extension is not yet ready for production use.**#
 
-If you want use this in production, please contact HiveMQ [email protected]
+If you want to use this in production, please contact HiveMQ [email protected].
 
 == Flow
 

README.adoc

@@ -54,6 +54,7 @@ testing {
         }
         "test"(JvmTestSuite::class) {
             dependencies {
+                implementation(libs.assertj)
                 implementation(libs.mockito)
                 implementation(libs.wiremock)
                 runtimeOnly(libs.logback.classic)
@@ -69,7 +70,7 @@ testing {
             }
             oci.of(this) {
                 imageDependencies {
-                    runtime("hivemq:hivemq4:4.5.3").tag("latest")
+                    runtime("hivemq:hivemq4:4.40.0").tag("latest")
                 }
             }
         }

build.gradle.kts

@@ -1,5 +1,4 @@
-ARG HIVEMQ_VERSION=4.5.3
-
+# hivemq/hivemq4:4.40.0
 FROM hivemq/hivemq4@sha256:02bc5a450b8c711ceb8c1de0b826a3f569dffc12501a10df234a90158fb8c1ff
 
 # Add extensions

deploy/docker/Dockerfile

@@ -20,4 +20,4 @@ hivemq:
       enabled: true
 monitoring:
   dedicated: true
-  enabled: true
+  enabled: true

deploy/k8s/hivemq.yaml

@@ -1,8 +1,9 @@
 [versions]
+assertj = "3.27.3"
 commonsLang = "3.17.0"
 dropwizard-metrics-influxdb = "1.3.4"
 gradleOci-junitJupiter = "0.7.0"
-hivemq-extensionSdk = "4.5.3"
+hivemq-extensionSdk = "4.40.0"
 hivemq-mqttClient = "1.3.5"
 junit-jupiter = "5.10.0"
 logback = "1.5.18"
@@ -12,6 +13,7 @@ testcontainers = "1.21.1"
 wiremock = "3.13.0"
 
 [libraries]
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 commonsLang = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang" }
 dropwizard-metrics-influxdb = { module = "com.izettle:dropwizard-metrics-influxdb", version.ref = "dropwizard-metrics-influxdb" }
 gradleOci-junitJupiter = { module = "io.github.sgtsilvio:gradle-oci-junit-jupiter", version.ref = "gradleOci-junitJupiter" }

gradle/libs.versions.toml

@@ -22,4 +22,4 @@ influxdb.bucket:hivemq
 influxdb.organization:hivemq
 
 ## sparkplug properties
-sparkplug.version:spBv1.0
+sparkplug.version:spBv1.0

src/hivemq-extension/sparkplug.properties

@@ -39,16 +39,14 @@
 class SparkplugBInterceptorIT {
 
     @Container
-    final @NotNull HiveMQContainer container =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4"))
-                    .withExtension(MountableFile.forClasspathResource("hivemq-sparkplug-extension"))
-                    .waitForExtension("HiveMQ Sparkplug Extension")
-                    .withLogLevel(Level.TRACE);
+    final @NotNull HiveMQContainer container = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withExtension(MountableFile.forClasspathResource("hivemq-sparkplug-extension"))
+            .waitForExtension("HiveMQ Sparkplug Extension")
+            .withLogLevel(Level.TRACE);
 
     @Test
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     void test_DBIRTH() throws Exception {
-
         final String DEATH_TOPIC = "spBv1.0/group1/NDEATH/eon1";
         final String BIRTH_TOPIC = "spBv1.0/group1/NBIRTH/eon1";
 
@@ -71,16 +69,12 @@ void test_DBIRTH() throws Exception {
         subscriber.toAsync().subscribeWith().topicFilter(BIRTH_TOPIC).callback(publishBIRTH::complete).send().get();
         subscriber.toAsync().subscribeWith().topicFilter(DEATH_TOPIC).callback(publishDEATH::complete).send().get();
 
-        final Mqtt5Publish will = Mqtt5Publish.builder()
-                .topic(DEATH_TOPIC)
-                .payload("".getBytes(StandardCharsets.UTF_8))
-                .build();
+        final Mqtt5Publish will =
+                Mqtt5Publish.builder().topic(DEATH_TOPIC).payload("".getBytes(StandardCharsets.UTF_8)).build();
         client.connectWith().willPublish(will).send();
 
-        final Mqtt5Publish birthPublish = Mqtt5Publish.builder()
-                .topic(BIRTH_TOPIC)
-                .payload("".getBytes(StandardCharsets.UTF_8))
-                .build();
+        final Mqtt5Publish birthPublish =
+                Mqtt5Publish.builder().topic(BIRTH_TOPIC).payload("".getBytes(StandardCharsets.UTF_8)).build();
         client.publish(birthPublish);
 
         final Mqtt5Publish birth = publishBIRTH.get();
@@ -94,4 +88,4 @@ void test_DBIRTH() throws Exception {
 
         subscriber.disconnect();
     }
-}
+}

src/integrationTest/java/com/hivemq/extensions/sparkplug/influxdb/SparkplugBInterceptorIT.java

@@ -34,4 +34,4 @@
     <!-- silence netty -->
     <logger name="io.netty" level="WARN"/>
 
-</configuration>
+</configuration>