From 61b6eba18cdbc154b6d7d088169d8dd5e79dba58 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Tue, 16 Feb 2021 07:43:38 +0100
Subject: [PATCH] Make sure all the DTOs implement equals() and toString()
---
.../adaptive/dto/AbstractPhaseDTO.java | 18 ++++++++++++
.../training/adaptive/dto/PhaseCreateDTO.java | 14 +++++++++
.../adaptive/dto/info/InfoPhaseDTO.java | 14 +++++++++
.../adaptive/dto/info/InfoPhaseUpdateDTO.java | 15 ++++++++++
.../questionnaire/AbstractQuestionDTO.java | 27 +++++++++++++++++
.../dto/questionnaire/QuestionChoiceDTO.java | 27 +++++++++++++++++
.../dto/questionnaire/QuestionDTO.java | 23 +++++++++++++++
.../QuestionPhaseRelationDTO.java | 29 +++++++++++++++++++
.../questionnaire/QuestionnairePhaseDTO.java | 25 ++++++++++++++++
.../questionnaire/QuestionnaireUpdateDTO.java | 16 ++++++++++
.../dto/training/DecisionMatrixRowDTO.java | 21 ++++++++++++++
.../adaptive/dto/training/TaskCopyDTO.java | 20 +++++++++++++
.../adaptive/dto/training/TaskDTO.java | 23 +++++++++++++++
.../adaptive/dto/training/TaskUpdateDTO.java | 20 +++++++++++++
.../dto/training/TrainingPhaseDTO.java | 29 +++++++++++++++++++
.../dto/training/TrainingPhaseUpdateDTO.java | 29 +++++++++++++++++++
16 files changed, 350 insertions(+)
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
index c49c0a51..b43a9a01 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
@@ -3,6 +3,8 @@ package cz.muni.ics.kypo.training.adaptive.dto;
import cz.muni.ics.kypo.training.adaptive.enums.PhaseType;
import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+
public abstract class AbstractPhaseDTO {
@ApiModelProperty(value = "ID of task", required = true, example = "1")
@@ -49,6 +51,22 @@ public abstract class AbstractPhaseDTO {
this.phaseType = phaseType;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ AbstractPhaseDTO that = (AbstractPhaseDTO) o;
+ return Objects.equals(id, that.id) &&
+ Objects.equals(title, that.title) &&
+ Objects.equals(order, that.order) &&
+ phaseType == that.phaseType;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, title, order, phaseType);
+ }
+
@Override
public String toString() {
return "AbstractPhaseDto{" +
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
index be9eb771..f994fa3b 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/PhaseCreateDTO.java
@@ -4,6 +4,7 @@ import cz.muni.ics.kypo.training.adaptive.enums.PhaseTypeCreate;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
+import java.util.Objects;
public class PhaseCreateDTO {
@@ -19,6 +20,19 @@ public class PhaseCreateDTO {
this.phaseType = phaseType;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ PhaseCreateDTO that = (PhaseCreateDTO) o;
+ return phaseType == that.phaseType;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(phaseType);
+ }
+
@Override
public String toString() {
return "PhaseCreateDTO{" +
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
index e0bb00a0..02114262 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseDTO.java
@@ -3,6 +3,8 @@ package cz.muni.ics.kypo.training.adaptive.dto.info;
import cz.muni.ics.kypo.training.adaptive.dto.AbstractPhaseDTO;
import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+
public class InfoPhaseDTO extends AbstractPhaseDTO {
@ApiModelProperty(value = "Short description of info phase", required = true, example = "Info phase title")
@@ -16,6 +18,18 @@ public class InfoPhaseDTO extends AbstractPhaseDTO {
this.content = content;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ InfoPhaseDTO that = (InfoPhaseDTO) o;
+ return Objects.equals(content, that.content);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(content);
+ }
@Override
public String toString() {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
index 96f30a52..3daeb4bd 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/info/InfoPhaseUpdateDTO.java
@@ -3,6 +3,7 @@ package cz.muni.ics.kypo.training.adaptive.dto.info;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
+import java.util.Objects;
public class InfoPhaseUpdateDTO {
@@ -30,6 +31,20 @@ public class InfoPhaseUpdateDTO {
this.content = content;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ InfoPhaseUpdateDTO that = (InfoPhaseUpdateDTO) o;
+ return Objects.equals(title, that.title) &&
+ Objects.equals(content, that.content);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(title, content);
+ }
+
@Override
public String toString() {
return "InfoPhaseUpdateDto{" +
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
index 23aebe36..4e9fdbfb 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/AbstractQuestionDTO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
+import java.util.Objects;
public abstract class AbstractQuestionDTO {
@@ -55,4 +56,30 @@ public abstract class AbstractQuestionDTO {
public void setChoices(List<QuestionChoiceDTO> choices) {
this.choices = choices;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ AbstractQuestionDTO that = (AbstractQuestionDTO) o;
+ return order == that.order &&
+ Objects.equals(text, that.text) &&
+ questionType == that.questionType &&
+ Objects.equals(choices, that.choices);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(order, text, questionType, choices);
+ }
+
+ @Override
+ public String toString() {
+ return "AbstractQuestionDTO{" +
+ "order=" + order +
+ ", text='" + text + '\'' +
+ ", questionType=" + questionType +
+ ", choices=" + choices +
+ '}';
+ }
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
index a9b2326b..a6b5f5c8 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionChoiceDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.util.Objects;
public class QuestionChoiceDTO {
@@ -53,4 +54,30 @@ public class QuestionChoiceDTO {
public void setOrder(Integer order) {
this.order = order;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ QuestionChoiceDTO that = (QuestionChoiceDTO) o;
+ return Objects.equals(id, that.id) &&
+ Objects.equals(text, that.text) &&
+ Objects.equals(correct, that.correct) &&
+ Objects.equals(order, that.order);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, text, correct, order);
+ }
+
+ @Override
+ public String toString() {
+ return "QuestionChoiceDTO{" +
+ "id=" + id +
+ ", text='" + text + '\'' +
+ ", correct=" + correct +
+ ", order=" + order +
+ '}';
+ }
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
index 89827a03..4cec7eda 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionDTO.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.dto.questionnaire;
import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+
public class QuestionDTO extends AbstractQuestionDTO {
@ApiModelProperty(value = "Question ID. Leave blank if a new question is added", required = true, example = "1")
@@ -14,4 +16,25 @@ public class QuestionDTO extends AbstractQuestionDTO {
public void setId(Long id) {
this.id = id;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ if (!super.equals(o)) return false;
+ QuestionDTO that = (QuestionDTO) o;
+ return Objects.equals(id, that.id);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(super.hashCode(), id);
+ }
+
+ @Override
+ public String toString() {
+ return "QuestionDTO{" +
+ "id=" + id +
+ "} " + super.toString();
+ }
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
index a8f647c2..50b17db9 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionPhaseRelationDTO.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
+import java.util.Objects;
import java.util.Set;
public class QuestionPhaseRelationDTO {
@@ -67,4 +68,32 @@ public class QuestionPhaseRelationDTO {
public void setSuccessRate(int successRate) {
this.successRate = successRate;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ QuestionPhaseRelationDTO that = (QuestionPhaseRelationDTO) o;
+ return successRate == that.successRate &&
+ Objects.equals(id, that.id) &&
+ Objects.equals(order, that.order) &&
+ Objects.equals(questionIds, that.questionIds) &&
+ Objects.equals(phaseId, that.phaseId);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, order, questionIds, phaseId, successRate);
+ }
+
+ @Override
+ public String toString() {
+ return "QuestionPhaseRelationDTO{" +
+ "id=" + id +
+ ", order=" + order +
+ ", questionIds=" + questionIds +
+ ", phaseId=" + phaseId +
+ ", successRate=" + successRate +
+ '}';
+ }
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
index acaffe5b..d2d8722e 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnairePhaseDTO.java
@@ -5,6 +5,7 @@ import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
+import java.util.Objects;
public class QuestionnairePhaseDTO extends AbstractPhaseDTO {
@@ -40,4 +41,28 @@ public class QuestionnairePhaseDTO extends AbstractPhaseDTO {
public void setPhaseRelations(List<QuestionPhaseRelationDTO> phaseRelations) {
this.phaseRelations = phaseRelations;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ QuestionnairePhaseDTO that = (QuestionnairePhaseDTO) o;
+ return Objects.equals(questions, that.questions) &&
+ questionnaireType == that.questionnaireType &&
+ Objects.equals(phaseRelations, that.phaseRelations);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(questions, questionnaireType, phaseRelations);
+ }
+
+ @Override
+ public String toString() {
+ return "QuestionnairePhaseDTO{" +
+ "questions=" + questions +
+ ", questionnaireType=" + questionnaireType +
+ ", phaseRelations=" + phaseRelations +
+ "} " + super.toString();
+ }
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
index 6d7c6c55..4d1b34fa 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/questionnaire/QuestionnaireUpdateDTO.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
import java.util.List;
+import java.util.Objects;
public class QuestionnaireUpdateDTO {
@@ -44,6 +45,21 @@ public class QuestionnaireUpdateDTO {
this.phaseRelations = phaseRelations;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ QuestionnaireUpdateDTO that = (QuestionnaireUpdateDTO) o;
+ return Objects.equals(title, that.title) &&
+ Objects.equals(questions, that.questions) &&
+ Objects.equals(phaseRelations, that.phaseRelations);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(title, questions, phaseRelations);
+ }
+
@Override
public String toString() {
return "QuestionnaireUpdateDto{" +
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 ec7a0b37..73bff497 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
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.dto.training;
import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+
public class DecisionMatrixRowDTO {
@ApiModelProperty(value = "ID of decision matrix row", required = true, example = "1")
@@ -81,6 +83,25 @@ public class DecisionMatrixRowDTO {
this.wrongAnswers = wrongAnswers;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ DecisionMatrixRowDTO that = (DecisionMatrixRowDTO) o;
+ return id == that.id &&
+ order == that.order &&
+ Double.compare(that.assessmentAnswered, assessmentAnswered) == 0 &&
+ Double.compare(that.keywordUsed, keywordUsed) == 0 &&
+ Double.compare(that.completedInTime, completedInTime) == 0 &&
+ Double.compare(that.solutionDisplayed, solutionDisplayed) == 0 &&
+ Double.compare(that.wrongAnswers, wrongAnswers) == 0;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, order, assessmentAnswered, keywordUsed, completedInTime, solutionDisplayed, wrongAnswers);
+ }
+
@Override
public String toString() {
return "DecisionMatrixRow{" +
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java
index c4704b9f..a27dd18e 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/training/TaskCopyDTO.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero;
+import java.util.Objects;
public class TaskCopyDTO {
@@ -92,6 +93,25 @@ public class TaskCopyDTO {
this.sandboxChangeExpectedDuration = sandboxChangeExpectedDuration;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TaskCopyDTO that = (TaskCopyDTO) o;
+ return modifySandbox == that.modifySandbox &&
+ sandboxChangeExpectedDuration == that.sandboxChangeExpectedDuration &&
+ Objects.equals(title, that.title) &&
+ Objects.equals(content, that.content) &&
+ Objects.equals(answer, that.answer) &&
+ Objects.equals(solution, that.solution) &&
+ Objects.equals(incorrectAnswerLimit, that.incorrectAnswerLimit);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(title, content, answer, solution, incorrectAnswerLimit, modifySandbox, sandboxChangeExpectedDuration);
+ }
+
@Override
public String toString() {
return "TaskCopyDTO{" +
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 251aabf0..9a8561b1 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
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.dto.training;
import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+
public class TaskDTO {
@ApiModelProperty(value = "ID of task", required = true, example = "1")
@@ -103,6 +105,27 @@ public class TaskDTO {
this.sandboxChangeExpectedDuration = sandboxChangeExpectedDuration;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TaskDTO taskDTO = (TaskDTO) o;
+ return incorrectAnswerLimit == taskDTO.incorrectAnswerLimit &&
+ modifySandbox == taskDTO.modifySandbox &&
+ sandboxChangeExpectedDuration == taskDTO.sandboxChangeExpectedDuration &&
+ Objects.equals(id, taskDTO.id) &&
+ Objects.equals(title, taskDTO.title) &&
+ Objects.equals(order, taskDTO.order) &&
+ Objects.equals(content, taskDTO.content) &&
+ Objects.equals(answer, taskDTO.answer) &&
+ Objects.equals(solution, taskDTO.solution);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(id, title, order, content, answer, solution, incorrectAnswerLimit, modifySandbox, sandboxChangeExpectedDuration);
+ }
+
@Override
public String toString() {
return "TaskDTO{" +
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 e53f7379..b7ede0b1 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
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero;
+import java.util.Objects;
public class TaskUpdateDTO {
@@ -92,6 +93,25 @@ public class TaskUpdateDTO {
this.sandboxChangeExpectedDuration = sandboxChangeExpectedDuration;
}
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TaskUpdateDTO that = (TaskUpdateDTO) o;
+ return modifySandbox == that.modifySandbox &&
+ sandboxChangeExpectedDuration == that.sandboxChangeExpectedDuration &&
+ Objects.equals(title, that.title) &&
+ Objects.equals(content, that.content) &&
+ Objects.equals(answer, that.answer) &&
+ Objects.equals(solution, that.solution) &&
+ Objects.equals(incorrectAnswerLimit, that.incorrectAnswerLimit);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(title, content, answer, solution, incorrectAnswerLimit, modifySandbox, sandboxChangeExpectedDuration);
+ }
+
@Override
public String toString() {
return "TaskUpdateDTO{" +
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 ffe22382..65320f19 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
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
public class TrainingPhaseDTO extends AbstractPhaseDTO {
@@ -62,4 +63,32 @@ public class TrainingPhaseDTO extends AbstractPhaseDTO {
public void setDecisionMatrix(List<DecisionMatrixRowDTO> decisionMatrix) {
this.decisionMatrix = decisionMatrix;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TrainingPhaseDTO that = (TrainingPhaseDTO) o;
+ return estimatedDuration == that.estimatedDuration &&
+ allowedCommands == that.allowedCommands &&
+ allowedWrongAnswers == that.allowedWrongAnswers &&
+ Objects.equals(tasks, that.tasks) &&
+ Objects.equals(decisionMatrix, that.decisionMatrix);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(estimatedDuration, allowedCommands, allowedWrongAnswers, tasks, decisionMatrix);
+ }
+
+ @Override
+ public String toString() {
+ return "TrainingPhaseDTO{" +
+ "estimatedDuration=" + estimatedDuration +
+ ", allowedCommands=" + allowedCommands +
+ ", allowedWrongAnswers=" + allowedWrongAnswers +
+ ", tasks=" + tasks +
+ ", decisionMatrix=" + decisionMatrix +
+ "} " + super.toString();
+ }
}
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 5aa47bc7..392dd0be 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
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
+import java.util.Objects;
public class TrainingPhaseUpdateDTO {
@@ -67,4 +68,32 @@ public class TrainingPhaseUpdateDTO {
public void setDecisionMatrix(List<DecisionMatrixRowDTO> decisionMatrix) {
this.decisionMatrix = decisionMatrix;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TrainingPhaseUpdateDTO that = (TrainingPhaseUpdateDTO) o;
+ return Objects.equals(title, that.title) &&
+ Objects.equals(allowedWrongAnswers, that.allowedWrongAnswers) &&
+ Objects.equals(allowedCommands, that.allowedCommands) &&
+ Objects.equals(estimatedDuration, that.estimatedDuration) &&
+ Objects.equals(decisionMatrix, that.decisionMatrix);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(title, allowedWrongAnswers, allowedCommands, estimatedDuration, decisionMatrix);
+ }
+
+ @Override
+ public String toString() {
+ return "TrainingPhaseUpdateDTO{" +
+ "title='" + title + '\'' +
+ ", allowedWrongAnswers=" + allowedWrongAnswers +
+ ", allowedCommands=" + allowedCommands +
+ ", estimatedDuration=" + estimatedDuration +
+ ", decisionMatrix=" + decisionMatrix +
+ '}';
+ }
}
--
GitLab