From e8fe297320597d9e80522eecb5228d58c1845726 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Sat, 6 Feb 2021 13:42:46 +0100
Subject: [PATCH] [Cleanup] Rename *Dto classes to *DTO so that it's consistent
with classes that are about to be merged
---
.../adaptive/controller/PhasesController.java | 58 ++++++-------
.../adaptive/controller/TasksController.java | 30 +++----
...actPhaseDto.java => AbstractPhaseDTO.java} | 2 +-
...stionDto.java => AbstractQuestionDTO.java} | 8 +-
...xRowDto.java => DecisionMatrixRowDTO.java} | 2 +-
.../{InfoPhaseDto.java => InfoPhaseDTO.java} | 2 +-
...UpdateDto.java => InfoPhaseUpdateDTO.java} | 2 +-
...nChoiceDto.java => QuestionChoiceDTO.java} | 2 +-
.../{QuestionDto.java => QuestionDTO.java} | 2 +-
...Dto.java => QuestionPhaseRelationDTO.java} | 2 +-
...dIdDto.java => QuestionRequiredIdDTO.java} | 2 +-
...nUpdateDto.java => QuestionUpdateDTO.java} | 2 +-
...aseDto.java => QuestionnairePhaseDTO.java} | 14 ++--
...teDto.java => QuestionnaireUpdateDTO.java} | 14 ++--
...{TaskCreateDto.java => TaskCreateDTO.java} | 2 +-
.../dto/{TaskDto.java => TaskDTO.java} | 2 +-
...{TaskUpdateDto.java => TaskUpdateDTO.java} | 2 +-
...ingPhaseDto.java => TrainingPhaseDTO.java} | 14 ++--
...teDto.java => TrainingPhaseUpdateDTO.java} | 8 +-
.../adaptive/facade/TrainingPhaseFacade.java | 36 ++++----
.../training/adaptive/mapper/BeanMapper.java | 82 +++++++++----------
.../adaptive/service/InfoPhaseService.java | 8 +-
.../adaptive/service/PhaseService.java | 6 +-
.../service/QuestionChoiceService.java | 8 +-
.../adaptive/service/QuestionService.java | 8 +-
.../service/QuestionnairePhaseService.java | 16 ++--
.../adaptive/service/TaskService.java | 16 ++--
.../service/TrainingPhaseService.java | 8 +-
28 files changed, 179 insertions(+), 179 deletions(-)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{AbstractPhaseDto.java => AbstractPhaseDTO.java} (94%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{AbstractQuestionDto.java => AbstractQuestionDTO.java} (87%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{DecisionMatrixRowDto.java => DecisionMatrixRowDTO.java} (97%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{InfoPhaseDto.java => InfoPhaseDTO.java} (87%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{InfoPhaseUpdateDto.java => InfoPhaseUpdateDTO.java} (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionChoiceDto.java => QuestionChoiceDTO.java} (96%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionDto.java => QuestionDTO.java} (86%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionPhaseRelationDto.java => QuestionPhaseRelationDTO.java} (98%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionRequiredIdDto.java => QuestionRequiredIdDTO.java} (87%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionUpdateDto.java => QuestionUpdateDTO.java} (98%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionnairePhaseDto.java => QuestionnairePhaseDTO.java} (60%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{QuestionnaireUpdateDto.java => QuestionnaireUpdateDTO.java} (83%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{TaskCreateDto.java => TaskCreateDTO.java} (76%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{TaskDto.java => TaskDTO.java} (97%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{TaskUpdateDto.java => TaskUpdateDTO.java} (98%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{TrainingPhaseDto.java => TrainingPhaseDTO.java} (72%)
rename src/main/java/cz/muni/ics/kypo/training/adaptive/dto/{TrainingPhaseUpdateDto.java => TrainingPhaseUpdateDTO.java} (90%)
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 e75d1d6a..2ec1798e 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.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.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;
@@ -49,7 +49,7 @@ public class PhasesController {
@ApiOperation(httpMethod = "POST",
value = "Create a new phase",
notes = "Creates a new default phase with a specified type",
- response = AbstractPhaseDto.class,
+ response = AbstractPhaseDTO.class,
nickname = "createPhase",
produces = MediaType.APPLICATION_JSON_VALUE
)
@@ -58,13 +58,13 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PostMapping
- public ResponseEntity<AbstractPhaseDto> createPhase(
+ public ResponseEntity<AbstractPhaseDTO> createPhase(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Level type", allowableValues = "questionnaire, info, game", required = true)
@RequestBody @Valid PhaseCreateDTO phaseCreateDTO) {
- AbstractPhaseDto createdPhase = trainingPhaseFacade.createPhase(definitionId, phaseCreateDTO);
+ AbstractPhaseDTO createdPhase = trainingPhaseFacade.createPhase(definitionId, phaseCreateDTO);
return new ResponseEntity<>(createdPhase, HttpStatus.CREATED);
}
@@ -81,18 +81,18 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@GetMapping
- public ResponseEntity<List<AbstractPhaseDto>> getPhases(
+ public ResponseEntity<List<AbstractPhaseDTO>> getPhases(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId) {
- List<AbstractPhaseDto> phases = trainingPhaseFacade.getPhases(definitionId);
+ List<AbstractPhaseDTO> phases = trainingPhaseFacade.getPhases(definitionId);
return new ResponseEntity<>(phases, HttpStatus.OK);
}
@ApiOperation(httpMethod = "GET",
value = "Get phase by ID",
- response = AbstractPhaseDto.class,
+ response = AbstractPhaseDTO.class,
nickname = "getPhase",
produces = MediaType.APPLICATION_JSON_VALUE
)
@@ -101,20 +101,20 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@GetMapping(path = "/{phaseId}")
- public ResponseEntity<AbstractPhaseDto> getPhase(
+ public ResponseEntity<AbstractPhaseDTO> getPhase(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Level ID", required = true)
@PathVariable("phaseId") Long phaseId) {
- AbstractPhaseDto phase = trainingPhaseFacade.getPhase(definitionId, phaseId);
+ AbstractPhaseDTO phase = trainingPhaseFacade.getPhase(definitionId, phaseId);
return new ResponseEntity<>(phase, HttpStatus.OK);
}
@ApiOperation(httpMethod = "DELETE",
value = "Remove phase by ID",
- response = AbstractPhaseDto.class,
+ response = AbstractPhaseDTO.class,
nickname = "getPhase",
produces = MediaType.APPLICATION_JSON_VALUE
)
@@ -123,13 +123,13 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@DeleteMapping(path = "/{phaseId}")
- public ResponseEntity<List<AbstractPhaseDto>> removePhase(
+ public ResponseEntity<List<AbstractPhaseDTO>> removePhase(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Level ID", required = true)
@PathVariable("phaseId") Long phaseId) {
- List<AbstractPhaseDto> remainingPhases = trainingPhaseFacade.deletePhase(definitionId, phaseId);
+ List<AbstractPhaseDTO> remainingPhases = trainingPhaseFacade.deletePhase(definitionId, phaseId);
return new ResponseEntity<>(remainingPhases, HttpStatus.OK);
}
@@ -137,7 +137,7 @@ public class PhasesController {
@ApiOperation(httpMethod = "PUT",
value = "Update info phase",
nickname = "updateInfoPhase",
- response = InfoPhaseDto.class,
+ response = InfoPhaseDTO.class,
consumes = MediaType.APPLICATION_JSON_VALUE
)
@ApiResponses(value = {
@@ -145,15 +145,15 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PutMapping(path = "/{phaseId}/info")
- public ResponseEntity<InfoPhaseDto> updateInfoPhase(
+ public ResponseEntity<InfoPhaseDTO> updateInfoPhase(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Level ID", required = true)
@PathVariable("phaseId") Long phaseId,
@ApiParam(value = "Info phase to be updated")
- @RequestBody @Valid InfoPhaseUpdateDto infoPhaseUpdateDto) {
+ @RequestBody @Valid InfoPhaseUpdateDTO infoPhaseUpdateDto) {
- InfoPhaseDto updatedInfoPhase = trainingPhaseFacade.updateInfoPhase(definitionId, phaseId, infoPhaseUpdateDto);
+ InfoPhaseDTO updatedInfoPhase = trainingPhaseFacade.updateInfoPhase(definitionId, phaseId, infoPhaseUpdateDto);
return new ResponseEntity<>(updatedInfoPhase, HttpStatus.OK);
}
@@ -161,7 +161,7 @@ public class PhasesController {
@ApiOperation(httpMethod = "PUT",
value = "Update training phase",
nickname = "updateTrainingPhase",
- response = TrainingPhaseDto.class,
+ response = TrainingPhaseDTO.class,
consumes = MediaType.APPLICATION_JSON_VALUE
)
@ApiResponses(value = {
@@ -169,15 +169,15 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PutMapping(path = "/{phaseId}/training")
- public ResponseEntity<TrainingPhaseDto> updateTrainingPhase(
+ public ResponseEntity<TrainingPhaseDTO> updateTrainingPhase(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Phase ID", required = true)
@PathVariable("phaseId") Long phaseId,
@ApiParam(value = "Training phase to be updated")
- @RequestBody @Valid TrainingPhaseUpdateDto trainingPhaseUpdateDto) {
+ @RequestBody @Valid TrainingPhaseUpdateDTO trainingPhaseUpdateDto) {
- TrainingPhaseDto updatedTrainingPhase = trainingPhaseFacade.updateTrainingPhase(definitionId, phaseId, trainingPhaseUpdateDto);
+ TrainingPhaseDTO updatedTrainingPhase = trainingPhaseFacade.updateTrainingPhase(definitionId, phaseId, trainingPhaseUpdateDto);
return new ResponseEntity<>(updatedTrainingPhase, HttpStatus.OK);
}
@@ -192,15 +192,15 @@ public class PhasesController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PutMapping(path = "/{phaseId}/questionnaire")
- public ResponseEntity<QuestionnairePhaseDto> updateQuestionnairePhase(
+ public ResponseEntity<QuestionnairePhaseDTO> updateQuestionnairePhase(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Phase ID", required = true)
@PathVariable("phaseId") Long phaseId,
@ApiParam(value = "Questionnaire to be updated")
- @RequestBody @Valid QuestionnaireUpdateDto questionnaireUpdateDto) {
+ @RequestBody @Valid QuestionnaireUpdateDTO questionnaireUpdateDto) {
- QuestionnairePhaseDto updatedQuestionnairePhase = trainingPhaseFacade.updateQuestionnairePhase(definitionId, phaseId, questionnaireUpdateDto);
+ QuestionnairePhaseDTO updatedQuestionnairePhase = trainingPhaseFacade.updateQuestionnairePhase(definitionId, phaseId, questionnaireUpdateDto);
return new ResponseEntity<>(updatedQuestionnairePhase, HttpStatus.OK);
}
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 0aa323a6..85e0162d 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.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;
@@ -42,7 +42,7 @@ public class TasksController {
@ApiOperation(httpMethod = "POST",
value = "Create a new task in a phase",
notes = "Creates a new default task in a specified training phase",
- response = TaskDto.class,
+ response = TaskDTO.class,
nickname = "createTask",
produces = MediaType.APPLICATION_JSON_VALUE
)
@@ -51,13 +51,13 @@ public class TasksController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PostMapping
- public ResponseEntity<TaskDto> createTask(
+ public ResponseEntity<TaskDTO> createTask(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Training phase ID", required = true)
@PathVariable(name = "phaseId") Long phaseId) {
- TaskDto createdTask = taskService.createDefaultTask(definitionId, phaseId);
+ TaskDTO createdTask = taskService.createDefaultTask(definitionId, phaseId);
return new ResponseEntity<>(createdTask, HttpStatus.CREATED);
}
@@ -65,7 +65,7 @@ public class TasksController {
@ApiOperation(httpMethod = "POST",
value = "Clone task inside of the training phase",
notes = "Creates a new task with the same properties as the specified task (pattern)",
- response = TaskDto.class,
+ response = TaskDTO.class,
nickname = "cloneTask",
produces = MediaType.APPLICATION_JSON_VALUE
)
@@ -74,7 +74,7 @@ public class TasksController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PostMapping(path = "/{taskId}")
- public ResponseEntity<TaskDto> cloneTask(
+ public ResponseEntity<TaskDTO> cloneTask(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Training phase ID", required = true)
@@ -82,7 +82,7 @@ public class TasksController {
@ApiParam(value = "Task ID", required = true)
@PathVariable(name = "taskId") Long taskId) {
- TaskDto createdTask = taskService.cloneTask(definitionId, phaseId, taskId);
+ TaskDTO createdTask = taskService.cloneTask(definitionId, phaseId, taskId);
return new ResponseEntity<>(createdTask, HttpStatus.CREATED);
}
@@ -90,7 +90,7 @@ public class TasksController {
@ApiOperation(httpMethod = "GET",
value = "Get task",
notes = "Get task detail associated with the specified training phase",
- response = TaskDto.class,
+ response = TaskDTO.class,
nickname = "getTask",
produces = MediaType.APPLICATION_JSON_VALUE
)
@@ -99,7 +99,7 @@ public class TasksController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@GetMapping(path = "/{taskId}")
- public ResponseEntity<TaskDto> getTask(
+ public ResponseEntity<TaskDTO> getTask(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Training phase ID", required = true)
@@ -107,7 +107,7 @@ public class TasksController {
@ApiParam(value = "Task ID", required = true)
@PathVariable(name = "taskId") Long taskId) {
- TaskDto createdTask = taskService.getTask(definitionId, phaseId, taskId);
+ TaskDTO createdTask = taskService.getTask(definitionId, phaseId, taskId);
return new ResponseEntity<>(createdTask, HttpStatus.CREATED);
}
@@ -123,7 +123,7 @@ public class TasksController {
@ApiResponse(code = 500, message = "Unexpected application error")
})
@PutMapping(path = "/{taskId}")
- public ResponseEntity<TaskDto> updateTask(
+ public ResponseEntity<TaskDTO> updateTask(
@ApiParam(value = "Training definition ID", required = true)
@PathVariable(name = "definitionId") Long definitionId,
@ApiParam(value = "Training phase ID", required = true)
@@ -131,9 +131,9 @@ public class TasksController {
@ApiParam(value = "Task ID", required = true)
@PathVariable(name = "taskId") Long taskId,
@ApiParam(value = "Task to be updated")
- @RequestBody @Valid TaskUpdateDto taskUpdateDto) {
+ @RequestBody @Valid TaskUpdateDTO taskUpdateDto) {
- TaskDto updatedTask = taskService.updateTask(definitionId, phaseId, taskId, taskUpdateDto);
+ TaskDTO updatedTask = taskService.updateTask(definitionId, phaseId, taskId, taskUpdateDto);
return new ResponseEntity<>(updatedTask, HttpStatus.OK);
}
@@ -141,7 +141,7 @@ public class TasksController {
@ApiOperation(httpMethod = "DELETE",
value = "Remove a task",
notes = "Remove the specified task",
- response = TaskDto.class,
+ response = TaskDTO.class,
nickname = "removeTask",
produces = MediaType.APPLICATION_JSON_VALUE
)
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDTO.java
similarity index 94%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDTO.java
index 8f08d5ab..1946f171 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/AbstractPhaseDTO.java
@@ -4,7 +4,7 @@ import cz.muni.ics.kypo.training.adaptive.enums.PhaseType;
import java.io.Serializable;
-public abstract class AbstractPhaseDto implements Serializable {
+public abstract class AbstractPhaseDTO implements Serializable {
private Long id;
private String title;
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/AbstractQuestionDTO.java
similarity index 87%
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/AbstractQuestionDTO.java
index e09d4461..21fb8dda 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/AbstractQuestionDTO.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
-public abstract class AbstractQuestionDto implements Serializable {
+public abstract class AbstractQuestionDTO implements Serializable {
@ApiModelProperty(value = "Order of question", required = true, example = "0")
@NotNull(message = "Question order must be specified")
@@ -23,7 +23,7 @@ public abstract class AbstractQuestionDto implements Serializable {
private QuestionType questionType;
@ApiModelProperty(value = "Choices that are distributed with the question", required = true)
- private List<QuestionChoiceDto> choices;
+ private List<QuestionChoiceDTO> choices;
public int getOrder() {
return order;
@@ -49,11 +49,11 @@ public abstract class AbstractQuestionDto implements Serializable {
this.questionType = type;
}
- public List<QuestionChoiceDto> getChoices() {
+ public List<QuestionChoiceDTO> getChoices() {
return choices;
}
- public void setChoices(List<QuestionChoiceDto> choices) {
+ public void setChoices(List<QuestionChoiceDTO> choices) {
this.choices = choices;
}
}
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/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/DecisionMatrixRowDTO.java
index 0440e904..46694819 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/DecisionMatrixRowDTO.java
@@ -1,6 +1,6 @@
package cz.muni.ics.kypo.training.adaptive.dto;
-public class DecisionMatrixRowDto {
+public class DecisionMatrixRowDTO {
private long id;
private int order;
private double AA;
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/InfoPhaseDTO.java
similarity index 87%
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/InfoPhaseDTO.java
index 6e62117c..39ba73b1 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/InfoPhaseDTO.java
@@ -2,7 +2,7 @@ package cz.muni.ics.kypo.training.adaptive.dto;
import java.io.Serializable;
-public class InfoPhaseDto extends AbstractPhaseDto implements Serializable {
+public class InfoPhaseDTO extends AbstractPhaseDTO implements Serializable {
private String content;
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/InfoPhaseUpdateDTO.java
similarity index 96%
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/InfoPhaseUpdateDTO.java
index 445cba25..4fc4aa47 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/InfoPhaseUpdateDTO.java
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
-public class InfoPhaseUpdateDto {
+public class InfoPhaseUpdateDTO {
@ApiModelProperty(value = "Short description of info phase", required = true, example = "Info phase title")
@NotEmpty(message = "Info phase title must not be blank")
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/QuestionChoiceDTO.java
similarity index 96%
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/QuestionChoiceDTO.java
index 2ebae1d4..f182228c 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/QuestionChoiceDTO.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
-public class QuestionChoiceDto implements Serializable {
+public class QuestionChoiceDTO implements Serializable {
@ApiModelProperty(value = "Question choice ID. Leave blank if new choice is added", required = true, example = "1")
private Long id;
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/QuestionDTO.java
similarity index 86%
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/QuestionDTO.java
index b221016b..7328f2d9 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/QuestionDTO.java
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
-public class QuestionDto extends AbstractQuestionDto implements Serializable {
+public class QuestionDTO extends AbstractQuestionDTO implements Serializable {
@ApiModelProperty(value = "Question ID. Leave blank if a new question is added", required = true, example = "1")
private Long id;
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/QuestionPhaseRelationDTO.java
similarity index 98%
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/QuestionPhaseRelationDTO.java
index 885aadce..5d8ff1c5 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/QuestionPhaseRelationDTO.java
@@ -7,7 +7,7 @@ import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.Set;
-public class QuestionPhaseRelationDto {
+public class QuestionPhaseRelationDTO {
@ApiModelProperty(value = "Question-Phase relation ID. Leave blank if a new one is added", required = true, example = "1")
private Long id;
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/QuestionRequiredIdDTO.java
similarity index 87%
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/QuestionRequiredIdDTO.java
index 249ad80f..23c0af41 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/QuestionRequiredIdDTO.java
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
-public class QuestionRequiredIdDto extends AbstractQuestionDto {
+public class QuestionRequiredIdDTO extends AbstractQuestionDTO {
@ApiModelProperty(value = "Question ID. Leave blank if a new question is added", required = true, example = "1")
@NotNull(message = "Question ID must be specified")
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/QuestionUpdateDTO.java
similarity index 98%
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/QuestionUpdateDTO.java
index 4a0f9699..dded8ef5 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/QuestionUpdateDTO.java
@@ -4,7 +4,7 @@ import cz.muni.ics.kypo.training.adaptive.enums.QuestionType;
import java.util.List;
-public class QuestionUpdateDto {
+public class QuestionUpdateDTO {
private Long id;
private QuestionType 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/QuestionnairePhaseDTO.java
similarity index 60%
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/QuestionnairePhaseDTO.java
index db1e717d..2446e666 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/QuestionnairePhaseDTO.java
@@ -4,17 +4,17 @@ import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
import java.util.List;
-public class QuestionnairePhaseDto extends AbstractPhaseDto {
+public class QuestionnairePhaseDTO extends AbstractPhaseDTO {
- private List<QuestionDto> questions;
+ private List<QuestionDTO> questions;
private QuestionnaireType questionnaireType;
- private List<QuestionPhaseRelationDto> phaseRelations;
+ private List<QuestionPhaseRelationDTO> phaseRelations;
- public List<QuestionDto> getQuestions() {
+ public List<QuestionDTO> getQuestions() {
return questions;
}
- public void setQuestions(List<QuestionDto> questions) {
+ public void setQuestions(List<QuestionDTO> questions) {
this.questions = questions;
}
@@ -26,11 +26,11 @@ public class QuestionnairePhaseDto extends AbstractPhaseDto {
this.questionnaireType = questionnaireType;
}
- public List<QuestionPhaseRelationDto> getPhaseRelations() {
+ public List<QuestionPhaseRelationDTO> getPhaseRelations() {
return phaseRelations;
}
- public void setPhaseRelations(List<QuestionPhaseRelationDto> phaseRelations) {
+ public void setPhaseRelations(List<QuestionPhaseRelationDTO> phaseRelations) {
this.phaseRelations = phaseRelations;
}
}
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/QuestionnaireUpdateDTO.java
similarity index 83%
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/QuestionnaireUpdateDTO.java
index 45adb564..9d5dc1b1 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/QuestionnaireUpdateDTO.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
-public class QuestionnaireUpdateDto {
+public class QuestionnaireUpdateDTO {
@ApiModelProperty(value = "Title of questionnaire", required = true, example = "Entrance test")
@NotEmpty(message = "Questionnaire title must not be blank")
@@ -20,11 +20,11 @@ public class QuestionnaireUpdateDto {
@Valid
@ApiModelProperty(value = "Questions in the questionnaire", required = true)
- private List<QuestionDto> questions;
+ private List<QuestionDTO> questions;
@Valid
@ApiModelProperty(value = "The relation between questions in the questionnaire and phases in the training definition", required = true)
- private List<QuestionPhaseRelationDto> phaseRelations;
+ private List<QuestionPhaseRelationDTO> phaseRelations;
public String getTitle() {
return title;
@@ -42,19 +42,19 @@ public class QuestionnaireUpdateDto {
this.questionnaireType = questionnaireType;
}
- public List<QuestionDto> getQuestions() {
+ public List<QuestionDTO> getQuestions() {
return questions;
}
- public void setQuestions(List<QuestionDto> questions) {
+ public void setQuestions(List<QuestionDTO> questions) {
this.questions = questions;
}
- public List<QuestionPhaseRelationDto> getPhaseRelations() {
+ public List<QuestionPhaseRelationDTO> getPhaseRelations() {
return phaseRelations;
}
- public void setPhaseRelations(List<QuestionPhaseRelationDto> phaseRelations) {
+ public void setPhaseRelations(List<QuestionPhaseRelationDTO> phaseRelations) {
this.phaseRelations = phaseRelations;
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDTO.java
similarity index 76%
rename from src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java
rename to src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDTO.java
index dea94543..ebd5a85e 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDto.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/TaskCreateDTO.java
@@ -1,6 +1,6 @@
package cz.muni.ics.kypo.training.adaptive.dto;
-public class TaskCreateDto extends TaskUpdateDto {
+public class TaskCreateDTO extends TaskUpdateDTO {
@Override
public String toString() {
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/TaskDTO.java
similarity index 97%
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/TaskDTO.java
index f6447b07..b135aa0f 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/TaskDTO.java
@@ -2,7 +2,7 @@ package cz.muni.ics.kypo.training.adaptive.dto;
import java.io.Serializable;
-public class TaskDto implements Serializable {
+public class TaskDTO implements Serializable {
private Long id;
private String title;
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/TaskUpdateDTO.java
similarity index 98%
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/TaskUpdateDTO.java
index 3813676e..b1ab49ef 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/TaskUpdateDTO.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero;
-public class TaskUpdateDto {
+public class TaskUpdateDTO {
@ApiModelProperty(value = "Short description of task", required = true, example = "Task title")
@NotEmpty(message = "Task title must not be blank")
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/TrainingPhaseDTO.java
similarity index 72%
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/TrainingPhaseDTO.java
index 3a3933d0..d0a2c356 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/TrainingPhaseDTO.java
@@ -3,14 +3,14 @@ package cz.muni.ics.kypo.training.adaptive.dto;
import java.util.ArrayList;
import java.util.List;
-public class TrainingPhaseDto extends AbstractPhaseDto {
+public class TrainingPhaseDTO extends AbstractPhaseDTO {
private int estimatedDuration;
private int allowedCommands;
private int allowedWrongFlags;
- private List<TaskDto> tasks = new ArrayList<>();
+ private List<TaskDTO> tasks = new ArrayList<>();
- private List<DecisionMatrixRowDto> decisionMatrix;
+ private List<DecisionMatrixRowDTO> decisionMatrix;
public int getEstimatedDuration() {
return estimatedDuration;
@@ -36,19 +36,19 @@ public class TrainingPhaseDto extends AbstractPhaseDto {
this.allowedWrongFlags = allowedWrongFlags;
}
- public List<TaskDto> getTasks() {
+ public List<TaskDTO> getTasks() {
return tasks;
}
- public void setTasks(List<TaskDto> tasks) {
+ public void setTasks(List<TaskDTO> tasks) {
this.tasks = tasks;
}
- public List<DecisionMatrixRowDto> getDecisionMatrix() {
+ public List<DecisionMatrixRowDTO> getDecisionMatrix() {
return decisionMatrix;
}
- public void setDecisionMatrix(List<DecisionMatrixRowDto> decisionMatrix) {
+ public void setDecisionMatrix(List<DecisionMatrixRowDTO> decisionMatrix) {
this.decisionMatrix = decisionMatrix;
}
}
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/TrainingPhaseUpdateDTO.java
similarity index 90%
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/TrainingPhaseUpdateDTO.java
index 9347cc84..96d2e208 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/TrainingPhaseUpdateDTO.java
@@ -6,7 +6,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
-public class TrainingPhaseUpdateDto {
+public class TrainingPhaseUpdateDTO {
@ApiModelProperty(value = "Short description of training phase", required = true, example = "Training phase title")
@NotEmpty(message = "Training phase title must not be blank")
@@ -24,7 +24,7 @@ public class TrainingPhaseUpdateDto {
@NotNull(message = "Estimated duration of phase task must be set")
private Integer estimatedDuration;
- private List<DecisionMatrixRowDto> decisionMatrix;
+ private List<DecisionMatrixRowDTO> decisionMatrix;
public String getTitle() {
return title;
@@ -58,11 +58,11 @@ public class TrainingPhaseUpdateDto {
this.estimatedDuration = estimatedDuration;
}
- public List<DecisionMatrixRowDto> getDecisionMatrix() {
+ public List<DecisionMatrixRowDTO> getDecisionMatrix() {
return decisionMatrix;
}
- public void setDecisionMatrix(List<DecisionMatrixRowDto> decisionMatrix) {
+ public void setDecisionMatrix(List<DecisionMatrixRowDTO> decisionMatrix) {
this.decisionMatrix = decisionMatrix;
}
}
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 d4adf5e9..fa63c818 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.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.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;
@@ -35,8 +35,8 @@ public class TrainingPhaseFacade {
@Autowired
private TrainingPhaseService trainingPhaseService;
- public AbstractPhaseDto createPhase(Long trainingDefinitionId, PhaseCreateDTO phaseCreateDTO) {
- AbstractPhaseDto abstractPhaseDto;
+ public AbstractPhaseDTO createPhase(Long trainingDefinitionId, PhaseCreateDTO phaseCreateDTO) {
+ AbstractPhaseDTO abstractPhaseDto;
if (PhaseType.INFO.equals(phaseCreateDTO.getPhaseType())) {
abstractPhaseDto = infoPhaseService.createDefaultInfoPhase(trainingDefinitionId);
} else if (PhaseType.TRAINING.equals(phaseCreateDTO.getPhaseType())) {
@@ -52,7 +52,7 @@ public class TrainingPhaseFacade {
@Transactional
- public List<AbstractPhaseDto> deletePhase(Long definitionId, Long phaseId) {
+ public List<AbstractPhaseDTO> deletePhase(Long definitionId, Long phaseId) {
phaseService.deletePhase(definitionId, phaseId);
@@ -61,11 +61,11 @@ public class TrainingPhaseFacade {
return getPhases(definitionId);
}
- public AbstractPhaseDto getPhase(Long definitionId, Long phaseId) {
- AbstractPhaseDto phase = phaseService.getPhase(definitionId, phaseId);
+ public AbstractPhaseDTO getPhase(Long definitionId, Long phaseId) {
+ AbstractPhaseDTO phase = phaseService.getPhase(definitionId, phaseId);
- if (phase instanceof QuestionnairePhaseDto) {
- QuestionnairePhaseDto questionnairePhaseDto = (QuestionnairePhaseDto) phase;
+ if (phase instanceof QuestionnairePhaseDTO) {
+ QuestionnairePhaseDTO questionnairePhaseDto = (QuestionnairePhaseDTO) phase;
if (QuestionnaireType.ADAPTIVE.equals(questionnairePhaseDto.getQuestionnaireType())) {
phase.setPhaseType(PhaseType.QUESTIONNAIRE_ADAPTIVE);
} else {
@@ -76,20 +76,20 @@ public class TrainingPhaseFacade {
return phase;
}
- public List<AbstractPhaseDto> getPhases(Long definitionId) {
+ public List<AbstractPhaseDTO> getPhases(Long definitionId) {
return phaseService.getPhases(definitionId);
}
- public InfoPhaseDto updateInfoPhase(Long definitionId, Long phaseId, InfoPhaseUpdateDto infoPhaseUpdateDto) {
+ public InfoPhaseDTO updateInfoPhase(Long definitionId, Long phaseId, InfoPhaseUpdateDTO infoPhaseUpdateDto) {
return infoPhaseService.updateInfoPhase(definitionId, phaseId, infoPhaseUpdateDto);
}
- public TrainingPhaseDto updateTrainingPhase(Long definitionId, Long phaseId, TrainingPhaseUpdateDto trainingPhaseUpdate) {
+ public TrainingPhaseDTO updateTrainingPhase(Long definitionId, Long phaseId, TrainingPhaseUpdateDTO trainingPhaseUpdate) {
return trainingPhaseService.updateTrainingPhase(definitionId, phaseId, trainingPhaseUpdate);
}
- public QuestionnairePhaseDto updateQuestionnairePhase(Long definitionId, Long phaseId, QuestionnaireUpdateDto questionnaireUpdateDto) {
+ public QuestionnairePhaseDTO updateQuestionnairePhase(Long definitionId, Long phaseId, QuestionnaireUpdateDTO questionnaireUpdateDto) {
return questionnairePhaseService.updateQuestionnairePhase(definitionId, phaseId, questionnaireUpdateDto);
}
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 5e5a4b95..0388811e 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
@@ -9,22 +9,22 @@ 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 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;
@@ -37,8 +37,8 @@ public interface BeanMapper {
BeanMapper INSTANCE = Mappers.getMapper(BeanMapper.class);
- default AbstractPhaseDto toDto(AbstractPhase abstractPhase) {
- AbstractPhaseDto abstractPhaseDto;
+ default AbstractPhaseDTO toDto(AbstractPhase abstractPhase) {
+ AbstractPhaseDTO abstractPhaseDto;
if (abstractPhase instanceof TrainingPhase) {
abstractPhaseDto = toDto((TrainingPhase) abstractPhase);
} else if (abstractPhase instanceof InfoPhase) {
@@ -52,57 +52,57 @@ public interface BeanMapper {
return abstractPhaseDto;
}
- List<AbstractPhaseDto> toDtoList(List<AbstractPhase> abstractPhase);
+ List<AbstractPhaseDTO> toDtoList(List<AbstractPhase> abstractPhase);
- TaskDto toDto(Task task);
+ TaskDTO toDto(Task task);
- Task toEntity(TaskDto taskDto);
+ Task toEntity(TaskDTO taskDto);
- Task toEntity(TaskCreateDto taskCreateDto);
+ Task toEntity(TaskCreateDTO taskCreateDto);
- Task toEntity(TaskUpdateDto taskUpdateDto);
+ Task toEntity(TaskUpdateDTO taskUpdateDto);
@Mapping(target = "phaseType", constant = "INFO")
- InfoPhaseDto toDto(InfoPhase infoPhase);
+ InfoPhaseDTO toDto(InfoPhase infoPhase);
- InfoPhase toEntity(InfoPhaseUpdateDto infoPhaseUpdateDto);
+ InfoPhase toEntity(InfoPhaseUpdateDTO infoPhaseUpdateDto);
@Mapping(target = "phaseType", constant = "TRAINING")
- TrainingPhaseDto toDto(TrainingPhase trainingPhase);
+ TrainingPhaseDTO toDto(TrainingPhase trainingPhase);
- TrainingPhase toEntity(TrainingPhaseDto trainingPhaseDto);
+ TrainingPhase toEntity(TrainingPhaseDTO trainingPhaseDto);
- TrainingPhase toEntity(TrainingPhaseUpdateDto trainingPhaseUpdateDto);
+ TrainingPhase toEntity(TrainingPhaseUpdateDTO trainingPhaseUpdateDto);
- DecisionMatrixRow toEntity(DecisionMatrixRowDto decisionMatrixRowDto);
+ DecisionMatrixRow toEntity(DecisionMatrixRowDTO decisionMatrixRowDto);
- DecisionMatrixRowDto toDto(DecisionMatrixRow decisionMatrixRow);
+ DecisionMatrixRowDTO toDto(DecisionMatrixRow decisionMatrixRow);
- QuestionChoice toEntity(QuestionChoiceDto questionChoiceDto);
+ QuestionChoice toEntity(QuestionChoiceDTO questionChoiceDto);
- QuestionChoiceDto toDto(QuestionChoice questionChoice);
+ QuestionChoiceDTO toDto(QuestionChoice questionChoice);
- Question toEntity(QuestionDto questionDto);
+ Question toEntity(QuestionDTO questionDto);
- Question toEntity(QuestionRequiredIdDto questionDto);
+ Question toEntity(QuestionRequiredIdDTO questionDto);
- Question toEntity(QuestionUpdateDto questionUpdateDto);
+ Question toEntity(QuestionUpdateDTO questionUpdateDto);
- QuestionDto toDto(Question question);
+ QuestionDTO toDto(Question question);
@Mapping(target = "questionPhaseRelations", source = "phaseRelations")
- QuestionnairePhase toEntity(QuestionnaireUpdateDto questionnaireUpdateDto);
+ QuestionnairePhase toEntity(QuestionnaireUpdateDTO questionnaireUpdateDto);
- QuestionnairePhase toEntity(QuestionnairePhaseDto questionnairePhaseDto);
+ QuestionnairePhase toEntity(QuestionnairePhaseDTO questionnairePhaseDto);
@Mapping(target = "phaseRelations", source = "questionPhaseRelations")
- QuestionnairePhaseDto toDto(QuestionnairePhase questionnairePhase);
+ QuestionnairePhaseDTO toDto(QuestionnairePhase questionnairePhase);
- QuestionPhaseRelation toEntity(QuestionPhaseRelationDto questionnairePhaseDto);
+ QuestionPhaseRelation toEntity(QuestionPhaseRelationDTO questionnairePhaseDto);
@Mapping(target = "phaseId", source = "relatedTrainingPhase")
@Mapping(target = "questionIds", source = "questions")
- QuestionPhaseRelationDto toDto(QuestionPhaseRelation questionnairePhase);
+ QuestionPhaseRelationDTO toDto(QuestionPhaseRelation questionnairePhase);
default Long mapTrainingPhaseId(TrainingPhase trainingPhase) {
if (trainingPhase == null) {
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 571993a8..b10eaac8 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.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;
@@ -25,7 +25,7 @@ public class InfoPhaseService {
this.abstractPhaseRepository = abstractPhaseRepository;
}
- public InfoPhaseDto createDefaultInfoPhase(Long trainingDefinitionId) {
+ public InfoPhaseDTO createDefaultInfoPhase(Long trainingDefinitionId) {
InfoPhase infoPhase = new InfoPhase();
infoPhase.setContent("Content of info level");
infoPhase.setTitle("Title of info level");
@@ -37,7 +37,7 @@ public class InfoPhaseService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public InfoPhaseDto updateInfoPhase(Long definitionId, Long phaseId, InfoPhaseUpdateDto infoPhaseUpdateDto) {
+ public InfoPhaseDTO updateInfoPhase(Long definitionId, Long phaseId, InfoPhaseUpdateDTO infoPhaseUpdateDto) {
InfoPhase infoPhaseUpdate = BeanMapper.INSTANCE.toEntity(infoPhaseUpdateDto);
infoPhaseUpdate.setId(phaseId);
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java
index b7facfc2..eb1ae0af 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/PhaseService.java
@@ -1,7 +1,7 @@
package cz.muni.ics.kypo.training.adaptive.service;
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.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;
@@ -34,7 +34,7 @@ public class PhaseService {
abstractPhaseRepository.delete(phase);
}
- public AbstractPhaseDto getPhase(Long definitionId, Long phaseId) {
+ public AbstractPhaseDTO getPhase(Long definitionId, Long phaseId) {
AbstractPhase phase = abstractPhaseRepository.findById(phaseId)
.orElseThrow(() -> new RuntimeException("Phase was not found"));
// TODO throw proper exception once kypo2-training is migrated
@@ -45,7 +45,7 @@ public class PhaseService {
}
- public List<AbstractPhaseDto> getPhases(Long trainingDefinitionId) {
+ public List<AbstractPhaseDTO> getPhases(Long trainingDefinitionId) {
List<AbstractPhase> phases = abstractPhaseRepository.findAllByTrainingDefinitionIdOrderByOrder(trainingDefinitionId);
return BeanMapper.INSTANCE.toDtoList(phases);
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java
index 3a444e0b..4e9bd6fd 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionChoiceService.java
@@ -2,7 +2,7 @@ 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.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;
@@ -24,7 +24,7 @@ public class QuestionChoiceService {
@Autowired
private QuestionChoiceRepository questionChoiceRepository;
- public QuestionChoiceDto createDefaultQuestionChoice(Long questionId) {
+ public QuestionChoiceDTO createDefaultQuestionChoice(Long questionId) {
Optional<Question> question = questionRepository.findById(questionId);
if (question.isEmpty()) {
// TODO return 404
@@ -41,13 +41,13 @@ public class QuestionChoiceService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public QuestionChoiceDto updateQuestionChoice(QuestionChoice questionChoice) {
+ public QuestionChoiceDTO updateQuestionChoice(QuestionChoice questionChoice) {
Optional<QuestionChoice> persistedQuestionChoice = questionChoiceRepository.findById(questionChoice.getId());
if (persistedQuestionChoice.isEmpty()) {
// TODO return 404
LOG.error("No question choice found with ID {}.", questionChoice.getId());
- return new QuestionChoiceDto();
+ return new QuestionChoiceDTO();
}
questionChoice.setQuestion(persistedQuestionChoice.get().getQuestion());
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java
index 99c83c28..4fb72932 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionService.java
@@ -2,7 +2,7 @@ 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.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;
@@ -25,7 +25,7 @@ public class QuestionService {
@Autowired
private QuestionRepository questionRepository;
- public QuestionDto createDefaultQuestion(Long questionnaireId, QuestionType questionType) {
+ public QuestionDTO createDefaultQuestion(Long questionnaireId, QuestionType questionType) {
Optional<QuestionnairePhase> questionnairePhase = questionnairePhaseRepository.findById(questionnaireId);
if (questionnairePhase.isEmpty()) {
// TODO return 404
@@ -43,13 +43,13 @@ public class QuestionService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public QuestionDto updateQuestion(Question question) {
+ public QuestionDTO updateQuestion(Question question) {
Optional<Question> persistedQuestion = questionRepository.findById(question.getId());
if (persistedQuestion.isEmpty()) {
// TODO return 404
LOG.error("No question found with ID {}.", question.getId());
- return new QuestionDto();
+ return new QuestionDTO();
}
question.setChoices(persistedQuestion.get().getChoices());
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 33e8479c..92809b11 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.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;
@@ -47,7 +47,7 @@ public class QuestionnairePhaseService {
@Autowired
private QuestionPhaseRelationRepository questionPhaseRelationRepository;
- public QuestionnairePhaseDto createDefaultQuestionnairePhase(Long trainingDefinitionId, PhaseCreateDTO phaseCreateDTO) {
+ public QuestionnairePhaseDTO createDefaultQuestionnairePhase(Long trainingDefinitionId, PhaseCreateDTO phaseCreateDTO) {
QuestionnairePhase questionnairePhase = new QuestionnairePhase();
questionnairePhase.setTitle("Title of questionnaire level");
@@ -65,7 +65,7 @@ public class QuestionnairePhaseService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public QuestionnairePhaseDto updateQuestionnairePhase(Long definitionId, Long phaseId, QuestionnaireUpdateDto questionnaireUpdateDto) {
+ public QuestionnairePhaseDTO updateQuestionnairePhase(Long definitionId, Long phaseId, QuestionnaireUpdateDTO questionnaireUpdateDto) {
QuestionnairePhase questionnairePhase = BeanMapper.INSTANCE.toEntity(questionnaireUpdateDto);
questionnairePhase.setId(phaseId);
@@ -90,7 +90,7 @@ public class QuestionnairePhaseService {
QuestionnairePhase savedEntity = questionnairePhaseRepository.save(questionnairePhase);
- QuestionnairePhaseDto result = BeanMapper.INSTANCE.toDto(savedEntity);
+ QuestionnairePhaseDTO result = BeanMapper.INSTANCE.toDto(savedEntity);
if (QuestionnaireType.ADAPTIVE.equals(savedEntity.getQuestionnaireType())) {
result.setPhaseType(PhaseType.QUESTIONNAIRE_ADAPTIVE);
} else {
@@ -100,12 +100,12 @@ public class QuestionnairePhaseService {
return result;
}
- private List<QuestionPhaseRelation> resolveQuestionnairePhaseRelationsUpdate(QuestionnairePhase questionnairePhase, QuestionnaireUpdateDto questionnaireUpdateDto) {
+ private List<QuestionPhaseRelation> resolveQuestionnairePhaseRelationsUpdate(QuestionnairePhase questionnairePhase, QuestionnaireUpdateDTO questionnaireUpdateDto) {
List<QuestionPhaseRelation> questionnairePhaseRelations = new ArrayList<>();
if (!CollectionUtils.isEmpty(questionnaireUpdateDto.getPhaseRelations())) {
int order = 0;
- for (QuestionPhaseRelationDto phaseRelation : questionnaireUpdateDto.getPhaseRelations()) {
+ for (QuestionPhaseRelationDTO phaseRelation : questionnaireUpdateDto.getPhaseRelations()) {
Set<Question> questionsInPhaseRelation = Set.copyOf(questionRepository.findAllById(phaseRelation.getQuestionIds()));
QuestionPhaseRelation questionPhaseRelation;
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 35020121..4f802bc8 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,9 +2,9 @@ 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.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;
@@ -29,7 +29,7 @@ public class TaskService {
this.trainingPhaseRepository = trainingPhaseRepository;
}
- public TaskDto createDefaultTask(Long trainingDefinitionId, Long phaseId) {
+ public TaskDTO createDefaultTask(Long trainingDefinitionId, Long phaseId) {
TrainingPhase trainingPhase = trainingPhaseRepository.findById(phaseId)
.orElseThrow(() -> new RuntimeException("Game phase was not found"));
// TODO throw proper exception once kypo2-training is migrated
@@ -49,7 +49,7 @@ public class TaskService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public TaskDto cloneTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
+ public TaskDTO cloneTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
Task taskToBeCloned = taskRepository.findById(taskId)
.orElseThrow(() -> new RuntimeException("Task was not found"));
// TODO throw proper exception once kypo2-training is migrated
@@ -72,7 +72,7 @@ public class TaskService {
}
- public TaskDto createTask(TaskCreateDto taskCreateDto) {
+ public TaskDTO createTask(TaskCreateDTO taskCreateDto) {
Task task = BeanMapper.INSTANCE.toEntity(taskCreateDto);
Task persistedEntity = taskRepository.save(task);
@@ -80,7 +80,7 @@ public class TaskService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public TaskDto getTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
+ public TaskDTO getTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
Task task = taskRepository.findById(taskId)
.orElseThrow(() -> new RuntimeException("Task was not found"));
// TODO throw proper exception once kypo2-training is migrated
@@ -90,7 +90,7 @@ public class TaskService {
return BeanMapper.INSTANCE.toDto(task);
}
- public TaskDto updateTask(Long trainingDefinitionId, Long phaseId, Long taskId, TaskUpdateDto taskUpdateDto) {
+ public TaskDTO updateTask(Long trainingDefinitionId, Long phaseId, Long taskId, TaskUpdateDTO taskUpdateDto) {
Task taskUpdate = BeanMapper.INSTANCE.toEntity(taskUpdateDto);
taskUpdate.setId(taskId);
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 96103a5c..0b8ec5c2 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.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;
@@ -30,7 +30,7 @@ public class TrainingPhaseService {
@Autowired
private AbstractPhaseRepository abstractPhaseRepository;
- public TrainingPhaseDto createDefaultTrainingPhase(Long trainingDefinitionId) {
+ public TrainingPhaseDTO createDefaultTrainingPhase(Long trainingDefinitionId) {
TrainingPhase trainingPhase = new TrainingPhase();
trainingPhase.setTitle("Title of phase level");
@@ -44,7 +44,7 @@ public class TrainingPhaseService {
return BeanMapper.INSTANCE.toDto(persistedEntity);
}
- public TrainingPhaseDto updateTrainingPhase(Long definitionId, Long phaseId, TrainingPhaseUpdateDto trainingPhaseUpdate) {
+ public TrainingPhaseDTO updateTrainingPhase(Long definitionId, Long phaseId, TrainingPhaseUpdateDTO trainingPhaseUpdate) {
TrainingPhase trainingPhase = BeanMapper.INSTANCE.toEntity(trainingPhaseUpdate);
trainingPhase.setId(phaseId);
--
GitLab