MAILBOX-339 Fix checkstyle, Eclipse and IntelliJ 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/11fed81f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/11fed81f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/11fed81f Branch: refs/heads/master Commit: 11fed81f0218dd893cac94ba41273132505fe010 Parents: 04adc91 Author: Raphael Ouazana <raphael.ouaz...@linagora.com> Authored: Thu May 24 17:38:32 2018 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Mon May 28 17:40:30 2018 +0200 ---------------------------------------------------------------------- .../CassandraMailboxSessionMapperFactory.java | 2 +- .../cassandra/mail/CassandraMailboxMapper.java | 11 +++++------ .../CassandraMailboxMapperConcurrencyTest.java | 3 +-- .../mail/CassandraMailboxMapperTest.java | 15 +++++++-------- .../mail/CassandraMailboxPathDAOTest.java | 17 +++++++++-------- .../elasticsearch/json/IndexableMessageTest.java | 1 + .../WebAdminServerIntegrationTest.java | 19 +++++++++---------- 7 files changed, 33 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index e0a3db6..71caf9c 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -166,7 +166,7 @@ public class CassandraMailboxSessionMapperFactory extends MailboxSessionMapperFa @Override public MailboxMapper createMailboxMapper(MailboxSession mailboxSession) { - return new CassandraMailboxMapper(mailboxDAO, mailboxPathDAO, mailboxPathV2DAO, userMailboxRightsDAO, aclMapper, cassandraConfiguration); + return new CassandraMailboxMapper(mailboxDAO, mailboxPathDAO, mailboxPathV2DAO, userMailboxRightsDAO, aclMapper); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java index a36406c..6433022 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapper.java @@ -33,7 +33,6 @@ import java.util.stream.Stream; import javax.inject.Inject; -import org.apache.james.backends.cassandra.init.CassandraConfiguration; import org.apache.james.mailbox.acl.ACLDiff; import org.apache.james.mailbox.cassandra.ids.CassandraId; import org.apache.james.mailbox.cassandra.mail.utils.DriverExceptionHelper; @@ -70,7 +69,7 @@ public class CassandraMailboxMapper implements MailboxMapper { private final CassandraUserMailboxRightsDAO userMailboxRightsDAO; @Inject - public CassandraMailboxMapper(CassandraMailboxDAO mailboxDAO, CassandraMailboxPathDAOImpl mailboxPathDAO, CassandraMailboxPathV2DAO mailboxPathV2DAO, CassandraUserMailboxRightsDAO userMailboxRightsDAO, CassandraACLMapper aclMapper, CassandraConfiguration cassandraConfiguration) { + public CassandraMailboxMapper(CassandraMailboxDAO mailboxDAO, CassandraMailboxPathDAOImpl mailboxPathDAO, CassandraMailboxPathV2DAO mailboxPathV2DAO, CassandraUserMailboxRightsDAO userMailboxRightsDAO, CassandraACLMapper aclMapper) { this.mailboxDAO = mailboxDAO; this.mailboxPathDAO = mailboxPathDAO; this.mailboxPathV2DAO = mailboxPathV2DAO; @@ -79,7 +78,7 @@ public class CassandraMailboxMapper implements MailboxMapper { } @Override - public void delete(Mailbox mailbox) throws MailboxException { + public void delete(Mailbox mailbox) { CassandraId mailboxId = (CassandraId) mailbox.getMailboxId(); FluentFutureStream.ofFutures(mailboxPathDAO.delete(mailbox.generateAssociatedPath()), mailboxPathV2DAO.delete(mailbox.generateAssociatedPath())) .thenComposeOnAll(any -> mailboxDAO.delete(mailboxId)) @@ -140,7 +139,7 @@ public class CassandraMailboxMapper implements MailboxMapper { } @Override - public List<Mailbox> findMailboxWithPathLike(MailboxPath path) throws MailboxException { + public List<Mailbox> findMailboxWithPathLike(MailboxPath path) { List<Mailbox> mailboxes = toMailboxes(path, mailboxPathV2DAO.listUserMailboxes(path.getNamespace(), path.getUser())); if (mailboxes.isEmpty()) { return toMailboxes(path, mailboxPathDAO.listUserMailboxes(path.getNamespace(), path.getUser())); @@ -211,7 +210,7 @@ public class CassandraMailboxMapper implements MailboxMapper { } @Override - public List<Mailbox> list() throws MailboxException { + public List<Mailbox> list() { return mailboxDAO.retrieveAllMailboxes() .thenComposeOnAll(this::toMailboxWithAclFuture) .join() @@ -266,7 +265,7 @@ public class CassandraMailboxMapper implements MailboxMapper { } @Override - public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) throws MailboxException { + public List<Mailbox> findNonPersonalMailboxes(String userName, Right right) { return FluentFutureStream.of(userMailboxRightsDAO.listRightsForUser(userName) .thenApply(map -> toAuthorizedMailboxIds(map, right))) .thenFlatComposeOnOptional(this::retrieveMailbox) http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java index 3cba151..b995a73 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperConcurrencyTest.java @@ -67,8 +67,7 @@ public class CassandraMailboxMapperConcurrencyTest { userMailboxRightsDAO, new CassandraACLMapper(cassandra.getConf(), userMailboxRightsDAO, - CassandraConfiguration.DEFAULT_CONFIGURATION), - CassandraConfiguration.DEFAULT_CONFIGURATION); + CassandraConfiguration.DEFAULT_CONFIGURATION)); } @After http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java index b5c651f..9a780fd 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java @@ -76,8 +76,7 @@ public class CassandraMailboxMapperTest { userMailboxRightsDAO, new CassandraACLMapper(cassandra.getConf(), new CassandraUserMailboxRightsDAO(cassandra.getConf(), CassandraUtils.WITH_DEFAULT_CONFIGURATION), - CassandraConfiguration.DEFAULT_CONFIGURATION), - CassandraConfiguration.DEFAULT_CONFIGURATION); + CassandraConfiguration.DEFAULT_CONFIGURATION)); } @After @@ -104,7 +103,7 @@ public class CassandraMailboxMapperTest { } @Test - public void deleteShouldDeleteMailboxAndMailboxPathFromV1Table() throws Exception { + public void deleteShouldDeleteMailboxAndMailboxPathFromV1Table() { mailboxDAO.save(MAILBOX) .join(); mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID) @@ -117,7 +116,7 @@ public class CassandraMailboxMapperTest { } @Test - public void deleteShouldDeleteMailboxAndMailboxPathFromV2Table() throws Exception { + public void deleteShouldDeleteMailboxAndMailboxPathFromV2Table() { mailboxDAO.save(MAILBOX) .join(); mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID) @@ -218,7 +217,7 @@ public class CassandraMailboxMapperTest { } @Test - public void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV1Table() throws Exception { + public void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV1Table() { mailboxDAO.save(MAILBOX) .join(); mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID) @@ -244,7 +243,7 @@ public class CassandraMailboxMapperTest { } @Test - public void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV2Table() throws Exception { + public void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV2Table() { mailboxDAO.save(MAILBOX) .join(); mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID) @@ -256,7 +255,7 @@ public class CassandraMailboxMapperTest { } @Test - public void hasChildrenShouldReturnChildWhenExistsInV1Table() throws Exception { + public void hasChildrenShouldReturnChildWhenExistsInV1Table() { mailboxDAO.save(MAILBOX) .join(); mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID) @@ -296,7 +295,7 @@ public class CassandraMailboxMapperTest { } @Test - public void hasChildrenShouldReturnChildWhenExistsInV2Table() throws Exception { + public void hasChildrenShouldReturnChildWhenExistsInV2Table() { mailboxDAO.save(MAILBOX) .join(); mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID) http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java index a88f1d6..ded624c 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java @@ -54,6 +54,7 @@ public abstract class CassandraMailboxPathDAOTest { protected CassandraCluster cassandra; private CassandraMailboxPathDAO testee; + abstract CassandraMailboxPathDAO testee(); @Before @@ -64,7 +65,7 @@ public abstract class CassandraMailboxPathDAOTest { } @After - public void tearDown() throws Exception { + public void tearDown() { cassandra.close(); } @@ -74,7 +75,7 @@ public abstract class CassandraMailboxPathDAOTest { } @Test - public void saveShouldInsertNewEntry() throws Exception { + public void saveShouldInsertNewEntry() { assertThat(testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join()).isTrue(); assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join()) @@ -82,20 +83,20 @@ public abstract class CassandraMailboxPathDAOTest { } @Test - public void saveOnSecondShouldBeFalse() throws Exception { + public void saveOnSecondShouldBeFalse() { assertThat(testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join()).isTrue(); assertThat(testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join()).isFalse(); } @Test - public void retrieveIdShouldReturnEmptyWhenEmptyData() throws Exception { + public void retrieveIdShouldReturnEmptyWhenEmptyData() { assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join() .isPresent()) .isFalse(); } @Test - public void retrieveIdShouldReturnStoredData() throws Exception { + public void retrieveIdShouldReturnStoredData() { testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join(); assertThat(testee.retrieveId(USER_INBOX_MAILBOXPATH).join()) @@ -103,7 +104,7 @@ public abstract class CassandraMailboxPathDAOTest { } @Test - public void getUserMailboxesShouldReturnAllMailboxesOfUser() throws Exception { + public void getUserMailboxesShouldReturnAllMailboxesOfUser() { testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join(); testee.save(USER_OUTBOX_MAILBOXPATH, OUTBOX_ID).join(); testee.save(OTHER_USER_MAILBOXPATH, otherMailboxId).join(); @@ -119,12 +120,12 @@ public abstract class CassandraMailboxPathDAOTest { } @Test - public void deleteShouldNotThrowWhenEmpty() throws Exception { + public void deleteShouldNotThrowWhenEmpty() { testee.delete(USER_INBOX_MAILBOXPATH).join(); } @Test - public void deleteShouldDeleteTheExistingMailboxId() throws Exception { + public void deleteShouldDeleteTheExistingMailboxId() { testee.save(USER_INBOX_MAILBOXPATH, INBOX_ID).join(); testee.delete(USER_INBOX_MAILBOXPATH).join(); http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java index 557b620..b868b6b 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java @@ -439,6 +439,7 @@ public class IndexableMessageTest { assertThat(indexableMessage.getAttachments()).isNotEmpty(); } + @SuppressWarnings("unchecked") @Test public void otherAttachmentsShouldBeenIndexedWhenOneOfThemCannotBeParsed() throws Exception { //Given http://git-wip-us.apache.org/repos/asf/james-project/blob/11fed81f/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java index ac8c7a8..a0b5dde 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminServerIntegrationTest.java @@ -76,7 +76,6 @@ public class WebAdminServerIntegrationTest { private GuiceJamesServer guiceJamesServer; private DataProbe dataProbe; - private WebAdminGuiceProbe webAdminGuiceProbe; @Before public void setUp() throws Exception { @@ -84,7 +83,7 @@ public class WebAdminServerIntegrationTest { .overrideWith(new WebAdminConfigurationModule()); guiceJamesServer.start(); dataProbe = guiceJamesServer.getProbe(DataProbeImpl.class); - webAdminGuiceProbe = guiceJamesServer.getProbe(WebAdminGuiceProbe.class); + WebAdminGuiceProbe webAdminGuiceProbe = guiceJamesServer.getProbe(WebAdminGuiceProbe.class); RestAssured.requestSpecification = WebAdminUtils.buildRequestSpecification(webAdminGuiceProbe.getWebAdminPort()) .build(); @@ -106,7 +105,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void mailQueueRoutesShouldBeExposed() throws Exception { + public void mailQueueRoutesShouldBeExposed() { when() .get(MailQueueRoutes.BASE_URL) .then() @@ -114,7 +113,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void mailRepositoriesRoutesShouldBeExposed() throws Exception { + public void mailRepositoriesRoutesShouldBeExposed() { when() .get(MailRepositoriesRoutes.MAIL_REPOSITORIES) .then() @@ -127,7 +126,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void gettingANonExistingMailRepositoryShouldNotCreateIt() throws Exception { + public void gettingANonExistingMailRepositoryShouldNotCreateIt() { given() .get(MailRepositoriesRoutes.MAIL_REPOSITORIES + "file%3A%2F%2Fvar%2Fmail%2Fcustom%2F"); @@ -224,7 +223,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void getCurrentVersionShouldReturnNullForCurrentVersionAsBeginning() throws Exception { + public void getCurrentVersionShouldReturnNullForCurrentVersionAsBeginning() { when() .get(VERSION) .then() @@ -234,7 +233,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void getLatestVersionShouldReturnTheConfiguredLatestVersion() throws Exception { + public void getLatestVersionShouldReturnTheConfiguredLatestVersion() { when() .get(VERSION_LATEST) .then() @@ -244,7 +243,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void postShouldDoMigrationAndUpdateCurrentVersion() throws Exception { + public void postShouldDoMigrationAndUpdateCurrentVersion() { String taskId = with() .body(String.valueOf(CassandraSchemaVersionManager.MAX_VERSION.getValue())) .post(UPGRADE_VERSION) @@ -263,7 +262,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void postShouldDoMigrationAndUpdateToTheLatestVersion() throws Exception { + public void postShouldDoMigrationAndUpdateToTheLatestVersion() { String taskId = with().post(UPGRADE_TO_LATEST_VERSION) .jsonPath() .get("taskId"); @@ -312,7 +311,7 @@ public class WebAdminServerIntegrationTest { } @Test - public void getSwaggerShouldReturnJsonDataForSwagger() throws Exception { + public void getSwaggerShouldReturnJsonDataForSwagger() { when() .get(SwaggerRoutes.SWAGGER_ENDPOINT) .then() --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
