Fix checkstyle and Eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cf5f341e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cf5f341e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cf5f341e Branch: refs/heads/master Commit: cf5f341e4b776ce97daa51e0648f64cb8b4b7562 Parents: 5b46ce3 Author: Raphael Ouazana <[email protected]> Authored: Tue Nov 27 15:33:39 2018 +0100 Committer: Raphael Ouazana <[email protected]> Committed: Tue Dec 11 15:23:47 2018 +0100 ---------------------------------------------------------------------- .../backends/es/ElasticSearchIndexerTest.java | 1 - .../rabbitmq/RabbitMQConnectionFactoryTest.java | 1 - .../java/org/apache/james/core/MailAddress.java | 1 - .../james/mailbox/MailboxManagerTest.java | 60 ++++++++++---------- .../mailet/base/MailetPipelineLoggingTest.java | 12 +--- .../ldap/ReadOnlyUsersLDAPRepositoryTest.java | 2 +- .../apache/james/jmap/model/KeywordsTest.java | 1 + .../view/cassandra/EnqueuedMailsDAO.java | 4 -- .../spamassassin/SpamAssassinExtension.java | 9 +-- 9 files changed, 39 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java index 0654a78..db60079 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java @@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; import org.apache.james.backends.es.utils.TestingClientProvider; import org.apache.james.util.concurrent.NamedThreadFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java index 87d9904..5a357a7 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backend/rabbitmq/RabbitMQConnectionFactoryTest.java @@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.net.URI; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; import org.apache.james.util.concurrent.NamedThreadFactory; import org.junit.jupiter.api.BeforeEach; http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/core/src/main/java/org/apache/james/core/MailAddress.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/james/core/MailAddress.java b/core/src/main/java/org/apache/james/core/MailAddress.java index c9ab6e0..0d4cbc9 100644 --- a/core/src/main/java/org/apache/james/core/MailAddress.java +++ b/core/src/main/java/org/apache/james/core/MailAddress.java @@ -378,7 +378,6 @@ public class MailAddress implements java.io.Serializable { * @returns true if the given object is equal to this one, false otherwise */ @Override - @SuppressWarnings("deprecated") public final boolean equals(Object obj) { if (obj == null) { return false; http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java index 6a22dab..a9a2690 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java @@ -175,18 +175,18 @@ public abstract class MailboxManagerTest { @Nested class AnnotationTests { - private final MailboxAnnotationKey PRIVATE_KEY = new MailboxAnnotationKey("/private/comment"); - private final MailboxAnnotationKey PRIVATE_CHILD_KEY = new MailboxAnnotationKey("/private/comment/user"); - private final MailboxAnnotationKey PRIVATE_GRANDCHILD_KEY = new MailboxAnnotationKey("/private/comment/user/name"); - private final MailboxAnnotationKey SHARED_KEY = new MailboxAnnotationKey("/shared/comment"); + private final MailboxAnnotationKey privateKey = new MailboxAnnotationKey("/private/comment"); + private final MailboxAnnotationKey privateChildKey = new MailboxAnnotationKey("/private/comment/user"); + private final MailboxAnnotationKey privateGrandchildKey = new MailboxAnnotationKey("/private/comment/user/name"); + private final MailboxAnnotationKey sharedKey = new MailboxAnnotationKey("/shared/comment"); - private final MailboxAnnotation PRIVATE_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_KEY, "My private comment"); - private final MailboxAnnotation PRIVATE_CHILD_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_CHILD_KEY, "My private comment"); - private final MailboxAnnotation PRIVATE_GRANDCHILD_ANNOTATION = MailboxAnnotation.newInstance(PRIVATE_GRANDCHILD_KEY, "My private comment"); - private final MailboxAnnotation PRIVATE_ANNOTATION_UPDATE = MailboxAnnotation.newInstance(PRIVATE_KEY, "My updated private comment"); - private final MailboxAnnotation SHARED_ANNOTATION = MailboxAnnotation.newInstance(SHARED_KEY, "My shared comment"); + private final MailboxAnnotation privateAnnotation = MailboxAnnotation.newInstance(privateKey, "My private comment"); + private final MailboxAnnotation privateChildAnnotation = MailboxAnnotation.newInstance(privateChildKey, "My private comment"); + private final MailboxAnnotation privateGrandchildAnnotation = MailboxAnnotation.newInstance(privateGrandchildKey, "My private comment"); + private final MailboxAnnotation privateAnnotationUpdate = MailboxAnnotation.newInstance(privateKey, "My updated private comment"); + private final MailboxAnnotation sharedAnnotation = MailboxAnnotation.newInstance(sharedKey, "My shared comment"); - private final List<MailboxAnnotation> ANNOTATIONS = ImmutableList.of(PRIVATE_ANNOTATION, SHARED_ANNOTATION); + private final List<MailboxAnnotation> annotations = ImmutableList.of(privateAnnotation, sharedAnnotation); @Test void updateAnnotationsShouldUpdateStoredAnnotation() throws Exception { @@ -195,10 +195,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation)); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION_UPDATE)); - assertThat(mailboxManager.getAllAnnotations(inbox, session)).containsOnly(PRIVATE_ANNOTATION_UPDATE); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotationUpdate)); + assertThat(mailboxManager.getAllAnnotations(inbox, session)).containsOnly(privateAnnotationUpdate); } @Test @@ -208,9 +208,9 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation)); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.nil(PRIVATE_KEY))); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.nil(privateKey))); assertThat(mailboxManager.getAllAnnotations(inbox, session)).isEmpty(); } @@ -220,7 +220,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_2); MailboxPath inbox = MailboxPath.inbox(session); - assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION))) + assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation))) .isInstanceOf(MailboxException.class); } @@ -241,9 +241,9 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ANNOTATIONS); + mailboxManager.updateAnnotations(inbox, session, annotations); - assertThat(mailboxManager.getAllAnnotations(inbox, session)).isEqualTo(ANNOTATIONS); + assertThat(mailboxManager.getAllAnnotations(inbox, session)).isEqualTo(annotations); } @Test @@ -263,10 +263,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ANNOTATIONS); + mailboxManager.updateAnnotations(inbox, session, annotations); - assertThat(mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(PRIVATE_KEY))) - .containsOnly(PRIVATE_ANNOTATION); + assertThat(mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(privateKey))) + .containsOnly(privateAnnotation); } @Test @@ -275,7 +275,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_2); MailboxPath inbox = MailboxPath.inbox(session); - assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(PRIVATE_KEY))) + assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeys(inbox, session, ImmutableSet.of(privateKey))) .isInstanceOf(MailboxException.class); } @@ -286,10 +286,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION, PRIVATE_GRANDCHILD_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation, privateChildAnnotation, privateGrandchildAnnotation)); - assertThat(mailboxManager.getAnnotationsByKeysWithOneDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY))) - .contains(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION); + assertThat(mailboxManager.getAnnotationsByKeysWithOneDepth(inbox, session, ImmutableSet.of(privateKey))) + .contains(privateAnnotation, privateChildAnnotation); } @Test @@ -298,7 +298,7 @@ public abstract class MailboxManagerTest { session = mailboxManager.createSystemSession(USER_2); MailboxPath inbox = MailboxPath.inbox(session); - assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY))) + assertThatThrownBy(() -> mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(privateKey))) .isInstanceOf(MailboxException.class); } @@ -309,10 +309,10 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION, PRIVATE_GRANDCHILD_ANNOTATION)); + mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(privateAnnotation, privateChildAnnotation, privateGrandchildAnnotation)); - assertThat(mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(PRIVATE_KEY))) - .contains(PRIVATE_ANNOTATION, PRIVATE_CHILD_ANNOTATION, PRIVATE_GRANDCHILD_ANNOTATION); + assertThat(mailboxManager.getAnnotationsByKeysWithAllDepth(inbox, session, ImmutableSet.of(privateKey))) + .contains(privateAnnotation, privateChildAnnotation, privateGrandchildAnnotation); } @Test @@ -322,7 +322,7 @@ public abstract class MailboxManagerTest { MailboxPath inbox = MailboxPath.inbox(session); mailboxManager.createMailbox(inbox, session); - assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.newInstance(PRIVATE_KEY, "The limitation of data is less than 30")))) + assertThatThrownBy(() -> mailboxManager.updateAnnotations(inbox, session, ImmutableList.of(MailboxAnnotation.newInstance(privateKey, "The limitation of data is less than 30")))) .isInstanceOf(AnnotationException.class); } http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java b/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java index 1115979..18a6a44 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/MailetPipelineLoggingTest.java @@ -22,21 +22,13 @@ package org.apache.mailet.base; import static org.assertj.core.api.Assertions.assertThat; import org.apache.mailet.Mail; -import org.junit.Before; import org.junit.Test; public class MailetPipelineLoggingTest { - MailetPipelineLogging testee; - - @Before - public void setup() { - testee = new MailetPipelineLogging(); - } - @Test public void getMailetInfoShouldReturnMailetInfoWhenGiven() { - assertThat(testee.getMailetInfo(new MailetWithMailetInfo())) + assertThat(MailetPipelineLogging.getMailetInfo(new MailetWithMailetInfo())) .isEqualTo("this is my info"); } @@ -54,7 +46,7 @@ public class MailetPipelineLoggingTest { @Test public void getMailetInfoShouldReturnSimpleClassNameWhenMailetInfoIsEmpty() { - assertThat(testee.getMailetInfo(new MailetWithoutMailetInfo())) + assertThat(MailetPipelineLogging.getMailetInfo(new MailetWithoutMailetInfo())) .isEqualTo("MailetWithoutMailetInfo"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java index b217ae1..5c21bcb 100644 --- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java +++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java @@ -92,7 +92,7 @@ public class ReadOnlyUsersLDAPRepositoryTest { ReadOnlyUsersLDAPRepository usersLDAPRepository = new ReadOnlyUsersLDAPRepository(domainList); - assertThatThrownBy(()-> usersLDAPRepository.configure(configuration)) + assertThatThrownBy(() -> usersLDAPRepository.configure(configuration)) .isInstanceOf(ConversionException.class); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java index b3c2493..d382ac1 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/KeywordsTest.java @@ -199,6 +199,7 @@ public class KeywordsTest { .fromMap(ImmutableMap.of("in&valid", true))) .isEqualTo(Keywords.DEFAULT_VALUE); } + @Test public void fromFlagsShouldNotThrowOnInvalidKeywordForLenientFactory() { assertThat(Keywords.lenientFactory() http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java index eb1e9cf..8562310 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java @@ -64,8 +64,6 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; public class EnqueuedMailsDAO { @@ -75,12 +73,10 @@ public class EnqueuedMailsDAO { private final CassandraUtils cassandraUtils; private final CassandraTypesProvider cassandraTypesProvider; private final BlobId.Factory blobFactory; - private Scheduler scheduler; @Inject EnqueuedMailsDAO(Session session, CassandraUtils cassandraUtils, CassandraTypesProvider cassandraTypesProvider, BlobId.Factory blobIdFactory) { - this.scheduler = Schedulers.parallel(); this.executor = new CassandraAsyncExecutor(session); this.cassandraUtils = cassandraUtils; this.cassandraTypesProvider = cassandraTypesProvider; http://git-wip-us.apache.org/repos/asf/james-project/blob/cf5f341e/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java ---------------------------------------------------------------------- diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java index 6a3d876..95f75f5 100644 --- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java +++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java @@ -55,10 +55,11 @@ public class SpamAssassinExtension implements BeforeAllCallback, AfterEachCallba .withFileFromClasspath("run.sh", "docker/spamassassin/run.sh") .withFileFromClasspath("spamd.sh", "docker/spamassassin/spamd.sh") .withFileFromClasspath("rule-update.sh", "docker/spamassassin/rule-update.sh") - .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")) - .withCreateContainerCmdModifier(cmd -> cmd.withName(containerName())); - spamAssassinContainer.withStartupTimeout(STARTUP_TIMEOUT); - spamAssassinContainer.waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer, STARTUP_TIMEOUT)); + .withFileFromClasspath("bayes_pg.sql", "docker/spamassassin/bayes_pg.sql")); + spamAssassinContainer + .withCreateContainerCmdModifier(cmd -> cmd.withName(containerName())) + .withStartupTimeout(STARTUP_TIMEOUT) + .waitingFor(new SpamAssassinWaitStrategy(spamAssassinContainer, STARTUP_TIMEOUT)); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
