Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 836b237

Browse files
author
FredrikSchäferVitagroup
committed
SORMAS-Foundation#3294 removed sensitiveData tags
and added auto formatting
1 parent d4047df commit 836b237

1 file changed

Lines changed: 29 additions & 17 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/person/JournalPersonDto.java

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public class JournalPersonDto implements Serializable {
3333
private Integer birthdateYYYY;
3434

3535
private Sex sex;
36-
@SensitiveData
3736
private Date latestFollowUpEndDate;
38-
@SensitiveData
3937
private FollowUpStatus followUpStatus;
4038

4139
public String getUuid() {
@@ -141,25 +139,39 @@ public String toString() {
141139

142140
@Override
143141
public boolean equals(Object o) {
144-
if (this == o) return true;
145-
if (o == null || getClass() != o.getClass()) return false;
142+
if (this == o)
143+
return true;
144+
if (o == null || getClass() != o.getClass())
145+
return false;
146146
JournalPersonDto that = (JournalPersonDto) o;
147-
return pseudonymized == that.pseudonymized &&
148-
Objects.equals(uuid, that.uuid) &&
149-
Objects.equals(firstName, that.firstName) &&
150-
Objects.equals(lastName, that.lastName) &&
151-
Objects.equals(emailAddress, that.emailAddress) &&
152-
Objects.equals(phone, that.phone) &&
153-
Objects.equals(birthdateDD, that.birthdateDD) &&
154-
Objects.equals(birthdateMM, that.birthdateMM) &&
155-
Objects.equals(birthdateYYYY, that.birthdateYYYY) &&
156-
sex == that.sex &&
157-
Objects.equals(latestFollowUpEndDate, that.latestFollowUpEndDate) &&
158-
followUpStatus == that.followUpStatus;
147+
return pseudonymized == that.pseudonymized
148+
&& Objects.equals(uuid, that.uuid)
149+
&& Objects.equals(firstName, that.firstName)
150+
&& Objects.equals(lastName, that.lastName)
151+
&& Objects.equals(emailAddress, that.emailAddress)
152+
&& Objects.equals(phone, that.phone)
153+
&& Objects.equals(birthdateDD, that.birthdateDD)
154+
&& Objects.equals(birthdateMM, that.birthdateMM)
155+
&& Objects.equals(birthdateYYYY, that.birthdateYYYY)
156+
&& sex == that.sex
157+
&& Objects.equals(latestFollowUpEndDate, that.latestFollowUpEndDate)
158+
&& followUpStatus == that.followUpStatus;
159159
}
160160

161161
@Override
162162
public int hashCode() {
163-
return Objects.hash(uuid, pseudonymized, firstName, lastName, emailAddress, phone, birthdateDD, birthdateMM, birthdateYYYY, sex, latestFollowUpEndDate, followUpStatus);
163+
return Objects.hash(
164+
uuid,
165+
pseudonymized,
166+
firstName,
167+
lastName,
168+
emailAddress,
169+
phone,
170+
birthdateDD,
171+
birthdateMM,
172+
birthdateYYYY,
173+
sex,
174+
latestFollowUpEndDate,
175+
followUpStatus);
164176
}
165177
}

0 commit comments

Comments
 (0)