diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java
index 9cd2c12b033ab48a03b81467536908abccc5a36a..c80c3a9fd77606332b99740bd2cba33d420307df 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/DecisionMatrixRow.java
@@ -24,7 +24,7 @@ public class DecisionMatrixRow implements Serializable {
private double keywordUsed;
private double completedInTime;
private double solutionDisplayed;
- private double wrongFlags;
+ private double wrongAnswers;
@ManyToOne(fetch = FetchType.LAZY)
private TrainingPhase trainingPhase;
@@ -77,12 +77,12 @@ public class DecisionMatrixRow implements Serializable {
this.solutionDisplayed = solutionDisplayed;
}
- public double getWrongFlags() {
- return wrongFlags;
+ public double getWrongAnswers() {
+ return wrongAnswers;
}
- public void setWrongFlags(double wrongFlags) {
- this.wrongFlags = wrongFlags;
+ public void setWrongAnswers(double wrongAnswers) {
+ this.wrongAnswers = wrongAnswers;
}
public TrainingPhase getTrainingPhase() {
@@ -102,7 +102,7 @@ public class DecisionMatrixRow implements Serializable {
", keywordUsed=" + keywordUsed +
", completedInTime=" + completedInTime +
", solutionDisplayed=" + solutionDisplayed +
- ", wrongFlags=" + wrongFlags +
+ ", wrongAnswers=" + wrongAnswers +
'}';
}
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java
index bd4f8d48b042a775081be75582e97cad8fb479b0..5d26e4d38d15998df68de89e547983e34995933b 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/Task.java
@@ -21,9 +21,9 @@ public class Task implements Serializable {
private String title;
private String content;
- private String flag;
+ private String answer;
private String solution;
- private int incorrectFlagLimit;
+ private int incorrectAnswerLimit;
@Column(name = "order_in_training_phase", nullable = false)
private Integer order;
@@ -63,12 +63,12 @@ public class Task implements Serializable {
this.content = content;
}
- public String getFlag() {
- return flag;
+ public String getAnswer() {
+ return answer;
}
- public void setFlag(String flag) {
- this.flag = flag;
+ public void setAnswer(String answer) {
+ this.answer = answer;
}
public String getSolution() {
@@ -79,12 +79,12 @@ public class Task implements Serializable {
this.solution = solution;
}
- public int getIncorrectFlagLimit() {
- return incorrectFlagLimit;
+ public int getIncorrectAnswerLimit() {
+ return incorrectAnswerLimit;
}
- public void setIncorrectFlagLimit(int incorrectFlagLimit) {
- this.incorrectFlagLimit = incorrectFlagLimit;
+ public void setIncorrectAnswerLimit(int incorrectAnswerLimit) {
+ this.incorrectAnswerLimit = incorrectAnswerLimit;
}
public TrainingPhase getTrainingPhase() {
@@ -102,9 +102,9 @@ public class Task implements Serializable {
"id=" + id +
", title='" + title + '\'' +
", content='" + content + '\'' +
- ", flag='" + flag + '\'' +
+ ", answer='" + answer + '\'' +
", solution='" + solution + '\'' +
- ", incorrectFlagLimit=" + incorrectFlagLimit +
+ ", incorrectAnswerLimit=" + incorrectAnswerLimit +
", order=" + order +
'}';
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java
index 2aff635518d5fdddf15011a35c3da52d4cc21a29..d9c5e69024c36db8757183a6049c72589cf2f5fa 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/domain/TrainingPhase.java
@@ -13,7 +13,7 @@ public class TrainingPhase extends AbstractPhase {
private int estimatedDuration;
private int allowedCommands;
- private int allowedWrongFlags;
+ private int allowedWrongAnswers;
@OrderBy
@OneToMany(mappedBy = "trainingPhase", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@@ -43,12 +43,12 @@ public class TrainingPhase extends AbstractPhase {
this.allowedCommands = allowedCommands;
}
- public int getAllowedWrongFlags() {
- return allowedWrongFlags;
+ public int getAllowedWrongAnswers() {
+ return allowedWrongAnswers;
}
- public void setAllowedWrongFlags(int allowedWrongFlags) {
- this.allowedWrongFlags = allowedWrongFlags;
+ public void setAllowedWrongAnswers(int allowedWrongAnswers) {
+ this.allowedWrongAnswers = allowedWrongAnswers;
}
public List<Task> getTasks() {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
index 4c907a2b72f4624f88426f6ba1d24643b4068467..ad3e6999350ac014a0f391906cf176e7409aeed5 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/DecisionMatrixRowDTO.java
@@ -7,7 +7,7 @@ public class DecisionMatrixRowDTO {
private double keywordUsed;
private double completedInTime;
private double solutionDisplayed;
- private double wrongFlags;
+ private double wrongAnswers;
public long getId() {
return id;
@@ -57,12 +57,12 @@ public class DecisionMatrixRowDTO {
this.solutionDisplayed = solutionDisplayed;
}
- public double getWrongFlags() {
- return wrongFlags;
+ public double getWrongAnswers() {
+ return wrongAnswers;
}
- public void setWrongFlags(double wrongFlags) {
- this.wrongFlags = wrongFlags;
+ public void setWrongAnswers(double wrongAnswers) {
+ this.wrongAnswers = wrongAnswers;
}
@Override
@@ -74,7 +74,7 @@ public class DecisionMatrixRowDTO {
", keywordUsed=" + keywordUsed +
", completedInTime=" + completedInTime +
", solutionDisplayed=" + solutionDisplayed +
- ", wrongFlags=" + wrongFlags +
+ ", wrongAnswers=" + wrongAnswers +
'}';
}
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
index 3559cc264a68809241510f31c66bd594150e1873..d975486ab87e15708d4dc9ae767533d755432ff3 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskDTO.java
@@ -6,9 +6,9 @@ public class TaskDTO {
private String title;
private Integer order;
private String content;
- private String flag;
+ private String answer;
private String solution;
- private int incorrectFlagLimit;
+ private int incorrectAnswerLimit;
public Long getId() {
return id;
@@ -42,12 +42,12 @@ public class TaskDTO {
this.content = content;
}
- public String getFlag() {
- return flag;
+ public String getAnswer() {
+ return answer;
}
- public void setFlag(String flag) {
- this.flag = flag;
+ public void setAnswer(String answer) {
+ this.answer = answer;
}
public String getSolution() {
@@ -58,12 +58,12 @@ public class TaskDTO {
this.solution = solution;
}
- public int getIncorrectFlagLimit() {
- return incorrectFlagLimit;
+ public int getIncorrectAnswerLimit() {
+ return incorrectAnswerLimit;
}
- public void setIncorrectFlagLimit(int incorrectFlagLimit) {
- this.incorrectFlagLimit = incorrectFlagLimit;
+ public void setIncorrectAnswerLimit(int incorrectAnswerLimit) {
+ this.incorrectAnswerLimit = incorrectAnswerLimit;
}
@Override
@@ -73,9 +73,9 @@ public class TaskDTO {
", title='" + title + '\'' +
", order=" + order +
", content='" + content + '\'' +
- ", flag='" + flag + '\'' +
+ ", answer='" + answer + '\'' +
", solution='" + solution + '\'' +
- ", incorrectFlagLimit=" + incorrectFlagLimit +
+ ", incorrectAnswerLimit=" + incorrectAnswerLimit +
"} " + super.toString();
}
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
index 5b1e8d532eda591befcf7b8152ed84fef690d0d2..bf3b10a3906d8ac6052f97b98a53cf5b6cbd7471 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskUpdateDTO.java
@@ -17,17 +17,17 @@ public class TaskUpdateDTO {
private String content;
@ApiModelProperty(value = "Keyword that must be found in the task. Necessary in order to get to the next phase", required = true, example = "secretFlag")
- @NotEmpty(message = "Flag of task cannot be null")
- private String flag;
+ @NotEmpty(message = "Answer of task cannot be null")
+ private String answer;
- @ApiModelProperty(value = "Description how to get the flag", required = true, example = "Open secret.txt")
+ @ApiModelProperty(value = "Description how to get the answer", required = true, example = "Open secret.txt")
@NotEmpty(message = "Solution of task cannot be null")
private String solution;
- @ApiModelProperty(value = "It defines the allowed number of incorrect flags submitted by the player", required = true, example = "5")
- @NotNull(message = "Limit of the number of provided incorrect flags must be specified")
- @PositiveOrZero(message = "Limit of the number of provided incorrect flags must not be a negative number")
- private Integer incorrectFlagLimit;
+ @ApiModelProperty(value = "It defines the allowed number of incorrect answers submitted by the player", required = true, example = "5")
+ @NotNull(message = "Limit of the number of provided incorrect answers must be specified")
+ @PositiveOrZero(message = "Limit of the number of provided incorrect answers must not be a negative number")
+ private Integer incorrectAnswerLimit;
public String getTitle() {
return title;
@@ -45,12 +45,12 @@ public class TaskUpdateDTO {
this.content = content;
}
- public String getFlag() {
- return flag;
+ public String getAnswer() {
+ return answer;
}
- public void setFlag(String flag) {
- this.flag = flag;
+ public void setAnswer(String answer) {
+ this.answer = answer;
}
public String getSolution() {
@@ -61,12 +61,12 @@ public class TaskUpdateDTO {
this.solution = solution;
}
- public Integer getIncorrectFlagLimit() {
- return incorrectFlagLimit;
+ public Integer getIncorrectAnswerLimit() {
+ return incorrectAnswerLimit;
}
- public void setIncorrectFlagLimit(Integer incorrectFlagLimit) {
- this.incorrectFlagLimit = incorrectFlagLimit;
+ public void setIncorrectAnswerLimit(Integer incorrectAnswerLimit) {
+ this.incorrectAnswerLimit = incorrectAnswerLimit;
}
@Override
@@ -74,9 +74,9 @@ public class TaskUpdateDTO {
return "TaskUpdateDto{" +
"title='" + title + '\'' +
", content='" + content + '\'' +
- ", flag='" + flag + '\'' +
+ ", answer='" + answer + '\'' +
", solution='" + solution + '\'' +
- ", incorrectFlagLimit=" + incorrectFlagLimit +
+ ", incorrectAnswerLimit=" + incorrectAnswerLimit +
'}';
}
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
index 5f5507126763b95d3fbb448c007bb05bbf174a5f..3cf60665a609c43a61696b35194f2641f49dadd4 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseDTO.java
@@ -9,7 +9,7 @@ public class TrainingPhaseDTO extends AbstractPhaseDTO {
private int estimatedDuration;
private int allowedCommands;
- private int allowedWrongFlags;
+ private int allowedWrongAnswers;
private List<TaskDTO> tasks = new ArrayList<>();
private List<DecisionMatrixRowDTO> decisionMatrix;
@@ -30,12 +30,12 @@ public class TrainingPhaseDTO extends AbstractPhaseDTO {
this.allowedCommands = allowedCommands;
}
- public int getAllowedWrongFlags() {
- return allowedWrongFlags;
+ public int getAllowedWrongAnswers() {
+ return allowedWrongAnswers;
}
- public void setAllowedWrongFlags(int allowedWrongFlags) {
- this.allowedWrongFlags = allowedWrongFlags;
+ public void setAllowedWrongAnswers(int allowedWrongAnswers) {
+ this.allowedWrongAnswers = allowedWrongAnswers;
}
public List<TaskDTO> getTasks() {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
index f7f051f52e73d5e79b7bffb0653c6cf8b652ae36..c1ca1f611818484ca8d0b12e266bb29997987a2b 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TrainingPhaseUpdateDTO.java
@@ -12,9 +12,9 @@ public class TrainingPhaseUpdateDTO {
@NotEmpty(message = "Training phase title must not be blank")
private String title;
- @ApiModelProperty(value = "Maximal number of allowed wrong flags provided by played", required = true, example = "10")
- @NotNull(message = "Maximal number of allowed wrong flags must be set")
- private Integer allowedWrongFlags;
+ @ApiModelProperty(value = "Maximal number of allowed wrong answers provided by played", required = true, example = "10")
+ @NotNull(message = "Maximal number of allowed wrong answers must be set")
+ private Integer allowedWrongAnswers;
@ApiModelProperty(value = "Maximal number of allowed commands provided by played", required = true, example = "10")
@NotNull(message = "Maximal number of allowed commands must be set")
@@ -34,12 +34,12 @@ public class TrainingPhaseUpdateDTO {
this.title = title;
}
- public Integer getAllowedWrongFlags() {
- return allowedWrongFlags;
+ public Integer getAllowedWrongAnswers() {
+ return allowedWrongAnswers;
}
- public void setAllowedWrongFlags(Integer allowedWrongFlags) {
- this.allowedWrongFlags = allowedWrongFlags;
+ public void setAllowedWrongAnswers(Integer allowedWrongAnswers) {
+ this.allowedWrongAnswers = allowedWrongAnswers;
}
public Integer getAllowedCommands() {
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 ef29146e6fd9249b5927abb8af89e9480928e744..e275b1efd99f3a92f7a21a5f628d66a42f7c5afb 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
@@ -40,10 +40,10 @@ public class TaskService {
task.setTitle("Title of a new task");
task.setTrainingPhase(trainingPhase);
task.setOrder(taskRepository.getCurrentMaxOrder(phaseId) + 1);
- task.setFlag("Secret flag");
+ task.setAnswer("Secret flag");
task.setContent("Task content ...");
task.setSolution("Task solution ...");
- task.setIncorrectFlagLimit(1);
+ task.setIncorrectAnswerLimit(1);
Task persistedEntity = taskRepository.save(task);