From 64498c935a19b8418e391537c55caf17b830c011 Mon Sep 17 00:00:00 2001
From: Daniel Rainer <daniel.m.rainer@student.uibk.ac.at>
Date: Sat, 6 Mar 2021 16:57:06 +0100
Subject: [PATCH] Refactor Person.equals
---
.../service/dto/SearchResultsDTO.java | 29 +++++--------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java b/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java
index 1eec244ea..400e079db 100644
--- a/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java
+++ b/src/main/java/at/ac/uibk/gitsearch/service/dto/SearchResultsDTO.java
@@ -2,6 +2,7 @@ package at.ac.uibk.gitsearch.service.dto;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -17,7 +18,7 @@ public class SearchResultsDTO {
this.externalName = externalName;
}
- private String externalName;
+ private final String externalName;
@JsonValue
public String getExternalName() {
@@ -74,27 +75,13 @@ public class SearchResultsDTO {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
+ if (!(obj instanceof Person)) {
+ return false;
+ }
Person other = (Person) obj;
- if (affiliation == null) {
- if (other.affiliation != null)
- return false;
- } else if (!affiliation.equals(other.affiliation))
- return false;
- if (email == null) {
- if (other.email != null)
- return false;
- } else if (!email.equals(other.email))
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- return true;
+ return Objects.equals(this.affiliation, other.affiliation)
+ && Objects.equals(this.email, other.email)
+ && Objects.equals(this.name, other.name);
}
}
--
GitLab