From eb7054d533ebd90e22ea8d4d316edb1058ad7afe Mon Sep 17 00:00:00 2001 From: Radek Davidek Date: Tue, 30 Jun 2026 17:45:58 +0200 Subject: [PATCH] refactor --- pom.xml | 2 +- .../trask/{adfsauthms => adfs}/AdfsAuthMsServer.java | 12 ++++++------ .../{adfsauthms => adfs}/config/AdfsConfig.java | 2 +- .../trask/{adfsauthms => adfs}/config/AppConfig.java | 2 +- .../config/ConfigurationManager.java | 2 +- .../context/BaseContextHandler.java | 6 +++--- .../{adfsauthms => adfs}/context/HealthHandler.java | 2 +- .../{adfsauthms => adfs}/context/ProcessHandler.java | 4 ++-- .../{adfsauthms => adfs}/dto/TokenPayloadIdp.java | 2 +- .../service/AdfsTokenService.java | 6 +++--- src/main/resources/config.yaml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/cz/trask/{adfsauthms => adfs}/AdfsAuthMsServer.java (94%) rename src/main/java/cz/trask/{adfsauthms => adfs}/config/AdfsConfig.java (98%) rename src/main/java/cz/trask/{adfsauthms => adfs}/config/AppConfig.java (99%) rename src/main/java/cz/trask/{adfsauthms => adfs}/config/ConfigurationManager.java (98%) rename src/main/java/cz/trask/{adfsauthms => adfs}/context/BaseContextHandler.java (97%) rename src/main/java/cz/trask/{adfsauthms => adfs}/context/HealthHandler.java (93%) rename src/main/java/cz/trask/{adfsauthms => adfs}/context/ProcessHandler.java (99%) rename src/main/java/cz/trask/{adfsauthms => adfs}/dto/TokenPayloadIdp.java (96%) rename src/main/java/cz/trask/{adfsauthms => adfs}/service/AdfsTokenService.java (98%) diff --git a/pom.xml b/pom.xml index 2e9de66..72d9cf1 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ - cz.trask.adfsauthms.AdfsAuthMsServer + cz.trask.adfs.AdfsAuthMsServer diff --git a/src/main/java/cz/trask/adfsauthms/AdfsAuthMsServer.java b/src/main/java/cz/trask/adfs/AdfsAuthMsServer.java similarity index 94% rename from src/main/java/cz/trask/adfsauthms/AdfsAuthMsServer.java rename to src/main/java/cz/trask/adfs/AdfsAuthMsServer.java index 317151d..d6b7357 100644 --- a/src/main/java/cz/trask/adfsauthms/AdfsAuthMsServer.java +++ b/src/main/java/cz/trask/adfs/AdfsAuthMsServer.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms; +package cz.trask.adfs; import java.io.FileInputStream; import java.net.InetSocketAddress; @@ -18,11 +18,11 @@ import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpsConfigurator; import com.sun.net.httpserver.HttpsServer; -import cz.trask.adfsauthms.config.AppConfig; -import cz.trask.adfsauthms.config.AppConfig.ContextConfig; -import cz.trask.adfsauthms.config.ConfigurationManager; -import cz.trask.adfsauthms.context.BaseContextHandler; -import cz.trask.adfsauthms.service.AdfsTokenService; +import cz.trask.adfs.config.AppConfig; +import cz.trask.adfs.config.AppConfig.ContextConfig; +import cz.trask.adfs.config.ConfigurationManager; +import cz.trask.adfs.context.BaseContextHandler; +import cz.trask.adfs.service.AdfsTokenService; public class AdfsAuthMsServer { diff --git a/src/main/java/cz/trask/adfsauthms/config/AdfsConfig.java b/src/main/java/cz/trask/adfs/config/AdfsConfig.java similarity index 98% rename from src/main/java/cz/trask/adfsauthms/config/AdfsConfig.java rename to src/main/java/cz/trask/adfs/config/AdfsConfig.java index b2984aa..574dc62 100644 --- a/src/main/java/cz/trask/adfsauthms/config/AdfsConfig.java +++ b/src/main/java/cz/trask/adfs/config/AdfsConfig.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.config; +package cz.trask.adfs.config; import java.util.List; diff --git a/src/main/java/cz/trask/adfsauthms/config/AppConfig.java b/src/main/java/cz/trask/adfs/config/AppConfig.java similarity index 99% rename from src/main/java/cz/trask/adfsauthms/config/AppConfig.java rename to src/main/java/cz/trask/adfs/config/AppConfig.java index 4f96620..54d2fa9 100644 --- a/src/main/java/cz/trask/adfsauthms/config/AppConfig.java +++ b/src/main/java/cz/trask/adfs/config/AppConfig.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.config; +package cz.trask.adfs.config; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cz/trask/adfsauthms/config/ConfigurationManager.java b/src/main/java/cz/trask/adfs/config/ConfigurationManager.java similarity index 98% rename from src/main/java/cz/trask/adfsauthms/config/ConfigurationManager.java rename to src/main/java/cz/trask/adfs/config/ConfigurationManager.java index cc76583..1586af6 100644 --- a/src/main/java/cz/trask/adfsauthms/config/ConfigurationManager.java +++ b/src/main/java/cz/trask/adfs/config/ConfigurationManager.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.config; +package cz.trask.adfs.config; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/cz/trask/adfsauthms/context/BaseContextHandler.java b/src/main/java/cz/trask/adfs/context/BaseContextHandler.java similarity index 97% rename from src/main/java/cz/trask/adfsauthms/context/BaseContextHandler.java rename to src/main/java/cz/trask/adfs/context/BaseContextHandler.java index 09dbe17..d6e4ca0 100644 --- a/src/main/java/cz/trask/adfsauthms/context/BaseContextHandler.java +++ b/src/main/java/cz/trask/adfs/context/BaseContextHandler.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.context; +package cz.trask.adfs.context; import java.io.IOException; import java.io.InputStream; @@ -15,8 +15,8 @@ import com.sun.net.httpserver.HttpHandler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import cz.trask.adfsauthms.config.AppConfig; -import cz.trask.adfsauthms.service.AdfsTokenService; +import cz.trask.adfs.config.AppConfig; +import cz.trask.adfs.service.AdfsTokenService; public abstract class BaseContextHandler implements HttpHandler { diff --git a/src/main/java/cz/trask/adfsauthms/context/HealthHandler.java b/src/main/java/cz/trask/adfs/context/HealthHandler.java similarity index 93% rename from src/main/java/cz/trask/adfsauthms/context/HealthHandler.java rename to src/main/java/cz/trask/adfs/context/HealthHandler.java index aab34a5..cab7de9 100644 --- a/src/main/java/cz/trask/adfsauthms/context/HealthHandler.java +++ b/src/main/java/cz/trask/adfs/context/HealthHandler.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.context; +package cz.trask.adfs.context; import java.io.IOException; import java.time.Instant; diff --git a/src/main/java/cz/trask/adfsauthms/context/ProcessHandler.java b/src/main/java/cz/trask/adfs/context/ProcessHandler.java similarity index 99% rename from src/main/java/cz/trask/adfsauthms/context/ProcessHandler.java rename to src/main/java/cz/trask/adfs/context/ProcessHandler.java index 7faa6b2..99708e6 100644 --- a/src/main/java/cz/trask/adfsauthms/context/ProcessHandler.java +++ b/src/main/java/cz/trask/adfs/context/ProcessHandler.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.context; +package cz.trask.adfs.context; import java.io.IOException; import java.io.InputStream; @@ -12,7 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; -import cz.trask.adfsauthms.dto.TokenPayloadIdp; +import cz.trask.adfs.dto.TokenPayloadIdp; public class ProcessHandler extends BaseContextHandler { diff --git a/src/main/java/cz/trask/adfsauthms/dto/TokenPayloadIdp.java b/src/main/java/cz/trask/adfs/dto/TokenPayloadIdp.java similarity index 96% rename from src/main/java/cz/trask/adfsauthms/dto/TokenPayloadIdp.java rename to src/main/java/cz/trask/adfs/dto/TokenPayloadIdp.java index c2e6e7a..ff329db 100644 --- a/src/main/java/cz/trask/adfsauthms/dto/TokenPayloadIdp.java +++ b/src/main/java/cz/trask/adfs/dto/TokenPayloadIdp.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.dto; +package cz.trask.adfs.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/cz/trask/adfsauthms/service/AdfsTokenService.java b/src/main/java/cz/trask/adfs/service/AdfsTokenService.java similarity index 98% rename from src/main/java/cz/trask/adfsauthms/service/AdfsTokenService.java rename to src/main/java/cz/trask/adfs/service/AdfsTokenService.java index 1e129d7..9255883 100644 --- a/src/main/java/cz/trask/adfsauthms/service/AdfsTokenService.java +++ b/src/main/java/cz/trask/adfs/service/AdfsTokenService.java @@ -1,4 +1,4 @@ -package cz.trask.adfsauthms.service; +package cz.trask.adfs.service; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,8 +30,8 @@ import org.apache.logging.log4j.Logger; import com.fasterxml.jackson.databind.ObjectMapper; -import cz.trask.adfsauthms.config.AdfsConfig; -import cz.trask.adfsauthms.dto.TokenPayloadIdp; +import cz.trask.adfs.config.AdfsConfig; +import cz.trask.adfs.dto.TokenPayloadIdp; public class AdfsTokenService { diff --git a/src/main/resources/config.yaml b/src/main/resources/config.yaml index a2113fb..7172f54 100644 --- a/src/main/resources/config.yaml +++ b/src/main/resources/config.yaml @@ -5,9 +5,9 @@ server: contexts: context: - path: /process - class: cz.trask.adfsauthms.context.ProcessHandler + class: cz.trask.adfs.context.ProcessHandler - path: /health - class: cz.trask.adfsauthms.context.HealthHandler + class: cz.trask.adfs.context.HealthHandler adfs: tokenUrl: "https://fs.komercpoj.loc/adfs/oauth2/token"