From c2a5d1e0be18d90ab31d1f08c93b3aaeda2582f7 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Wed, 10 Feb 2021 06:33:51 +0100
Subject: [PATCH] Add another level of package structure to DTO package
---
.../adaptive/controller/PhasesController.java | 12 ++++----
.../adaptive/controller/TasksController.java | 4 +--
.../adaptive/dto/{ => info}/InfoPhaseDTO.java | 4 ++-
.../dto/{ => info}/InfoPhaseUpdateDTO.java | 2 +-
.../AbstractQuestionDTO.java | 2 +-
.../QuestionChoiceDTO.java | 2 +-
.../dto/{ => questionnaire}/QuestionDTO.java | 2 +-
.../QuestionPhaseRelationDTO.java | 2 +-
.../QuestionRequiredIdDTO.java | 2 +-
.../QuestionUpdateDTO.java | 2 +-
.../QuestionnairePhaseDTO.java | 3 +-
.../QuestionnaireUpdateDTO.java | 2 +-
.../{ => training}/DecisionMatrixRowDTO.java | 2 +-
.../adaptive/dto/{ => training}/TaskDTO.java | 2 +-
.../dto/{ => training}/TaskUpdateDTO.java | 2 +-
.../dto/{ => training}/TrainingPhaseDTO.java | 4 ++-
.../TrainingPhaseUpdateDTO.java | 2 +-
.../adaptive/facade/TrainingPhaseFacade.java | 12 ++++----
.../training/adaptive/mapper/BeanMapper.java | 28 +++++++++----------
.../adaptive/service/InfoPhaseService.java | 4 +--
.../service/QuestionnairePhaseService.java | 6 ++--
.../adaptive/service/TaskService.java | 4 +--
.../service/TrainingPhaseService.java | 4 +--
23 files changed, 57 insertions(+), 52 deletions(-)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => info}/InfoPhaseDTO.java (77%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => info}/InfoPhaseUpdateDTO.java (95%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/AbstractQuestionDTO.java (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionChoiceDTO.java (95%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionDTO.java (85%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionPhaseRelationDTO.java (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionRequiredIdDTO.java (88%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionUpdateDTO.java (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionnairePhaseDTO.java (88%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => questionnaire}/QuestionnaireUpdateDTO.java (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => training}/DecisionMatrixRowDTO.java (97%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => training}/TaskDTO.java (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => training}/TaskUpdateDTO.java (97%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => training}/TrainingPhaseDTO.java (91%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{ => training}/TrainingPhaseUpdateDTO.java (97%)
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
index e985a33c..c97d53f0 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/PhasesController.java
@@ -1,13 +1,13 @@
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.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
import cz.muni.ics.kypo.training.adaptive.facade.TrainingPhaseFacade;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
index 54a13d87..139f6c50 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TasksController.java
@@ -1,7 +1,7 @@
package cz.muni.ics.kypo.training.adaptive.controller;
-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.training.TaskDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskUpdateDTO;
import cz.muni.ics.kypo.training.adaptive.service.TaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
similarity index 77%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
index e7cbcdb8..9acc05a3 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
@@ -1,4 +1,6 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.info;
+
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
public class InfoPhaseDTO extends AbstractPhaseDTO {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
similarity index 95%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
index 4fc4aa47..96f30a52 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/InfoPhaseUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.info;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
index 7b987b18..23aebe36 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractQuestionDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
similarity index 95%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
index c4999337..a9b2326b 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionChoiceDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
similarity index 85%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
index 0b02db86..89827a03 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
index 5d8ff1c5..a8f647c2 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionPhaseRelationDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
similarity index 88%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
index 23c0af41..2f156eeb 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionRequiredIdDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionRequiredIdDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java
index dded8ef5..a535715b 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
similarity index 88%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
index 2446e666..9d41ff5a 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnairePhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
@@ -1,5 +1,6 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
import java.util.List;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
index 3d4a645b..6d7c6c55 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
similarity index 97%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
index 317aa1a0..4c907a2b 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/DecisionMatrixRowDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
public class DecisionMatrixRowDTO {
private long id;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
similarity index 96%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
index 52575f49..3559cc26 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
public class TaskDTO {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
similarity index 97%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
index cdaf26f8..5b1e8d53 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
similarity index 91%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
index d0a2c356..5f550712 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
@@ -1,4 +1,6 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
+
+import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
similarity index 97%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
index 96d2e208..f7f051f5 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TrainingPhaseUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
@@ -1,4 +1,4 @@
-package cz.muni.ics.kypo.training.adaptive.dto;
+package cz.muni.ics.kypo.training.adaptive.dto.training;
import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
index 2f63d228..596f32ef 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingPhaseFacade.java
@@ -1,13 +1,13 @@
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.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
import cz.muni.ics.kypo.training.adaptive.enums.PhaseTypeCreate;
import cz.muni.ics.kypo.training.adaptive.service.InfoPhaseService;
import cz.muni.ics.kypo.training.adaptive.service.PhaseService;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
index d982a560..861e6022 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/mapper/BeanMapper.java
@@ -10,20 +10,20 @@ 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.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 cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.InfoPhaseUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionChoiceDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionPhaseRelationDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionRequiredIdDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.DecisionMatrixRowDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TrainingPhaseUpdateDTO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
index 4d61270c..5d109ab3 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/InfoPhaseService.java
@@ -1,8 +1,8 @@
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.dto.info.InfoPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.info.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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
index 909f82bf..0eb15741 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java
@@ -5,9 +5,9 @@ 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.dto.questionnaire.QuestionPhaseRelationDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnairePhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.questionnaire.QuestionnaireUpdateDTO;
import cz.muni.ics.kypo.training.adaptive.enums.PhaseTypeCreate;
import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
import cz.muni.ics.kypo.training.adaptive.mapper.BeanMapper;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
index 42f47ec9..3173993e 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
@@ -2,8 +2,8 @@ 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.TaskDTO;
-import cz.muni.ics.kypo.training.adaptive.dto.TaskUpdateDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.TaskDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.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;
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
index 414600ea..9cceba82 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TrainingPhaseService.java
@@ -2,8 +2,8 @@ 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.dto.training.TrainingPhaseDTO;
+import cz.muni.ics.kypo.training.adaptive.dto.training.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;
--
GitLab