You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/06/19 09:53:53 UTC

[7/8] james-project git commit: JAMES-2429 Upgrade EqualsVerifier

JAMES-2429 Upgrade EqualsVerifier


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f1097588
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f1097588
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f1097588

Branch: refs/heads/master
Commit: f1097588f380390913d82fce9bb2544df06cdf85
Parents: a8586df
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Mon Jun 18 17:53:01 2018 +0200
Committer: benwa <bt...@linagora.com>
Committed: Tue Jun 19 16:53:02 2018 +0700

----------------------------------------------------------------------
 .../cassandra/init/CassandraConfigurationTest.java        |  1 -
 .../java/org/apache/james/domainlist/api/DomainTest.java  |  4 +++-
 .../java/org/apache/james/eventsourcing/EventIdTest.java  |  1 -
 .../james/eventsourcing/eventstore/HistoryTest.java       |  1 -
 .../james/mailbox/acl/PositiveUserACLChangedTest.java     |  1 -
 .../java/org/apache/james/mailbox/model/BlobIdTest.java   |  1 -
 .../java/org/apache/james/mailbox/model/BlobTest.java     |  1 +
 .../org/apache/james/mailbox/model/MailboxPathTest.java   |  1 -
 .../org/apache/james/mailbox/model/QuotaRatioTest.java    |  1 -
 .../org/apache/james/mailbox/model/SearchQueryTest.java   |  4 +++-
 .../mailbox/cassandra/mail/CassandraMessageDAOTest.java   |  1 -
 .../mailing/QuotaMailingListenerConfigurationTest.java    |  1 -
 .../quota/mailing/aggregates/UserQuotaThresholdsTest.java |  1 -
 .../mailing/commands/DetectThresholdCrossingTest.java     |  1 +
 .../mailing/subscribers/QuotaThresholdNoticeTest.java     |  1 -
 .../james/mailbox/quota/model/HistoryEvolutionTest.java   |  1 -
 .../mailbox/quota/model/QuotaThresholdChangeTest.java     |  1 -
 .../mailbox/quota/model/QuotaThresholdHistoryTest.java    |  1 -
 .../james/mailbox/quota/model/QuotaThresholdTest.java     |  1 -
 .../james/mailbox/quota/model/QuotaThresholdsTest.java    |  1 -
 .../search/elasticsearch/json/QuotaRatioAsJsonTest.java   |  1 -
 .../java/org/apache/james/quota/search/LimitTest.java     |  1 -
 .../java/org/apache/james/quota/search/OffsetTest.java    |  1 -
 .../org/apache/james/quota/search/QuotaClauseTest.java    |  4 ----
 .../org/apache/james/quota/search/QuotaQueryTest.java     |  1 -
 .../spamassassin/SpamAssassinConfigurationTest.java       |  1 -
 .../james/mailbox/store/mail/model/UsernameTest.java      |  1 -
 .../test/java/org/apache/mailet/base/test/FakeMail.java   |  4 +++-
 mdn/src/test/java/org/apache/james/mdn/MDNReportTest.java |  1 -
 mdn/src/test/java/org/apache/james/mdn/MDNTest.java       |  1 -
 .../java/org/apache/james/mdn/fields/AddressTypeTest.java |  1 -
 .../java/org/apache/james/mdn/fields/DispositionTest.java |  1 -
 .../test/java/org/apache/james/mdn/fields/ErrorTest.java  |  1 -
 .../org/apache/james/mdn/fields/ExtensionFieldTest.java   |  1 -
 .../org/apache/james/mdn/fields/FinalRecipientTest.java   |  1 -
 .../java/org/apache/james/mdn/fields/GatewayTest.java     |  1 -
 .../apache/james/mdn/fields/OriginalMessageIdTest.java    |  1 -
 .../apache/james/mdn/fields/OriginalRecipientTest.java    |  1 -
 .../apache/james/mdn/fields/ReportingUserAgentTest.java   |  1 -
 .../test/java/org/apache/james/mdn/fields/TextTest.java   |  1 -
 .../james/mdn/modifier/DispositionModifierTest.java       |  1 -
 pom.xml                                                   |  2 +-
 .../james/imap/api/message/request/SearchKeyTest.java     | 10 ++++++++++
 .../apache/james/protocols/smtp/hook/HookResultTest.java  |  1 -
 .../java/org/apache/james/util/streams/OffsetTest.java    |  1 -
 .../apache/james/dlp/api/DLPConfigurationItemTest.java    |  3 ---
 .../test/java/org/apache/james/rrt/lib/MappingTest.java   |  1 +
 .../dlp/eventsourcing/aggregates/DLPAggregateIdTest.java  |  1 -
 .../dlp/eventsourcing/commands/ClearCommandTest.java      |  1 -
 .../dlp/eventsourcing/commands/StoreCommandTest.java      |  1 -
 .../eventsourcing/events/ConfigurationItemsAddedTest.java |  1 -
 .../events/ConfigurationItemsRemovedTest.java             |  1 -
 .../james/mailrepository/api/MailRepositoryUrlTest.java   |  1 +
 .../java/org/apache/james/jmap/model/JmapMDNTest.java     |  1 -
 .../org/apache/james/jmap/model/MDNDispositionTest.java   |  1 -
 .../james/jmap/model/mailbox/MailboxNamespaceTest.java    |  1 -
 .../org/apache/james/jmap/model/mailbox/RightsTest.java   |  2 --
 .../src/test/java/org/apache/james/task/TaskIdTest.java   |  1 -
 58 files changed, 24 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationTest.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationTest.java
