From 0139ab4d207843cfd3ae79bef7f82667d1fb71c9 Mon Sep 17 00:00:00 2001 From: Jan Tymel <410388@mail.muni.cz> Date: Sat, 6 Feb 2021 12:17:48 +0100 Subject: [PATCH] [Cleanup] Change project package structure to a more production-ready one --- .../training/adaptive}/DemoApplication.java | 2 +- .../adaptive}/config/SwaggerConfig.java | 2 +- .../controller/PhasesController.java | 22 ++++---- .../adaptive}/controller/TasksController.java | 8 +-- .../adaptive}/domain/AbstractPhase.java | 2 +- .../adaptive}/domain/DecisionMatrixRow.java | 2 +- .../training/adaptive}/domain/InfoPhase.java | 2 +- .../training/adaptive}/domain/Question.java | 4 +- .../adaptive}/domain/QuestionChoice.java | 2 +- .../domain/QuestionPhaseRelation.java | 2 +- .../adaptive}/domain/QuestionnairePhase.java | 4 +- .../kypo/training/adaptive}/domain/Task.java | 2 +- .../adaptive}/domain/TrainingPhase.java | 2 +- .../adaptive}/dto/AbstractPhaseDto.java | 4 +- .../adaptive}/dto/AbstractQuestionDto.java | 4 +- .../adaptive}/dto/DecisionMatrixRowDto.java | 2 +- .../training/adaptive}/dto/InfoPhaseDto.java | 2 +- .../adaptive}/dto/InfoPhaseUpdateDto.java | 2 +- .../adaptive}/dto/PhaseCreateDTO.java | 4 +- .../adaptive}/dto/QuestionChoiceDto.java | 2 +- .../training/adaptive}/dto/QuestionDto.java | 2 +- .../dto/QuestionPhaseRelationDto.java | 2 +- .../adaptive}/dto/QuestionRequiredIdDto.java | 2 +- .../adaptive}/dto/QuestionUpdateDto.java | 4 +- .../adaptive}/dto/QuestionnairePhaseDto.java | 4 +- .../adaptive}/dto/QuestionnaireUpdateDto.java | 4 +- .../training/adaptive}/dto/TaskCreateDto.java | 2 +- .../kypo/training/adaptive}/dto/TaskDto.java | 2 +- .../training/adaptive}/dto/TaskUpdateDto.java | 2 +- .../adaptive}/dto/TrainingPhaseDto.java | 2 +- .../adaptive}/dto/TrainingPhaseUpdateDto.java | 2 +- .../training/adaptive}/enums/PhaseType.java | 2 +- .../adaptive}/enums/QuestionType.java | 2 +- .../adaptive}/enums/QuestionnaireType.java | 2 +- .../adaptive}/facade/TrainingPhaseFacade.java | 32 +++++------ .../training/adaptive}/mapper/BeanMapper.java | 54 +++++++++---------- .../repository/AbstractPhaseRepository.java | 4 +- .../repository/InfoPhaseRepository.java | 4 +- .../repository/QuestionChoiceRepository.java | 4 +- .../QuestionPhaseRelationRepository.java | 4 +- .../repository/QuestionRepository.java | 4 +- .../QuestionnairePhaseRepository.java | 4 +- .../adaptive}/repository/TaskRepository.java | 4 +- .../repository/TrainingPhaseRepository.java | 4 +- .../adaptive}/service/InfoPhaseService.java | 16 +++--- .../adaptive}/service/PhaseService.java | 10 ++-- .../service/QuestionChoiceService.java | 16 +++--- .../adaptive}/service/QuestionService.java | 18 +++---- .../service/QuestionnairePhaseService.java | 36 ++++++------- .../adaptive}/service/TaskService.java | 20 +++---- .../service/TrainingPhaseService.java | 18 +++---- .../adaptive}/DemoApplicationTests.java | 2 +- 52 files changed, 182 insertions(+), 182 deletions(-) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/DemoApplication.java (86%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/config/SwaggerConfig.java (93%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/controller/PhasesController.java (93%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/controller/TasksController.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/AbstractPhase.java (96%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/DecisionMatrixRow.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/InfoPhase.java (89%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/Question.java (95%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/QuestionChoice.java (95%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/QuestionPhaseRelation.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/QuestionnairePhase.java (92%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/Task.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/domain/TrainingPhase.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/AbstractPhaseDto.java (90%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/AbstractQuestionDto.java (93%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/DecisionMatrixRowDto.java (96%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/InfoPhaseDto.java (90%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/InfoPhaseUpdateDto.java (95%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/PhaseCreateDTO.java (86%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionChoiceDto.java (96%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionDto.java (89%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionPhaseRelationDto.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionRequiredIdDto.java (90%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionUpdateDto.java (94%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionnairePhaseDto.java (88%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/QuestionnaireUpdateDto.java (94%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/TaskCreateDto.java (77%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/TaskDto.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/TaskUpdateDto.java (98%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/TrainingPhaseDto.java (96%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/dto/TrainingPhaseUpdateDto.java (97%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/enums/PhaseType.java (67%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/enums/QuestionType.java (52%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/enums/QuestionnaireType.java (54%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/facade/TrainingPhaseFacade.java (76%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/mapper/BeanMapper.java (65%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/AbstractPhaseRepository.java (94%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/InfoPhaseRepository.java (55%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/QuestionChoiceRepository.java (86%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/QuestionPhaseRelationRepository.java (56%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/QuestionRepository.java (88%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/QuestionnairePhaseRepository.java (56%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/TaskRepository.java (94%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/repository/TrainingPhaseRepository.java (83%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/InfoPhaseService.java (82%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/PhaseService.java (89%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/QuestionChoiceService.java (84%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/QuestionService.java (82%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/QuestionnairePhaseService.java (83%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/TaskService.java (90%) rename src/main/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/service/TrainingPhaseService.java (91%) rename src/test/java/{com/example/demo => cz/muni/ics/kypo/training/adaptive}/DemoApplicationTests.java (80%) diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java similarity index 86% rename from src/main/java/com/example/demo/DemoApplication.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java index 2a9bdbe0..f27e2306 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/DemoApplication.java @@ -1,4 +1,4 @@ -package com.example.demo; +package cz.muni.ics.kypo.training.adaptive; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/example/demo/config/SwaggerConfig.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/SwaggerConfig.java similarity index 93% rename from src/main/java/com/example/demo/config/SwaggerConfig.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/config/SwaggerConfig.java index f9d6e88c..f0eadc5a 100644 --- a/src/main/java/com/example/demo/config/SwaggerConfig.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.example.demo.config; +package cz.muni.ics.kypo.training.adaptive.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/demo/controller/PhasesController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java similarity index 93% rename from src/main/java/com/example/demo/controller/PhasesController.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java index f59af521..e75d1d6a 100644 --- a/src/main/java/com/example/demo/controller/PhasesController.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java @@ -1,14 +1,14 @@ -package com.example.demo.controller; - -import com.example.demo.dto.AbstractPhaseDto; -import com.example.demo.dto.InfoPhaseDto; -import com.example.demo.dto.InfoPhaseUpdateDto; -import com.example.demo.dto.PhaseCreateDTO; -import com.example.demo.dto.QuestionnairePhaseDto; -import com.example.demo.dto.TrainingPhaseDto; -import com.example.demo.dto.TrainingPhaseUpdateDto; -import com.example.demo.dto.QuestionnaireUpdateDto; -import com.example.demo.facade.TrainingPhaseFacade; +package cz.muni.ics.kypo.training.adaptive.controller; + +import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.PhaseCreateDTO; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.facade.TrainingPhaseFacade; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/com/example/demo/controller/TasksController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java similarity index 97% rename from src/main/java/com/example/demo/controller/TasksController.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java index 30de910a..0aa323a6 100644 --- a/src/main/java/com/example/demo/controller/TasksController.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java @@ -1,8 +1,8 @@ -package com.example.demo.controller; +package cz.muni.ics.kypo.training.adaptive.controller; -import com.example.demo.dto.TaskDto; -import com.example.demo.dto.TaskUpdateDto; -import com.example.demo.service.TaskService; +import cz.muni.ics.kypo.training.adaptive.dto.TaskDto; +import cz.muni.ics.kypo.training.adaptive.dto.TaskUpdateDto; +import cz.muni.ics.kypo.training.adaptive.service.TaskService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/com/example/demo/domain/AbstractPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AbstractPhase.java similarity index 96% rename from src/main/java/com/example/demo/domain/AbstractPhase.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AbstractPhase.java index e194f92e..d6d156c9 100644 --- a/src/main/java/com/example/demo/domain/AbstractPhase.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/AbstractPhase.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.Column; diff --git a/src/main/java/com/example/demo/domain/DecisionMatrixRow.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java similarity index 97% rename from src/main/java/com/example/demo/domain/DecisionMatrixRow.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java index f4509145..94e61acf 100644 --- a/src/main/java/com/example/demo/domain/DecisionMatrixRow.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/example/demo/domain/InfoPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/InfoPhase.java similarity index 89% rename from src/main/java/com/example/demo/domain/InfoPhase.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/InfoPhase.java index 82b0a8f7..e0f0b83f 100644 --- a/src/main/java/com/example/demo/domain/InfoPhase.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/InfoPhase.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.Entity; diff --git a/src/main/java/com/example/demo/domain/Question.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Question.java similarity index 95% rename from src/main/java/com/example/demo/domain/Question.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Question.java index 0a87e136..f0432e49 100644 --- a/src/main/java/com/example/demo/domain/Question.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Question.java @@ -1,6 +1,6 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; -import com.example.demo.enums.QuestionType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionType; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/main/java/com/example/demo/domain/QuestionChoice.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionChoice.java similarity index 95% rename from src/main/java/com/example/demo/domain/QuestionChoice.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionChoice.java index b1bafaa5..110fc978 100644 --- a/src/main/java/com/example/demo/domain/QuestionChoice.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionChoice.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/example/demo/domain/QuestionPhaseRelation.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionPhaseRelation.java similarity index 97% rename from src/main/java/com/example/demo/domain/QuestionPhaseRelation.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionPhaseRelation.java index db6e6ae1..53f20929 100644 --- a/src/main/java/com/example/demo/domain/QuestionPhaseRelation.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionPhaseRelation.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.CascadeType; import javax.persistence.Column; diff --git a/src/main/java/com/example/demo/domain/QuestionnairePhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionnairePhase.java similarity index 92% rename from src/main/java/com/example/demo/domain/QuestionnairePhase.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionnairePhase.java index 1bced338..7b199398 100644 --- a/src/main/java/com/example/demo/domain/QuestionnairePhase.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/QuestionnairePhase.java @@ -1,6 +1,6 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; -import com.example.demo.enums.QuestionnaireType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/main/java/com/example/demo/domain/Task.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java similarity index 97% rename from src/main/java/com/example/demo/domain/Task.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java index 23bf2d22..ceb59992 100644 --- a/src/main/java/com/example/demo/domain/Task.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/example/demo/domain/TrainingPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java similarity index 97% rename from src/main/java/com/example/demo/domain/TrainingPhase.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java index 9e91ba8c..550188ef 100644 --- a/src/main/java/com/example/demo/domain/TrainingPhase.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java @@ -1,4 +1,4 @@ -package com.example.demo.domain; +package cz.muni.ics.kypo.training.adaptive.domain; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/src/main/java/com/example/demo/dto/AbstractPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java similarity index 90% rename from src/main/java/com/example/demo/dto/AbstractPhaseDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java index c15487a2..8f08d5ab 100644 --- a/src/main/java/com/example/demo/dto/AbstractPhaseDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java @@ -1,6 +1,6 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; -import com.example.demo.enums.PhaseType; +import cz.muni.ics.kypo.training.adaptive.enums.PhaseType; import java.io.Serializable; diff --git a/src/main/java/com/example/demo/dto/AbstractQuestionDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDto.java similarity index 93% rename from src/main/java/com/example/demo/dto/AbstractQuestionDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDto.java index 32bb7b43..e09d4461 100644 --- a/src/main/java/com/example/demo/dto/AbstractQuestionDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDto.java @@ -1,6 +1,6 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; -import com.example.demo.enums.QuestionType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionType; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotEmpty; diff --git a/src/main/java/com/example/demo/dto/DecisionMatrixRowDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDto.java similarity index 96% rename from src/main/java/com/example/demo/dto/DecisionMatrixRowDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDto.java index 81dc0891..0440e904 100644 --- a/src/main/java/com/example/demo/dto/DecisionMatrixRowDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; public class DecisionMatrixRowDto { private long id; diff --git a/src/main/java/com/example/demo/dto/InfoPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDto.java similarity index 90% rename from src/main/java/com/example/demo/dto/InfoPhaseDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDto.java index e7f8ceb1..6e62117c 100644 --- a/src/main/java/com/example/demo/dto/InfoPhaseDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import java.io.Serializable; diff --git a/src/main/java/com/example/demo/dto/InfoPhaseUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDto.java similarity index 95% rename from src/main/java/com/example/demo/dto/InfoPhaseUpdateDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDto.java index add16336..445cba25 100644 --- a/src/main/java/com/example/demo/dto/InfoPhaseUpdateDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java similarity index 86% rename from src/main/java/com/example/demo/dto/PhaseCreateDTO.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java index 13330b24..9f7a29aa 100644 --- a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java @@ -1,6 +1,6 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; -import com.example.demo.enums.PhaseType; +import cz.muni.ics.kypo.training.adaptive.enums.PhaseType; import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/example/demo/dto/QuestionChoiceDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDto.java similarity index 96% rename from src/main/java/com/example/demo/dto/QuestionChoiceDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDto.java index da686f75..2ebae1d4 100644 --- a/src/main/java/com/example/demo/dto/QuestionChoiceDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/dto/QuestionDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDto.java similarity index 89% rename from src/main/java/com/example/demo/dto/QuestionDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDto.java index 2cbc9390..b221016b 100644 --- a/src/main/java/com/example/demo/dto/QuestionDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/dto/QuestionPhaseRelationDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDto.java similarity index 97% rename from src/main/java/com/example/demo/dto/QuestionPhaseRelationDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDto.java index a409ff19..885aadce 100644 --- a/src/main/java/com/example/demo/dto/QuestionPhaseRelationDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/dto/QuestionRequiredIdDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDto.java similarity index 90% rename from src/main/java/com/example/demo/dto/QuestionRequiredIdDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDto.java index dc142029..249ad80f 100644 --- a/src/main/java/com/example/demo/dto/QuestionRequiredIdDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/dto/QuestionUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDto.java similarity index 94% rename from src/main/java/com/example/demo/dto/QuestionUpdateDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDto.java index bc66c10a..4a0f9699 100644 --- a/src/main/java/com/example/demo/dto/QuestionUpdateDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDto.java @@ -1,6 +1,6 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; -import com.example.demo.enums.QuestionType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionType; import java.util.List; diff --git a/src/main/java/com/example/demo/dto/QuestionnairePhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDto.java similarity index 88% rename from src/main/java/com/example/demo/dto/QuestionnairePhaseDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDto.java index bb773bde..db1e717d 100644 --- a/src/main/java/com/example/demo/dto/QuestionnairePhaseDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDto.java @@ -1,6 +1,6 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; -import com.example.demo.enums.QuestionnaireType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType; import java.util.List; diff --git a/src/main/java/com/example/demo/dto/QuestionnaireUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDto.java similarity index 94% rename from src/main/java/com/example/demo/dto/QuestionnaireUpdateDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDto.java index bcf552d1..45adb564 100644 --- a/src/main/java/com/example/demo/dto/QuestionnaireUpdateDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDto.java @@ -1,6 +1,6 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; -import com.example.demo.enums.QuestionnaireType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType; import io.swagger.annotations.ApiModelProperty; import javax.validation.Valid; diff --git a/src/main/java/com/example/demo/dto/TaskCreateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java similarity index 77% rename from src/main/java/com/example/demo/dto/TaskCreateDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java index 5b073c01..dea94543 100644 --- a/src/main/java/com/example/demo/dto/TaskCreateDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; public class TaskCreateDto extends TaskUpdateDto { diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDto.java similarity index 97% rename from src/main/java/com/example/demo/dto/TaskDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDto.java index 863bdf30..f6447b07 100644 --- a/src/main/java/com/example/demo/dto/TaskDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import java.io.Serializable; diff --git a/src/main/java/com/example/demo/dto/TaskUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDto.java similarity index 98% rename from src/main/java/com/example/demo/dto/TaskUpdateDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDto.java index 94690d57..3813676e 100644 --- a/src/main/java/com/example/demo/dto/TaskUpdateDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/dto/TrainingPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDto.java similarity index 96% rename from src/main/java/com/example/demo/dto/TrainingPhaseDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDto.java index c81bcf72..3a3933d0 100644 --- a/src/main/java/com/example/demo/dto/TrainingPhaseDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/example/demo/dto/TrainingPhaseUpdateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDto.java similarity index 97% rename from src/main/java/com/example/demo/dto/TrainingPhaseUpdateDto.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDto.java index acc72518..9347cc84 100644 --- a/src/main/java/com/example/demo/dto/TrainingPhaseUpdateDto.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDto.java @@ -1,4 +1,4 @@ -package com.example.demo.dto; +package cz.muni.ics.kypo.training.adaptive.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/example/demo/enums/PhaseType.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/PhaseType.java similarity index 67% rename from src/main/java/com/example/demo/enums/PhaseType.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/enums/PhaseType.java index 03298dbd..45e243a5 100644 --- a/src/main/java/com/example/demo/enums/PhaseType.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/PhaseType.java @@ -1,4 +1,4 @@ -package com.example.demo.enums; +package cz.muni.ics.kypo.training.adaptive.enums; public enum PhaseType { QUESTIONNAIRE_ADAPTIVE, diff --git a/src/main/java/com/example/demo/enums/QuestionType.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionType.java similarity index 52% rename from src/main/java/com/example/demo/enums/QuestionType.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionType.java index e0d127ee..63c10dad 100644 --- a/src/main/java/com/example/demo/enums/QuestionType.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionType.java @@ -1,4 +1,4 @@ -package com.example.demo.enums; +package cz.muni.ics.kypo.training.adaptive.enums; public enum QuestionType { FFQ, diff --git a/src/main/java/com/example/demo/enums/QuestionnaireType.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionnaireType.java similarity index 54% rename from src/main/java/com/example/demo/enums/QuestionnaireType.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionnaireType.java index c7b23f38..a4d365fb 100644 --- a/src/main/java/com/example/demo/enums/QuestionnaireType.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/enums/QuestionnaireType.java @@ -1,4 +1,4 @@ -package com.example.demo.enums; +package cz.muni.ics.kypo.training.adaptive.enums; public enum QuestionnaireType { ADAPTIVE, diff --git a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java similarity index 76% rename from src/main/java/com/example/demo/facade/TrainingPhaseFacade.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java index d01ee5a4..d4adf5e9 100644 --- a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java @@ -1,19 +1,19 @@ -package com.example.demo.facade; - -import com.example.demo.dto.AbstractPhaseDto; -import com.example.demo.dto.InfoPhaseDto; -import com.example.demo.dto.InfoPhaseUpdateDto; -import com.example.demo.dto.PhaseCreateDTO; -import com.example.demo.dto.QuestionnairePhaseDto; -import com.example.demo.dto.QuestionnaireUpdateDto; -import com.example.demo.dto.TrainingPhaseDto; -import com.example.demo.dto.TrainingPhaseUpdateDto; -import com.example.demo.enums.PhaseType; -import com.example.demo.enums.QuestionnaireType; -import com.example.demo.service.InfoPhaseService; -import com.example.demo.service.PhaseService; -import com.example.demo.service.QuestionnairePhaseService; -import com.example.demo.service.TrainingPhaseService; +package cz.muni.ics.kypo.training.adaptive.facade; + +import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.PhaseCreateDTO; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.enums.PhaseType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType; +import cz.muni.ics.kypo.training.adaptive.service.InfoPhaseService; +import cz.muni.ics.kypo.training.adaptive.service.PhaseService; +import cz.muni.ics.kypo.training.adaptive.service.QuestionnairePhaseService; +import cz.muni.ics.kypo.training.adaptive.service.TrainingPhaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java similarity index 65% rename from src/main/java/com/example/demo/mapper/BeanMapper.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java index e1617c69..5e5a4b95 100644 --- a/src/main/java/com/example/demo/mapper/BeanMapper.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java @@ -1,30 +1,30 @@ -package com.example.demo.mapper; - -import com.example.demo.domain.AbstractPhase; -import com.example.demo.domain.DecisionMatrixRow; -import com.example.demo.domain.InfoPhase; -import com.example.demo.domain.Question; -import com.example.demo.domain.QuestionChoice; -import com.example.demo.domain.QuestionPhaseRelation; -import com.example.demo.domain.QuestionnairePhase; -import com.example.demo.domain.Task; -import com.example.demo.domain.TrainingPhase; -import com.example.demo.dto.AbstractPhaseDto; -import com.example.demo.dto.DecisionMatrixRowDto; -import com.example.demo.dto.InfoPhaseDto; -import com.example.demo.dto.InfoPhaseUpdateDto; -import com.example.demo.dto.QuestionChoiceDto; -import com.example.demo.dto.QuestionDto; -import com.example.demo.dto.QuestionPhaseRelationDto; -import com.example.demo.dto.QuestionRequiredIdDto; -import com.example.demo.dto.QuestionUpdateDto; -import com.example.demo.dto.QuestionnairePhaseDto; -import com.example.demo.dto.QuestionnaireUpdateDto; -import com.example.demo.dto.TaskCreateDto; -import com.example.demo.dto.TaskDto; -import com.example.demo.dto.TaskUpdateDto; -import com.example.demo.dto.TrainingPhaseDto; -import com.example.demo.dto.TrainingPhaseUpdateDto; +package cz.muni.ics.kypo.training.adaptive.mapper; + +import cz.muni.ics.kypo.training.adaptive.domain.AbstractPhase; +import cz.muni.ics.kypo.training.adaptive.domain.DecisionMatrixRow; +import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase; +import cz.muni.ics.kypo.training.adaptive.domain.Question; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionChoice; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase; +import cz.muni.ics.kypo.training.adaptive.domain.Task; +import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase; +import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.DecisionMatrixRowDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionChoiceDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionPhaseRelationDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionRequiredIdDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.TaskCreateDto; +import cz.muni.ics.kypo.training.adaptive.dto.TaskDto; +import cz.muni.ics.kypo.training.adaptive.dto.TaskUpdateDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDto; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/src/main/java/com/example/demo/repository/AbstractPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java similarity index 94% rename from src/main/java/com/example/demo/repository/AbstractPhaseRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java index 1b8c6a03..3c402788 100644 --- a/src/main/java/com/example/demo/repository/AbstractPhaseRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.AbstractPhase; +import cz.muni.ics.kypo.training.adaptive.domain.AbstractPhase; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/demo/repository/InfoPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java similarity index 55% rename from src/main/java/com/example/demo/repository/InfoPhaseRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java index c9877448..37ab685f 100644 --- a/src/main/java/com/example/demo/repository/InfoPhaseRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.InfoPhase; +import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase; import org.springframework.data.jpa.repository.JpaRepository; public interface InfoPhaseRepository extends JpaRepository<InfoPhase, Long> { diff --git a/src/main/java/com/example/demo/repository/QuestionChoiceRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionChoiceRepository.java similarity index 86% rename from src/main/java/com/example/demo/repository/QuestionChoiceRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionChoiceRepository.java index 7d403efe..88afad95 100644 --- a/src/main/java/com/example/demo/repository/QuestionChoiceRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionChoiceRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.QuestionChoice; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionChoice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/demo/repository/QuestionPhaseRelationRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java similarity index 56% rename from src/main/java/com/example/demo/repository/QuestionPhaseRelationRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java index 49057b93..c5f3cf6a 100644 --- a/src/main/java/com/example/demo/repository/QuestionPhaseRelationRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.QuestionPhaseRelation; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation; import org.springframework.data.jpa.repository.JpaRepository; public interface QuestionPhaseRelationRepository extends JpaRepository<QuestionPhaseRelation, Long> { diff --git a/src/main/java/com/example/demo/repository/QuestionRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java similarity index 88% rename from src/main/java/com/example/demo/repository/QuestionRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java index 13648e40..4add485b 100644 --- a/src/main/java/com/example/demo/repository/QuestionRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.Question; +import cz.muni.ics.kypo.training.adaptive.domain.Question; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/demo/repository/QuestionnairePhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java similarity index 56% rename from src/main/java/com/example/demo/repository/QuestionnairePhaseRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java index 268cdd53..26cf52a4 100644 --- a/src/main/java/com/example/demo/repository/QuestionnairePhaseRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.QuestionnairePhase; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase; import org.springframework.data.jpa.repository.JpaRepository; public interface QuestionnairePhaseRepository extends JpaRepository<QuestionnairePhase, Long> { diff --git a/src/main/java/com/example/demo/repository/TaskRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java similarity index 94% rename from src/main/java/com/example/demo/repository/TaskRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java index 584402d4..25d9484e 100644 --- a/src/main/java/com/example/demo/repository/TaskRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.Task; +import cz.muni.ics.kypo.training.adaptive.domain.Task; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/demo/repository/TrainingPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java similarity index 83% rename from src/main/java/com/example/demo/repository/TrainingPhaseRepository.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java index eee47905..50903da8 100644 --- a/src/main/java/com/example/demo/repository/TrainingPhaseRepository.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java @@ -1,6 +1,6 @@ -package com.example.demo.repository; +package cz.muni.ics.kypo.training.adaptive.repository; -import com.example.demo.domain.TrainingPhase; +import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/example/demo/service/InfoPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java similarity index 82% rename from src/main/java/com/example/demo/service/InfoPhaseService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java index c0fb1d2b..571993a8 100644 --- a/src/main/java/com/example/demo/service/InfoPhaseService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java @@ -1,11 +1,11 @@ -package com.example.demo.service; - -import com.example.demo.domain.InfoPhase; -import com.example.demo.dto.InfoPhaseDto; -import com.example.demo.dto.InfoPhaseUpdateDto; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.AbstractPhaseRepository; -import com.example.demo.repository.InfoPhaseRepository; +package cz.muni.ics.kypo.training.adaptive.service; + +import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.InfoPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository; +import cz.muni.ics.kypo.training.adaptive.repository.InfoPhaseRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/service/PhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java similarity index 89% rename from src/main/java/com/example/demo/service/PhaseService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java index 3468202f..b7facfc2 100644 --- a/src/main/java/com/example/demo/service/PhaseService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java @@ -1,9 +1,9 @@ -package com.example.demo.service; +package cz.muni.ics.kypo.training.adaptive.service; -import com.example.demo.domain.AbstractPhase; -import com.example.demo.dto.AbstractPhaseDto; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.AbstractPhaseRepository; +import cz.muni.ics.kypo.training.adaptive.domain.AbstractPhase; +import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDto; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/demo/service/QuestionChoiceService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java similarity index 84% rename from src/main/java/com/example/demo/service/QuestionChoiceService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java index aeb31201..3a444e0b 100644 --- a/src/main/java/com/example/demo/service/QuestionChoiceService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java @@ -1,11 +1,11 @@ -package com.example.demo.service; - -import com.example.demo.domain.Question; -import com.example.demo.domain.QuestionChoice; -import com.example.demo.dto.QuestionChoiceDto; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.QuestionChoiceRepository; -import com.example.demo.repository.QuestionRepository; +package cz.muni.ics.kypo.training.adaptive.service; + +import cz.muni.ics.kypo.training.adaptive.domain.Question; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionChoice; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionChoiceDto; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionChoiceRepository; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/service/QuestionService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java similarity index 82% rename from src/main/java/com/example/demo/service/QuestionService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java index e978bc0b..99c83c28 100644 --- a/src/main/java/com/example/demo/service/QuestionService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java @@ -1,12 +1,12 @@ -package com.example.demo.service; - -import com.example.demo.domain.Question; -import com.example.demo.domain.QuestionnairePhase; -import com.example.demo.dto.QuestionDto; -import com.example.demo.enums.QuestionType; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.QuestionRepository; -import com.example.demo.repository.QuestionnairePhaseRepository; +package cz.muni.ics.kypo.training.adaptive.service; + +import cz.muni.ics.kypo.training.adaptive.domain.Question; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionDto; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionType; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionRepository; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionnairePhaseRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/service/QuestionnairePhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java similarity index 83% rename from src/main/java/com/example/demo/service/QuestionnairePhaseService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java index d2a095fb..33e8479c 100644 --- a/src/main/java/com/example/demo/service/QuestionnairePhaseService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java @@ -1,21 +1,21 @@ -package com.example.demo.service; - -import com.example.demo.domain.Question; -import com.example.demo.domain.QuestionPhaseRelation; -import com.example.demo.domain.QuestionnairePhase; -import com.example.demo.domain.TrainingPhase; -import com.example.demo.dto.PhaseCreateDTO; -import com.example.demo.dto.QuestionPhaseRelationDto; -import com.example.demo.dto.QuestionnairePhaseDto; -import com.example.demo.dto.QuestionnaireUpdateDto; -import com.example.demo.enums.PhaseType; -import com.example.demo.enums.QuestionnaireType; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.AbstractPhaseRepository; -import com.example.demo.repository.QuestionPhaseRelationRepository; -import com.example.demo.repository.QuestionRepository; -import com.example.demo.repository.QuestionnairePhaseRepository; -import com.example.demo.repository.TrainingPhaseRepository; +package cz.muni.ics.kypo.training.adaptive.service; + +import cz.muni.ics.kypo.training.adaptive.domain.Question; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation; +import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase; +import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase; +import cz.muni.ics.kypo.training.adaptive.dto.PhaseCreateDTO; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionPhaseRelationDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnairePhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.QuestionnaireUpdateDto; +import cz.muni.ics.kypo.training.adaptive.enums.PhaseType; +import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionPhaseRelationRepository; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionRepository; +import cz.muni.ics.kypo.training.adaptive.repository.QuestionnairePhaseRepository; +import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/service/TaskService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java similarity index 90% rename from src/main/java/com/example/demo/service/TaskService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java index ebd1fb43..35020121 100644 --- a/src/main/java/com/example/demo/service/TaskService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java @@ -1,13 +1,13 @@ -package com.example.demo.service; - -import com.example.demo.domain.Task; -import com.example.demo.domain.TrainingPhase; -import com.example.demo.dto.TaskCreateDto; -import com.example.demo.dto.TaskDto; -import com.example.demo.dto.TaskUpdateDto; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.TaskRepository; -import com.example.demo.repository.TrainingPhaseRepository; +package cz.muni.ics.kypo.training.adaptive.service; + +import cz.muni.ics.kypo.training.adaptive.domain.Task; +import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase; +import cz.muni.ics.kypo.training.adaptive.dto.TaskCreateDto; +import cz.muni.ics.kypo.training.adaptive.dto.TaskDto; +import cz.muni.ics.kypo.training.adaptive.dto.TaskUpdateDto; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.TaskRepository; +import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/example/demo/service/TrainingPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java similarity index 91% rename from src/main/java/com/example/demo/service/TrainingPhaseService.java rename to src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java index 41c226b4..96103a5c 100644 --- a/src/main/java/com/example/demo/service/TrainingPhaseService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java @@ -1,12 +1,12 @@ -package com.example.demo.service; - -import com.example.demo.domain.DecisionMatrixRow; -import com.example.demo.domain.TrainingPhase; -import com.example.demo.dto.TrainingPhaseDto; -import com.example.demo.dto.TrainingPhaseUpdateDto; -import com.example.demo.mapper.BeanMapper; -import com.example.demo.repository.AbstractPhaseRepository; -import com.example.demo.repository.TrainingPhaseRepository; +package cz.muni.ics.kypo.training.adaptive.service; + +import cz.muni.ics.kypo.training.adaptive.domain.DecisionMatrixRow; +import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseDto; +import cz.muni.ics.kypo.training.adaptive.dto.TrainingPhaseUpdateDto; +import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper; +import cz.muni.ics.kypo.training.adaptive.repository.AbstractPhaseRepository; +import cz.muni.ics.kypo.training.adaptive.repository.TrainingPhaseRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/cz/muni/ics/kypo/training/adaptive/DemoApplicationTests.java similarity index 80% rename from src/test/java/com/example/demo/DemoApplicationTests.java rename to src/test/java/cz/muni/ics/kypo/training/adaptive/DemoApplicationTests.java index 2778a6a7..6a9221cf 100644 --- a/src/test/java/com/example/demo/DemoApplicationTests.java +++ b/src/test/java/cz/muni/ics/kypo/training/adaptive/DemoApplicationTests.java @@ -1,4 +1,4 @@ -package com.example.demo; +package cz.muni.ics.kypo.training.adaptive; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -- GitLab