From 367677c7a8850f392782a4afa24d24734416d002 Mon Sep 17 00:00:00 2001 From: Mysaa Java Date: Sun, 7 Jun 2026 20:00:32 +0200 Subject: [PATCH] Ordered everything in subprojects --- .../misael/{web => auth}/AuthController.java | 12 ++++---- .../{ => auth}/CustomUserDetailsService.java | 10 +++---- .../misael/{ => auth}/SpringSecurity.java | 2 +- .../misael/{ => auth}/model/Privilege.java | 2 +- .../bernard/misael/{ => auth}/model/Role.java | 2 +- .../bernard/misael/{ => auth}/model/User.java | 4 ++- .../{ => auth}/repository/RoleRepository.java | 4 +-- .../{ => auth}/repository/UserRepository.java | 4 +-- .../misael/{ => auth}/service/AdminMaker.java | 12 ++++---- .../{ => auth}/service/UserService.java | 8 ++--- .../{ => auth}/service/UserServiceImpl.java | 10 +++---- .../{ => auth}/service/dto/UserDto.java | 2 +- .../{web => quizz}/QuestionsController.java | 18 +++++------ .../misael/{ => quizz}/model/Answer.java | 4 +-- .../misael/{ => quizz}/model/Question.java | 8 ++--- .../misael/{ => quizz}/model/Quizz.java | 4 ++- .../misael/{ => quizz}/model/QuizzForm.java | 4 ++- .../{ => quizz}/questions/DccQuestion.java | 8 ++--- .../misael/{ => quizz}/questions/QTypes.java | 2 +- .../{ => quizz}/questions/QuestionType.java | 4 +-- .../repository/AnswerRepository.java | 8 ++--- .../repository/QuestionRepository.java | 6 ++-- .../repository/QuizzFormRepository.java | 8 ++--- .../repository/QuizzRepository.java | 6 ++-- .../service/JsonNodeConverter.java | 2 +- .../{ => quizz}/service/QuizzManager.java | 10 +++---- .../{ => quizz}/service/QuizzManagerImpl.java | 30 ++++++++++--------- .../exception/MalformedAnswerException.java | 2 +- .../MalformedClientAnswerException.java | 2 +- .../exception/QuestionTypeException.java | 2 +- .../misael/{ => thecrew}/TheCrewConfig.java | 2 +- .../{web => thecrew}/TheCrewController.java | 2 +- .../misael/MisaelApplicationTests.java | 2 +- 33 files changed, 107 insertions(+), 99 deletions(-) rename src/main/java/com/bernard/misael/{web => auth}/AuthController.java (92%) rename src/main/java/com/bernard/misael/{ => auth}/CustomUserDetailsService.java (86%) rename src/main/java/com/bernard/misael/{ => auth}/SpringSecurity.java (98%) rename src/main/java/com/bernard/misael/{ => auth}/model/Privilege.java (87%) rename src/main/java/com/bernard/misael/{ => auth}/model/Role.java (97%) rename src/main/java/com/bernard/misael/{ => auth}/model/User.java (94%) rename src/main/java/com/bernard/misael/{ => auth}/repository/RoleRepository.java (66%) rename src/main/java/com/bernard/misael/{ => auth}/repository/UserRepository.java (66%) rename src/main/java/com/bernard/misael/{ => auth}/service/AdminMaker.java (87%) rename src/main/java/com/bernard/misael/{ => auth}/service/UserService.java (59%) rename src/main/java/com/bernard/misael/{ => auth}/service/UserServiceImpl.java (87%) rename src/main/java/com/bernard/misael/{ => auth}/service/dto/UserDto.java (90%) rename src/main/java/com/bernard/misael/{web => quizz}/QuestionsController.java (96%) rename src/main/java/com/bernard/misael/{ => quizz}/model/Answer.java (92%) rename src/main/java/com/bernard/misael/{ => quizz}/model/Question.java (80%) rename src/main/java/com/bernard/misael/{ => quizz}/model/Quizz.java (91%) rename src/main/java/com/bernard/misael/{ => quizz}/model/QuizzForm.java (90%) rename src/main/java/com/bernard/misael/{ => quizz}/questions/DccQuestion.java (94%) rename src/main/java/com/bernard/misael/{ => quizz}/questions/QTypes.java (94%) rename src/main/java/com/bernard/misael/{ => quizz}/questions/QuestionType.java (81%) rename src/main/java/com/bernard/misael/{ => quizz}/repository/AnswerRepository.java (62%) rename src/main/java/com/bernard/misael/{ => quizz}/repository/QuestionRepository.java (72%) rename src/main/java/com/bernard/misael/{ => quizz}/repository/QuizzFormRepository.java (68%) rename src/main/java/com/bernard/misael/{ => quizz}/repository/QuizzRepository.java (80%) rename src/main/java/com/bernard/misael/{ => quizz}/service/JsonNodeConverter.java (94%) rename src/main/java/com/bernard/misael/{ => quizz}/service/QuizzManager.java (86%) rename src/main/java/com/bernard/misael/{ => quizz}/service/QuizzManagerImpl.java (96%) rename src/main/java/com/bernard/misael/{ => quizz}/service/exception/MalformedAnswerException.java (58%) rename src/main/java/com/bernard/misael/{ => quizz}/service/exception/MalformedClientAnswerException.java (60%) rename src/main/java/com/bernard/misael/{ => quizz}/service/exception/QuestionTypeException.java (56%) rename src/main/java/com/bernard/misael/{ => thecrew}/TheCrewConfig.java (94%) rename src/main/java/com/bernard/misael/{web => thecrew}/TheCrewController.java (97%) diff --git a/src/main/java/com/bernard/misael/web/AuthController.java b/src/main/java/com/bernard/misael/auth/AuthController.java similarity index 92% rename from src/main/java/com/bernard/misael/web/AuthController.java rename to src/main/java/com/bernard/misael/auth/AuthController.java index 8428f2b..4d1d1a8 100644 --- a/src/main/java/com/bernard/misael/web/AuthController.java +++ b/src/main/java/com/bernard/misael/auth/AuthController.java @@ -1,4 +1,4 @@ -package com.bernard.misael.web; +package com.bernard.misael.auth; import java.security.Principal; import java.util.List; @@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -import com.bernard.misael.model.Role; -import com.bernard.misael.model.User; -import com.bernard.misael.repository.UserRepository; -import com.bernard.misael.service.UserService; -import com.bernard.misael.service.dto.UserDto; +import com.bernard.misael.auth.repository.UserRepository; +import com.bernard.misael.auth.service.UserService; +import com.bernard.misael.auth.model.Role; +import com.bernard.misael.auth.model.User; +import com.bernard.misael.auth.service.dto.UserDto; import jakarta.validation.Valid; import lombok.Getter; diff --git a/src/main/java/com/bernard/misael/CustomUserDetailsService.java b/src/main/java/com/bernard/misael/auth/CustomUserDetailsService.java similarity index 86% rename from src/main/java/com/bernard/misael/CustomUserDetailsService.java rename to src/main/java/com/bernard/misael/auth/CustomUserDetailsService.java index b481b6e..818237f 100644 --- a/src/main/java/com/bernard/misael/CustomUserDetailsService.java +++ b/src/main/java/com/bernard/misael/auth/CustomUserDetailsService.java @@ -1,4 +1,4 @@ -package com.bernard.misael; +package com.bernard.misael.auth; import java.util.Set; import java.util.function.Function; @@ -9,10 +9,10 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.bernard.misael.model.Privilege; -import com.bernard.misael.model.Role; -import com.bernard.misael.model.User; -import com.bernard.misael.repository.UserRepository; +import com.bernard.misael.auth.repository.UserRepository; +import com.bernard.misael.auth.model.Privilege; +import com.bernard.misael.auth.model.Role; +import com.bernard.misael.auth.model.User; @Service public class CustomUserDetailsService implements UserDetailsService { diff --git a/src/main/java/com/bernard/misael/SpringSecurity.java b/src/main/java/com/bernard/misael/auth/SpringSecurity.java similarity index 98% rename from src/main/java/com/bernard/misael/SpringSecurity.java rename to src/main/java/com/bernard/misael/auth/SpringSecurity.java index f3cfb28..d55637f 100644 --- a/src/main/java/com/bernard/misael/SpringSecurity.java +++ b/src/main/java/com/bernard/misael/auth/SpringSecurity.java @@ -1,4 +1,4 @@ -package com.bernard.misael; +package com.bernard.misael.auth; import java.util.logging.Logger; diff --git a/src/main/java/com/bernard/misael/model/Privilege.java b/src/main/java/com/bernard/misael/auth/model/Privilege.java similarity index 87% rename from src/main/java/com/bernard/misael/model/Privilege.java rename to src/main/java/com/bernard/misael/auth/model/Privilege.java index 5a1c680..79977d8 100644 --- a/src/main/java/com/bernard/misael/model/Privilege.java +++ b/src/main/java/com/bernard/misael/auth/model/Privilege.java @@ -1,4 +1,4 @@ -package com.bernard.misael.model; +package com.bernard.misael.auth.model; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/bernard/misael/model/Role.java b/src/main/java/com/bernard/misael/auth/model/Role.java similarity index 97% rename from src/main/java/com/bernard/misael/model/Role.java rename to src/main/java/com/bernard/misael/auth/model/Role.java index 978df56..719adc9 100644 --- a/src/main/java/com/bernard/misael/model/Role.java +++ b/src/main/java/com/bernard/misael/auth/model/Role.java @@ -1,4 +1,4 @@ -package com.bernard.misael.model; +package com.bernard.misael.auth.model; import java.util.EnumSet; import java.util.List; diff --git a/src/main/java/com/bernard/misael/model/User.java b/src/main/java/com/bernard/misael/auth/model/User.java similarity index 94% rename from src/main/java/com/bernard/misael/model/User.java rename to src/main/java/com/bernard/misael/auth/model/User.java index d71e59d..30e6b7c 100644 --- a/src/main/java/com/bernard/misael/model/User.java +++ b/src/main/java/com/bernard/misael/auth/model/User.java @@ -1,9 +1,11 @@ -package com.bernard.misael.model; +package com.bernard.misael.auth.model; import java.util.ArrayList; import java.util.List; import java.util.Set; +import com.bernard.misael.quizz.model.Quizz; + import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/bernard/misael/repository/RoleRepository.java b/src/main/java/com/bernard/misael/auth/repository/RoleRepository.java similarity index 66% rename from src/main/java/com/bernard/misael/repository/RoleRepository.java rename to src/main/java/com/bernard/misael/auth/repository/RoleRepository.java index d028fce..6705ccb 100644 --- a/src/main/java/com/bernard/misael/repository/RoleRepository.java +++ b/src/main/java/com/bernard/misael/auth/repository/RoleRepository.java @@ -1,8 +1,8 @@ -package com.bernard.misael.repository; +package com.bernard.misael.auth.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.bernard.misael.model.Role; +import com.bernard.misael.auth.model.Role; public interface RoleRepository extends JpaRepository { diff --git a/src/main/java/com/bernard/misael/repository/UserRepository.java b/src/main/java/com/bernard/misael/auth/repository/UserRepository.java similarity index 66% rename from src/main/java/com/bernard/misael/repository/UserRepository.java rename to src/main/java/com/bernard/misael/auth/repository/UserRepository.java index 2ffcd24..6cdabee 100644 --- a/src/main/java/com/bernard/misael/repository/UserRepository.java +++ b/src/main/java/com/bernard/misael/auth/repository/UserRepository.java @@ -1,8 +1,8 @@ -package com.bernard.misael.repository; +package com.bernard.misael.auth.repository; import org.springframework.data.jpa.repository.JpaRepository; -import com.bernard.misael.model.User; +import com.bernard.misael.auth.model.User; public interface UserRepository extends JpaRepository { diff --git a/src/main/java/com/bernard/misael/service/AdminMaker.java b/src/main/java/com/bernard/misael/auth/service/AdminMaker.java similarity index 87% rename from src/main/java/com/bernard/misael/service/AdminMaker.java rename to src/main/java/com/bernard/misael/auth/service/AdminMaker.java index b1e28fb..b7deafe 100644 --- a/src/main/java/com/bernard/misael/service/AdminMaker.java +++ b/src/main/java/com/bernard/misael/auth/service/AdminMaker.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service; +package com.bernard.misael.auth.service; import java.util.Arrays; import java.util.EnumSet; @@ -11,11 +11,11 @@ import org.springframework.lang.NonNull; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; -import com.bernard.misael.model.Privilege; -import com.bernard.misael.model.Role; -import com.bernard.misael.model.User; -import com.bernard.misael.repository.RoleRepository; -import com.bernard.misael.repository.UserRepository; +import com.bernard.misael.auth.repository.RoleRepository; +import com.bernard.misael.auth.repository.UserRepository; +import com.bernard.misael.auth.model.Privilege; +import com.bernard.misael.auth.model.Role; +import com.bernard.misael.auth.model.User; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/bernard/misael/service/UserService.java b/src/main/java/com/bernard/misael/auth/service/UserService.java similarity index 59% rename from src/main/java/com/bernard/misael/service/UserService.java rename to src/main/java/com/bernard/misael/auth/service/UserService.java index ad59bea..23dab13 100644 --- a/src/main/java/com/bernard/misael/service/UserService.java +++ b/src/main/java/com/bernard/misael/auth/service/UserService.java @@ -1,10 +1,10 @@ -package com.bernard.misael.service; +package com.bernard.misael.auth.service; import java.util.List; -import com.bernard.misael.model.Privilege; -import com.bernard.misael.model.User; -import com.bernard.misael.service.dto.UserDto; +import com.bernard.misael.auth.model.Privilege; +import com.bernard.misael.auth.model.User; +import com.bernard.misael.auth.service.dto.UserDto; public interface UserService { diff --git a/src/main/java/com/bernard/misael/service/UserServiceImpl.java b/src/main/java/com/bernard/misael/auth/service/UserServiceImpl.java similarity index 87% rename from src/main/java/com/bernard/misael/service/UserServiceImpl.java rename to src/main/java/com/bernard/misael/auth/service/UserServiceImpl.java index f79040b..72eaac5 100644 --- a/src/main/java/com/bernard/misael/service/UserServiceImpl.java +++ b/src/main/java/com/bernard/misael/auth/service/UserServiceImpl.java @@ -1,14 +1,14 @@ -package com.bernard.misael.service; +package com.bernard.misael.auth.service; import java.util.List; import java.util.stream.Collectors; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import com.bernard.misael.model.Privilege; -import com.bernard.misael.model.User; -import com.bernard.misael.repository.UserRepository; -import com.bernard.misael.service.dto.UserDto; +import com.bernard.misael.auth.repository.UserRepository; +import com.bernard.misael.auth.service.dto.UserDto; +import com.bernard.misael.auth.model.Privilege; +import com.bernard.misael.auth.model.User; @Service public class UserServiceImpl implements UserService { diff --git a/src/main/java/com/bernard/misael/service/dto/UserDto.java b/src/main/java/com/bernard/misael/auth/service/dto/UserDto.java similarity index 90% rename from src/main/java/com/bernard/misael/service/dto/UserDto.java rename to src/main/java/com/bernard/misael/auth/service/dto/UserDto.java index 46df941..d7195e3 100644 --- a/src/main/java/com/bernard/misael/service/dto/UserDto.java +++ b/src/main/java/com/bernard/misael/auth/service/dto/UserDto.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service.dto; +package com.bernard.misael.auth.service.dto; import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/bernard/misael/web/QuestionsController.java b/src/main/java/com/bernard/misael/quizz/QuestionsController.java similarity index 96% rename from src/main/java/com/bernard/misael/web/QuestionsController.java rename to src/main/java/com/bernard/misael/quizz/QuestionsController.java index 1bdd9d8..0d6d851 100644 --- a/src/main/java/com/bernard/misael/web/QuestionsController.java +++ b/src/main/java/com/bernard/misael/quizz/QuestionsController.java @@ -1,4 +1,4 @@ -package com.bernard.misael.web; +package com.bernard.misael.quizz; import java.security.Principal; import java.util.ArrayList; @@ -16,14 +16,14 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import com.bernard.misael.model.Quizz; -import com.bernard.misael.model.QuizzForm; -import com.bernard.misael.model.User; -import com.bernard.misael.questions.QTypes; -import com.bernard.misael.repository.QuizzFormRepository; -import com.bernard.misael.repository.QuizzRepository; -import com.bernard.misael.repository.UserRepository; -import com.bernard.misael.service.QuizzManager; +import com.bernard.misael.auth.repository.UserRepository; +import com.bernard.misael.quizz.model.Quizz; +import com.bernard.misael.quizz.model.QuizzForm; +import com.bernard.misael.auth.model.User; +import com.bernard.misael.quizz.questions.QTypes; +import com.bernard.misael.quizz.repository.QuizzFormRepository; +import com.bernard.misael.quizz.repository.QuizzRepository; +import com.bernard.misael.quizz.service.QuizzManager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/src/main/java/com/bernard/misael/model/Answer.java b/src/main/java/com/bernard/misael/quizz/model/Answer.java similarity index 92% rename from src/main/java/com/bernard/misael/model/Answer.java rename to src/main/java/com/bernard/misael/quizz/model/Answer.java index 4649bd4..c2691c5 100644 --- a/src/main/java/com/bernard/misael/model/Answer.java +++ b/src/main/java/com/bernard/misael/quizz/model/Answer.java @@ -1,6 +1,6 @@ -package com.bernard.misael.model; +package com.bernard.misael.quizz.model; -import com.bernard.misael.service.JsonNodeConverter; +import com.bernard.misael.quizz.service.JsonNodeConverter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/src/main/java/com/bernard/misael/model/Question.java b/src/main/java/com/bernard/misael/quizz/model/Question.java similarity index 80% rename from src/main/java/com/bernard/misael/model/Question.java rename to src/main/java/com/bernard/misael/quizz/model/Question.java index 948cb56..e3e41c9 100644 --- a/src/main/java/com/bernard/misael/model/Question.java +++ b/src/main/java/com/bernard/misael/quizz/model/Question.java @@ -1,8 +1,8 @@ -package com.bernard.misael.model; +package com.bernard.misael.quizz.model; -import com.bernard.misael.questions.QTypes; -import com.bernard.misael.questions.QuestionType; -import com.bernard.misael.service.JsonNodeConverter; +import com.bernard.misael.quizz.questions.QTypes; +import com.bernard.misael.quizz.questions.QuestionType; +import com.bernard.misael.quizz.service.JsonNodeConverter; import com.fasterxml.jackson.databind.JsonNode; import jakarta.persistence.*; diff --git a/src/main/java/com/bernard/misael/model/Quizz.java b/src/main/java/com/bernard/misael/quizz/model/Quizz.java similarity index 91% rename from src/main/java/com/bernard/misael/model/Quizz.java rename to src/main/java/com/bernard/misael/quizz/model/Quizz.java index 07d623c..e522dd2 100644 --- a/src/main/java/com/bernard/misael/model/Quizz.java +++ b/src/main/java/com/bernard/misael/quizz/model/Quizz.java @@ -1,9 +1,11 @@ -package com.bernard.misael.model; +package com.bernard.misael.quizz.model; import java.util.Set; import org.hibernate.annotations.ColumnDefault; +import com.bernard.misael.auth.model.User; + import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/bernard/misael/model/QuizzForm.java b/src/main/java/com/bernard/misael/quizz/model/QuizzForm.java similarity index 90% rename from src/main/java/com/bernard/misael/model/QuizzForm.java rename to src/main/java/com/bernard/misael/quizz/model/QuizzForm.java index 630bd82..de497b2 100644 --- a/src/main/java/com/bernard/misael/model/QuizzForm.java +++ b/src/main/java/com/bernard/misael/quizz/model/QuizzForm.java @@ -1,4 +1,6 @@ -package com.bernard.misael.model; +package com.bernard.misael.quizz.model; + +import com.bernard.misael.auth.model.User; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/bernard/misael/questions/DccQuestion.java b/src/main/java/com/bernard/misael/quizz/questions/DccQuestion.java similarity index 94% rename from src/main/java/com/bernard/misael/questions/DccQuestion.java rename to src/main/java/com/bernard/misael/quizz/questions/DccQuestion.java index df0fb2e..ee76355 100644 --- a/src/main/java/com/bernard/misael/questions/DccQuestion.java +++ b/src/main/java/com/bernard/misael/quizz/questions/DccQuestion.java @@ -1,4 +1,4 @@ -package com.bernard.misael.questions; +package com.bernard.misael.quizz.questions; import java.util.ArrayList; import java.util.Collections; @@ -13,9 +13,9 @@ import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.bernard.misael.service.exception.MalformedAnswerException; -import com.bernard.misael.service.exception.MalformedClientAnswerException; -import com.bernard.misael.service.exception.QuestionTypeException; +import com.bernard.misael.quizz.service.exception.MalformedAnswerException; +import com.bernard.misael.quizz.service.exception.MalformedClientAnswerException; +import com.bernard.misael.quizz.service.exception.QuestionTypeException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/src/main/java/com/bernard/misael/questions/QTypes.java b/src/main/java/com/bernard/misael/quizz/questions/QTypes.java similarity index 94% rename from src/main/java/com/bernard/misael/questions/QTypes.java rename to src/main/java/com/bernard/misael/quizz/questions/QTypes.java index 77024ab..b2123bf 100644 --- a/src/main/java/com/bernard/misael/questions/QTypes.java +++ b/src/main/java/com/bernard/misael/quizz/questions/QTypes.java @@ -1,4 +1,4 @@ -package com.bernard.misael.questions; +package com.bernard.misael.quizz. questions; import java.util.function.Function; diff --git a/src/main/java/com/bernard/misael/questions/QuestionType.java b/src/main/java/com/bernard/misael/quizz/questions/QuestionType.java similarity index 81% rename from src/main/java/com/bernard/misael/questions/QuestionType.java rename to src/main/java/com/bernard/misael/quizz/questions/QuestionType.java index 06e9e0f..a70767a 100644 --- a/src/main/java/com/bernard/misael/questions/QuestionType.java +++ b/src/main/java/com/bernard/misael/quizz/questions/QuestionType.java @@ -1,6 +1,6 @@ -package com.bernard.misael.questions; +package com.bernard.misael.quizz. questions; -import com.bernard.misael.service.exception.QuestionTypeException; +import com.bernard.misael.quizz.service.exception.QuestionTypeException; import com.fasterxml.jackson.databind.JsonNode; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/bernard/misael/repository/AnswerRepository.java b/src/main/java/com/bernard/misael/quizz/repository/AnswerRepository.java similarity index 62% rename from src/main/java/com/bernard/misael/repository/AnswerRepository.java rename to src/main/java/com/bernard/misael/quizz/repository/AnswerRepository.java index 97b1247..cfad4b5 100644 --- a/src/main/java/com/bernard/misael/repository/AnswerRepository.java +++ b/src/main/java/com/bernard/misael/quizz/repository/AnswerRepository.java @@ -1,12 +1,12 @@ -package com.bernard.misael.repository; +package com.bernard.misael.quizz.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.bernard.misael.model.Answer; -import com.bernard.misael.model.Question; -import com.bernard.misael.model.QuizzForm; +import com.bernard.misael.quizz.model.Answer; +import com.bernard.misael.quizz.model.Question; +import com.bernard.misael.quizz.model.QuizzForm; public interface AnswerRepository extends JpaRepository { diff --git a/src/main/java/com/bernard/misael/repository/QuestionRepository.java b/src/main/java/com/bernard/misael/quizz/repository/QuestionRepository.java similarity index 72% rename from src/main/java/com/bernard/misael/repository/QuestionRepository.java rename to src/main/java/com/bernard/misael/quizz/repository/QuestionRepository.java index 81f44e1..5841276 100644 --- a/src/main/java/com/bernard/misael/repository/QuestionRepository.java +++ b/src/main/java/com/bernard/misael/quizz/repository/QuestionRepository.java @@ -1,12 +1,12 @@ -package com.bernard.misael.repository; +package com.bernard.misael.quizz.repository; import java.util.List; import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; -import com.bernard.misael.model.Question; -import com.bernard.misael.model.Quizz; +import com.bernard.misael.quizz.model.Question; +import com.bernard.misael.quizz.model.Quizz; public interface QuestionRepository extends JpaRepository { diff --git a/src/main/java/com/bernard/misael/repository/QuizzFormRepository.java b/src/main/java/com/bernard/misael/quizz/repository/QuizzFormRepository.java similarity index 68% rename from src/main/java/com/bernard/misael/repository/QuizzFormRepository.java rename to src/main/java/com/bernard/misael/quizz/repository/QuizzFormRepository.java index 6606d38..c3ff483 100644 --- a/src/main/java/com/bernard/misael/repository/QuizzFormRepository.java +++ b/src/main/java/com/bernard/misael/quizz/repository/QuizzFormRepository.java @@ -1,12 +1,12 @@ -package com.bernard.misael.repository; +package com.bernard.misael.quizz.repository; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import com.bernard.misael.model.Quizz; -import com.bernard.misael.model.QuizzForm; -import com.bernard.misael.model.User; +import com.bernard.misael.quizz.model.Quizz; +import com.bernard.misael.quizz.model.QuizzForm; +import com.bernard.misael.auth.model.User; public interface QuizzFormRepository extends JpaRepository { diff --git a/src/main/java/com/bernard/misael/repository/QuizzRepository.java b/src/main/java/com/bernard/misael/quizz/repository/QuizzRepository.java similarity index 80% rename from src/main/java/com/bernard/misael/repository/QuizzRepository.java rename to src/main/java/com/bernard/misael/quizz/repository/QuizzRepository.java index d15f96f..afb9103 100644 --- a/src/main/java/com/bernard/misael/repository/QuizzRepository.java +++ b/src/main/java/com/bernard/misael/quizz/repository/QuizzRepository.java @@ -1,4 +1,4 @@ -package com.bernard.misael.repository; +package com.bernard.misael.quizz.repository; import java.util.Optional; import java.util.Set; @@ -6,8 +6,8 @@ import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.lang.NonNull; -import com.bernard.misael.model.Quizz; -import com.bernard.misael.model.User; +import com.bernard.misael.quizz.model.Quizz; +import com.bernard.misael.auth.model.User; public interface QuizzRepository extends JpaRepository { diff --git a/src/main/java/com/bernard/misael/service/JsonNodeConverter.java b/src/main/java/com/bernard/misael/quizz/service/JsonNodeConverter.java similarity index 94% rename from src/main/java/com/bernard/misael/service/JsonNodeConverter.java rename to src/main/java/com/bernard/misael/quizz/service/JsonNodeConverter.java index 6202179..6c2337c 100644 --- a/src/main/java/com/bernard/misael/service/JsonNodeConverter.java +++ b/src/main/java/com/bernard/misael/quizz/service/JsonNodeConverter.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service; +package com.bernard.misael.quizz.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/com/bernard/misael/service/QuizzManager.java b/src/main/java/com/bernard/misael/quizz/service/QuizzManager.java similarity index 86% rename from src/main/java/com/bernard/misael/service/QuizzManager.java rename to src/main/java/com/bernard/misael/quizz/service/QuizzManager.java index 5484658..e42dab8 100644 --- a/src/main/java/com/bernard/misael/service/QuizzManager.java +++ b/src/main/java/com/bernard/misael/quizz/service/QuizzManager.java @@ -1,12 +1,12 @@ -package com.bernard.misael.service; +package com.bernard.misael.quizz.service; import java.util.List; import java.util.Optional; -import com.bernard.misael.model.Quizz; -import com.bernard.misael.model.QuizzForm; -import com.bernard.misael.model.User; -import com.bernard.misael.questions.QTypes; +import com.bernard.misael.auth.model.User; +import com.bernard.misael.quizz.model.Quizz; +import com.bernard.misael.quizz.model.QuizzForm; +import com.bernard.misael.quizz.questions.QTypes; import com.fasterxml.jackson.databind.JsonNode; public interface QuizzManager { diff --git a/src/main/java/com/bernard/misael/service/QuizzManagerImpl.java b/src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java similarity index 96% rename from src/main/java/com/bernard/misael/service/QuizzManagerImpl.java rename to src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java index dcb538e..2fe58e1 100644 --- a/src/main/java/com/bernard/misael/service/QuizzManagerImpl.java +++ b/src/main/java/com/bernard/misael/quizz/service/QuizzManagerImpl.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service; +package com.bernard.misael.quizz.service; import java.util.ArrayList; import java.util.HashSet; @@ -13,19 +13,21 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bernard.misael.model.Answer; -import com.bernard.misael.model.Privilege; -import com.bernard.misael.model.Question; -import com.bernard.misael.model.Quizz; -import com.bernard.misael.model.QuizzForm; -import com.bernard.misael.model.User; -import com.bernard.misael.questions.QTypes; -import com.bernard.misael.questions.QuestionType.AnswerResult; -import com.bernard.misael.repository.*; -import com.bernard.misael.service.exception.MalformedAnswerException; -import com.bernard.misael.service.exception.MalformedClientAnswerException; -import com.bernard.misael.service.exception.QuestionTypeException; -import com.bernard.misael.web.QuestionsController; +import com.bernard.misael.auth.repository.UserRepository; +import com.bernard.misael.auth.service.UserService; +import com.bernard.misael.quizz.model.Answer; +import com.bernard.misael.auth.model.Privilege; +import com.bernard.misael.quizz.model.Question; +import com.bernard.misael.quizz.model.Quizz; +import com.bernard.misael.quizz.model.QuizzForm; +import com.bernard.misael.auth.model.User; +import com.bernard.misael.quizz.questions.QTypes; +import com.bernard.misael.quizz.questions.QuestionType.AnswerResult; +import com.bernard.misael.quizz.QuestionsController; +import com.bernard.misael.quizz.repository.*; +import com.bernard.misael.quizz.service.exception.MalformedAnswerException; +import com.bernard.misael.quizz.service.exception.MalformedClientAnswerException; +import com.bernard.misael.quizz.service.exception.QuestionTypeException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/src/main/java/com/bernard/misael/service/exception/MalformedAnswerException.java b/src/main/java/com/bernard/misael/quizz/service/exception/MalformedAnswerException.java similarity index 58% rename from src/main/java/com/bernard/misael/service/exception/MalformedAnswerException.java rename to src/main/java/com/bernard/misael/quizz/service/exception/MalformedAnswerException.java index 416aa30..82c0c65 100644 --- a/src/main/java/com/bernard/misael/service/exception/MalformedAnswerException.java +++ b/src/main/java/com/bernard/misael/quizz/service/exception/MalformedAnswerException.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service.exception; +package com.bernard.misael.quizz.service.exception; public class MalformedAnswerException extends QuestionTypeException{ diff --git a/src/main/java/com/bernard/misael/service/exception/MalformedClientAnswerException.java b/src/main/java/com/bernard/misael/quizz/service/exception/MalformedClientAnswerException.java similarity index 60% rename from src/main/java/com/bernard/misael/service/exception/MalformedClientAnswerException.java rename to src/main/java/com/bernard/misael/quizz/service/exception/MalformedClientAnswerException.java index eca967a..b6ab926 100644 --- a/src/main/java/com/bernard/misael/service/exception/MalformedClientAnswerException.java +++ b/src/main/java/com/bernard/misael/quizz/service/exception/MalformedClientAnswerException.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service.exception; +package com.bernard.misael.quizz.service.exception; public class MalformedClientAnswerException extends QuestionTypeException { diff --git a/src/main/java/com/bernard/misael/service/exception/QuestionTypeException.java b/src/main/java/com/bernard/misael/quizz/service/exception/QuestionTypeException.java similarity index 56% rename from src/main/java/com/bernard/misael/service/exception/QuestionTypeException.java rename to src/main/java/com/bernard/misael/quizz/service/exception/QuestionTypeException.java index 8569986..85051e5 100644 --- a/src/main/java/com/bernard/misael/service/exception/QuestionTypeException.java +++ b/src/main/java/com/bernard/misael/quizz/service/exception/QuestionTypeException.java @@ -1,4 +1,4 @@ -package com.bernard.misael.service.exception; +package com.bernard.misael.quizz.service.exception; public abstract class QuestionTypeException extends Exception{ diff --git a/src/main/java/com/bernard/misael/TheCrewConfig.java b/src/main/java/com/bernard/misael/thecrew/TheCrewConfig.java similarity index 94% rename from src/main/java/com/bernard/misael/TheCrewConfig.java rename to src/main/java/com/bernard/misael/thecrew/TheCrewConfig.java index 2707f70..a495046 100644 --- a/src/main/java/com/bernard/misael/TheCrewConfig.java +++ b/src/main/java/com/bernard/misael/thecrew/TheCrewConfig.java @@ -1,4 +1,4 @@ -package com.bernard.misael; +package com.bernard.misael.thecrew; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; diff --git a/src/main/java/com/bernard/misael/web/TheCrewController.java b/src/main/java/com/bernard/misael/thecrew/TheCrewController.java similarity index 97% rename from src/main/java/com/bernard/misael/web/TheCrewController.java rename to src/main/java/com/bernard/misael/thecrew/TheCrewController.java index 4b27e68..b48d9b5 100644 --- a/src/main/java/com/bernard/misael/web/TheCrewController.java +++ b/src/main/java/com/bernard/misael/thecrew/TheCrewController.java @@ -1,4 +1,4 @@ -package com.bernard.misael.web; +package com.bernard.misael.thecrew; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/com/bernard/misael/MisaelApplicationTests.java b/src/test/java/com/bernard/misael/MisaelApplicationTests.java index d4e7097..4791c59 100644 --- a/src/test/java/com/bernard/misael/MisaelApplicationTests.java +++ b/src/test/java/com/bernard/misael/MisaelApplicationTests.java @@ -3,7 +3,7 @@ package com.bernard.misael; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import com.bernard.misael.questions.QTypes; +import com.bernard.misael.quizz.questions.QTypes; @SpringBootTest class MisaelApplicationTests {