From cf97429ad9ae8c131ba51f42daee72121d755a9d Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 9 Dec 2025 19:28:01 +0100 Subject: [PATCH] I said "revert bullshit" --- build.gradle.kts | 12 ++++++++---- .../src/authorization/AuthorizedClients.java | 1 + .../httpServer/src/handlers/RequestHandler.java | 5 +---- .../src/interceptors/RequestInterceptor.java | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 364190a..05dac03 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,20 +3,24 @@ plugins { } sourceSets { + create("common") { + java.srcDir("common/src") + } + create("acq") { - java.srcDir("src/main/java/acq/acq/src") + java.srcDir("acq/src") } create("acs") { - java.srcDir("src/main/java/acs/acs/src") + java.srcDir("acs/src") } create("externalApp") { - java.srcDir("src/main/java/externalApp/externalApp/src") + java.srcDir("externalApp/src") } create("httpServer") { - java.srcDir("src/main/java/httpServer/httpServer/src") + java.srcDir("httpServer/src") } } diff --git a/src/main/java/httpServer/httpServer/src/authorization/AuthorizedClients.java b/src/main/java/httpServer/httpServer/src/authorization/AuthorizedClients.java index 68b4a33..001a8e4 100644 --- a/src/main/java/httpServer/httpServer/src/authorization/AuthorizedClients.java +++ b/src/main/java/httpServer/httpServer/src/authorization/AuthorizedClients.java @@ -1,5 +1,6 @@ package authorization; +import httpServer.httpServer.src.authorization.Client; import org.springframework.security.crypto.bcrypt.BCrypt; import java.util.*; diff --git a/src/main/java/httpServer/httpServer/src/handlers/RequestHandler.java b/src/main/java/httpServer/httpServer/src/handlers/RequestHandler.java index c6237ac..11fc6f3 100644 --- a/src/main/java/httpServer/httpServer/src/handlers/RequestHandler.java +++ b/src/main/java/httpServer/httpServer/src/handlers/RequestHandler.java @@ -7,14 +7,11 @@ import common.common.src.html.HtmlManager; import common.common.src.json.JsonManager; import common.common.src.logger.Logger; import common.common.src.socket.SocketManager; -import common.common.src.json.JsonManager; import httpServer.httpServer.src.annotations.AllowedVerb; -import httpServer.httpServer.src.annotations.OnlyAuthorizedClients; -import httpServer.httpServer.src.authorization.AuthorizedClients; import httpServer.httpServer.src.authorization.Client; import static common.common.src.ports.Ports.*; - +import authorization.AuthorizedClients; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; diff --git a/src/main/java/httpServer/httpServer/src/interceptors/RequestInterceptor.java b/src/main/java/httpServer/httpServer/src/interceptors/RequestInterceptor.java index a537385..691356f 100644 --- a/src/main/java/httpServer/httpServer/src/interceptors/RequestInterceptor.java +++ b/src/main/java/httpServer/httpServer/src/interceptors/RequestInterceptor.java @@ -4,7 +4,7 @@ import com.sun.net.httpserver.HttpExchange; import common.common.src.logger.Logger; import httpServer.httpServer.src.annotations.AllowedVerb; import httpServer.httpServer.src.annotations.OnlyAuthorizedClients; -import httpServer.httpServer.src.authorization.AuthorizedClients; +import authorization.AuthorizedClients; import httpServer.httpServer.src.exceptions.NoSuchVerbException; import httpServer.httpServer.src.exceptions.ClientAuthorisationException;