From 6f8f28fc282c30e336b1f851b8286e53b7d44ae9 Mon Sep 17 00:00:00 2001 From: Radek Davidek Date: Fri, 20 Mar 2026 13:34:08 +0100 Subject: [PATCH] refactor, some fixes --- .../fabka/{httpserver => app}/AppConfig.java | 2 +- .../HttpServerApplication.java | 72 +++++++++---------- .../{httpserver => }/auth/AuthService.java | 2 +- .../auth/AuthenticatedUser.java | 2 +- .../auth/DatabaseAuthService.java | 4 +- .../{httpserver => }/auth/EnvAuthService.java | 2 +- .../fabka/{httpserver => }/crypto/Md5.java | 2 +- .../http/ClasspathStaticFileHandler.java | 2 +- .../http/MultipartFormData.java | 2 +- .../{httpserver => }/http/RequestContext.java | 6 +- .../{httpserver => }/http/Responses.java | 2 +- .../{httpserver => }/http/RouteHandler.java | 2 +- .../fabka/{httpserver => }/http/Router.java | 4 +- .../http/StaticFileHttpHandler.java | 2 +- .../repository/ChatRepository.java | 5 +- .../repository/ForumRepository.java | 10 ++- .../repository/MemberRepository.java | 6 +- .../repository/MysqlClientRepository.java | 2 +- .../repository/PrivateMessageRepository.java | 7 +- .../repository/SettingsRepository.java | 4 +- .../repository/UserIconRepository.java | 4 +- .../model}/AttachmentData.java | 2 +- .../model}/ChatLine.java | 2 +- .../model}/ChatVoteStats.java | 2 +- .../model}/ForumAttachment.java | 2 +- .../model}/ForumDetail.java | 2 +- .../model}/ForumDisplayView.java | 2 +- .../model}/ForumMessage.java | 2 +- .../model}/ForumSummary.java | 2 +- .../model}/MemberProfile.java | 2 +- .../model}/MessageRenderSettings.java | 2 +- .../model}/PrivateMessageItem.java | 2 +- .../model}/PrivateMessageStats.java | 2 +- .../model}/PrivateThreadRoot.java | 2 +- .../model}/PrivateThreadSummary.java | 2 +- .../model}/QuotedTextItem.java | 2 +- .../model}/UserIcon.java | 2 +- .../model}/VoteStats.java | 2 +- .../{httpserver => }/session/SessionData.java | 2 +- .../session/SessionManager.java | 2 +- .../web/LegacyMessageFormatter.java | 2 +- .../fabka/{httpserver => }/web/Pages.java | 30 ++++---- 42 files changed, 119 insertions(+), 95 deletions(-) rename src/main/java/cz/kamma/fabka/{httpserver => app}/AppConfig.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver => app}/HttpServerApplication.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver => }/auth/AuthService.java (72%) rename src/main/java/cz/kamma/fabka/{httpserver => }/auth/AuthenticatedUser.java (90%) rename src/main/java/cz/kamma/fabka/{httpserver => }/auth/DatabaseAuthService.java (95%) rename src/main/java/cz/kamma/fabka/{httpserver => }/auth/EnvAuthService.java (93%) rename src/main/java/cz/kamma/fabka/{httpserver => }/crypto/Md5.java (95%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/ClasspathStaticFileHandler.java (98%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/MultipartFormData.java (99%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/RequestContext.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/Responses.java (96%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/RouteHandler.java (73%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/Router.java (93%) rename src/main/java/cz/kamma/fabka/{httpserver => }/http/StaticFileHttpHandler.java (98%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/ChatRepository.java (98%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/ForumRepository.java (98%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/MemberRepository.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/MysqlClientRepository.java (99%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/PrivateMessageRepository.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/SettingsRepository.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver => }/repository/UserIconRepository.java (96%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/AttachmentData.java (91%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ChatLine.java (96%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ChatVoteStats.java (90%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ForumAttachment.java (92%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ForumDetail.java (93%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ForumDisplayView.java (97%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ForumMessage.java (98%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/ForumSummary.java (96%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/MemberProfile.java (95%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/MessageRenderSettings.java (93%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/PrivateMessageItem.java (96%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/PrivateMessageStats.java (87%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/PrivateThreadRoot.java (94%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/PrivateThreadSummary.java (96%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/QuotedTextItem.java (87%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/UserIcon.java (88%) rename src/main/java/cz/kamma/fabka/{httpserver/repository => repository/model}/VoteStats.java (92%) rename src/main/java/cz/kamma/fabka/{httpserver => }/session/SessionData.java (95%) rename src/main/java/cz/kamma/fabka/{httpserver => }/session/SessionManager.java (98%) rename src/main/java/cz/kamma/fabka/{httpserver => }/web/LegacyMessageFormatter.java (99%) rename src/main/java/cz/kamma/fabka/{httpserver => }/web/Pages.java (98%) diff --git a/src/main/java/cz/kamma/fabka/httpserver/AppConfig.java b/src/main/java/cz/kamma/fabka/app/AppConfig.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/AppConfig.java rename to src/main/java/cz/kamma/fabka/app/AppConfig.java index d51d30f..b2ef1f2 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/AppConfig.java +++ b/src/main/java/cz/kamma/fabka/app/AppConfig.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver; +package cz.kamma.fabka.app; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/cz/kamma/fabka/httpserver/HttpServerApplication.java b/src/main/java/cz/kamma/fabka/app/HttpServerApplication.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/HttpServerApplication.java rename to src/main/java/cz/kamma/fabka/app/HttpServerApplication.java index d391f1d..06dded0 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/HttpServerApplication.java +++ b/src/main/java/cz/kamma/fabka/app/HttpServerApplication.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver; +package cz.kamma.fabka.app; import java.io.IOException; import java.net.InetSocketAddress; @@ -16,41 +16,41 @@ import java.util.stream.Collectors; import com.sun.net.httpserver.HttpServer; -import cz.kamma.fabka.httpserver.auth.AuthService; -import cz.kamma.fabka.httpserver.auth.AuthenticatedUser; -import cz.kamma.fabka.httpserver.auth.DatabaseAuthService; -import cz.kamma.fabka.httpserver.http.ClasspathStaticFileHandler; -import cz.kamma.fabka.httpserver.http.MultipartFormData; -import cz.kamma.fabka.httpserver.http.RequestContext; -import cz.kamma.fabka.httpserver.http.Responses; -import cz.kamma.fabka.httpserver.http.Router; -import cz.kamma.fabka.httpserver.repository.AttachmentData; -import cz.kamma.fabka.httpserver.repository.ChatLine; -import cz.kamma.fabka.httpserver.repository.ChatRepository; -import cz.kamma.fabka.httpserver.repository.ChatVoteStats; -import cz.kamma.fabka.httpserver.repository.ForumAttachment; -import cz.kamma.fabka.httpserver.repository.ForumDetail; -import cz.kamma.fabka.httpserver.repository.ForumDisplayView; -import cz.kamma.fabka.httpserver.repository.ForumMessage; -import cz.kamma.fabka.httpserver.repository.ForumRepository; -import cz.kamma.fabka.httpserver.repository.ForumSummary; -import cz.kamma.fabka.httpserver.repository.MemberProfile; -import cz.kamma.fabka.httpserver.repository.MemberRepository; -import cz.kamma.fabka.httpserver.repository.MessageRenderSettings; -import cz.kamma.fabka.httpserver.repository.MysqlClientRepository; -import cz.kamma.fabka.httpserver.repository.PrivateMessageItem; -import cz.kamma.fabka.httpserver.repository.PrivateMessageRepository; -import cz.kamma.fabka.httpserver.repository.PrivateMessageStats; -import cz.kamma.fabka.httpserver.repository.PrivateThreadRoot; -import cz.kamma.fabka.httpserver.repository.PrivateThreadSummary; -import cz.kamma.fabka.httpserver.repository.QuotedTextItem; -import cz.kamma.fabka.httpserver.repository.SettingsRepository; -import cz.kamma.fabka.httpserver.repository.UserIcon; -import cz.kamma.fabka.httpserver.repository.UserIconRepository; -import cz.kamma.fabka.httpserver.repository.VoteStats; -import cz.kamma.fabka.httpserver.session.SessionData; -import cz.kamma.fabka.httpserver.session.SessionManager; -import cz.kamma.fabka.httpserver.web.Pages; +import cz.kamma.fabka.auth.AuthService; +import cz.kamma.fabka.auth.AuthenticatedUser; +import cz.kamma.fabka.auth.DatabaseAuthService; +import cz.kamma.fabka.http.ClasspathStaticFileHandler; +import cz.kamma.fabka.http.MultipartFormData; +import cz.kamma.fabka.http.RequestContext; +import cz.kamma.fabka.http.Responses; +import cz.kamma.fabka.http.Router; +import cz.kamma.fabka.repository.model.AttachmentData; +import cz.kamma.fabka.repository.model.ChatLine; +import cz.kamma.fabka.repository.ChatRepository; +import cz.kamma.fabka.repository.model.ChatVoteStats; +import cz.kamma.fabka.repository.model.ForumAttachment; +import cz.kamma.fabka.repository.model.ForumDetail; +import cz.kamma.fabka.repository.model.ForumDisplayView; +import cz.kamma.fabka.repository.model.ForumMessage; +import cz.kamma.fabka.repository.ForumRepository; +import cz.kamma.fabka.repository.model.ForumSummary; +import cz.kamma.fabka.repository.model.MemberProfile; +import cz.kamma.fabka.repository.MemberRepository; +import cz.kamma.fabka.repository.model.MessageRenderSettings; +import cz.kamma.fabka.repository.MysqlClientRepository; +import cz.kamma.fabka.repository.model.PrivateMessageItem; +import cz.kamma.fabka.repository.PrivateMessageRepository; +import cz.kamma.fabka.repository.model.PrivateMessageStats; +import cz.kamma.fabka.repository.model.PrivateThreadRoot; +import cz.kamma.fabka.repository.model.PrivateThreadSummary; +import cz.kamma.fabka.repository.model.QuotedTextItem; +import cz.kamma.fabka.repository.SettingsRepository; +import cz.kamma.fabka.repository.model.UserIcon; +import cz.kamma.fabka.repository.UserIconRepository; +import cz.kamma.fabka.repository.model.VoteStats; +import cz.kamma.fabka.session.SessionData; +import cz.kamma.fabka.session.SessionManager; +import cz.kamma.fabka.web.Pages; public class HttpServerApplication { diff --git a/src/main/java/cz/kamma/fabka/httpserver/auth/AuthService.java b/src/main/java/cz/kamma/fabka/auth/AuthService.java similarity index 72% rename from src/main/java/cz/kamma/fabka/httpserver/auth/AuthService.java rename to src/main/java/cz/kamma/fabka/auth/AuthService.java index e537e31..39d5cc7 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/auth/AuthService.java +++ b/src/main/java/cz/kamma/fabka/auth/AuthService.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.auth; +package cz.kamma.fabka.auth; public interface AuthService { AuthenticatedUser authenticate(String username, String password); diff --git a/src/main/java/cz/kamma/fabka/httpserver/auth/AuthenticatedUser.java b/src/main/java/cz/kamma/fabka/auth/AuthenticatedUser.java similarity index 90% rename from src/main/java/cz/kamma/fabka/httpserver/auth/AuthenticatedUser.java rename to src/main/java/cz/kamma/fabka/auth/AuthenticatedUser.java index e176f64..9edf66a 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/auth/AuthenticatedUser.java +++ b/src/main/java/cz/kamma/fabka/auth/AuthenticatedUser.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.auth; +package cz.kamma.fabka.auth; public class AuthenticatedUser { private final long userId; diff --git a/src/main/java/cz/kamma/fabka/httpserver/auth/DatabaseAuthService.java b/src/main/java/cz/kamma/fabka/auth/DatabaseAuthService.java similarity index 95% rename from src/main/java/cz/kamma/fabka/httpserver/auth/DatabaseAuthService.java rename to src/main/java/cz/kamma/fabka/auth/DatabaseAuthService.java index 206e1cc..def0785 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/auth/DatabaseAuthService.java +++ b/src/main/java/cz/kamma/fabka/auth/DatabaseAuthService.java @@ -1,6 +1,6 @@ -package cz.kamma.fabka.httpserver.auth; +package cz.kamma.fabka.auth; -import cz.kamma.fabka.httpserver.crypto.Md5; +import cz.kamma.fabka.crypto.Md5; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/cz/kamma/fabka/httpserver/auth/EnvAuthService.java b/src/main/java/cz/kamma/fabka/auth/EnvAuthService.java similarity index 93% rename from src/main/java/cz/kamma/fabka/httpserver/auth/EnvAuthService.java rename to src/main/java/cz/kamma/fabka/auth/EnvAuthService.java index 8c117c6..f14d212 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/auth/EnvAuthService.java +++ b/src/main/java/cz/kamma/fabka/auth/EnvAuthService.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.auth; +package cz.kamma.fabka.auth; import java.util.Objects; diff --git a/src/main/java/cz/kamma/fabka/httpserver/crypto/Md5.java b/src/main/java/cz/kamma/fabka/crypto/Md5.java similarity index 95% rename from src/main/java/cz/kamma/fabka/httpserver/crypto/Md5.java rename to src/main/java/cz/kamma/fabka/crypto/Md5.java index ec98c95..3a17c80 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/crypto/Md5.java +++ b/src/main/java/cz/kamma/fabka/crypto/Md5.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.crypto; +package cz.kamma.fabka.crypto; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/ClasspathStaticFileHandler.java b/src/main/java/cz/kamma/fabka/http/ClasspathStaticFileHandler.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/http/ClasspathStaticFileHandler.java rename to src/main/java/cz/kamma/fabka/http/ClasspathStaticFileHandler.java index c9e8af2..fd60efa 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/ClasspathStaticFileHandler.java +++ b/src/main/java/cz/kamma/fabka/http/ClasspathStaticFileHandler.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/MultipartFormData.java b/src/main/java/cz/kamma/fabka/http/MultipartFormData.java similarity index 99% rename from src/main/java/cz/kamma/fabka/httpserver/http/MultipartFormData.java rename to src/main/java/cz/kamma/fabka/http/MultipartFormData.java index f69b662..347c27c 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/MultipartFormData.java +++ b/src/main/java/cz/kamma/fabka/http/MultipartFormData.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; import com.sun.net.httpserver.HttpExchange; diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/RequestContext.java b/src/main/java/cz/kamma/fabka/http/RequestContext.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/http/RequestContext.java rename to src/main/java/cz/kamma/fabka/http/RequestContext.java index 9c7c149..72190b7 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/RequestContext.java +++ b/src/main/java/cz/kamma/fabka/http/RequestContext.java @@ -1,9 +1,9 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; -import cz.kamma.fabka.httpserver.session.SessionData; -import cz.kamma.fabka.httpserver.session.SessionManager; +import cz.kamma.fabka.session.SessionData; +import cz.kamma.fabka.session.SessionManager; import java.io.IOException; import java.net.URLDecoder; diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/Responses.java b/src/main/java/cz/kamma/fabka/http/Responses.java similarity index 96% rename from src/main/java/cz/kamma/fabka/httpserver/http/Responses.java rename to src/main/java/cz/kamma/fabka/http/Responses.java index 2e5788c..e52b7db 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/Responses.java +++ b/src/main/java/cz/kamma/fabka/http/Responses.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; import com.sun.net.httpserver.HttpExchange; diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/RouteHandler.java b/src/main/java/cz/kamma/fabka/http/RouteHandler.java similarity index 73% rename from src/main/java/cz/kamma/fabka/httpserver/http/RouteHandler.java rename to src/main/java/cz/kamma/fabka/http/RouteHandler.java index caceed7..a938bf0 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/RouteHandler.java +++ b/src/main/java/cz/kamma/fabka/http/RouteHandler.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; @FunctionalInterface public interface RouteHandler { diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/Router.java b/src/main/java/cz/kamma/fabka/http/Router.java similarity index 93% rename from src/main/java/cz/kamma/fabka/httpserver/http/Router.java rename to src/main/java/cz/kamma/fabka/http/Router.java index 69fe03c..4f1b8fb 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/Router.java +++ b/src/main/java/cz/kamma/fabka/http/Router.java @@ -1,8 +1,8 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import cz.kamma.fabka.httpserver.session.SessionManager; +import cz.kamma.fabka.session.SessionManager; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/cz/kamma/fabka/httpserver/http/StaticFileHttpHandler.java b/src/main/java/cz/kamma/fabka/http/StaticFileHttpHandler.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/http/StaticFileHttpHandler.java rename to src/main/java/cz/kamma/fabka/http/StaticFileHttpHandler.java index 42c2cfd..8ad45ef 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/http/StaticFileHttpHandler.java +++ b/src/main/java/cz/kamma/fabka/http/StaticFileHttpHandler.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.http; +package cz.kamma.fabka.http; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ChatRepository.java b/src/main/java/cz/kamma/fabka/repository/ChatRepository.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ChatRepository.java rename to src/main/java/cz/kamma/fabka/repository/ChatRepository.java index bffc663..9faf84a 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ChatRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/ChatRepository.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; import java.sql.Connection; import java.sql.DriverManager; @@ -10,6 +10,9 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import cz.kamma.fabka.repository.model.ChatLine; +import cz.kamma.fabka.repository.model.ChatVoteStats; + public class ChatRepository { private static final DateTimeFormatter TIME_FORMAT = DateTimeFormatter.ofPattern("HH:mm:ss"); private static final ZoneId APP_ZONE = ZoneId.of("Europe/Prague"); diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumRepository.java b/src/main/java/cz/kamma/fabka/repository/ForumRepository.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ForumRepository.java rename to src/main/java/cz/kamma/fabka/repository/ForumRepository.java index 3a15ef6..ccb4569 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/ForumRepository.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; @@ -17,6 +17,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import cz.kamma.fabka.repository.model.AttachmentData; +import cz.kamma.fabka.repository.model.ForumAttachment; +import cz.kamma.fabka.repository.model.ForumDetail; +import cz.kamma.fabka.repository.model.ForumMessage; +import cz.kamma.fabka.repository.model.ForumSummary; +import cz.kamma.fabka.repository.model.QuotedTextItem; +import cz.kamma.fabka.repository.model.VoteStats; + public class ForumRepository { private static final DateTimeFormatter DATETIME_FORMAT = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"); private static final ZoneId APP_ZONE = ZoneId.of("Europe/Prague"); diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/MemberRepository.java b/src/main/java/cz/kamma/fabka/repository/MemberRepository.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/repository/MemberRepository.java rename to src/main/java/cz/kamma/fabka/repository/MemberRepository.java index 54a3662..a4df329 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/MemberRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/MemberRepository.java @@ -1,6 +1,6 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; -import cz.kamma.fabka.httpserver.crypto.Md5; +import cz.kamma.fabka.crypto.Md5; import java.sql.Connection; import java.sql.DriverManager; @@ -10,6 +10,8 @@ import java.sql.Timestamp; import java.time.ZoneId; import java.time.format.DateTimeFormatter; +import cz.kamma.fabka.repository.model.MemberProfile; + public class MemberRepository { private static final DateTimeFormatter DATETIME_FORMAT = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"); private static final ZoneId APP_ZONE = ZoneId.of("Europe/Prague"); diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/MysqlClientRepository.java b/src/main/java/cz/kamma/fabka/repository/MysqlClientRepository.java similarity index 99% rename from src/main/java/cz/kamma/fabka/httpserver/repository/MysqlClientRepository.java rename to src/main/java/cz/kamma/fabka/repository/MysqlClientRepository.java index 0a403f5..a2411e9 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/MysqlClientRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/MysqlClientRepository.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageRepository.java b/src/main/java/cz/kamma/fabka/repository/PrivateMessageRepository.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageRepository.java rename to src/main/java/cz/kamma/fabka/repository/PrivateMessageRepository.java index 7305c44..a0eeb9a 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/PrivateMessageRepository.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; import java.sql.Connection; import java.sql.DriverManager; @@ -11,6 +11,11 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import cz.kamma.fabka.repository.model.PrivateMessageItem; +import cz.kamma.fabka.repository.model.PrivateMessageStats; +import cz.kamma.fabka.repository.model.PrivateThreadRoot; +import cz.kamma.fabka.repository.model.PrivateThreadSummary; + public class PrivateMessageRepository { private static final DateTimeFormatter DATE_TIME = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"); private static final ZoneId APP_ZONE = ZoneId.of("Europe/Prague"); diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/SettingsRepository.java b/src/main/java/cz/kamma/fabka/repository/SettingsRepository.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/repository/SettingsRepository.java rename to src/main/java/cz/kamma/fabka/repository/SettingsRepository.java index aed20ae..65a2ff7 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/SettingsRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/SettingsRepository.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; import java.sql.Connection; import java.sql.DriverManager; @@ -7,6 +7,8 @@ import java.sql.ResultSet; import java.util.HashMap; import java.util.Map; +import cz.kamma.fabka.repository.model.MessageRenderSettings; + public class SettingsRepository { private static final String SETTING_SQL = "SELECT value FROM settings WHERE name=? LIMIT 1"; private static final String USER_SETTINGS_SQL = "SELECT name, value FROM settings WHERE userid=?"; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/UserIconRepository.java b/src/main/java/cz/kamma/fabka/repository/UserIconRepository.java similarity index 96% rename from src/main/java/cz/kamma/fabka/httpserver/repository/UserIconRepository.java rename to src/main/java/cz/kamma/fabka/repository/UserIconRepository.java index fd39ace..613eba8 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/UserIconRepository.java +++ b/src/main/java/cz/kamma/fabka/repository/UserIconRepository.java @@ -1,10 +1,12 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; +import cz.kamma.fabka.repository.model.UserIcon; + public class UserIconRepository { private static final String USER_ICON_SQL = "SELECT data, mimetype FROM user_icon WHERE userid=? ORDER BY id DESC LIMIT 1"; private static final String INSERT_USER_ICON_SQL = "INSERT INTO user_icon (userid, data, mimetype) VALUES (?,?,?)"; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/AttachmentData.java b/src/main/java/cz/kamma/fabka/repository/model/AttachmentData.java similarity index 91% rename from src/main/java/cz/kamma/fabka/httpserver/repository/AttachmentData.java rename to src/main/java/cz/kamma/fabka/repository/model/AttachmentData.java index f0b774f..a7abc97 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/AttachmentData.java +++ b/src/main/java/cz/kamma/fabka/repository/model/AttachmentData.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class AttachmentData { private final String name; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ChatLine.java b/src/main/java/cz/kamma/fabka/repository/model/ChatLine.java similarity index 96% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ChatLine.java rename to src/main/java/cz/kamma/fabka/repository/model/ChatLine.java index 1a659e1..6591fc5 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ChatLine.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ChatLine.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class ChatLine { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ChatVoteStats.java b/src/main/java/cz/kamma/fabka/repository/model/ChatVoteStats.java similarity index 90% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ChatVoteStats.java rename to src/main/java/cz/kamma/fabka/repository/model/ChatVoteStats.java index 0b43a3c..4ceef3d 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ChatVoteStats.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ChatVoteStats.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class ChatVoteStats { private final String thumbUpUsers; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumAttachment.java b/src/main/java/cz/kamma/fabka/repository/model/ForumAttachment.java similarity index 92% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ForumAttachment.java rename to src/main/java/cz/kamma/fabka/repository/model/ForumAttachment.java index 695b48c..908c587 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumAttachment.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ForumAttachment.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class ForumAttachment { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumDetail.java b/src/main/java/cz/kamma/fabka/repository/model/ForumDetail.java similarity index 93% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ForumDetail.java rename to src/main/java/cz/kamma/fabka/repository/model/ForumDetail.java index 3c38d2d..8d990d7 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumDetail.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ForumDetail.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class ForumDetail { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumDisplayView.java b/src/main/java/cz/kamma/fabka/repository/model/ForumDisplayView.java similarity index 97% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ForumDisplayView.java rename to src/main/java/cz/kamma/fabka/repository/model/ForumDisplayView.java index 9a8e544..9983571 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumDisplayView.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ForumDisplayView.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; import java.util.List; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumMessage.java b/src/main/java/cz/kamma/fabka/repository/model/ForumMessage.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ForumMessage.java rename to src/main/java/cz/kamma/fabka/repository/model/ForumMessage.java index 62bd4a9..24e772c 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumMessage.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ForumMessage.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; import java.util.List; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumSummary.java b/src/main/java/cz/kamma/fabka/repository/model/ForumSummary.java similarity index 96% rename from src/main/java/cz/kamma/fabka/httpserver/repository/ForumSummary.java rename to src/main/java/cz/kamma/fabka/repository/model/ForumSummary.java index 0f0a292..a7158c9 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/ForumSummary.java +++ b/src/main/java/cz/kamma/fabka/repository/model/ForumSummary.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class ForumSummary { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/MemberProfile.java b/src/main/java/cz/kamma/fabka/repository/model/MemberProfile.java similarity index 95% rename from src/main/java/cz/kamma/fabka/httpserver/repository/MemberProfile.java rename to src/main/java/cz/kamma/fabka/repository/model/MemberProfile.java index cccbc51..147b31f 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/MemberProfile.java +++ b/src/main/java/cz/kamma/fabka/repository/model/MemberProfile.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class MemberProfile { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/MessageRenderSettings.java b/src/main/java/cz/kamma/fabka/repository/model/MessageRenderSettings.java similarity index 93% rename from src/main/java/cz/kamma/fabka/httpserver/repository/MessageRenderSettings.java rename to src/main/java/cz/kamma/fabka/repository/model/MessageRenderSettings.java index be4b3b6..d7aaab0 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/MessageRenderSettings.java +++ b/src/main/java/cz/kamma/fabka/repository/model/MessageRenderSettings.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class MessageRenderSettings { private final String youtubeSnippet; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageItem.java b/src/main/java/cz/kamma/fabka/repository/model/PrivateMessageItem.java similarity index 96% rename from src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageItem.java rename to src/main/java/cz/kamma/fabka/repository/model/PrivateMessageItem.java index 6a3a870..73d519c 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageItem.java +++ b/src/main/java/cz/kamma/fabka/repository/model/PrivateMessageItem.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class PrivateMessageItem { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageStats.java b/src/main/java/cz/kamma/fabka/repository/model/PrivateMessageStats.java similarity index 87% rename from src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageStats.java rename to src/main/java/cz/kamma/fabka/repository/model/PrivateMessageStats.java index 46a09b9..c72a609 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateMessageStats.java +++ b/src/main/java/cz/kamma/fabka/repository/model/PrivateMessageStats.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class PrivateMessageStats { private final int unread; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateThreadRoot.java b/src/main/java/cz/kamma/fabka/repository/model/PrivateThreadRoot.java similarity index 94% rename from src/main/java/cz/kamma/fabka/httpserver/repository/PrivateThreadRoot.java rename to src/main/java/cz/kamma/fabka/repository/model/PrivateThreadRoot.java index 61123e9..56d4445 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateThreadRoot.java +++ b/src/main/java/cz/kamma/fabka/repository/model/PrivateThreadRoot.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class PrivateThreadRoot { private final long rootId; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateThreadSummary.java b/src/main/java/cz/kamma/fabka/repository/model/PrivateThreadSummary.java similarity index 96% rename from src/main/java/cz/kamma/fabka/httpserver/repository/PrivateThreadSummary.java rename to src/main/java/cz/kamma/fabka/repository/model/PrivateThreadSummary.java index 075b6b5..82802e7 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/PrivateThreadSummary.java +++ b/src/main/java/cz/kamma/fabka/repository/model/PrivateThreadSummary.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class PrivateThreadSummary { private final long id; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/QuotedTextItem.java b/src/main/java/cz/kamma/fabka/repository/model/QuotedTextItem.java similarity index 87% rename from src/main/java/cz/kamma/fabka/httpserver/repository/QuotedTextItem.java rename to src/main/java/cz/kamma/fabka/repository/model/QuotedTextItem.java index 568700a..c1ad60c 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/QuotedTextItem.java +++ b/src/main/java/cz/kamma/fabka/repository/model/QuotedTextItem.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class QuotedTextItem { private final String author; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/UserIcon.java b/src/main/java/cz/kamma/fabka/repository/model/UserIcon.java similarity index 88% rename from src/main/java/cz/kamma/fabka/httpserver/repository/UserIcon.java rename to src/main/java/cz/kamma/fabka/repository/model/UserIcon.java index a368d58..ffe6c94 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/UserIcon.java +++ b/src/main/java/cz/kamma/fabka/repository/model/UserIcon.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class UserIcon { private final byte[] data; diff --git a/src/main/java/cz/kamma/fabka/httpserver/repository/VoteStats.java b/src/main/java/cz/kamma/fabka/repository/model/VoteStats.java similarity index 92% rename from src/main/java/cz/kamma/fabka/httpserver/repository/VoteStats.java rename to src/main/java/cz/kamma/fabka/repository/model/VoteStats.java index 1c2d7ac..1c0ae10 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/repository/VoteStats.java +++ b/src/main/java/cz/kamma/fabka/repository/model/VoteStats.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.repository; +package cz.kamma.fabka.repository.model; public class VoteStats { private final int yes; diff --git a/src/main/java/cz/kamma/fabka/httpserver/session/SessionData.java b/src/main/java/cz/kamma/fabka/session/SessionData.java similarity index 95% rename from src/main/java/cz/kamma/fabka/httpserver/session/SessionData.java rename to src/main/java/cz/kamma/fabka/session/SessionData.java index c24ddd7..6e42709 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/session/SessionData.java +++ b/src/main/java/cz/kamma/fabka/session/SessionData.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.session; +package cz.kamma.fabka.session; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/cz/kamma/fabka/httpserver/session/SessionManager.java b/src/main/java/cz/kamma/fabka/session/SessionManager.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/session/SessionManager.java rename to src/main/java/cz/kamma/fabka/session/SessionManager.java index 9eeb370..e8bf5ef 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/session/SessionManager.java +++ b/src/main/java/cz/kamma/fabka/session/SessionManager.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.session; +package cz.kamma.fabka.session; import java.time.Duration; import java.util.ArrayList; diff --git a/src/main/java/cz/kamma/fabka/httpserver/web/LegacyMessageFormatter.java b/src/main/java/cz/kamma/fabka/web/LegacyMessageFormatter.java similarity index 99% rename from src/main/java/cz/kamma/fabka/httpserver/web/LegacyMessageFormatter.java rename to src/main/java/cz/kamma/fabka/web/LegacyMessageFormatter.java index 0215e34..9ccee6a 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/web/LegacyMessageFormatter.java +++ b/src/main/java/cz/kamma/fabka/web/LegacyMessageFormatter.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.web; +package cz.kamma.fabka.web; import java.util.StringTokenizer; diff --git a/src/main/java/cz/kamma/fabka/httpserver/web/Pages.java b/src/main/java/cz/kamma/fabka/web/Pages.java similarity index 98% rename from src/main/java/cz/kamma/fabka/httpserver/web/Pages.java rename to src/main/java/cz/kamma/fabka/web/Pages.java index 3f9b41a..76c7ad7 100644 --- a/src/main/java/cz/kamma/fabka/httpserver/web/Pages.java +++ b/src/main/java/cz/kamma/fabka/web/Pages.java @@ -1,4 +1,4 @@ -package cz.kamma.fabka.httpserver.web; +package cz.kamma.fabka.web; import java.io.IOException; import java.io.InputStream; @@ -8,19 +8,21 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import cz.kamma.fabka.httpserver.repository.ForumAttachment; -import cz.kamma.fabka.httpserver.repository.ForumDetail; -import cz.kamma.fabka.httpserver.repository.ForumDisplayView; -import cz.kamma.fabka.httpserver.repository.ForumMessage; -import cz.kamma.fabka.httpserver.repository.ForumSummary; -import cz.kamma.fabka.httpserver.repository.MemberProfile; -import cz.kamma.fabka.httpserver.repository.MessageRenderSettings; -import cz.kamma.fabka.httpserver.repository.MysqlClientRepository; -import cz.kamma.fabka.httpserver.repository.PrivateMessageItem; -import cz.kamma.fabka.httpserver.repository.PrivateMessageStats; -import cz.kamma.fabka.httpserver.repository.PrivateThreadRoot; -import cz.kamma.fabka.httpserver.repository.PrivateThreadSummary; -import cz.kamma.fabka.httpserver.repository.QuotedTextItem; +import cz.kamma.fabka.repository.MysqlClientRepository; +import cz.kamma.fabka.repository.model.AttachmentData; +import cz.kamma.fabka.repository.model.ForumAttachment; +import cz.kamma.fabka.repository.model.ForumDetail; +import cz.kamma.fabka.repository.model.ForumDisplayView; +import cz.kamma.fabka.repository.model.ForumMessage; +import cz.kamma.fabka.repository.model.ForumSummary; +import cz.kamma.fabka.repository.model.MemberProfile; +import cz.kamma.fabka.repository.model.MessageRenderSettings; +import cz.kamma.fabka.repository.model.PrivateMessageItem; +import cz.kamma.fabka.repository.model.PrivateMessageStats; +import cz.kamma.fabka.repository.model.PrivateThreadRoot; +import cz.kamma.fabka.repository.model.PrivateThreadSummary; +import cz.kamma.fabka.repository.model.QuotedTextItem; +import cz.kamma.fabka.repository.model.UserIcon; public final class Pages { private static final String LOGIN_TEMPLATE = readTemplate("webapp/login.html");