From 27a4f7cc4a5275295a7b60ec2a053b33e8d37261 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 --- src/main/java/dev/dinauer/metrics/service/Repo.java | 8 +++++--- .../java/dev/dinauer/metrics/service/Resource.java | 5 +++-- .../java/dev/dinauer/metrics/service/Service.java | 7 ++++--- .../dinauer/metrics/service/client/ClientRepo.java | 3 ++- .../service/client/auth/AuthenticationService.java | 12 +++++++----- .../service/client/auth/BasicAuthClientProvider.java | 12 +++++++----- .../client/auth/BearerAuthClientProvider.java | 10 ++++++---- .../metrics/service/utils/BucketConfigProvider.java | 8 +++++--- 8 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/main/java/dev/dinauer/metrics/service/Repo.java b/src/main/java/dev/dinauer/metrics/service/Repo.java index 078a16d..75afc7b 100644 --- a/src/main/java/dev/dinauer/metrics/service/Repo.java +++ b/src/main/java/dev/dinauer/metrics/service/Repo.java @@ -3,11 +3,13 @@ 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 jakarta.enterprise.context.ApplicationScoped; + import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; import io.quarkus.panache.common.Parameters; -import jakarta.enterprise.context.ApplicationScoped; + +import dev.dinauer.metrics.service.model.BucketUnit; +import dev.dinauer.metrics.service.model.Collection; @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 e846c68..08cd16d 100644 --- a/src/main/java/dev/dinauer/metrics/service/Resource.java +++ b/src/main/java/dev/dinauer/metrics/service/Resource.java @@ -4,11 +4,12 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; + 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.*; @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 1a2dfce..a240c81 100644 --- a/src/main/java/dev/dinauer/metrics/service/Service.java +++ b/src/main/java/dev/dinauer/metrics/service/Service.java @@ -5,13 +5,14 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.Map; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.transaction.Transactional; + import dev.dinauer.metrics.service.model.BucketUnit; import dev.dinauer.metrics.service.model.Collection; import dev.dinauer.metrics.service.utils.BucketConfigProvider; import dev.dinauer.metrics.service.utils.TimestampGenerator; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.transaction.Transactional; @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 c3952fe..4d68a2f 100644 --- a/src/main/java/dev/dinauer/metrics/service/client/ClientRepo.java +++ b/src/main/java/dev/dinauer/metrics/service/client/ClientRepo.java @@ -3,12 +3,13 @@ package dev.dinauer.metrics.service.client; import java.util.ArrayList; import java.util.List; +import jakarta.enterprise.context.ApplicationScoped; + 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; @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 8e41f7e..76fef1f 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 @@ -2,15 +2,17 @@ package dev.dinauer.metrics.service.client.auth; import java.util.List; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; + +import io.quarkus.security.UnauthorizedException; + import dev.dinauer.metrics.service.client.Client; import dev.dinauer.metrics.service.client.Permission; import dev.dinauer.metrics.service.client.auth.utils.AuthHeader; import dev.dinauer.metrics.service.client.auth.utils.AuthType; -import io.quarkus.security.UnauthorizedException; -import jakarta.enterprise.context.RequestScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.HttpHeaders; @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 1e468f8..797e9a0 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 @@ -2,15 +2,17 @@ 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; -import io.quarkus.elytron.security.common.BcryptUtil; -import io.quarkus.security.UnauthorizedException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.NotFoundException; +import io.quarkus.elytron.security.common.BcryptUtil; +import io.quarkus.security.UnauthorizedException; + +import dev.dinauer.metrics.service.client.Client; +import dev.dinauer.metrics.service.client.ClientRepo; +import dev.dinauer.metrics.service.client.auth.utils.BasicAuthCredentials; + @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 01a09de..eee8c88 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 @@ -2,16 +2,18 @@ package dev.dinauer.metrics.service.client.auth; import java.util.Optional; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + 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 jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; + +import dev.dinauer.metrics.service.client.Client; +import dev.dinauer.metrics.service.client.Permission; @ApplicationScoped public class BearerAuthClientProvider 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 720fcac..4479f4b 100644 --- a/src/main/java/dev/dinauer/metrics/service/utils/BucketConfigProvider.java +++ b/src/main/java/dev/dinauer/metrics/service/utils/BucketConfigProvider.java @@ -3,14 +3,16 @@ package dev.dinauer.metrics.service.utils; import java.util.Set; import java.util.stream.Collectors; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import org.antlr.v4.runtime.misc.OrderedHashSet; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; -import dev.dinauer.metrics.service.model.BucketUnit; import io.quarkus.runtime.Startup; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; + +import dev.dinauer.metrics.service.model.BucketUnit; @Startup @ApplicationScoped