From 506a02866a06751f63a3ef58f33f8edaf785cfcf Mon Sep 17 00:00:00 2001 From: "andreas.dinauer" Date: Sat, 15 Nov 2025 11:16:35 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Add=20impso?= =?UTF-8?q?rt=20and=20organize=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 38 +++++++++++++++---- .../dev/dinauer/metrics/service/Repo.java | 6 +-- .../dev/dinauer/metrics/service/Resource.java | 8 ++-- .../dev/dinauer/metrics/service/Service.java | 10 ++--- .../metrics/service/client/ClientRepo.java | 11 +++--- .../client/auth/AuthenticationService.java | 4 +- .../client/auth/BasicAuthClientProvider.java | 4 +- .../client/auth/BearerAuthClientProvider.java | 10 ++--- .../metrics/service/model/Collection.java | 16 ++++---- .../service/utils/BucketConfigProvider.java | 15 ++++---- .../service/utils/TimestampGenerator.java | 6 +-- .../java/dev/dinauer/GreetingResourceIT.java | 9 ----- .../dev/dinauer/GreetingResourceTest.java | 18 --------- 13 files changed, 75 insertions(+), 80 deletions(-) delete mode 100644 src/test/java/dev/dinauer/GreetingResourceIT.java delete mode 100644 src/test/java/dev/dinauer/GreetingResourceTest.java diff --git a/pom.xml b/pom.xml index f62ddfe..2a4b63a 100644 --- a/pom.xml +++ b/pom.xml @@ -138,19 +138,41 @@ net.revelc.code.formatter formatter-maven-plugin 2.29.0 - - - validate - - format - - - format.xml LF UTF-8 + + + validate + + validate + + + + + + net.revelc.code + impsort-maven-plugin + 1.12.0 + + java.,jakarta.,org.,com.,io.,* + java.,jakarta.,org.,com.,io.,* + true + LF + + **/*.java + + + + + validate + + check + + + diff --git a/src/main/java/dev/dinauer/metrics/service/Repo.java b/src/main/java/dev/dinauer/metrics/service/Repo.java index 456e27e..078a16d 100644 --- a/src/main/java/dev/dinauer/metrics/service/Repo.java +++ b/src/main/java/dev/dinauer/metrics/service/Repo.java @@ -1,14 +1,14 @@ package dev.dinauer.metrics.service; +import java.util.List; +import java.util.Optional; + import dev.dinauer.metrics.service.model.BucketUnit; import dev.dinauer.metrics.service.model.Collection; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; import io.quarkus.panache.common.Parameters; import jakarta.enterprise.context.ApplicationScoped; -import java.util.List; -import java.util.Optional; - @ApplicationScoped public class Repo implements PanacheRepositoryBase { diff --git a/src/main/java/dev/dinauer/metrics/service/Resource.java b/src/main/java/dev/dinauer/metrics/service/Resource.java index 5b1a5c3..e846c68 100644 --- a/src/main/java/dev/dinauer/metrics/service/Resource.java +++ b/src/main/java/dev/dinauer/metrics/service/Resource.java @@ -1,15 +1,15 @@ package dev.dinauer.metrics.service; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import dev.dinauer.metrics.service.client.auth.AuthenticationService; import dev.dinauer.metrics.service.model.BucketUnit; import dev.dinauer.metrics.service.model.Collection; import jakarta.inject.Inject; import jakarta.ws.rs.*; -import java.util.List; -import java.util.Map; -import java.util.Optional; - @Path("/{resource}/{metric}") public class Resource { diff --git a/src/main/java/dev/dinauer/metrics/service/Service.java b/src/main/java/dev/dinauer/metrics/service/Service.java index e3fd22c..1a2dfce 100644 --- a/src/main/java/dev/dinauer/metrics/service/Service.java +++ b/src/main/java/dev/dinauer/metrics/service/Service.java @@ -1,5 +1,10 @@ package dev.dinauer.metrics.service; +import java.time.Clock; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Map; + import dev.dinauer.metrics.service.model.BucketUnit; import dev.dinauer.metrics.service.model.Collection; import dev.dinauer.metrics.service.utils.BucketConfigProvider; @@ -8,11 +13,6 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.transaction.Transactional; -import java.time.Clock; -import java.time.ZonedDateTime; -import java.util.List; -import java.util.Map; - @ApplicationScoped public class Service { diff --git a/src/main/java/dev/dinauer/metrics/service/client/ClientRepo.java b/src/main/java/dev/dinauer/metrics/service/client/ClientRepo.java index 3d731b3..c3952fe 100644 --- a/src/main/java/dev/dinauer/metrics/service/client/ClientRepo.java +++ b/src/main/java/dev/dinauer/metrics/service/client/ClientRepo.java @@ -1,13 +1,14 @@ package dev.dinauer.metrics.service.client; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.microprofile.config.Config; +import org.eclipse.microprofile.config.ConfigProvider; + import io.quarkus.elytron.security.common.BcryptUtil; import io.quarkus.runtime.Startup; import jakarta.enterprise.context.ApplicationScoped; -import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; - -import java.util.ArrayList; -import java.util.List; @Startup @ApplicationScoped diff --git a/src/main/java/dev/dinauer/metrics/service/client/auth/AuthenticationService.java b/src/main/java/dev/dinauer/metrics/service/client/auth/AuthenticationService.java index a23bb5e..8e41f7e 100644 --- a/src/main/java/dev/dinauer/metrics/service/client/auth/AuthenticationService.java +++ b/src/main/java/dev/dinauer/metrics/service/client/auth/AuthenticationService.java @@ -1,5 +1,7 @@ package dev.dinauer.metrics.service.client.auth; +import java.util.List; + import dev.dinauer.metrics.service.client.Client; import dev.dinauer.metrics.service.client.Permission; import dev.dinauer.metrics.service.client.auth.utils.AuthHeader; @@ -10,8 +12,6 @@ import jakarta.inject.Inject; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.HttpHeaders; -import java.util.List; - @RequestScoped public class AuthenticationService { diff --git a/src/main/java/dev/dinauer/metrics/service/client/auth/BasicAuthClientProvider.java b/src/main/java/dev/dinauer/metrics/service/client/auth/BasicAuthClientProvider.java index efc9892..1e468f8 100644 --- a/src/main/java/dev/dinauer/metrics/service/client/auth/BasicAuthClientProvider.java +++ b/src/main/java/dev/dinauer/metrics/service/client/auth/BasicAuthClientProvider.java @@ -1,5 +1,7 @@ package dev.dinauer.metrics.service.client.auth; +import java.util.Base64; + import dev.dinauer.metrics.service.client.Client; import dev.dinauer.metrics.service.client.ClientRepo; import dev.dinauer.metrics.service.client.auth.utils.BasicAuthCredentials; @@ -9,8 +11,6 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.NotFoundException; -import java.util.Base64; - @ApplicationScoped public class BasicAuthClientProvider { diff --git a/src/main/java/dev/dinauer/metrics/service/client/auth/BearerAuthClientProvider.java b/src/main/java/dev/dinauer/metrics/service/client/auth/BearerAuthClientProvider.java index 1d08bc6..01a09de 100644 --- a/src/main/java/dev/dinauer/metrics/service/client/auth/BearerAuthClientProvider.java +++ b/src/main/java/dev/dinauer/metrics/service/client/auth/BearerAuthClientProvider.java @@ -1,17 +1,17 @@ package dev.dinauer.metrics.service.client.auth; +import java.util.Optional; + +import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.eclipse.microprofile.jwt.JsonWebToken; + import dev.dinauer.metrics.service.client.Client; import dev.dinauer.metrics.service.client.Permission; import io.quarkus.security.UnauthorizedException; import io.smallrye.jwt.auth.principal.JWTParser; import io.smallrye.jwt.auth.principal.ParseException; -import io.smallrye.jwt.build.Jwt; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.eclipse.microprofile.jwt.JsonWebToken; - -import java.util.Optional; @ApplicationScoped public class BearerAuthClientProvider diff --git a/src/main/java/dev/dinauer/metrics/service/model/Collection.java b/src/main/java/dev/dinauer/metrics/service/model/Collection.java index 085d372..4dbc0f3 100644 --- a/src/main/java/dev/dinauer/metrics/service/model/Collection.java +++ b/src/main/java/dev/dinauer/metrics/service/model/Collection.java @@ -1,16 +1,18 @@ package dev.dinauer.metrics.service.model; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.persistence.*; -import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.UpdateTimestamp; - import java.time.ZonedDateTime; import java.util.Map; import java.util.UUID; +import jakarta.persistence.*; + +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + @Entity @Table(name = "collection") public class Collection diff --git a/src/main/java/dev/dinauer/metrics/service/utils/BucketConfigProvider.java b/src/main/java/dev/dinauer/metrics/service/utils/BucketConfigProvider.java index 1cbcf7d..720fcac 100644 --- a/src/main/java/dev/dinauer/metrics/service/utils/BucketConfigProvider.java +++ b/src/main/java/dev/dinauer/metrics/service/utils/BucketConfigProvider.java @@ -1,17 +1,16 @@ package dev.dinauer.metrics.service.utils; -import dev.dinauer.metrics.service.model.BucketUnit; -import io.quarkus.runtime.Startup; -import jakarta.annotation.PostConstruct; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; +import java.util.Set; +import java.util.stream.Collectors; + import org.antlr.v4.runtime.misc.OrderedHashSet; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; +import dev.dinauer.metrics.service.model.BucketUnit; +import io.quarkus.runtime.Startup; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @Startup @ApplicationScoped diff --git a/src/main/java/dev/dinauer/metrics/service/utils/TimestampGenerator.java b/src/main/java/dev/dinauer/metrics/service/utils/TimestampGenerator.java index d0e0ea7..d995816 100644 --- a/src/main/java/dev/dinauer/metrics/service/utils/TimestampGenerator.java +++ b/src/main/java/dev/dinauer/metrics/service/utils/TimestampGenerator.java @@ -1,13 +1,11 @@ package dev.dinauer.metrics.service.utils; -import com.arjuna.ats.jta.UserTransaction; -import dev.dinauer.metrics.service.model.BucketUnit; -import org.jboss.resteasy.reactive.common.NotImplementedYet; - import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.WeekFields; +import dev.dinauer.metrics.service.model.BucketUnit; + public class TimestampGenerator { public static String generateTimestamp(ZonedDateTime timestamp, BucketUnit unit) diff --git a/src/test/java/dev/dinauer/GreetingResourceIT.java b/src/test/java/dev/dinauer/GreetingResourceIT.java deleted file mode 100644 index 9050ab2..0000000 --- a/src/test/java/dev/dinauer/GreetingResourceIT.java +++ /dev/null @@ -1,9 +0,0 @@ -package dev.dinauer; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class GreetingResourceIT extends GreetingResourceTest -{ - // Execute the same tests but in packaged mode. -} diff --git a/src/test/java/dev/dinauer/GreetingResourceTest.java b/src/test/java/dev/dinauer/GreetingResourceTest.java deleted file mode 100644 index 914a42f..0000000 --- a/src/test/java/dev/dinauer/GreetingResourceTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package dev.dinauer; - -import io.quarkus.test.junit.QuarkusTest; -import org.junit.jupiter.api.Test; - -import static io.restassured.RestAssured.given; -import static org.hamcrest.CoreMatchers.is; - -@QuarkusTest -class GreetingResourceTest -{ - @Test - void testHelloEndpoint() - { - given().when().get("/hello").then().statusCode(200).body(is("Hello from Quarkus REST")); - } - -} \ No newline at end of file