Skip to content
Snippets Groups Projects
Commit 2e334abb authored by Dominika Zemanovičová's avatar Dominika Zemanovičová
Browse files

Use lombok for equals and hashcode

parent 74200cc2
No related branches found
No related tags found
3 merge requests!31M2,!30M2 exercise,!29M2 exercise
......@@ -3,13 +3,13 @@ package org.fuseri.model.dto.exercise;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.fuseri.model.dto.common.DomainObjectDto;
import java.util.Objects;
@AllArgsConstructor
@Getter
@EqualsAndHashCode(callSuper = false)
public class AnswerDto extends DomainObjectDto {
@NotBlank
......@@ -17,22 +17,4 @@ public class AnswerDto extends DomainObjectDto {
@NotNull
private boolean correct;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AnswerDto answerDto = (AnswerDto) o;
if (correct != answerDto.correct) return false;
return Objects.equals(text, answerDto.text);
}
@Override
public int hashCode() {
int result = text != null ? text.hashCode() : 0;
result = 31 * result + (correct ? 1 : 0);
return result;
}
}
......@@ -3,14 +3,14 @@ package org.fuseri.model.dto.exercise;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.PositiveOrZero;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.fuseri.model.dto.common.DomainObjectDto;
import java.util.Objects;
@Getter
@Setter
@EqualsAndHashCode(callSuper = false)
public class ExerciseDto extends DomainObjectDto {
@NotBlank
......@@ -25,16 +25,4 @@ public class ExerciseDto extends DomainObjectDto {
@NotNull
private long courseId;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof ExerciseDto that)) return false;
return getDifficulty() == that.getDifficulty() && getCourseId() == that.getCourseId() && Objects.equals(getName(), that.getName()) && Objects.equals(getDescription(), that.getDescription());
}
@Override
public int hashCode() {
return Objects.hash(getName(), getDescription(), getDifficulty(), getCourseId());
}
}
......@@ -4,18 +4,19 @@ import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.fuseri.model.dto.common.DomainObjectDto;
import java.util.List;
import java.util.Objects;
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class QuestionDto extends DomainObjectDto {
@NotBlank
......@@ -26,16 +27,4 @@ public class QuestionDto extends DomainObjectDto {
@Valid
private List<AnswerDto> answers;
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof QuestionDto that)) return false;
return getExerciseId() == that.getExerciseId() && Objects.equals(getText(), that.getText()) && Objects.equals(getAnswers(), that.getAnswers());
}
@Override
public int hashCode() {
return Objects.hash(getText(), getExerciseId(), getAnswers());
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment