From 58e927cc8765ffe4e589e766b0af199feace2ffc Mon Sep 17 00:00:00 2001 From: iRedTea Date: Mon, 29 Aug 2022 13:41:59 +0300 Subject: [PATCH] Reorganization packages --- .../config/LoginMvcConfig.java} | 6 +- .../{ => auth}/config/WebSecurityConfig.java | 2 +- .../controller/RegistrationController.java | 4 +- .../domain/forum/DiscussionStatus.java | 5 -- .../controller/ForumController.java | 17 +++-- .../forum => forum/domain}/Discussion.java | 2 +- .../domain}/DiscussionMessage.java | 2 +- .../forum/domain/DiscussionStatus.java | 5 ++ .../{domain/forum => forum/domain}/Topic.java | 2 +- .../{ => forum}/filter/FilterService.java | 10 +-- .../forum/repo/DiscussionMessageRepo.java | 7 ++ .../forum => forum/repo}/DiscussionRepo.java | 4 +- .../easystartupcore/forum/repo/TopicRepo.java | 7 ++ .../{repos => repo}/UserRepo.java | 2 +- .../repos/forum/DiscussionMessageRepo.java | 8 --- .../repos/forum/TopicRepo.java | 8 --- .../{ => storag}/config/FileConfig.java | 6 +- .../service}/FileLocalStorageService.java | 2 +- .../StorageFileNotFoundException.java | 2 +- .../service}/StorageService.java | 2 +- src/main/resources/templates/topic-new.html | 64 +++++++++++++++++++ .../easystartupcore/FileUploadTests.java | 4 +- 22 files changed, 116 insertions(+), 55 deletions(-) rename src/main/java/site/easystartup/easystartupcore/{config/MvcConfig.java => auth/config/LoginMvcConfig.java} (76%) rename src/main/java/site/easystartup/easystartupcore/{ => auth}/config/WebSecurityConfig.java (97%) rename src/main/java/site/easystartup/easystartupcore/{ => auth}/controller/RegistrationController.java (92%) delete mode 100644 src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionStatus.java rename src/main/java/site/easystartup/easystartupcore/{ => forum}/controller/ForumController.java (72%) rename src/main/java/site/easystartup/easystartupcore/{domain/forum => forum/domain}/Discussion.java (94%) rename src/main/java/site/easystartup/easystartupcore/{domain/forum => forum/domain}/DiscussionMessage.java (93%) create mode 100644 src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionStatus.java rename src/main/java/site/easystartup/easystartupcore/{domain/forum => forum/domain}/Topic.java (94%) rename src/main/java/site/easystartup/easystartupcore/{ => forum}/filter/FilterService.java (78%) create mode 100644 src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionMessageRepo.java rename src/main/java/site/easystartup/easystartupcore/{repos/forum => forum/repo}/DiscussionRepo.java (54%) create mode 100644 src/main/java/site/easystartup/easystartupcore/forum/repo/TopicRepo.java rename src/main/java/site/easystartup/easystartupcore/{repos => repo}/UserRepo.java (82%) delete mode 100644 src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionMessageRepo.java delete mode 100644 src/main/java/site/easystartup/easystartupcore/repos/forum/TopicRepo.java rename src/main/java/site/easystartup/easystartupcore/{ => storag}/config/FileConfig.java (62%) rename src/main/java/site/easystartup/easystartupcore/{storage => storag/service}/FileLocalStorageService.java (97%) rename src/main/java/site/easystartup/easystartupcore/{storage => storag/service}/StorageFileNotFoundException.java (77%) rename src/main/java/site/easystartup/easystartupcore/{storage => storag/service}/StorageService.java (87%) create mode 100644 src/main/resources/templates/topic-new.html diff --git a/src/main/java/site/easystartup/easystartupcore/config/MvcConfig.java b/src/main/java/site/easystartup/easystartupcore/auth/config/LoginMvcConfig.java similarity index 76% rename from src/main/java/site/easystartup/easystartupcore/config/MvcConfig.java rename to src/main/java/site/easystartup/easystartupcore/auth/config/LoginMvcConfig.java index d1736f6..b032536 100644 --- a/src/main/java/site/easystartup/easystartupcore/config/MvcConfig.java +++ b/src/main/java/site/easystartup/easystartupcore/auth/config/LoginMvcConfig.java @@ -1,12 +1,12 @@ -package site.easystartup.easystartupcore.config; +package site.easystartup.easystartupcore.auth.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class MvcConfig implements WebMvcConfigurer { +public class LoginMvcConfig implements WebMvcConfigurer { public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/login").setViewName("login"); } -} +} \ No newline at end of file diff --git a/src/main/java/site/easystartup/easystartupcore/config/WebSecurityConfig.java b/src/main/java/site/easystartup/easystartupcore/auth/config/WebSecurityConfig.java similarity index 97% rename from src/main/java/site/easystartup/easystartupcore/config/WebSecurityConfig.java rename to src/main/java/site/easystartup/easystartupcore/auth/config/WebSecurityConfig.java index 96fba26..ecfb0a1 100644 --- a/src/main/java/site/easystartup/easystartupcore/config/WebSecurityConfig.java +++ b/src/main/java/site/easystartup/easystartupcore/auth/config/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.config; +package site.easystartup.easystartupcore.auth.config; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/site/easystartup/easystartupcore/controller/RegistrationController.java b/src/main/java/site/easystartup/easystartupcore/auth/controller/RegistrationController.java similarity index 92% rename from src/main/java/site/easystartup/easystartupcore/controller/RegistrationController.java rename to src/main/java/site/easystartup/easystartupcore/auth/controller/RegistrationController.java index 4048f45..a097a07 100644 --- a/src/main/java/site/easystartup/easystartupcore/controller/RegistrationController.java +++ b/src/main/java/site/easystartup/easystartupcore/auth/controller/RegistrationController.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.controller; +package site.easystartup.easystartupcore.auth.controller; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import site.easystartup.easystartupcore.domain.Role; import site.easystartup.easystartupcore.domain.User; -import site.easystartup.easystartupcore.repos.UserRepo; +import site.easystartup.easystartupcore.repo.UserRepo; import java.util.Collections; diff --git a/src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionStatus.java b/src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionStatus.java deleted file mode 100644 index 4aed8e7..0000000 --- a/src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package site.easystartup.easystartupcore.domain.forum; - -public enum DiscussionStatus { - OPEN, CLOSED; -} diff --git a/src/main/java/site/easystartup/easystartupcore/controller/ForumController.java b/src/main/java/site/easystartup/easystartupcore/forum/controller/ForumController.java similarity index 72% rename from src/main/java/site/easystartup/easystartupcore/controller/ForumController.java rename to src/main/java/site/easystartup/easystartupcore/forum/controller/ForumController.java index b2bc834..70b3157 100644 --- a/src/main/java/site/easystartup/easystartupcore/controller/ForumController.java +++ b/src/main/java/site/easystartup/easystartupcore/forum/controller/ForumController.java @@ -1,21 +1,15 @@ -package site.easystartup.easystartupcore.controller; +package site.easystartup.easystartupcore.forum.controller; -import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.val; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.User; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import site.easystartup.easystartupcore.domain.forum.Discussion; -import site.easystartup.easystartupcore.domain.forum.Topic; -import site.easystartup.easystartupcore.filter.FilterService; -import site.easystartup.easystartupcore.repos.forum.TopicRepo; - -import java.util.Collections; +import site.easystartup.easystartupcore.forum.filter.FilterService; +import site.easystartup.easystartupcore.forum.repo.TopicRepo; @Controller @RequiredArgsConstructor(onConstructor_ = @Autowired) @@ -38,4 +32,9 @@ public class ForumController { model.addAttribute("discussions", discussions); return "my-discussions"; } + + @GetMapping("/forum/new") + public String forumNew() { + return "topic-new"; + } } diff --git a/src/main/java/site/easystartup/easystartupcore/domain/forum/Discussion.java b/src/main/java/site/easystartup/easystartupcore/forum/domain/Discussion.java similarity index 94% rename from src/main/java/site/easystartup/easystartupcore/domain/forum/Discussion.java rename to src/main/java/site/easystartup/easystartupcore/forum/domain/Discussion.java index b492a07..b901943 100644 --- a/src/main/java/site/easystartup/easystartupcore/domain/forum/Discussion.java +++ b/src/main/java/site/easystartup/easystartupcore/forum/domain/Discussion.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.domain.forum; +package site.easystartup.easystartupcore.forum.domain; import lombok.*; import org.hibernate.Hibernate; diff --git a/src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionMessage.java b/src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionMessage.java similarity index 93% rename from src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionMessage.java rename to src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionMessage.java index b82cc08..99c93d3 100644 --- a/src/main/java/site/easystartup/easystartupcore/domain/forum/DiscussionMessage.java +++ b/src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionMessage.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.domain.forum; +package site.easystartup.easystartupcore.forum.domain; import lombok.*; import org.hibernate.Hibernate; diff --git a/src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionStatus.java b/src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionStatus.java new file mode 100644 index 0000000..3eaa997 --- /dev/null +++ b/src/main/java/site/easystartup/easystartupcore/forum/domain/DiscussionStatus.java @@ -0,0 +1,5 @@ +package site.easystartup.easystartupcore.forum.domain; + +public enum DiscussionStatus { + OPEN, CLOSED; +} diff --git a/src/main/java/site/easystartup/easystartupcore/domain/forum/Topic.java b/src/main/java/site/easystartup/easystartupcore/forum/domain/Topic.java similarity index 94% rename from src/main/java/site/easystartup/easystartupcore/domain/forum/Topic.java rename to src/main/java/site/easystartup/easystartupcore/forum/domain/Topic.java index d6e5b95..59cad8e 100644 --- a/src/main/java/site/easystartup/easystartupcore/domain/forum/Topic.java +++ b/src/main/java/site/easystartup/easystartupcore/forum/domain/Topic.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.domain.forum; +package site.easystartup.easystartupcore.forum.domain; import lombok.*; import org.hibernate.Hibernate; diff --git a/src/main/java/site/easystartup/easystartupcore/filter/FilterService.java b/src/main/java/site/easystartup/easystartupcore/forum/filter/FilterService.java similarity index 78% rename from src/main/java/site/easystartup/easystartupcore/filter/FilterService.java rename to src/main/java/site/easystartup/easystartupcore/forum/filter/FilterService.java index 93e6b20..f027ecd 100644 --- a/src/main/java/site/easystartup/easystartupcore/filter/FilterService.java +++ b/src/main/java/site/easystartup/easystartupcore/forum/filter/FilterService.java @@ -1,13 +1,13 @@ -package site.easystartup.easystartupcore.filter; +package site.easystartup.easystartupcore.forum.filter; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import site.easystartup.easystartupcore.domain.forum.Discussion; -import site.easystartup.easystartupcore.domain.forum.DiscussionMessage; -import site.easystartup.easystartupcore.repos.forum.DiscussionMessageRepo; -import site.easystartup.easystartupcore.repos.forum.DiscussionRepo; +import site.easystartup.easystartupcore.forum.domain.Discussion; +import site.easystartup.easystartupcore.forum.domain.DiscussionMessage; +import site.easystartup.easystartupcore.forum.repo.DiscussionMessageRepo; +import site.easystartup.easystartupcore.forum.repo.DiscussionRepo; import java.util.List; diff --git a/src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionMessageRepo.java b/src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionMessageRepo.java new file mode 100644 index 0000000..36d17b0 --- /dev/null +++ b/src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionMessageRepo.java @@ -0,0 +1,7 @@ +package site.easystartup.easystartupcore.forum.repo; + +import org.springframework.data.repository.CrudRepository; +import site.easystartup.easystartupcore.forum.domain.DiscussionMessage; + +public interface DiscussionMessageRepo extends CrudRepository { +} diff --git a/src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionRepo.java b/src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionRepo.java similarity index 54% rename from src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionRepo.java rename to src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionRepo.java index 51d7e63..7fe0ba0 100644 --- a/src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionRepo.java +++ b/src/main/java/site/easystartup/easystartupcore/forum/repo/DiscussionRepo.java @@ -1,7 +1,7 @@ -package site.easystartup.easystartupcore.repos.forum; +package site.easystartup.easystartupcore.forum.repo; import org.springframework.data.repository.CrudRepository; -import site.easystartup.easystartupcore.domain.forum.Discussion; +import site.easystartup.easystartupcore.forum.domain.Discussion; public interface DiscussionRepo extends CrudRepository { } diff --git a/src/main/java/site/easystartup/easystartupcore/forum/repo/TopicRepo.java b/src/main/java/site/easystartup/easystartupcore/forum/repo/TopicRepo.java new file mode 100644 index 0000000..75fc36b --- /dev/null +++ b/src/main/java/site/easystartup/easystartupcore/forum/repo/TopicRepo.java @@ -0,0 +1,7 @@ +package site.easystartup.easystartupcore.forum.repo; + +import org.springframework.data.repository.CrudRepository; +import site.easystartup.easystartupcore.forum.domain.Topic; + +public interface TopicRepo extends CrudRepository { +} diff --git a/src/main/java/site/easystartup/easystartupcore/repos/UserRepo.java b/src/main/java/site/easystartup/easystartupcore/repo/UserRepo.java similarity index 82% rename from src/main/java/site/easystartup/easystartupcore/repos/UserRepo.java rename to src/main/java/site/easystartup/easystartupcore/repo/UserRepo.java index d716224..977f8e3 100644 --- a/src/main/java/site/easystartup/easystartupcore/repos/UserRepo.java +++ b/src/main/java/site/easystartup/easystartupcore/repo/UserRepo.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.repos; +package site.easystartup.easystartupcore.repo; import org.springframework.data.jpa.repository.JpaRepository; import site.easystartup.easystartupcore.domain.User; diff --git a/src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionMessageRepo.java b/src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionMessageRepo.java deleted file mode 100644 index aae42de..0000000 --- a/src/main/java/site/easystartup/easystartupcore/repos/forum/DiscussionMessageRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package site.easystartup.easystartupcore.repos.forum; - -import org.springframework.data.repository.CrudRepository; -import site.easystartup.easystartupcore.domain.forum.Discussion; -import site.easystartup.easystartupcore.domain.forum.DiscussionMessage; - -public interface DiscussionMessageRepo extends CrudRepository { -} diff --git a/src/main/java/site/easystartup/easystartupcore/repos/forum/TopicRepo.java b/src/main/java/site/easystartup/easystartupcore/repos/forum/TopicRepo.java deleted file mode 100644 index b5fbcd5..0000000 --- a/src/main/java/site/easystartup/easystartupcore/repos/forum/TopicRepo.java +++ /dev/null @@ -1,8 +0,0 @@ -package site.easystartup.easystartupcore.repos.forum; - -import org.springframework.data.repository.CrudRepository; -import site.easystartup.easystartupcore.domain.forum.Discussion; -import site.easystartup.easystartupcore.domain.forum.Topic; - -public interface TopicRepo extends CrudRepository { -} diff --git a/src/main/java/site/easystartup/easystartupcore/config/FileConfig.java b/src/main/java/site/easystartup/easystartupcore/storag/config/FileConfig.java similarity index 62% rename from src/main/java/site/easystartup/easystartupcore/config/FileConfig.java rename to src/main/java/site/easystartup/easystartupcore/storag/config/FileConfig.java index 8208195..7447a0e 100644 --- a/src/main/java/site/easystartup/easystartupcore/config/FileConfig.java +++ b/src/main/java/site/easystartup/easystartupcore/storag/config/FileConfig.java @@ -1,10 +1,10 @@ -package site.easystartup.easystartupcore.config; +package site.easystartup.easystartupcore.storag.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; -import site.easystartup.easystartupcore.storage.FileLocalStorageService; -import site.easystartup.easystartupcore.storage.StorageService; +import site.easystartup.easystartupcore.storag.service.FileLocalStorageService; +import site.easystartup.easystartupcore.storag.service.StorageService; @Configuration public class FileConfig { diff --git a/src/main/java/site/easystartup/easystartupcore/storage/FileLocalStorageService.java b/src/main/java/site/easystartup/easystartupcore/storag/service/FileLocalStorageService.java similarity index 97% rename from src/main/java/site/easystartup/easystartupcore/storage/FileLocalStorageService.java rename to src/main/java/site/easystartup/easystartupcore/storag/service/FileLocalStorageService.java index 3786d50..ad17b32 100644 --- a/src/main/java/site/easystartup/easystartupcore/storage/FileLocalStorageService.java +++ b/src/main/java/site/easystartup/easystartupcore/storag/service/FileLocalStorageService.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.storage; +package site.easystartup.easystartupcore.storag.service; import lombok.SneakyThrows; import org.springframework.core.io.Resource; diff --git a/src/main/java/site/easystartup/easystartupcore/storage/StorageFileNotFoundException.java b/src/main/java/site/easystartup/easystartupcore/storag/service/StorageFileNotFoundException.java similarity index 77% rename from src/main/java/site/easystartup/easystartupcore/storage/StorageFileNotFoundException.java rename to src/main/java/site/easystartup/easystartupcore/storag/service/StorageFileNotFoundException.java index 03021fd..786b8ee 100644 --- a/src/main/java/site/easystartup/easystartupcore/storage/StorageFileNotFoundException.java +++ b/src/main/java/site/easystartup/easystartupcore/storag/service/StorageFileNotFoundException.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.storage; +package site.easystartup.easystartupcore.storag.service; public class StorageFileNotFoundException extends RuntimeException { public StorageFileNotFoundException(String filename) { diff --git a/src/main/java/site/easystartup/easystartupcore/storage/StorageService.java b/src/main/java/site/easystartup/easystartupcore/storag/service/StorageService.java similarity index 87% rename from src/main/java/site/easystartup/easystartupcore/storage/StorageService.java rename to src/main/java/site/easystartup/easystartupcore/storag/service/StorageService.java index dd6a170..1dcf094 100644 --- a/src/main/java/site/easystartup/easystartupcore/storage/StorageService.java +++ b/src/main/java/site/easystartup/easystartupcore/storag/service/StorageService.java @@ -1,4 +1,4 @@ -package site.easystartup.easystartupcore.storage; +package site.easystartup.easystartupcore.storag.service; import org.springframework.core.io.Resource; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/resources/templates/topic-new.html b/src/main/resources/templates/topic-new.html new file mode 100644 index 0000000..df8e7b8 --- /dev/null +++ b/src/main/resources/templates/topic-new.html @@ -0,0 +1,64 @@ + + + + + Вход + + + + + + + + +
+ +
+

Пожалуйста, введите данные новой темы

+ +
+ + +
+
+ + +
+ +
+ +
+ + + +
+ Неправильный логин или пароль. +
+
+ Вы вышли из аккаунта. +
+ +

© 2022

+
+
+ + + + + + + \ No newline at end of file diff --git a/src/test/java/site/easystartup/easystartupcore/FileUploadTests.java b/src/test/java/site/easystartup/easystartupcore/FileUploadTests.java index 50399ab..b35cd6b 100644 --- a/src/test/java/site/easystartup/easystartupcore/FileUploadTests.java +++ b/src/test/java/site/easystartup/easystartupcore/FileUploadTests.java @@ -10,8 +10,8 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.web.servlet.MockMvc; -import site.easystartup.easystartupcore.storage.StorageFileNotFoundException; -import site.easystartup.easystartupcore.storage.StorageService; +import site.easystartup.easystartupcore.storag.service.StorageFileNotFoundException; +import site.easystartup.easystartupcore.storag.service.StorageService; import java.nio.file.Files; import java.nio.file.Path;