Compare commits

..

2 Commits

Author SHA1 Message Date
d3ac15df2c 🧑‍💻 Add retrieval of format.xml 2025-11-15 11:34:30 +01:00
27a4f7cc4a 🧑‍💻 Add impsort and organize imports 2025-11-15 11:34:28 +01:00
11 changed files with 60 additions and 63 deletions

1
.gitignore vendored
View File

@ -44,3 +44,4 @@ nb-configuration.xml
# TLS Certificates
.certs/
/src/main/resources/dev/
/format.xml

View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<profiles version="12">
<profile kind="CodeFormatterProfile" name="format" version="12">
<!-- General code formatting settings -->
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<!-- Braces in new line -->
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
<!-- Spaces after keywords -->
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_keyword_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_keyword_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_keyword_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_keyword_in_switch" value="insert"/>
<!-- Else-if-statement -->
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
<!-- Switch-statement -->
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<!-- No Line Wrapping -->
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="9999"/>
</profile>
</profiles>

20
pom.xml
View File

@ -134,6 +134,26 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<get src="https://git.dinauer.dev/andreas.dinauer/formatter/raw/branch/main/format.xml"
dest="format.xml"
usetimestamp="true"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>

View File

@ -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<Collection, String>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
{

View File

@ -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

View File

@ -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