diff --git a/pom.xml b/pom.xml index 8e34f06..ca351f3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,8 @@ 3.13.0 3.5.2 0.8.12 + 2.43.0 + 2.50.0 quarkus-bom io.quarkus.platform @@ -132,6 +134,29 @@ + + com.diffplug.spotless + spotless-maven-plugin + ${spotless-maven-plugin.version} + + + + check + + compile + + + + + + + ${palantir-java-format.version} + + false + + + + diff --git a/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducer.java b/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducer.java index 97d95fc..6426fa3 100644 --- a/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducer.java +++ b/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducer.java @@ -3,7 +3,6 @@ package ch.phoenixtechnologies.quarkus.commons.clock; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; - import java.time.Clock; class ClockProducer { @@ -14,5 +13,4 @@ class ClockProducer { Clock produceClock() { return Clock.systemDefaultZone(); } - } diff --git a/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImpl.java b/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImpl.java index bfe34be..e1a32c1 100644 --- a/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImpl.java +++ b/quarkus-clock-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImpl.java @@ -2,7 +2,6 @@ package ch.phoenixtechnologies.quarkus.commons.clock; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.context.ApplicationScoped; - import java.time.Clock; import java.time.Instant; diff --git a/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducerTest.java b/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducerTest.java index 3735ff0..63a5be2 100644 --- a/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducerTest.java +++ b/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockProducerTest.java @@ -1,13 +1,11 @@ package ch.phoenixtechnologies.quarkus.commons.clock; +import static org.assertj.core.api.Assertions.assertThat; + import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - import java.time.Clock; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; @QuarkusTest class ClockProducerTest { @@ -21,4 +19,4 @@ class ClockProducerTest { .as("Produced clock's zone should match expected value") .isEqualTo(Clock.systemDefaultZone().getZone()); } -} \ No newline at end of file +} diff --git a/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImplTest.java b/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImplTest.java index b7c0ff6..fc4d312 100644 --- a/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImplTest.java +++ b/quarkus-clock-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/clock/ClockServiceImplTest.java @@ -1,17 +1,15 @@ package ch.phoenixtechnologies.quarkus.commons.clock; -import io.quarkus.test.InjectMock; -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.mockito.InjectSpy; -import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - -import java.time.Clock; -import java.time.Instant; - import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; +import io.quarkus.test.InjectMock; +import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import java.time.Clock; +import java.time.Instant; +import org.junit.jupiter.api.Test; + @QuarkusTest class ClockServiceImplTest { @@ -40,4 +38,4 @@ class ClockServiceImplTest { .as("Instant should match expected value") .isEqualTo(expected); } -} \ No newline at end of file +} diff --git a/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonService.java b/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonService.java index 9570ae7..d2c28bd 100644 --- a/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonService.java +++ b/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonService.java @@ -9,5 +9,4 @@ public interface JsonService { T fromJson(String json, Class clazz); T fromJson(String json, TypeReference typeReference); - } diff --git a/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImpl.java b/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImpl.java index 32f2b41..c87d376 100644 --- a/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImpl.java +++ b/quarkus-json-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImpl.java @@ -30,10 +30,9 @@ class JsonServiceImpl implements JsonService { try { return objectMapper.readValue(json, clazz); } catch (JsonProcessingException e) { - throw new IllegalArgumentException("Unable to read object of class [" + clazz.getName() - + "] from json String: " + json, e); + throw new IllegalArgumentException( + "Unable to read object of class [" + clazz.getName() + "] from json String: " + json, e); } - } @Override @@ -41,8 +40,10 @@ class JsonServiceImpl implements JsonService { try { return objectMapper.readValue(json, typeReference); } catch (JsonProcessingException e) { - throw new IllegalArgumentException("Unable to read object of type [" + typeReference.getType().getTypeName() - + "] from json String: " + json, e); + throw new IllegalArgumentException( + "Unable to read object of type [" + typeReference.getType().getTypeName() + "] from json String: " + + json, + e); } } } diff --git a/quarkus-json-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImplTest.java b/quarkus-json-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImplTest.java index a9a388e..d01d46c 100644 --- a/quarkus-json-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImplTest.java +++ b/quarkus-json-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/json/JsonServiceImplTest.java @@ -1,24 +1,21 @@ package ch.phoenixtechnologies.quarkus.commons.json; -import com.fasterxml.jackson.core.type.TypeReference; -import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -import java.util.List; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.fasterxml.jackson.core.type.TypeReference; +import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import java.util.List; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + @QuarkusTest class JsonServiceImplTest { - public static final TypeReference> TYPE_REFERENCE = new TypeReference<>() { - }; + public static final TypeReference> TYPE_REFERENCE = new TypeReference<>() {}; - record TestRecord(String name, int age) { - } + record TestRecord(String name, int age) {} @Inject JsonServiceImpl jsonService; @@ -29,9 +26,7 @@ class JsonServiceImplTest { var actual = jsonService.toJson(new TestRecord("John Doe", 30)); - assertThat(actual) - .as("Json should match expected value") - .isEqualTo(expected); + assertThat(actual).as("Json should match expected value").isEqualTo(expected); } @Test @@ -41,9 +36,7 @@ class JsonServiceImplTest { var actual = jsonService.fromJson(json, TestRecord.class); - assertThat(actual) - .as("Deserialized object should match expected value") - .isEqualTo(expected); + assertThat(actual).as("Deserialized object should match expected value").isEqualTo(expected); } @Test @@ -53,7 +46,8 @@ class JsonServiceImplTest { assertThatThrownBy(() -> jsonService.fromJson(json, TestRecord.class)) .as("Should throw IllegalArgumentException when input is invalid") .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Unable to read object of class [ch.phoenixtechnologies.quarkus.commons.json.JsonServiceImplTest$TestRecord] from json String: {\"name\":\"John Doe\",\"age\":\"30\""); + .hasMessage( + "Unable to read object of class [ch.phoenixtechnologies.quarkus.commons.json.JsonServiceImplTest$TestRecord] from json String: {\"name\":\"John Doe\",\"age\":\"30\""); } @Test @@ -75,6 +69,7 @@ class JsonServiceImplTest { assertThatThrownBy(() -> jsonService.fromJson(json, TYPE_REFERENCE)) .as("Should throw IllegalArgumentException when input is invalid") .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Unable to read object of type [java.util.List] from json String: {\"name\":\"John Doe\",\"age\":30},{\"name\":\"Jane Doe\",\"age\":\"25\"}"); + .hasMessage( + "Unable to read object of type [java.util.List] from json String: {\"name\":\"John Doe\",\"age\":30},{\"name\":\"Jane Doe\",\"age\":\"25\"}"); } -} \ No newline at end of file +} diff --git a/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestConfiguration.java b/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestConfiguration.java index 6720b90..ebd7b78 100644 --- a/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestConfiguration.java +++ b/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestConfiguration.java @@ -8,5 +8,4 @@ public interface MessageDigestConfiguration { @WithDefault("SHA-256") String defaultAlgorithm(); - } diff --git a/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImpl.java b/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImpl.java index eb3e749..3b9e42e 100644 --- a/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImpl.java +++ b/quarkus-message-digest-service/src/main/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImpl.java @@ -2,7 +2,6 @@ package ch.phoenixtechnologies.quarkus.commons.digest; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.context.ApplicationScoped; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/quarkus-message-digest-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImplTest.java b/quarkus-message-digest-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImplTest.java index 42647b5..341554a 100644 --- a/quarkus-message-digest-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImplTest.java +++ b/quarkus-message-digest-service/src/test/java/ch/phoenixtechnologies/quarkus/commons/digest/MessageDigestServiceImplTest.java @@ -1,37 +1,37 @@ package ch.phoenixtechnologies.quarkus.commons.digest; -import io.quarkus.test.junit.QuarkusTest; -import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + @QuarkusTest class MessageDigestServiceImplTest { public static final String INPUT = "test"; - public static final byte[] EXPECTED_SHA256_DIGEST = {-97, -122, -48, -127, -120, 76, 125, 101, -102, 47, -22, -96, -59, 90, -48, 21, -93, -65, 79, 27, 43, 11, -126, 44, -47, 93, 108, 21, -80, -16, 10, 8}; + public static final byte[] EXPECTED_SHA256_DIGEST = { + -97, -122, -48, -127, -120, 76, 125, 101, -102, 47, -22, -96, -59, 90, -48, 21, -93, -65, 79, 27, 43, 11, -126, + 44, -47, 93, 108, 21, -80, -16, 10, 8 + }; @Inject MessageDigestServiceImpl service; @Test void getInstance() { - assertThat(service.getInstance()) - .isInstanceOf(MessageDigest.class); + assertThat(service.getInstance()).isInstanceOf(MessageDigest.class); } @ParameterizedTest @ValueSource(strings = {"SHA-256", "SHA-512", "MD5"}) void getInstanceWithAlgorithm(String algorithm) { - assertThat(service.getInstance(algorithm)) - .isInstanceOf(MessageDigest.class); + assertThat(service.getInstance(algorithm)).isInstanceOf(MessageDigest.class); } @ParameterizedTest @@ -61,7 +61,6 @@ class MessageDigestServiceImplTest { assertThat(service.digest(INPUT, StandardCharsets.UTF_8)) .as("Digest should match expected value") .isEqualTo(EXPECTED_SHA256_DIGEST); - } @Test @@ -78,4 +77,4 @@ class MessageDigestServiceImplTest { .as("Digest should match expected value") .isEqualTo(EXPECTED_SHA256_DIGEST); } -} \ No newline at end of file +} diff --git a/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java index 3b8ab2d..bed44c6 100644 --- a/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java +++ b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImpl.java @@ -2,7 +2,6 @@ package ch.phoenixtechnologies.quarkus.commons.random; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.context.ApplicationScoped; - import java.math.BigInteger; import java.util.Random; diff --git a/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java index 0cb083e..d4be20a 100644 --- a/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java +++ b/quarkus-random-number-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImpl.java @@ -2,7 +2,6 @@ package ch.phoenixtechnologies.quarkus.commons.random; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.context.ApplicationScoped; - import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; @@ -19,6 +18,4 @@ class RandomProviderImpl implements RandomProvider { throw new IllegalStateException("Unable to obtain strong SecureRandom instance", e); } } - } - diff --git a/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java b/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java index f6680bf..11d4a91 100644 --- a/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java +++ b/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomNumberGeneratorImplTest.java @@ -1,15 +1,14 @@ package ch.phoenixtechnologies.quarkus.commons.random; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectSpy; import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - import java.math.BigInteger; import java.util.Random; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; +import org.junit.jupiter.api.Test; @QuarkusTest class RandomNumberGeneratorImplTest { @@ -26,9 +25,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateInt(); - assertThat(actual) - .as("Generated int should match expected value") - .isEqualTo(-1305521323); + assertThat(actual).as("Generated int should match expected value").isEqualTo(-1305521323); } @Test @@ -37,9 +34,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateInt(40); - assertThat(actual) - .as("Generated int should match expected value") - .isEqualTo(26); + assertThat(actual).as("Generated int should match expected value").isEqualTo(26); } @Test @@ -48,21 +43,16 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateInt(1, 40); - assertThat(actual) - .as("Generated int should match expected value") - .isEqualTo(17); + assertThat(actual).as("Generated int should match expected value").isEqualTo(17); } - @Test void generateLong() { when(provider.get()).thenReturn(getRandom()); var actual = generator.generateLong(); - assertThat(actual) - .as("Generated long should match expected value") - .isEqualTo(-5607171386684657918L); + assertThat(actual).as("Generated long should match expected value").isEqualTo(-5607171386684657918L); } @Test @@ -71,9 +61,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateLong(40L); - assertThat(actual) - .as("Generated long should match expected value") - .isEqualTo(9L); + assertThat(actual).as("Generated long should match expected value").isEqualTo(9L); } @Test @@ -82,9 +70,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateLong(1L, 40L); - assertThat(actual) - .as("Generated long should match expected value") - .isEqualTo(23L); + assertThat(actual).as("Generated long should match expected value").isEqualTo(23L); } @Test @@ -93,9 +79,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateFloat(); - assertThat(actual) - .as("Generated float should match expected value") - .isEqualTo(0.6960346f); + assertThat(actual).as("Generated float should match expected value").isEqualTo(0.6960346f); } @Test @@ -104,9 +88,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateFloat(0.99f); - assertThat(actual) - .as("Generated float should match expected value") - .isEqualTo(0.6890743f); + assertThat(actual).as("Generated float should match expected value").isEqualTo(0.6890743f); } @Test @@ -115,9 +97,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateFloat(0.01f, 0.99f); - assertThat(actual) - .as("Generated float should match expected value") - .isEqualTo(0.69211394f); + assertThat(actual).as("Generated float should match expected value").isEqualTo(0.69211394f); } @Test @@ -126,9 +106,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateDouble(); - assertThat(actual) - .as("Generated double should match expected value") - .isEqualTo(0.6960346394874213d); + assertThat(actual).as("Generated double should match expected value").isEqualTo(0.6960346394874213d); } @Test @@ -137,9 +115,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateDouble(0.99d); - assertThat(actual) - .as("Generated double should match expected value") - .isEqualTo(0.6890742930925471d); + assertThat(actual).as("Generated double should match expected value").isEqualTo(0.6890742930925471d); } @Test @@ -148,9 +124,7 @@ class RandomNumberGeneratorImplTest { var actual = generator.generateDouble(0.01d, 0.99d); - assertThat(actual) - .as("Generated double should match expected value") - .isEqualTo(0.6921139466976729d); + assertThat(actual).as("Generated double should match expected value").isEqualTo(0.6921139466976729d); } @Test @@ -176,5 +150,4 @@ class RandomNumberGeneratorImplTest { private static Random getRandom() { return new Random(24353L); } - -} \ No newline at end of file +} diff --git a/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java b/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java index 4f66f4e..7b84434 100644 --- a/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java +++ b/quarkus-random-number-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/random/RandomProviderImplTest.java @@ -1,16 +1,15 @@ package ch.phoenixtechnologies.quarkus.commons.random; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - import java.security.AccessController; import java.security.PrivilegedAction; import java.security.SecureRandom; import java.security.Security; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; @QuarkusTest @SuppressWarnings("removal") @@ -47,16 +46,13 @@ class RandomProviderImplTest { private static String getSecurityProperty() { return AccessController.doPrivileged( - (PrivilegedAction) () -> Security.getProperty( - SECURE_RANDOM_STRONG_ALGORITHMS)); + (PrivilegedAction) () -> Security.getProperty(SECURE_RANDOM_STRONG_ALGORITHMS)); } private static void setSecurityProperty(String datum) { - AccessController.doPrivileged( - (PrivilegedAction) () -> { - Security.setProperty( - SECURE_RANDOM_STRONG_ALGORITHMS, datum); - return (Void) null; - }); + AccessController.doPrivileged((PrivilegedAction) () -> { + Security.setProperty(SECURE_RANDOM_STRONG_ALGORITHMS, datum); + return (Void) null; + }); } -} \ No newline at end of file +} diff --git a/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java index 3848724..4310bc0 100644 --- a/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java +++ b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGenerator.java @@ -33,5 +33,4 @@ public interface UUIDGenerator { default UUID generateV5WithX500Namespace(String name) { return generateV5(NAMESPACE_X500, name); } - } diff --git a/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java index 9f846be..76b51b5 100644 --- a/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java +++ b/quarkus-uuid-generator/src/main/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImpl.java @@ -3,7 +3,6 @@ package ch.phoenixtechnologies.quarkus.commons.uuid; import com.fasterxml.uuid.Generators; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.context.ApplicationScoped; - import java.util.Random; import java.util.UUID; @@ -30,5 +29,4 @@ class UUIDGeneratorImpl implements UUIDGenerator { public UUID generateV5(UUID namespace, String name) { return Generators.nameBasedGenerator(namespace).generate(name); } - } diff --git a/quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java b/quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java index 7b1cc6f..c652791 100644 --- a/quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java +++ b/quarkus-uuid-generator/src/test/java/ch/phoenixtechnologies/quarkus/commons/uuid/UUIDGeneratorImplTest.java @@ -1,19 +1,17 @@ package ch.phoenixtechnologies.quarkus.commons.uuid; -import ch.phoenixtechnologies.quarkus.commons.uuid.UUIDGeneratorImpl; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; +import java.util.Random; +import java.util.UUID; +import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import java.util.Random; -import java.util.UUID; -import java.util.stream.Stream; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; - @QuarkusTest class UUIDGeneratorImplTest { @@ -44,9 +42,7 @@ class UUIDGeneratorImplTest { var actual = generator.generateV4(getRandom()); - assertThat(actual) - .as("Generated UUID should match expected value") - .isEqualTo(expected); + assertThat(actual).as("Generated UUID should match expected value").isEqualTo(expected); } @Test @@ -55,9 +51,7 @@ class UUIDGeneratorImplTest { var actual = generator.generateV5("test"); - assertThat(actual) - .as("Generated UUID should match expected value") - .isEqualTo(expected); + assertThat(actual).as("Generated UUID should match expected value").isEqualTo(expected); } public static Stream generateV5WithNamespace() { @@ -65,8 +59,7 @@ class UUIDGeneratorImplTest { Arguments.of(NAMESPACE_DNS, V5_NAME, EXPECTED_V5_DNS), Arguments.of(NAMESPACE_URL, V5_NAME, EXPECTED_V5_URL), Arguments.of(NAMESPACE_OID, V5_NAME, EXPECTED_V5_OID), - Arguments.of(NAMESPACE_X500, V5_NAME, EXPECTED_V5_X500) - ); + Arguments.of(NAMESPACE_X500, V5_NAME, EXPECTED_V5_X500)); } @MethodSource @@ -74,27 +67,21 @@ class UUIDGeneratorImplTest { void generateV5WithNamespace(UUID namespace, String name, UUID expected) { var actual = generator.generateV5(namespace, name); - assertThat(actual) - .as("Generated UUID should match expected value") - .isEqualTo(expected); + assertThat(actual).as("Generated UUID should match expected value").isEqualTo(expected); } @Test void generateV5WithDNSNamespace() { var actual = generator.generateV5WithDNSNamespace(V5_NAME); - assertThat(actual) - .as("Generated UUID should match expected value") - .isEqualTo(EXPECTED_V5_DNS); + assertThat(actual).as("Generated UUID should match expected value").isEqualTo(EXPECTED_V5_DNS); } @Test void generateV5WithURLNamespace() { var actual = generator.generateV5WithURLNamespace(V5_NAME); - assertThat(actual) - .as("Generated UUID should match expected value") - .isEqualTo(EXPECTED_V5_URL); + assertThat(actual).as("Generated UUID should match expected value").isEqualTo(EXPECTED_V5_URL); } @Test @@ -114,5 +101,4 @@ class UUIDGeneratorImplTest { private static Random getRandom() { return new Random(24353L); } - -} \ No newline at end of file +}