This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e4d52f2d89d5f2dadc8a4f473b5802d72b3fda59 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Dec 18 15:16:59 2019 +0700 JAMES-2993 JsonSerializationVerifier should rely on isEqualToComparingFieldByFieldRecursively Tested bean thus do not need to implement equals. --- .../apache/james/JsonSerializationVerifier.java | 2 +- .../routes/DeletedMessagesVaultDeleteTask.java | 34 ---------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/json/src/test/java/org/apache/james/JsonSerializationVerifier.java b/json/src/test/java/org/apache/james/JsonSerializationVerifier.java index 31eee87..53d423d 100644 --- a/json/src/test/java/org/apache/james/JsonSerializationVerifier.java +++ b/json/src/test/java/org/apache/james/JsonSerializationVerifier.java @@ -64,6 +64,6 @@ public class JsonSerializationVerifier<T, U extends DTO> { assertThat(seriliazer.deserialize(json)) .describedAs("Deserialization test") - .isEqualTo(bean); + .isEqualToComparingFieldByFieldRecursively(bean); } } diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java index 232cf89..a62b1dd 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java @@ -21,7 +21,6 @@ package org.apache.james.webadmin.vault.routes; import java.time.Clock; import java.time.Instant; -import java.util.Objects; import java.util.Optional; import javax.inject.Inject; @@ -81,23 +80,6 @@ public class DeletedMessagesVaultDeleteTask implements Task { public Instant timestamp() { return timestamp; } - - @Override - public final boolean equals(Object o) { - if (o instanceof AdditionalInformation) { - AdditionalInformation that = (AdditionalInformation) o; - - return Objects.equals(this.username, that.username) - && Objects.equals(this.deleteMessageId, that.deleteMessageId) - && Objects.equals(this.timestamp, that.timestamp); - } - return false; - } - - @Override - public final int hashCode() { - return Objects.hash(username, deleteMessageId, timestamp); - } } private final DeletedMessageVault vault; @@ -136,20 +118,4 @@ public class DeletedMessagesVaultDeleteTask implements Task { public Optional<TaskExecutionDetails.AdditionalInformation> details() { return Optional.of(new AdditionalInformation(username, messageId, Clock.systemUTC().instant())); } - - @Override - public final boolean equals(Object o) { - if (o instanceof DeletedMessagesVaultDeleteTask) { - DeletedMessagesVaultDeleteTask that = (DeletedMessagesVaultDeleteTask) o; - - return Objects.equals(this.username, that.username) - && Objects.equals(this.messageId, that.messageId); - } - return false; - } - - @Override - public final int hashCode() { - return Objects.hash(username, messageId); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
