Apply review

LukasBrand · LukasBrand · commit c1281c9ca953 · 2024-07-15T16:47:06.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -292,8 +292,7 @@ testing {
                 implementation(libs.hivemq.communityEditionEmbedded)
                 implementation(libs.junit.pioneer)
                 implementation(libs.junit.platformLauncher)
-                implementation(libs.testcontainers.hivemq)
-                implementation(libs.testcontainers.junitJupiter)
+                implementation(libs.testcontainers)
 
                 implementation(libs.apache.commonsIO)
                 implementation(libs.gson)
@@ -614,15 +613,12 @@ oci {
     imageDefinitions.register("main") {
         allPlatforms {
             parentImages {
-                add("library:eclipse-temurin:sha256!603d23272e30bbefa9e7c436a7165c6303b9c67e27aae07472d8ddc748fe96a2") // 21.0.2_13-jre-jammy
+                add("library:eclipse-temurin:sha256!e2318d304bc50c798edea630a23f7b90b1adb14a02658de91d2c99027a071c26") // 21.0.3_9-jre-jammy
             }
             config {
                 entryPoint.add("java")
                 entryPoint.addAll(application.applicationDefaultJvmArgs)
-                entryPoint.addAll(
-                    "-cp",
-                    "/app/classpath/*:/app/libs/*",
-                )
+                entryPoint.addAll("-cp", "/app/classpath/*:/app/libs/*")
                 entryPoint.add(application.mainClass)
             }
             layers {
@@ -642,6 +638,7 @@ oci {
                 layer("resources") {
                     contents {
                         from("src/distribution")
+                        into("app")
                     }
                 }
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -68,6 +68,7 @@ picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" }
 picocli-shellJline = { module = "info.picocli:picocli-shell-jline3", version.ref = "picocli" }
 swagger-annotations = { module = "io.swagger:swagger-annotations", version.ref = "swagger-annotations" }
+testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
 testcontainers-hivemq = { module = "org.testcontainers:hivemq", version.ref = "testcontainers" }
 testcontainers-junitJupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
 tinylog-api = { module = "org.tinylog:tinylog-api", version.ref = "tinylog" }
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterDefaultIT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterDefaultIT.java
@@ -48,8 +48,7 @@
 class Mqtt3FeatureTesterDefaultIT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq");
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4"));
 
     private @NotNull Mqtt3FeatureTester mqtt3FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterQos0IT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterQos0IT.java
@@ -33,9 +33,8 @@
 class Mqtt3FeatureTesterQos0IT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos0-config.xml"));
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos0-config.xml"));
 
     private @NotNull Mqtt3FeatureTester mqtt3FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterQos1IT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterQos1IT.java
@@ -33,9 +33,8 @@
 class Mqtt3FeatureTesterQos1IT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos1-config.xml"));
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos1-config.xml"));
 
     private @NotNull Mqtt3FeatureTester mqtt3FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterRestrictedIT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt3FeatureTesterRestrictedIT.java
@@ -43,9 +43,8 @@
 class Mqtt3FeatureTesterRestrictedIT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/restricted-config.xml"));
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/restricted-config.xml"));
 
     private @NotNull Mqtt3FeatureTester mqtt3FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterDefaultIT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterDefaultIT.java
@@ -47,8 +47,7 @@
 class Mqtt5FeatureTesterDefaultIT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq");
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4"));
 
     private @NotNull Mqtt5FeatureTester mqtt5FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterQos0IT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterQos0IT.java
@@ -33,9 +33,8 @@
 class Mqtt5FeatureTesterQos0IT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos0-config.xml"));
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos0-config.xml"));
 
     private @NotNull Mqtt5FeatureTester mqtt5FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterQos1IT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterQos1IT.java
@@ -33,9 +33,8 @@
 class Mqtt5FeatureTesterQos1IT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos1-config.xml"));
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/qos1-config.xml"));
 
     private @NotNull Mqtt5FeatureTester mqtt5FeatureTester;
 
diff --git a/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterRestrictedIT.java b/src/integrationTest/java/com/hivemq/cli/mqtt/test/Mqtt5FeatureTesterRestrictedIT.java
@@ -43,9 +43,8 @@
 class Mqtt5FeatureTesterRestrictedIT {
 
     @Container
-    private final @NotNull HiveMQContainer hivemq =
-            new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")).withNetworkAliases("hivemq")
-                    .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/restricted-config.xml"));
+    private final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq4")) //
+            .withHiveMQConfig(MountableFile.forClasspathResource("mqtt/test/restricted-config.xml"));
 
     private @NotNull Mqtt5FeatureTester mqtt5FeatureTester;
 
diff --git a/src/systemTest/java/com/hivemq/cli/commands/distribution/DockerImageST.java b/src/systemTest/java/com/hivemq/cli/commands/distribution/DockerImageST.java
@@ -1,9 +1,23 @@
+/*
+ * Copyright 2019-present HiveMQ and the HiveMQ Community
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.hivemq.cli.commands.distribution;
 
 import com.hivemq.cli.utils.MqttVersionConverter;
 import com.hivemq.cli.utils.broker.HiveMQExtension;
-import com.hivemq.cli.utils.cli.MqttCli;
-import com.hivemq.cli.utils.cli.results.ExecutionResult;
 import io.github.sgtsilvio.gradle.oci.junit.jupiter.OciImages;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterEach;
@@ -12,19 +26,14 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static com.hivemq.cli.utils.broker.assertions.ConnectAssertion.assertConnectPacket;
 import static com.hivemq.cli.utils.broker.assertions.PublishAssertion.assertPublishPacket;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@Testcontainers
 public class DockerImageST {
 
     final @NotNull GenericContainer<?> mqttCli = new GenericContainer<>(OciImages.getImageName("hivemq/mqtt-cli"));
@@ -41,10 +50,11 @@ void tearDown() {
     @ParameterizedTest
     @Timeout(value = 3, unit = TimeUnit.MINUTES)
     @ValueSource(chars = {'3', '5'})
-    void test_successfulConnectAndPublish(final char mqttVersion) throws Exception {
-        final List<String> publishCommand1 = List.of("pub",
+    void test_successfulConnectAndPublish(final char mqttVersion) {
+        final String[] publishCommand = {
+                "pub",
                 "-h",
-                hivemq.getHost(),
+                "host.docker.internal",
                 "-p",
                 String.valueOf(hivemq.getMqttPort()),
                 "-V",
@@ -55,16 +65,8 @@ void test_successfulConnectAndPublish(final char mqttVersion) throws Exception {
                 "test",
                 "-m",
                 "message",
-                "-d");
-        mqttCli.withCommand(publishCommand1.toArray(new String[0])).start();
-
-        final ExecutionResult executionResult = MqttCli.execute(publishCommand1);
-
-        assertEquals(0, executionResult.getExitCode());
-        assertTrue(executionResult.getStandardOutput().contains("sending CONNECT"));
-        assertTrue(executionResult.getStandardOutput().contains("received CONNACK"));
-        assertTrue(executionResult.getStandardOutput().contains("sending PUBLISH"));
-        assertTrue(executionResult.getStandardOutput().contains("finish PUBLISH"));
+                "-d"};
+        mqttCli.withCommand(publishCommand).start();
 
         assertConnectPacket(hivemq.getConnectPackets().getFirst(),
                 connectAssertion -> connectAssertion.setMqttVersion(MqttVersionConverter.toExtensionSdkVersion(
