diff --git a/LICENSE.md b/LICENSE.md index e3ff585..689f5bd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2023 Julian Nodorp +Copyright (c) 2016-2024 Julian Nodorp Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/io/github/jnodorp/jiffybox/models/Parameter.java b/src/main/java/io/github/jnodorp/jiffybox/models/Parameter.java index 73d6b88..f265b6e 100644 --- a/src/main/java/io/github/jnodorp/jiffybox/models/Parameter.java +++ b/src/main/java/io/github/jnodorp/jiffybox/models/Parameter.java @@ -11,7 +11,7 @@ * @see DocEntry */ @JsonAutoDetect -class Parameter extends PrintableModel { +public class Parameter extends PrintableModel { /** * The description. diff --git a/src/main/java/io/github/jnodorp/jiffybox/modules/JiffyBoxBuilderSerializerModule.java b/src/main/java/io/github/jnodorp/jiffybox/modules/JiffyBoxBuilderSerializerModule.java index 36fcb9f..c2b9244 100644 --- a/src/main/java/io/github/jnodorp/jiffybox/modules/JiffyBoxBuilderSerializerModule.java +++ b/src/main/java/io/github/jnodorp/jiffybox/modules/JiffyBoxBuilderSerializerModule.java @@ -21,7 +21,7 @@ final class JiffyBoxBuilderSerializerModule extends SimpleModule { super(JiffyBoxBuilderSerializerModule.class.getSimpleName(), new Version(1, 0, 0, "SNAPSHOT", "io.github.jnodorp", "jiffybox")); - addSerializer(JiffyBoxBuilder.class, new JsonSerializer() { + addSerializer(JiffyBoxBuilder.class, new JsonSerializer<>() { @Override public void serialize(JiffyBoxBuilder value, JsonGenerator gen, SerializerProvider serializers) throws IOException { ((DefaultJiffyBoxBuilder) value).serialize(gen, serializers); diff --git a/src/main/java/io/github/jnodorp/jiffybox/modules/MonitoringCheckBuilderSerializerModule.java b/src/main/java/io/github/jnodorp/jiffybox/modules/MonitoringCheckBuilderSerializerModule.java index 74859ea..a1dfac3 100644 --- a/src/main/java/io/github/jnodorp/jiffybox/modules/MonitoringCheckBuilderSerializerModule.java +++ b/src/main/java/io/github/jnodorp/jiffybox/modules/MonitoringCheckBuilderSerializerModule.java @@ -21,7 +21,7 @@ final class MonitoringCheckBuilderSerializerModule extends SimpleModule { super(MonitoringCheckBuilderSerializerModule.class.getSimpleName(), new Version(1, 0, 0, "SNAPSHOT", "io.github.jnodorp", "jiffybox")); - addSerializer(MonitoringCheckBuilder.class, new JsonSerializer() { + addSerializer(MonitoringCheckBuilder.class, new JsonSerializer<>() { @Override public void serialize(MonitoringCheckBuilder value, JsonGenerator gen, SerializerProvider serializers) throws IOException { ((DefaultMonitoringCheckBuilder) value).serialize(gen, serializers); diff --git a/src/test/java/io/github/jnodorp/jiffybox/BuildTest.java b/src/test/java/io/github/jnodorp/jiffybox/BuildTest.java index b503de4..1e6b072 100644 --- a/src/test/java/io/github/jnodorp/jiffybox/BuildTest.java +++ b/src/test/java/io/github/jnodorp/jiffybox/BuildTest.java @@ -15,11 +15,9 @@ class BuildTest { /** * Make sure an exception is thrown when trying to create an instance of the * {@link Build} class. - * - * @throws Exception Expect an exception. */ @Test - void testPrivateConstructor_AssertionError() throws Exception { + void testPrivateConstructor_AssertionError() { assertThrows(Exception.class, () -> { Constructor constructor = Build.class.getDeclaredConstructor(); constructor.setAccessible(true); diff --git a/src/test/java/io/github/jnodorp/jiffybox/internal/DefaultMonitoringCheckBuilderTest.java b/src/test/java/io/github/jnodorp/jiffybox/internal/DefaultMonitoringCheckBuilderTest.java index c78e8ba..1bb9674 100644 --- a/src/test/java/io/github/jnodorp/jiffybox/internal/DefaultMonitoringCheckBuilderTest.java +++ b/src/test/java/io/github/jnodorp/jiffybox/internal/DefaultMonitoringCheckBuilderTest.java @@ -21,7 +21,7 @@ class DefaultMonitoringCheckBuilderTest { * Test method for {@link DefaultMonitoringCheckBuilder#withContactgroups(List)}. */ @Test - void testWithContactgroups() throws Exception { + void testWithContactgroups() { final List contactGroupIds = new ArrayList<>(); contactGroupIds.add(1); contactGroupIds.add(2); @@ -34,7 +34,7 @@ void testWithContactgroups() throws Exception { * Test method for {@link DefaultMonitoringCheckBuilder#withCheckInterval(int)}. */ @Test - void testWithCheckInterval() throws Exception { + void testWithCheckInterval() { assertTrue(BUILDER.withCheckInterval(1).toString().contains("\"checkInterval\":1")); } @@ -42,7 +42,7 @@ void testWithCheckInterval() throws Exception { * Test method for {@link DefaultMonitoringCheckBuilder#withReminderInterval(int)}. */ @Test - void testWithReminderInterval() throws Exception { + void testWithReminderInterval() { assertTrue(BUILDER.withReminderInterval(1).toString().contains("\"reminderInterval\":1")); } @@ -50,7 +50,7 @@ void testWithReminderInterval() throws Exception { * Test method for {@link DefaultMonitoringCheckBuilder#withRetryTolerance(int)}. */ @Test - void testWithRetryTolerance() throws Exception { + void testWithRetryTolerance() { assertTrue(BUILDER.withRetryTolerance(1).toString().contains("\"retryTolerance\":1")); } @@ -58,7 +58,7 @@ void testWithRetryTolerance() throws Exception { * Test method for {@link DefaultMonitoringCheckBuilder#withTimeout(int)}. */ @Test - void testWithTimeout() throws Exception { + void testWithTimeout() { assertTrue(BUILDER.withTimeout(1).toString().contains("\"timeout\":1")); } @@ -66,7 +66,7 @@ void testWithTimeout() throws Exception { * Test method for {@link DefaultMonitoringCheckBuilder#withActive(boolean)}. */ @Test - void testWithActive() throws Exception { + void testWithActive() { assertTrue(BUILDER.withActive(true).toString().contains("\"checkInterval\":1")); } } diff --git a/src/test/java/io/github/jnodorp/jiffybox/models/PrintableModelTest.java b/src/test/java/io/github/jnodorp/jiffybox/models/PrintableModelTest.java index b29b75f..f8cdc02 100644 --- a/src/test/java/io/github/jnodorp/jiffybox/models/PrintableModelTest.java +++ b/src/test/java/io/github/jnodorp/jiffybox/models/PrintableModelTest.java @@ -19,7 +19,7 @@ void testToStringValidObject() { ModelTestHelper.validateJson(new PrintableModel() { @JsonProperty("property") @SuppressWarnings("unused") - private String property = "value"; + private final String property = "value"; }.toString()); } diff --git a/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleContactGroupsTest.java b/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleContactGroupsTest.java index eac7a8c..89f8c50 100644 --- a/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleContactGroupsTest.java +++ b/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleContactGroupsTest.java @@ -33,9 +33,9 @@ class ModuleContactGroupsTest { void testGetContactGroups(WireMockServer wireMock, JiffyBoxApi api) { wireMock.stubFor(get(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups")).willReturn (aResponse() - .withHeaders(WireMockHelper.headers()) - .withStatus(200) - .withBodyFile("modules/contactGroups/testGetContactGroups.json"))); + .withHeaders(WireMockHelper.headers()) + .withStatus(200) + .withBodyFile("modules/contactGroups/testGetContactGroups.json"))); Response> response = api.contactGroups().getContactGroups(); List messages = response.getMessages(); @@ -67,9 +67,9 @@ void testGetContactGroups(WireMockServer wireMock, JiffyBoxApi api) { void testGetContactGroup(WireMockServer wireMock, JiffyBoxApi api) { wireMock.stubFor(get(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups/123")).willReturn (aResponse() - .withHeaders(WireMockHelper.headers()) - .withStatus(200) - .withBodyFile("modules/contactGroups/testGetContactGroup.json"))); + .withHeaders(WireMockHelper.headers()) + .withStatus(200) + .withBodyFile("modules/contactGroups/testGetContactGroup.json"))); Response response = api.contactGroups().getContactGroup(123); List messages = response.getMessages(); @@ -92,9 +92,9 @@ void testGetContactGroup(WireMockServer wireMock, JiffyBoxApi api) { void testDeleteContactGroup(WireMockServer wireMock, JiffyBoxApi api) { wireMock.stubFor(delete(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups/123")) .willReturn(aResponse() - .withHeaders(WireMockHelper.headers()) - .withStatus(200) - .withBodyFile("modules/contactGroups/testDeleteContactGroup.json"))); + .withHeaders(WireMockHelper.headers()) + .withStatus(200) + .withBodyFile("modules/contactGroups/testDeleteContactGroup.json"))); Response response = api.contactGroups().deleteContactGroup(123); List messages = response.getMessages(); @@ -110,9 +110,11 @@ void testDeleteContactGroup(WireMockServer wireMock, JiffyBoxApi api) { */ @TestTemplate void testCreateContactGroup(WireMockServer wireMock, JiffyBoxApi api) { - wireMock.stubFor(post(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups")).withRequestBody - (equalToJson("{\"name\": \"TestGruppe\", \"contacts\": [\"m.mustermann@df.eu\", \"f" + "" + "" + "" + - ".musterfrau@df.eu\"] }", false, false)) + wireMock.stubFor(post(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups")) + .withRequestBody(equalToJson( + "{\"name\": \"TestGruppe\", \"contacts\": [\"m.mustermann@df.eu\", \"f.musterfrau@df.eu\"] }", + false, false + )) .willReturn(aResponse().withHeaders(WireMockHelper.headers()) .withStatus(200) .withBodyFile("modules/contactGroups/testCreateContactGroup.json"))); @@ -196,8 +198,9 @@ void testUpdateContactGroup1(WireMockServer wireMock, JiffyBoxApi api) { @TestTemplate void testUpdateContactGroup2(WireMockServer wireMock, JiffyBoxApi api) { wireMock.stubFor(put(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups/1234")) - .withRequestBody(equalToJson("{\"name\": \"Neuer Name der TestGruppe\", \"contacts\": [\"f" + "" + "" - + "" + "" + "" + ".musterfrau@example.com\"]}", false, false)) + .withRequestBody(equalToJson( + "{\"name\": \"Neuer Name der TestGruppe\", \"contacts\": [\"f.musterfrau@example.com\"]}", + false, false)) .willReturn(aResponse().withHeaders(WireMockHelper.headers()) .withStatus(200) .withBodyFile("modules/contactGroups/testUpdateContactGroup2.json"))); @@ -252,8 +255,9 @@ void testDuplicateContactGroup(WireMockServer wireMock, JiffyBoxApi api) { @TestTemplate void testDuplicateContactGroup1(WireMockServer wireMock, JiffyBoxApi api) { wireMock.stubFor(post(urlPathEqualTo("/00000000000000000000000000000000/v1.0/contactGroups/1234")) - .withRequestBody(equalToJson("{\"name\": \"Kopie von TestGruppe\", \"contacts\": [\"f" + "" + "" + "" - + ".musterfrau@example.com\"]}", false, false)) + .withRequestBody(equalToJson( + "{\"name\": \"Kopie von TestGruppe\", \"contacts\": [\"f.musterfrau@example.com\"]}", + false, false)) .willReturn(aResponse().withHeaders(WireMockHelper.headers()) .withStatus(200) .withBodyFile("modules/contactGroups/testDuplicateContactGroup1.json"))); diff --git a/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleTestExtension.java b/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleTestExtension.java index 79e0e7a..62ab3de 100644 --- a/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleTestExtension.java +++ b/src/test/java/io/github/jnodorp/jiffybox/modules/ModuleTestExtension.java @@ -81,21 +81,7 @@ public Stream provideTestTemplateInvocationContex /** * {@link TestTemplateInvocationContext} used to invoke tests wit different API tokens. */ - private static class ModuleTestContext implements TestTemplateInvocationContext { - - /** - * The token. - */ - private final String token; - - /** - * Create a new instance. - * - * @param token the token - */ - ModuleTestContext(String token) { - this.token = token; - } + private record ModuleTestContext(String token) implements TestTemplateInvocationContext { @Override public String getDisplayName(int invocationIndex) { @@ -111,21 +97,7 @@ public List getAdditionalExtensions() { /** * Extension to inject {@link JiffyBoxApi} instances into tests. */ - private static class JiffyBoxApiInjector implements ParameterResolver { - - /** - * The token. - */ - private final String token; - - /** - * Create a new instance. - * - * @param token the token - */ - JiffyBoxApiInjector(String token) { - this.token = token; - } + private record JiffyBoxApiInjector(String token) implements ParameterResolver { @Override public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext context) {