index c59fc6c..6c2b4ce 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/init/CassandraConfigurationTest.java
@@ -35,7 +35,6 @@ public class CassandraConfigurationTest {
     @Test
     public void cassandraConfigurationShouldRespectBeanContract() {
         EqualsVerifier.forClass(CassandraConfiguration.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java b/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
index ef2821c..5073d02 100644
--- a/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
+++ b/core/src/test/java/org/apache/james/domainlist/api/DomainTest.java
@@ -31,7 +31,9 @@ public class DomainTest {
 
     @Test
     public void shouldRespectBeanContract() {
-        EqualsVerifier.forClass(Domain.class).verify();
+        EqualsVerifier.forClass(Domain.class)
+            .withIgnoredFields("domainName")
+            .verify();
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/event-sourcing/event-sourcing-pojo/src/test/java/org/apache/james/eventsourcing/EventIdTest.java
----------------------------------------------------------------------
diff --git a/event-sourcing/event-sourcing-pojo/src/test/java/org/apache/james/eventsourcing/EventIdTest.java b/event-sourcing/event-sourcing-pojo/src/test/java/org/apache/james/eventsourcing/EventIdTest.java
index 1b46fbf..ea566f8 100644
--- a/event-sourcing/event-sourcing-pojo/src/test/java/org/apache/james/eventsourcing/EventIdTest.java
+++ b/event-sourcing/event-sourcing-pojo/src/test/java/org/apache/james/eventsourcing/EventIdTest.java
@@ -30,7 +30,6 @@ class EventIdTest {
     @Test
     void shouldMatchBeanContract() {
         EqualsVerifier.forClass(EventId.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/event-sourcing/event-store-api/src/test/java/org/apache/james/eventsourcing/eventstore/HistoryTest.java
----------------------------------------------------------------------
diff --git a/event-sourcing/event-store-api/src/test/java/org/apache/james/eventsourcing/eventstore/HistoryTest.java b/event-sourcing/event-store-api/src/test/java/org/apache/james/eventsourcing/eventstore/HistoryTest.java
index 2945b92..db5e79e 100644
--- a/event-sourcing/event-store-api/src/test/java/org/apache/james/eventsourcing/eventstore/HistoryTest.java
+++ b/event-sourcing/event-store-api/src/test/java/org/apache/james/eventsourcing/eventstore/HistoryTest.java
@@ -34,7 +34,6 @@ class HistoryTest {
     @Test
     void shouldMatchBeanContract() {
         EqualsVerifier.forClass(History.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLChangedTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLChangedTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLChangedTest.java
index 3581aa2..70a5ee7 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLChangedTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/acl/PositiveUserACLChangedTest.java
@@ -28,7 +28,6 @@ public class PositiveUserACLChangedTest {
     @Test
     public void shouldMatchBeanContact() {
         EqualsVerifier.forClass(PositiveUserACLChanged.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobIdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobIdTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobIdTest.java
index c5a5740..f91b9c7 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobIdTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobIdTest.java
@@ -33,7 +33,6 @@ public class BlobIdTest {
     @Test
     public void shouldMatchBeanContact() {
         EqualsVerifier.forClass(BlobId.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobTest.java
index ed35795..0c306d4 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/BlobTest.java
@@ -37,6 +37,7 @@ public class BlobTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(Blob.class)
+            .withIgnoredFields("payload", "size")
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java
index 7e0d330..422d587 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxPathTest.java
@@ -32,7 +32,6 @@ public class MailboxPathTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(MailboxPath.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRatioTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRatioTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRatioTest.java
index 3940068..ac3ad9c 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRatioTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/QuotaRatioTest.java
@@ -41,7 +41,6 @@ class QuotaRatioTest {
     @Test
     void shouldMatchBeanContact() {
         EqualsVerifier.forClass(QuotaRatio.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/api/src/test/java/org/apache/james/mailbox/model/SearchQueryTest.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/SearchQueryTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/SearchQueryTest.java
index b6ed574..b5725a6 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/SearchQueryTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/SearchQueryTest.java
@@ -30,7 +30,9 @@ public class SearchQueryTest {
 
     @Test
     public void searchQueryShouldRespectBeanContract() {
-        EqualsVerifier.forClass(SearchQuery.class).verify();
+        EqualsVerifier.forClass(SearchQuery.class)
+            .withOnlyTheseFields("criterias")
+            .verify();
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
index 8e00d7b..8d4c963 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageDAOTest.java
@@ -332,7 +332,6 @@ public class CassandraMessageDAOTest {
     @Test
     public void messageIdAttachmentIdsShouldMatchBeanContract() {
         EqualsVerifier.forClass(MessageIdAttachmentIds.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/QuotaMailingListenerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/QuotaMailingListenerConfigurationTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/QuotaMailingListenerConfigurationTest.java
index e2c39ea..9f76365 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/QuotaMailingListenerConfigurationTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/QuotaMailingListenerConfigurationTest.java
@@ -47,7 +47,6 @@ public class QuotaMailingListenerConfigurationTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaMailingListenerConfiguration.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/aggregates/UserQuotaThresholdsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/aggregates/UserQuotaThresholdsTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/aggregates/UserQuotaThresholdsTest.java
index 52d7ff4..bc1390a 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/aggregates/UserQuotaThresholdsTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/aggregates/UserQuotaThresholdsTest.java
@@ -34,7 +34,6 @@ public class UserQuotaThresholdsTest {
     @Test
     public void aggregateShouldMatchBeanContract() {
         EqualsVerifier.forClass(UserQuotaThresholds.Id.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/commands/DetectThresholdCrossingTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/commands/DetectThresholdCrossingTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/commands/DetectThresholdCrossingTest.java
index 9a287c2..2b6b942 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/commands/DetectThresholdCrossingTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/commands/DetectThresholdCrossingTest.java
@@ -28,6 +28,7 @@ public class DetectThresholdCrossingTest {
     @Test
     public void aggregateShouldMatchBeanContract() {
         EqualsVerifier.forClass(DetectThresholdCrossing.class)
+            .withIgnoredFields("instant")
             .verify();
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
index 576ae0a..8ddcf64 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/mailing/subscribers/QuotaThresholdNoticeTest.java
@@ -59,7 +59,6 @@ class QuotaThresholdNoticeTest {
     @Test
     void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaThresholdNotice.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/HistoryEvolutionTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/HistoryEvolutionTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/HistoryEvolutionTest.java
index 2855e6f..d6771ce 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/HistoryEvolutionTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/HistoryEvolutionTest.java
@@ -34,7 +34,6 @@ class HistoryEvolutionTest {
     @Test
     void shouldMatchBeanContract() {
         EqualsVerifier.forClass(HistoryEvolution.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdChangeTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdChangeTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdChangeTest.java
index 5fb150e..b556c80 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdChangeTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdChangeTest.java
@@ -33,7 +33,6 @@ class QuotaThresholdChangeTest {
     @Test
     void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaThresholdChange.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdHistoryTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdHistoryTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdHistoryTest.java
index a4bf51c..2a68910 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdHistoryTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdHistoryTest.java
@@ -38,7 +38,6 @@ public class QuotaThresholdHistoryTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaThresholdHistory.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
index ca2f5b0..2d850be 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdTest.java
@@ -38,7 +38,6 @@ public class QuotaThresholdTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaThreshold.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
index b871296..f7f18f6 100644
--- a/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
+++ b/mailbox/plugin/quota-mailing/src/test/java/org/apache/james/mailbox/quota/model/QuotaThresholdsTest.java
@@ -39,7 +39,6 @@ public class QuotaThresholdsTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaThresholds.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
index e5046ba..32a1aca 100644
--- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
+++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioAsJsonTest.java
@@ -45,7 +45,6 @@ public class QuotaRatioAsJsonTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaRatioAsJson.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/LimitTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/LimitTest.java b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/LimitTest.java
index 4e8387a..9bd6e8e 100644
--- a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/LimitTest.java
+++ b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/LimitTest.java
@@ -30,7 +30,6 @@ public class LimitTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(Limit.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/OffsetTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/OffsetTest.java b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/OffsetTest.java
index 50ae174..99486ff 100644
--- a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/OffsetTest.java
+++ b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/OffsetTest.java
@@ -30,7 +30,6 @@ public class OffsetTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(Offset.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaClauseTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaClauseTest.java b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaClauseTest.java
index ff7a5ab..414b4d3 100644
--- a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaClauseTest.java
+++ b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaClauseTest.java
@@ -35,28 +35,24 @@ public class QuotaClauseTest {
     @Test
     public void lessThanShouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaClause.LessThan.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
     
     @Test
     public void moreThanShouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaClause.MoreThan.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
     
     @Test
     public void hasDomainShouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaClause.HasDomain.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
     
     @Test
     public void andShouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaClause.And.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaQueryTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaQueryTest.java b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaQueryTest.java
index c2371db..654e503 100644
--- a/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaQueryTest.java
+++ b/mailbox/plugin/quota-search/src/test/java/org/apache/james/quota/search/QuotaQueryTest.java
@@ -33,7 +33,6 @@ public class QuotaQueryTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(QuotaQuery.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinConfigurationTest.java
----------------------------------------------------------------------
diff --git a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinConfigurationTest.java b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinConfigurationTest.java
index 40f4423..5136daa 100644
--- a/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinConfigurationTest.java
+++ b/mailbox/plugin/spamassassin/src/test/java/org/apache/james/mailbox/spamassassin/SpamAssassinConfigurationTest.java
@@ -32,7 +32,6 @@ public class SpamAssassinConfigurationTest {
     @Test
     public void spamAssassinConfigurationShouldRespectBeanContract() {
         EqualsVerifier.forClass(SpamAssassinConfiguration.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
index 225449b..0ec4eed 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/UsernameTest.java
@@ -33,7 +33,6 @@ public class UsernameTest {
     @Test
     public void shouldRespectBeanContract() {
         EqualsVerifier.forClass(Username.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
index 6a5bf52..6791a1f 100644
--- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
+++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java
@@ -424,6 +424,8 @@ public class FakeMail implements Mail, Serializable {
                 && Objects.equal(this.errorMessage, that.errorMessage)
                 && Objects.equal(this.lastUpdated, that.lastUpdated)
                 && Objects.equal(this.attributes, that.attributes)
+                && Objects.equal(this.remoteHost, that.remoteHost)
+                && Objects.equal(this.perRecipientHeaders, that.perRecipientHeaders)
                 && Objects.equal(this.remoteAddr, that.remoteAddr);
         }
         return false;
@@ -431,7 +433,7 @@ public class FakeMail implements Mail, Serializable {
 
     @Override
     public final int hashCode() {
-        return Objects.hashCode(name, sender, recipients, state, errorMessage, lastUpdated, attributes, size, remoteAddr);
+        return Objects.hashCode(name, sender, recipients, state, errorMessage, lastUpdated, attributes, size, remoteAddr, remoteHost, perRecipientHeaders);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/MDNReportTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/MDNReportTest.java b/mdn/src/test/java/org/apache/james/mdn/MDNReportTest.java
index 5c65916..cc8ffaa 100644
--- a/mdn/src/test/java/org/apache/james/mdn/MDNReportTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/MDNReportTest.java
@@ -52,7 +52,6 @@ public class MDNReportTest {
     @Test
     public void shouldMatchBeanContact() {
         EqualsVerifier.forClass(MDNReport.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/MDNTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/MDNTest.java b/mdn/src/test/java/org/apache/james/mdn/MDNTest.java
index 905a209..7362cf6 100644
--- a/mdn/src/test/java/org/apache/james/mdn/MDNTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/MDNTest.java
@@ -55,7 +55,6 @@ public class MDNTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(MDN.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/AddressTypeTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/AddressTypeTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/AddressTypeTest.java
index ee2520b..527d6d7 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/AddressTypeTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/AddressTypeTest.java
@@ -34,7 +34,6 @@ public class AddressTypeTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(AddressType.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/DispositionTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/DispositionTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/DispositionTest.java
index 817d731..05ddf9e 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/DispositionTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/DispositionTest.java
@@ -41,7 +41,6 @@ public class DispositionTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(Disposition.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/ErrorTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/ErrorTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/ErrorTest.java
index 294b90b..0f50d48 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/ErrorTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/ErrorTest.java
@@ -35,7 +35,6 @@ public class ErrorTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(Error.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/ExtensionFieldTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/ExtensionFieldTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/ExtensionFieldTest.java
index 5d9ff6b..d487d5f 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/ExtensionFieldTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/ExtensionFieldTest.java
@@ -35,7 +35,6 @@ public class ExtensionFieldTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(ExtensionField.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/FinalRecipientTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/FinalRecipientTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/FinalRecipientTest.java
index ef4cd69..24595a3 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/FinalRecipientTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/FinalRecipientTest.java
@@ -35,7 +35,6 @@ public class FinalRecipientTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(FinalRecipient.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/GatewayTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/GatewayTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/GatewayTest.java
index a276d19..7132c6b 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/GatewayTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/GatewayTest.java
@@ -35,7 +35,6 @@ public class GatewayTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(Gateway.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
index fb5719a..2c6b1b2 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
@@ -35,7 +35,6 @@ public class OriginalMessageIdTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(OriginalMessageId.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/OriginalRecipientTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/OriginalRecipientTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/OriginalRecipientTest.java
index fcc6756..9723951 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/OriginalRecipientTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/OriginalRecipientTest.java
@@ -36,7 +36,6 @@ public class OriginalRecipientTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(OriginalRecipient.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/ReportingUserAgentTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/ReportingUserAgentTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/ReportingUserAgentTest.java
index abd5f1c..e425f63 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/ReportingUserAgentTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/ReportingUserAgentTest.java
@@ -37,7 +37,6 @@ public class ReportingUserAgentTest {
     @Test
     public void shouldMatchBeanContact() {
         EqualsVerifier.forClass(ReportingUserAgent.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/fields/TextTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/TextTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/TextTest.java
index 0d82c28..f64804c 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/TextTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/TextTest.java
@@ -35,7 +35,6 @@ public class TextTest {
     @Test
     public void shouldMatchBeanContact() {
         EqualsVerifier.forClass(Text.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/mdn/src/test/java/org/apache/james/mdn/modifier/DispositionModifierTest.java
----------------------------------------------------------------------
diff --git a/mdn/src/test/java/org/apache/james/mdn/modifier/DispositionModifierTest.java b/mdn/src/test/java/org/apache/james/mdn/modifier/DispositionModifierTest.java
index dccf3dd..64ee91b 100644
--- a/mdn/src/test/java/org/apache/james/mdn/modifier/DispositionModifierTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/modifier/DispositionModifierTest.java
@@ -33,7 +33,6 @@ public class DispositionModifierTest {
     @Test
     public void shouldMatchBeanContract() throws Exception {
         EqualsVerifier.forClass(DispositionModifier.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index baece46..7b93832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1959,7 +1959,7 @@
             <dependency>
                 <groupId>nl.jqno.equalsverifier</groupId>
                 <artifactId>equalsverifier</artifactId>
-                <version>1.7.6</version>
+                <version>2.4.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/protocols/imap/src/test/java/org/apache/james/imap/api/message/request/SearchKeyTest.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/api/message/request/SearchKeyTest.java b/protocols/imap/src/test/java/org/apache/james/imap/api/message/request/SearchKeyTest.java
index 9630f7b..e8a962d 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/api/message/request/SearchKeyTest.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/api/message/request/SearchKeyTest.java
@@ -21,14 +21,24 @@ package org.apache.james.imap.api.message.request;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
+
 import org.junit.Test;
 
+import com.google.common.collect.ImmutableList;
+
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 public class SearchKeyTest {
+
+    private static final SearchKey RED = SearchKey.buildFrom("red");
+    private static final SearchKey BLACK = SearchKey.buildTo("black");
+
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(SearchKey.class)
+            .withPrefabValues(SearchKey.class, RED, BLACK)
+            .withPrefabValues(List.class, ImmutableList.of(RED), ImmutableList.of(BLACK))
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/hook/HookResultTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/hook/HookResultTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/hook/HookResultTest.java
index 8c6db85..a76d50a 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/hook/HookResultTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/hook/HookResultTest.java
@@ -28,7 +28,6 @@ public class HookResultTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(HookResult.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/container/util-java8/src/test/java/org/apache/james/util/streams/OffsetTest.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/streams/OffsetTest.java b/server/container/util-java8/src/test/java/org/apache/james/util/streams/OffsetTest.java
index 5a5b2b0..45d8e6d 100644
--- a/server/container/util-java8/src/test/java/org/apache/james/util/streams/OffsetTest.java
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/streams/OffsetTest.java
@@ -34,7 +34,6 @@ public class OffsetTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(Offset.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java b/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
index e185d15..375b6c4 100644
--- a/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
+++ b/server/data/data-api/src/test/java/org/apache/james/dlp/api/DLPConfigurationItemTest.java
@@ -38,21 +38,18 @@ public class DLPConfigurationItemTest {
     @Test
     void shouldMatchBeanContract() {
         EqualsVerifier.forClass(DLPConfigurationItem.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 
     @Test
     void innerClassTargetsShouldMatchBeanContract() {
         EqualsVerifier.forClass(DLPConfigurationItem.Targets.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 
     @Test
     void innerClassIdShouldMatchBeanContract() {
         EqualsVerifier.forClass(DLPConfigurationItem.Targets.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
index 63fd182..6c49e8d 100644
--- a/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
+++ b/server/data/data-api/src/test/java/org/apache/james/rrt/lib/MappingTest.java
@@ -147,6 +147,7 @@ public class MappingTest {
     @Test
     void beanShouldRespectBeanContract() {
         EqualsVerifier.forClass(Mapping.Impl.class)
+            .withOnlyTheseFields("type", "mapping")
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateIdTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateIdTest.java b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateIdTest.java
index 3604974..a5f740b 100644
--- a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateIdTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/aggregates/DLPAggregateIdTest.java
@@ -32,7 +32,6 @@ public class DLPAggregateIdTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(DLPAggregateId.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/ClearCommandTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/ClearCommandTest.java b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/ClearCommandTest.java
index d859728..34a1289 100644
--- a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/ClearCommandTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/ClearCommandTest.java
@@ -30,7 +30,6 @@ public class ClearCommandTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(ClearCommand.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/StoreCommandTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/StoreCommandTest.java b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/StoreCommandTest.java
index 5b6b473..b8be60f 100644
--- a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/StoreCommandTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/commands/StoreCommandTest.java
@@ -34,7 +34,6 @@ public class StoreCommandTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(StoreCommand.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsAddedTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsAddedTest.java b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsAddedTest.java
index 3aa81b5..3a62657 100644
--- a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsAddedTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsAddedTest.java
@@ -36,7 +36,6 @@ public class ConfigurationItemsAddedTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(ConfigurationItemsAdded.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsRemovedTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsRemovedTest.java b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsRemovedTest.java
index 2a2027b..a6d4ecc 100644
--- a/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsRemovedTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/dlp/eventsourcing/events/ConfigurationItemsRemovedTest.java
@@ -36,7 +36,6 @@ public class ConfigurationItemsRemovedTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(ConfigurationItemsRemoved.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlTest.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlTest.java b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlTest.java
index 7b14795..83766b3 100644
--- a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlTest.java
+++ b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/api/MailRepositoryUrlTest.java
@@ -30,6 +30,7 @@ public class MailRepositoryUrlTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(MailRepositoryUrl.class)
+            .withIgnoredFields("protocol")
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
index e692d87..064a0be 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/JmapMDNTest.java
@@ -60,7 +60,6 @@ public class JmapMDNTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(JmapMDN.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MDNDispositionTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MDNDispositionTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MDNDispositionTest.java
index f5f5d57..916b905 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MDNDispositionTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MDNDispositionTest.java
@@ -34,7 +34,6 @@ public class MDNDispositionTest {
     @Test
     public void shouldMatchBeanContract() {
         EqualsVerifier.forClass(MDNDisposition.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxNamespaceTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxNamespaceTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxNamespaceTest.java
index 1836b1a..e8e2234 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxNamespaceTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxNamespaceTest.java
@@ -30,7 +30,6 @@ public class MailboxNamespaceTest {
     @Test
     public void shouldRespectJavaBeanContract() throws Exception {
         EqualsVerifier.forClass(MailboxNamespace.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RightsTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RightsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RightsTest.java
index 2b54b19..9e40ec2 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RightsTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/RightsTest.java
@@ -42,14 +42,12 @@ public class RightsTest {
     @Test
     public void rightsShouldMatchBeanContract() {
         EqualsVerifier.forClass(Rights.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 
     @Test
     public void usernameShouldMatchBeanContract() {
         EqualsVerifier.forClass(Rights.Username.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f1097588/server/task/src/test/java/org/apache/james/task/TaskIdTest.java
----------------------------------------------------------------------
diff --git a/server/task/src/test/java/org/apache/james/task/TaskIdTest.java b/server/task/src/test/java/org/apache/james/task/TaskIdTest.java
index c1f378a..24c3a03 100644
--- a/server/task/src/test/java/org/apache/james/task/TaskIdTest.java
+++ b/server/task/src/test/java/org/apache/james/task/TaskIdTest.java
@@ -28,7 +28,6 @@ public class TaskIdTest {
     @Test
     public void taskIdShouldMatchBeanContract() {
         EqualsVerifier.forClass(TaskId.class)
-            .allFieldsShouldBeUsed()
             .verify();
     }
 }
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org