Skip to content

Commit ebfa0a1

Browse files
DonnerbartDonnerbart
committed
Clean up project
1 parent b172681 commit ebfa0a1

File tree

13 files changed

+84
-113
lines changed

13 files changed

+84
-113
lines changed

‎build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,18 @@ testing {
7777
"test"(JvmTestSuite::class) {
7878
dependencies {
7979
compileOnly(libs.jetbrains.annotations)
80+
implementation(libs.assertj)
8081
implementation(libs.mockito)
8182
}
8283
}
8384
"integrationTest"(JvmTestSuite::class) {
8485
dependencies {
8586
compileOnly(libs.jetbrains.annotations)
87+
implementation(libs.assertj)
8688
implementation(libs.hivemq.mqttClient)
8789
implementation(libs.testcontainers.junitJupiter)
8890
implementation(libs.testcontainers.hivemq)
8991
implementation(libs.gradleOci.junitJupiter)
90-
implementation(libs.okhttp)
9192
runtimeOnly(libs.logback.classic)
9293
}
9394
oci.of(this) {

‎gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[versions]
2+
assertj = "3.27.3"
23
commonsLang = "3.17.0"
34
commonsText = "1.13.1"
45
gradleOci-junitJupiter = "0.7.0"
@@ -11,10 +12,10 @@ jetty = "11.0.25"
1112
junit-jupiter = "5.10.0"
1213
logback = "1.5.18"
1314
mockito = "5.18.0"
14-
okhttp = "4.12.0"
1515
testcontainers = "1.21.3"
1616

1717
[libraries]
18+
assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
1819
commonsLang = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang" }
1920
commonsText = { module = "org.apache.commons:commons-text", version.ref = "commonsText" }
2021
gradleOci-junitJupiter = { module = "io.github.sgtsilvio:gradle-oci-junit-jupiter", version.ref = "gradleOci-junitJupiter" }
@@ -26,7 +27,6 @@ jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty
2627
jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" }
2728
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
2829
mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
29-
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
3030
testcontainers-hivemq = { module = "org.testcontainers:hivemq", version.ref = "testcontainers" }
3131
testcontainers-junitJupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
3232

‎renovate.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"local>hivemq/renovate-config:default.json5",
55
],
66
addLabels: [
7-
"tooling-and-extensions-coordination",
7+
"integrations-team-coordination",
88
]
99
}

‎src/integrationTest/java/com/hivemq/extensions/heartbeat/CustomConfigIT.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
package com.hivemq.extensions.heartbeat;
1717

1818
import io.github.sgtsilvio.gradle.oci.junit.jupiter.OciImages;
19-
import okhttp3.OkHttpClient;
20-
import okhttp3.Request;
21-
import okhttp3.Response;
22-
import okhttp3.ResponseBody;
2319
import org.jetbrains.annotations.NotNull;
2420
import org.junit.jupiter.api.Test;
2521
import org.junit.jupiter.api.Timeout;
@@ -28,10 +24,13 @@
2824
import org.testcontainers.junit.jupiter.Testcontainers;
2925
import org.testcontainers.utility.MountableFile;
3026

27+
import java.net.URI;
28+
import java.net.http.HttpClient;
29+
import java.net.http.HttpRequest;
30+
import java.net.http.HttpResponse;
3131
import java.util.concurrent.TimeUnit;
3232

33-
import static org.junit.jupiter.api.Assertions.assertEquals;
34-
import static org.junit.jupiter.api.Assertions.assertNotNull;
33+
import static org.assertj.core.api.Assertions.assertThat;
3534

3635
/**
3736
* @author Yannick Weber
@@ -52,18 +51,15 @@ class CustomConfigIT {
5251
@Test
5352
@Timeout(value = 2, unit = TimeUnit.MINUTES)
5453
void customConfigPresent_customConfigUsed() throws Exception {
55-
final OkHttpClient client = new OkHttpClient();
54+
final var client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build();
5655

57-
final Request request = new Request.Builder().url("http://" +
58-
hivemq.getHost() +
59-
":" +
60-
hivemq.getMappedPort(9191) +
61-
"/custom-endpoint").build();
56+
//noinspection HttpUrlsUsage
57+
final var request = HttpRequest.newBuilder()
58+
.uri(URI.create("http://" + hivemq.getHost() + ":" + hivemq.getMappedPort(9191) + "/custom-endpoint"))
59+
.build();
6260

63-
try (final Response response = client.newCall(request).execute()) {
64-
final ResponseBody body = response.body();
65-
assertEquals(200, response.code());
66-
assertNotNull(body);
67-
}
61+
final var response = client.send(request, HttpResponse.BodyHandlers.ofString());
62+
assertThat(response.statusCode()).isEqualTo(200);
63+
assertThat(response.body()).isNotNull();
6864
}
6965
}

‎src/integrationTest/java/com/hivemq/extensions/heartbeat/DefaultConfigIT.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@
1616
package com.hivemq.extensions.heartbeat;
1717

1818
import io.github.sgtsilvio.gradle.oci.junit.jupiter.OciImages;
19-
import okhttp3.OkHttpClient;
20-
import okhttp3.Request;
21-
import okhttp3.Response;
22-
import okhttp3.ResponseBody;
2319
import org.jetbrains.annotations.NotNull;
2420
import org.junit.jupiter.api.Test;
2521
import org.junit.jupiter.api.Timeout;
2622
import org.testcontainers.hivemq.HiveMQContainer;
2723
import org.testcontainers.junit.jupiter.Container;
2824
import org.testcontainers.junit.jupiter.Testcontainers;
2925

26+
import java.net.URI;
27+
import java.net.http.HttpClient;
28+
import java.net.http.HttpRequest;
29+
import java.net.http.HttpResponse;
3030
import java.util.concurrent.TimeUnit;
3131

32-
import static org.junit.jupiter.api.Assertions.assertEquals;
33-
import static org.junit.jupiter.api.Assertions.assertNotNull;
32+
import static org.assertj.core.api.Assertions.assertThat;
3433

3534
/**
3635
* @author Yannick Weber
@@ -49,18 +48,15 @@ class DefaultConfigIT {
4948
@Test
5049
@Timeout(value = 2, unit = TimeUnit.MINUTES)
5150
void defaultConfigFilePresent_defaultConfigFileUsed() throws Exception {
52-
final OkHttpClient client = new OkHttpClient();
51+
final var client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build();
5352

54-
final Request request = new Request.Builder().url("http://" +
55-
hivemq.getHost() +
56-
":" +
57-
hivemq.getMappedPort(9090) +
58-
"/heartbeat").build();
53+
//noinspection HttpUrlsUsage
54+
final var request = HttpRequest.newBuilder()
55+
.uri(URI.create("http://" + hivemq.getHost() + ":" + hivemq.getMappedPort(9090) + "/heartbeat"))
56+
.build();
5957

60-
try (final Response response = client.newCall(request).execute()) {
61-
final ResponseBody body = response.body();
62-
assertEquals(200, response.code());
63-
assertNotNull(body);
64-
}
58+
final var response = client.send(request, HttpResponse.BodyHandlers.ofString());
59+
assertThat(response.statusCode()).isEqualTo(200);
60+
assertThat(response.body()).isNotNull();
6561
}
6662
}

‎src/integrationTest/java/com/hivemq/extensions/heartbeat/FallbackToDefaultsIT.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
package com.hivemq.extensions.heartbeat;
1717

1818
import io.github.sgtsilvio.gradle.oci.junit.jupiter.OciImages;
19-
import okhttp3.OkHttpClient;
20-
import okhttp3.Request;
21-
import okhttp3.Response;
22-
import okhttp3.ResponseBody;
2319
import org.jetbrains.annotations.NotNull;
2420
import org.junit.jupiter.api.Test;
2521
import org.junit.jupiter.api.Timeout;
@@ -28,10 +24,13 @@
2824
import org.testcontainers.junit.jupiter.Testcontainers;
2925
import org.testcontainers.utility.MountableFile;
3026

27+
import java.net.URI;
28+
import java.net.http.HttpClient;
29+
import java.net.http.HttpRequest;
30+
import java.net.http.HttpResponse;
3131
import java.util.concurrent.TimeUnit;
3232

33-
import static org.junit.jupiter.api.Assertions.assertEquals;
34-
import static org.junit.jupiter.api.Assertions.assertNotNull;
33+
import static org.assertj.core.api.Assertions.assertThat;
3534

3635
/**
3736
* @author Yannick Weber
@@ -52,18 +51,15 @@ class FallbackToDefaultsIT {
5251
@Test
5352
@Timeout(value = 2, unit = TimeUnit.MINUTES)
5453
void brokenConfigFilePresent_defaultsUsed() throws Exception {
55-
final OkHttpClient client = new OkHttpClient();
54+
final var client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build();
5655

57-
final Request request = new Request.Builder().url("http://" +
58-
hivemq.getHost() +
59-
":" +
60-
hivemq.getMappedPort(9090) +
61-
"/heartbeat").build();
56+
//noinspection HttpUrlsUsage
57+
final var request = HttpRequest.newBuilder()
58+
.uri(URI.create("http://" + hivemq.getHost() + ":" + hivemq.getMappedPort(9090) + "/heartbeat"))
59+
.build();
6260

63-
try (final Response response = client.newCall(request).execute()) {
64-
final ResponseBody body = response.body();
65-
assertEquals(200, response.code());
66-
assertNotNull(body);
67-
}
61+
final var response = client.send(request, HttpResponse.BodyHandlers.ofString());
62+
assertThat(response.statusCode()).isEqualTo(200);
63+
assertThat(response.body()).isNotNull();
6864
}
6965
}

‎src/main/java/com/hivemq/extensions/heartbeat/HeartbeatMain.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030

31-
import java.io.File;
32-
3331
/**
3432
* Main class for HiveMQ Heartbeat extension
3533
* <p>
@@ -52,14 +50,10 @@ public final void extensionStart(
5250
final @NotNull ExtensionStartInput extensionStartInput,
5351
final @NotNull ExtensionStartOutput extensionStartOutput) {
5452
try {
55-
final @NotNull File extensionHomeFolder =
56-
extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
57-
final @NotNull ExtensionConfiguration extensionConfiguration =
58-
new ExtensionConfiguration(extensionHomeFolder);
59-
53+
final var extensionHome = extensionStartInput.getExtensionInformation().getExtensionHomeFolder();
54+
final var extensionConfiguration = new ExtensionConfiguration(extensionHome);
6055
startRestService(extensionConfiguration);
61-
62-
} catch (Exception e) {
56+
} catch (final Exception e) {
6357
extensionStartOutput.preventExtensionStartup("Heartbeat Extension cannot be started.");
6458
LOG.error("{} extension could not be started. An exception was thrown while starting!",
6559
extensionStartInput.getExtensionInformation().getName(),
@@ -80,5 +74,4 @@ private void startRestService(final @NotNull ExtensionConfiguration extensionCon
8074
httpService = new HTTPService(extensionConfiguration.getHeartbeatConfig(), new HiveMQHeartbeatServlet());
8175
httpService.startHttpServer();
8276
}
83-
8477
}

‎src/main/java/com/hivemq/extensions/heartbeat/configuration/ConfigurationXmlParser.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import javax.xml.bind.JAXBContext;
2525
import javax.xml.bind.JAXBException;
26-
import javax.xml.bind.Unmarshaller;
2726
import java.io.File;
2827
import java.io.IOException;
2928

@@ -35,26 +34,25 @@ public class ConfigurationXmlParser {
3534

3635
private static final @NotNull Logger LOG = LoggerFactory.getLogger(ConfigurationXmlParser.class);
3736

38-
//jaxb context is thread safe
37+
// JAXB context is thread safe
3938
private final @NotNull JAXBContext jaxb;
4039

4140
ConfigurationXmlParser() {
4241
try {
4342
jaxb = JAXBContext.newInstance(Heartbeat.class);
44-
} catch (JAXBException e) {
43+
} catch (final JAXBException e) {
4544
LOG.error("Error in the Heartbeat Extension. Could not initialize XML parser", e);
4645
throw new RuntimeException("Could not initialize XML parser.", e);
4746
}
4847
}
4948

5049
final @NotNull Heartbeat unmarshalExtensionConfig(final @NotNull File file) throws IOException {
5150
try {
52-
final Unmarshaller unmarshaller = jaxb.createUnmarshaller();
51+
final var unmarshaller = jaxb.createUnmarshaller();
5352
return (Heartbeat) unmarshaller.unmarshal(file);
54-
} catch (JAXBException e) {
53+
} catch (final JAXBException e) {
5554
LOG.error("Error in the Heartbeat Extension. Could not unmarshal XML configuration", e);
5655
throw new IOException("Could not unmarshal XML configuration.", e);
5756
}
5857
}
59-
6058
}

‎src/main/java/com/hivemq/extensions/heartbeat/configuration/ExtensionConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@ public class ExtensionConfiguration {
3131

3232
private static final @NotNull String EXTENSION_CONFIG_FILE_NAME = "extension-config.xml";
3333
private static final @NotNull Logger LOG = LoggerFactory.getLogger(ExtensionConfiguration.class);
34+
3435
private final @NotNull ConfigurationXmlParser configurationXmlParser = new ConfigurationXmlParser();
3536
private final @NotNull File extensionHomeFolder;
36-
private @Nullable Heartbeat heartbeat;
3737

38+
private @Nullable Heartbeat heartbeat;
3839

3940
public ExtensionConfiguration(final @NotNull File extensionHomeFolder) {
4041
this.extensionHomeFolder = extensionHomeFolder;
@@ -52,11 +53,10 @@ public ExtensionConfiguration(final @NotNull File extensionHomeFolder) {
5253
* @return the new heartbeat based on the file contents or default if the heartbeat configuration is invalid
5354
*/
5455
private @NotNull Heartbeat read(final @NotNull File configFile) {
55-
56-
final @NotNull Heartbeat defaultHeartbeat = new Heartbeat();
56+
final var defaultHeartbeat = new Heartbeat();
5757
if (configFile.exists() && configFile.canRead() && configFile.length() > 0) {
5858
try {
59-
final @NotNull Heartbeat newHeartbeat = configurationXmlParser.unmarshalExtensionConfig(configFile);
59+
final var newHeartbeat = configurationXmlParser.unmarshalExtensionConfig(configFile);
6060
return validate(newHeartbeat, defaultHeartbeat);
6161
} catch (final IOException e) {
6262
LOG.warn("Could not read Heartbeat extension configuration file, reason: {}, using defaults {}.",
@@ -73,12 +73,12 @@ public ExtensionConfiguration(final @NotNull File extensionHomeFolder) {
7373
}
7474

7575
private @NotNull Heartbeat validate(
76-
final @NotNull Heartbeat newHeartbeat, final @NotNull Heartbeat defaultHeartbeat) {
76+
final @NotNull Heartbeat newHeartbeat,
77+
final @NotNull Heartbeat defaultHeartbeat) {
7778
if (newHeartbeat.getPort() < 1) {
7879
LOG.warn("Port must be greater than 0, using default port " + defaultHeartbeat.getPort());
7980
newHeartbeat.setPort(defaultHeartbeat.getPort());
8081
}
8182
return newHeartbeat;
8283
}
83-
8484
}

‎src/main/java/com/hivemq/extensions/heartbeat/configuration/entities/Heartbeat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public int getPort() {
5353
return port;
5454
}
5555

56-
public void setPort(int port) {
56+
public void setPort(final int port) {
5757
this.port = port;
5858
}
5959

0 commit comments

Comments
 (0)