http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java index d823f01..3a49f9f 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraUsersRepository.java @@ -95,7 +95,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository { } private PreparedStatement prepareRemoveUserStatement(Session session) { - return session.prepare( delete() + return session.prepare(delete() .from(TABLE_NAME) .where(eq(NAME, bindMarker(NAME))) .ifExists()); @@ -117,7 +117,7 @@ public class CassandraUsersRepository extends AbstractUsersRepository { } @Override - public User getUserByName(String name){ + public User getUserByName(String name) { ResultSet result = executor.execute(getUserStatement.bind() .setString(NAME, name.toLowerCase(Locale.US))) .join();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java index 6aa8f80..c9c597b 100644 --- a/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java @@ -275,7 +275,7 @@ public class SieveFileRepository implements SieveRepository { return new DateTime(getActiveFile(user).lastModified()); } - public void setActive( String user, String name) throws ScriptNotFoundException, StorageException { + public void setActive(String user, String name) throws ScriptNotFoundException, StorageException { synchronized (lock) { // Turn off currently active script, if any File oldActive = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java index ed3f182..106e55f 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java @@ -111,9 +111,8 @@ public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository { } else if (user instanceof DefaultUser) { DefaultUser aUser = (DefaultUser) user; jamesUser = new DefaultJamesUser(aUser.getUserName(), aUser.getHashedPassword(), aUser.getHashAlgorithm()); - } - // Can't handle any other implementations. - else { + } else { + // Can't handle any other implementations. throw new RuntimeException("An unknown implementation of User was " + "found. This implementation cannot be " + "persisted to a UsersJDBCRepsitory."); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/access/AccessTokenTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/access/AccessTokenTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/access/AccessTokenTest.java index 4bcf2cd..118144d 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/access/AccessTokenTest.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/access/AccessTokenTest.java @@ -26,7 +26,7 @@ import org.junit.Test; public class AccessTokenTest { - @Test(expected=NotAnAccessTokenException.class) + @Test(expected = NotAnAccessTokenException.class) public void fromStringShouldThrowWhenNotAnUUID() throws NotAnAccessTokenException { AccessToken.fromString("bad"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java index 2b48563..c7c3550 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java @@ -56,7 +56,7 @@ public class JPARecipientRewriteTable extends AbstractRecipientRewriteTable { * @param entityManagerFactory */ @Inject - @PersistenceUnit(unitName="James") + @PersistenceUnit(unitName = "James") public void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) { this.entityManagerFactory = entityManagerFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java index 64d18c0..e623ddf 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java @@ -59,7 +59,7 @@ public class JPAUsersRepository extends AbstractUsersRepository { * the entityManager to set */ @Inject - @PersistenceUnit(unitName="James") + @PersistenceUnit(unitName = "James") public final void setEntityManagerFactory(EntityManagerFactory entityManagerFactory) { this.entityManagerFactory = entityManagerFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java index 1ff4ae9..c104024 100644 --- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java +++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java @@ -138,7 +138,7 @@ public abstract class AbstractDomainList implements DomainList, Configurable { @Override public String getDefaultDomain() throws DomainListException { - if (defaultDomain!= null) { + if (defaultDomain != null) { return defaultDomain; } else { throw new DomainListException("Null default domain. Domain list might not be configured yet."); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java index 83a433f..023f64b 100644 --- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java +++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListManagement.java @@ -47,8 +47,7 @@ public class DomainListManagement extends StandardMBean implements DomainListMan public void addDomain(String domain) throws Exception { try { domainList.addDomain(domain); - } - catch (DomainListException e) { + } catch (DomainListException e) { throw new Exception(e.getMessage()); } } @@ -57,8 +56,7 @@ public class DomainListManagement extends StandardMBean implements DomainListMan public boolean containsDomain(String domain) throws Exception { try { return domainList.containsDomain(domain); - } - catch (DomainListException e) { + } catch (DomainListException e) { throw new Exception(e.getMessage()); } } @@ -67,8 +65,7 @@ public class DomainListManagement extends StandardMBean implements DomainListMan public List<String> getDomains() throws Exception { try { return ImmutableList.copyOf(domainList.getDomains()); - } - catch (DomainListException e) { + } catch (DomainListException e) { throw new Exception(e.getMessage()); } } @@ -77,8 +74,7 @@ public class DomainListManagement extends StandardMBean implements DomainListMan public void removeDomain(String domain) throws Exception { try { domainList.removeDomain(domain); - } - catch (DomainListException e) { + } catch (DomainListException e) { throw new Exception(e.getMessage()); } } @@ -87,8 +83,7 @@ public class DomainListManagement extends StandardMBean implements DomainListMan public String getDefaultDomain() throws Exception { try { return domainList.getDefaultDomain(); - } - catch (DomainListException e) { + } catch (DomainListException e) { throw new Exception(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java index c4ccce6..cdb80ca 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingImplTest.java @@ -27,23 +27,23 @@ import org.junit.Test; public class MappingImplTest { - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void addressFactoryMethodShouldThrowOnNull() { assertThat(MappingImpl.address(null)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void regexFactoryMethodShouldThrowOnNull() { assertThat(MappingImpl.regex(null)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void domainFactoryMethodShouldThrowOnNull() { assertThat(MappingImpl.domain(null)); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void errorFactoryMethodShouldThrowOnNull() { assertThat(MappingImpl.error(null)); } @@ -78,7 +78,7 @@ public class MappingImplTest { assertThat(MappingImpl.address("abc@d").appendDomain("domain")).isEqualTo(MappingImpl.address("abc@d@domain")); } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void appendDomainShouldThrowWhenNullDomain() { MappingImpl.address("abc@d").appendDomain(null); } @@ -113,7 +113,7 @@ public class MappingImplTest { assertThat(MappingImpl.domain("abc").getType()).isEqualTo(Mapping.Type.Domain); } - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void getErrorMessageShouldThrowWhenMappingIsNotAnError() { MappingImpl.domain("toto").getErrorMessage(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java index 85bab7e..db10629 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java @@ -28,7 +28,7 @@ import org.junit.Test; public class MappingsImplTest { - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void fromRawStringShouldThrowWhenNull() { MappingsImpl.fromRawString(null); } @@ -150,7 +150,7 @@ public class MappingsImplTest { } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void containsShouldThrowWhenNull() { MappingsImpl mappings = MappingsImpl.builder().add(MappingImpl.regex("toto")).build(); assertThat(mappings.contains((Mapping.Type)null)); @@ -182,7 +182,7 @@ public class MappingsImplTest { } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void selectShouldThrowWhenNull() { MappingsImpl mappings = MappingsImpl.builder().add(MappingImpl.regex("toto")).build(); assertThat(mappings.select((Mapping.Type)null)); @@ -213,7 +213,7 @@ public class MappingsImplTest { } - @Test(expected=NullPointerException.class) + @Test(expected = NullPointerException.class) public void excludeShouldThrowWhenNull() { MappingsImpl mappings = MappingsImpl.builder().add(MappingImpl.regex("toto")).build(); assertThat(mappings.exclude((Mapping.Type)null)); @@ -235,7 +235,7 @@ public class MappingsImplTest { assertThat(optional.isPresent()).isFalse(); } - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void unionShouldThrowWhenMappingsNull() { MappingsImpl.empty().union(null); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java index 203f5b5..dca065a 100644 --- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java @@ -225,7 +225,7 @@ public abstract class AbstractUsersRepositoryTest { //Given usersRepository.addUser(login("username"), "password"); //When - boolean actual= usersRepository.test(login("userName"), "password"); + boolean actual = usersRepository.test(login("userName"), "password"); //Then assertThat(actual).isFalse(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java index 51ad51b..5c1a0f4 100644 --- a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java +++ b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/InMemoryDNSService.java @@ -66,7 +66,7 @@ public class InMemoryDNSService implements DNSService { records.put(hostname, dnsRecordFor(mxRecords, txtRecords, addresses)); } - public void dropRecord(String hostname){ + public void dropRecord(String hostname) { records.remove(hostname); } @@ -138,7 +138,7 @@ public class InMemoryDNSService implements DNSService { this.txtRecords = txtRecords; } - public boolean contains(InetAddress address){ + public boolean contains(InetAddress address) { return addresses.contains(address); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java ---------------------------------------------------------------------- diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java index b651a25..2cb0263 100644 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java +++ b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java @@ -2,7 +2,7 @@ package org.apache.james.karaf.features; import org.junit.Test; -public class Mime4jTestLive extends KarafLiveTestSupport{ +public class Mime4jTestLive extends KarafLiveTestSupport { @Test public void testInstallApacheMime4jFeature() throws Exception { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java index 7770d1a..6a38d4d 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryFilesystemModule.java @@ -86,7 +86,7 @@ public class TemporaryFilesystemModule extends AbstractModule { } private void copyResource(Path resourcesFolder, String resourceName) { - try (OutputStream outputStream = new FileOutputStream(resourcesFolder.resolve(resourceName).toFile())){ + try (OutputStream outputStream = new FileOutputStream(resourcesFolder.resolve(resourceName).toFile())) { IOUtils.copy(ClassLoader.getSystemClassLoader().getResource(resourceName).openStream(), outputStream); } catch (IOException e) { Throwables.propagate(e); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index 87e24f6..787d1e9 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -259,7 +259,7 @@ public class GroupMappingTest { restApiRequest.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + GROUP_ON_DOMAIN2); messageSender.connect(LOCALHOST_IP, SMTP_PORT) - .sendMessage( FakeMail.builder() + .sendMessage(FakeMail.builder() .mimeMessage(message) .sender(SENDER) .recipient(GROUP_ON_DOMAIN1)) @@ -432,8 +432,10 @@ public class GroupMappingTest { .awaitSent(awaitOneMinute); fakeSmtp.isReceived(response -> response - .body("[0].from", equalTo(SENDER)) - .body("[0].to[0]", equalTo(externalMail)) - .body("[0].text", equalTo(MESSAGE_CONTENT))); + .body("[0].from", equalTo(SENDER)) + .body("[0].to[0]", equalTo(externalMail)) + .body("[0].text", equalTo(MESSAGE_CONTENT))); + + } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java index c697124..a72d98a 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java @@ -585,14 +585,14 @@ public class ICSAttachmentWorkflowTest { Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); DocumentContext jsonPath = toJsonPath(content.get()); - assertThat(jsonPath.<String> read("ical")).isEqualTo(ICS_1); - assertThat(jsonPath.<String> read("sender")).isEqualTo(FROM); - assertThat(jsonPath.<String> read("recipient")).isEqualTo(RECIPIENT); - assertThat(jsonPath.<String> read("uid")).isEqualTo(ICS_UID); - assertThat(jsonPath.<String> read("sequence")).isEqualTo(ICS_SEQUENCE); - assertThat(jsonPath.<String> read("dtstamp")).isEqualTo(ICS_DTSTAMP); - assertThat(jsonPath.<String> read("method")).isEqualTo(ICS_METHOD); - assertThat(jsonPath.<String> read("recurrence-id")).isNull(); + assertThat(jsonPath.<String>read("ical")).isEqualTo(ICS_1); + assertThat(jsonPath.<String>read("sender")).isEqualTo(FROM); + assertThat(jsonPath.<String>read("recipient")).isEqualTo(RECIPIENT); + assertThat(jsonPath.<String>read("uid")).isEqualTo(ICS_UID); + assertThat(jsonPath.<String>read("sequence")).isEqualTo(ICS_SEQUENCE); + assertThat(jsonPath.<String>read("dtstamp")).isEqualTo(ICS_DTSTAMP); + assertThat(jsonPath.<String>read("method")).isEqualTo(ICS_METHOD); + assertThat(jsonPath.<String>read("recurrence-id")).isNull(); } private DocumentContext toJsonPath(String content) { @@ -682,13 +682,13 @@ public class ICSAttachmentWorkflowTest { Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); DocumentContext jsonPath = toJsonPath(content.get()); - assertThat(jsonPath.<String> read("sender")).isEqualTo(FROM); - assertThat(jsonPath.<String> read("recipient")).isEqualTo(RECIPIENT); - assertThat(jsonPath.<String> read("uid")).isEqualTo(ICS_BASE64_UID); - assertThat(jsonPath.<String> read("sequence")).isEqualTo(ICS_SEQUENCE); - assertThat(jsonPath.<String> read("dtstamp")).isEqualTo(ICS_BASE64_DTSTAMP); - assertThat(jsonPath.<String> read("method")).isEqualTo(ICS_METHOD); - assertThat(jsonPath.<String> read("recurrence-id")).isNull(); + assertThat(jsonPath.<String>read("sender")).isEqualTo(FROM); + assertThat(jsonPath.<String>read("recipient")).isEqualTo(RECIPIENT); + assertThat(jsonPath.<String>read("uid")).isEqualTo(ICS_BASE64_UID); + assertThat(jsonPath.<String>read("sequence")).isEqualTo(ICS_SEQUENCE); + assertThat(jsonPath.<String>read("dtstamp")).isEqualTo(ICS_BASE64_DTSTAMP); + assertThat(jsonPath.<String>read("method")).isEqualTo(ICS_METHOD); + assertThat(jsonPath.<String>read("recurrence-id")).isNull(); } @Test @@ -708,14 +708,14 @@ public class ICSAttachmentWorkflowTest { Optional<String> content = amqpRule.readContent(); assertThat(content).isPresent(); DocumentContext jsonPath = toJsonPath(content.get()); - assertThat(jsonPath.<String> read("sender")).isEqualTo("[email protected]"); - assertThat(jsonPath.<String> read("recipient")).isEqualTo(RECIPIENT); - assertThat(jsonPath.<String> read("uid")).isEqualTo("5014513f-1026-4b58-82cf-80d4fc060bbe"); - assertThat(jsonPath.<String> read("sequence")).isEqualTo("0"); - assertThat(jsonPath.<String> read("dtstamp")).isEqualTo("20170123T121635Z"); - assertThat(jsonPath.<String> read("method")).isEqualTo("REQUEST"); - assertThat(jsonPath.<String> read("ical")).isEqualTo(ICS_YAHOO); - assertThat(jsonPath.<String> read("recurrence-id")).isNull(); + assertThat(jsonPath.<String>read("sender")).isEqualTo("[email protected]"); + assertThat(jsonPath.<String>read("recipient")).isEqualTo(RECIPIENT); + assertThat(jsonPath.<String>read("uid")).isEqualTo("5014513f-1026-4b58-82cf-80d4fc060bbe"); + assertThat(jsonPath.<String>read("sequence")).isEqualTo("0"); + assertThat(jsonPath.<String>read("dtstamp")).isEqualTo("20170123T121635Z"); + assertThat(jsonPath.<String>read("method")).isEqualTo("REQUEST"); + assertThat(jsonPath.<String>read("ical")).isEqualTo(ICS_YAHOO); + assertThat(jsonPath.<String>read("recurrence-id")).isNull(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java index 4495c5b..b47cb28 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java @@ -75,7 +75,7 @@ public class RecipientRewriteTableProcessor { this.mailetContext = mailetContext; } - public void processMail(Mail mail) throws MessagingException{ + public void processMail(Mail mail) throws MessagingException { ImmutableList<RrtExecutionResult> mappingDatas = toMappingDatas(mail); ImmutableSet<MailAddress> newRecipients = getRecipientsByCondition(mappingDatas, mappingData -> !mappingData.isError()); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java index 55352a9..57296d3 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Sieve.java @@ -71,7 +71,7 @@ public class Sieve extends GenericMailet { @Override public void service(Mail mail) throws MessagingException { - for(MailAddress recipient: mail.getRecipients()) { + for (MailAddress recipient: mail.getRecipients()) { sieveExecutor.execute(recipient, mail); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java index 53d2f59..ed4d6a0 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java @@ -86,8 +86,7 @@ public class FileIntoAction implements MailAction { //TODO: copying this message so many times seems a waste context.post(url, aMail); delivered = true; - } - catch (MessagingException ex) { + } catch (MessagingException ex) { LOGGER.debug("Error while storing mail into {}.", destinationMailbox, ex); throw ex; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index 2740d2e..7ba7f2d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -413,15 +413,15 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC List<String> headerValues = getHeader(arg); List<MailboxList> mailboxes = new ArrayList<>(); int size = 0; - for(String headerValue : headerValues) { + for (String headerValue : headerValues) { MailboxList mailboxList = new AddressList(DefaultAddressParser.DEFAULT.parseAddressList(headerValue), true).flatten(); size += mailboxList.size(); mailboxes.add(mailboxList); } int i = 0; final Address[] results = new Address[size]; - for(MailboxList mailboxList : mailboxes) { - for(Mailbox mailbox : mailboxList) { + for (MailboxList mailboxList : mailboxes) { + for (Mailbox mailbox : mailboxList) { results[i] = new AddressImpl(mailbox.getLocalPart(), mailbox.getDomain()); i++; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java index 927d330..1b8bd74 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailet.java @@ -198,8 +198,7 @@ public class ManageSieveMailet extends GenericMailet implements MessageToCoreToM return scanner.useDelimiter("\\A").next(); } catch (IOException ex) { throw new MessagingException("Unable to access help URL: " + helpURL.toExternalForm(), ex); - } - finally { + } finally { if (scanner != null) { scanner.close(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java index 1aa6d41..5eb3f33 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/EnhancedMessagingException.java @@ -160,7 +160,7 @@ public class EnhancedMessagingException { try { Method getAddress = target.getClass().getMethod(getter); return getAddress.invoke(target); - } catch (NoSuchMethodException|IllegalAccessException|IllegalArgumentException|InvocationTargetException e) { + } catch (NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { return new IllegalStateException("Exception invoking " + getter + " on a " + target.getClass() + " object"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java index 8f335f4..17f04d6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java @@ -213,7 +213,7 @@ public class MailDelivrer { if (sfe.getValidSentAddresses() != null) { Address[] validSent = sfe.getValidSentAddresses(); if (validSent.length > 0) { - LOGGER.debug( "Mail ({}) sent successfully for {}", mail.getName(), validSent); + LOGGER.debug("Mail ({}) sent successfully for {}", mail.getName(), validSent); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrerToHost.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrerToHost.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrerToHost.java index 62db1de..903ea98 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrerToHost.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrerToHost.java @@ -64,7 +64,7 @@ public class MailDelivrerToHost { SMTPTransport transport = null; try { transport = (SMTPTransport) session.getTransport(outgoingMailServer); - transport.setLocalHost( props.getProperty("mail.smtp.localhost", configuration.getHeloNameProvider().getHeloName())); + transport.setLocalHost(props.getProperty("mail.smtp.localhost", configuration.getHeloNameProvider().getHeloName())); connect(outgoingMailServer, transport); transport.sendMessage(adaptToTransport(mail.getMessage(), transport), addr); LOGGER.debug("Mail ({}) sent successfully to {} at {} from {} for {}", mail.getName(), outgoingMailServer.getHostName(), http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java index 29f03cc..e04c2be 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MessageComposer.java @@ -133,7 +133,7 @@ public class MessageComposer { try { Method getAddress = target.getClass().getMethod(getter); return getAddress.invoke(target); - } catch (NoSuchMethodException|IllegalAccessException|IllegalArgumentException|InvocationTargetException e) { + } catch (NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { return new IllegalStateException("Exception invoking " + getter + " on a " + target.getClass() + " object"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java index 6905a6e..f6596ff 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java @@ -192,7 +192,7 @@ public class RemoteDeliveryConfiguration { if (gateway != null) { ImmutableList.Builder<String> builder = ImmutableList.builder(); Iterable<String> gatewayParts = Splitter.on(',').split(gateway); - for(String gatewayPart : gatewayParts) { + for (String gatewayPart : gatewayParts) { builder.add(parsePart(gatewayPort, gatewayPart)); } return builder.build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java index e38ac68..6adc888 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java @@ -115,8 +115,7 @@ public abstract class AbstractStorageQuota extends AbstractQuotaMatcher { // see if we need use the full email address as username or not. // See JAMES-1197 username = localUsers.getUser(recipient).toLowerCase(Locale.US); - } - catch (UsersRepositoryException e) { + } catch (UsersRepositoryException e) { throw new MessagingException("Unable to access UsersRepository", e); } session = manager.createSystemSession(username); @@ -139,11 +138,9 @@ public abstract class AbstractStorageQuota extends AbstractQuotaMatcher { } manager.endProcessingRequest(session); manager.logout(session, true); - } - catch (BadCredentialsException e) { + } catch (BadCredentialsException e) { throw new MessagingException("Unable to authenticate to mailbox", e); - } - catch (MailboxException e) { + } catch (MailboxException e) { throw new MessagingException("Unable to get used space from mailbox", e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java index fb7bb57..7b0c680 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailDispatcherTest.java @@ -176,7 +176,7 @@ public class MailDispatcherTest { verify(mailStore).storeMail(any(MailAddress.class), mailCaptor.capture()); assertThat(mailCaptor.getValue().getMessage().getHeader(RFC2822Headers.RETURN_PATH)) - .containsOnly("<" + MailAddressFixture.OTHER_AT_JAMES +">"); + .containsOnly("<" + MailAddressFixture.OTHER_AT_JAMES + ">"); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java index 2dcb91a..28c81a2 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java @@ -513,7 +513,7 @@ public class ManageSieveMailetTestCase { MimeMessage result = verifyHeaders(subject); MimeMultipart multipart = (MimeMultipart) result.getContent(); assertThat(multipart.getCount()).isEqualTo(contents.length); - for(int i = 0; i < contents.length; i++) { + for (int i = 0; i < contents.length; i++) { if (multipart.getBodyPart(i).getContent() instanceof String) { assertThat(((String) multipart.getBodyPart(i).getContent()).trim()).isEqualTo(contents[i]); } else { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java index 302a8a3..fa1e5a3 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java @@ -99,7 +99,7 @@ public class AddressExtractorTest { @Test public void extractShouldReturnEmptyWhenAddressListIsAbsent() throws Exception { List<MailAddress> extract = AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of()) + .allowedSpecials(ImmutableList.<String>of()) .extract(Optional.empty()); assertThat(extract).isEmpty();; @@ -108,7 +108,7 @@ public class AddressExtractorTest { @Test public void extractShouldReturnListWhenParsingSucceed() throws Exception { List<MailAddress> extract = AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of()) + .allowedSpecials(ImmutableList.<String>of()) .extract(Optional.of("[email protected], [email protected]")); assertThat(extract).containsOnly(new MailAddress("user", "james.org"), @@ -118,7 +118,7 @@ public class AddressExtractorTest { @Test public void extractShouldReturnSpecialAddressesWhenAddressesAreSpecial() throws Exception { List<MailAddress> extract = AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of("postmaster", "to")) + .allowedSpecials(ImmutableList.<String>of("postmaster", "to")) .extract(Optional.of("postmaster, to")); assertThat(extract).containsOnly(new MailAddress("postmaster", "james.org"), @@ -129,14 +129,14 @@ public class AddressExtractorTest { public void extractShouldThrowWhenParsingFail() throws Exception { expectedException.expect(MessagingException.class); AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of()) + .allowedSpecials(ImmutableList.<String>of()) .extract(Optional.of("user@james@org")); } @Test public void getSpecialAddressShouldReturnAbsentWhenAddressIsNull() throws Exception { Optional<MailAddress> specialAddress = AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of()) + .allowedSpecials(ImmutableList.<String>of()) .getSpecialAddress(null); assertThat(specialAddress).isEmpty(); } @@ -144,7 +144,7 @@ public class AddressExtractorTest { @Test public void getSpecialAddressShouldReturnAbsentWhenAddressIsEmpty() throws Exception { Optional<MailAddress> specialAddress = AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of()) + .allowedSpecials(ImmutableList.<String>of()) .getSpecialAddress(""); assertThat(specialAddress).isEmpty(); } @@ -152,7 +152,7 @@ public class AddressExtractorTest { @Test public void getSpecialAddressShouldReturnAbsentWhenAddressIsNotSpecial() throws Exception { Optional<MailAddress> specialAddress = AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of()) + .allowedSpecials(ImmutableList.<String>of()) .getSpecialAddress("[email protected]"); assertThat(specialAddress).isEmpty(); } @@ -241,7 +241,7 @@ public class AddressExtractorTest { public void getSpecialAddressShouldThrowWhenSpecialAddressNotAllowed() throws Exception { expectedException.expect(MessagingException.class); AddressExtractor.withContext(mailetContext) - .allowedSpecials(ImmutableList.<String> of("notallowed")) + .allowedSpecials(ImmutableList.<String>of("notallowed")) .getSpecialAddress("postmaster"); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java index 0b4c993..951e93c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java @@ -189,7 +189,7 @@ public class NotifyMailetsMessageTest { MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()), new ByteArrayInputStream(content.getBytes())); FakeMail mail = FakeMail.from(message); - mail.setMessageSize((long)(5.9*1024)); + mail.setMessageSize((long)(5.9 * 1024)); String generateMessage = new NotifyMailetsMessage().generateMessage("my message", mail); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryTest.java index 6e944e3..2216a65 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryTest.java @@ -94,7 +94,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldAddEmailToSpool() throws Exception{ + public void remoteDeliveryShouldAddEmailToSpool() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .build()); @@ -109,7 +109,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldSplitMailsByServerWhenNoGateway() throws Exception{ + public void remoteDeliveryShouldSplitMailsByServerWhenNoGateway() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .build()); @@ -132,7 +132,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldNotSplitMailsByServerWhenGateway() throws Exception{ + public void remoteDeliveryShouldNotSplitMailsByServerWhenGateway() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .setProperty(RemoteDeliveryConfiguration.GATEWAY, MailAddressFixture.JAMES_LOCAL) @@ -152,7 +152,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldGhostMails() throws Exception{ + public void remoteDeliveryShouldGhostMails() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .build()); @@ -164,7 +164,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldAddPriorityIfSpecified() throws Exception{ + public void remoteDeliveryShouldAddPriorityIfSpecified() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .setProperty(RemoteDeliveryConfiguration.USE_PRIORITY, "true") @@ -181,7 +181,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldNotForwardMailsWithNoRecipients() throws Exception{ + public void remoteDeliveryShouldNotForwardMailsWithNoRecipients() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .build()); @@ -193,7 +193,7 @@ public class RemoteDeliveryTest { } @Test - public void remoteDeliveryShouldNotForwardMailsWithNoRecipientsWithGateway() throws Exception{ + public void remoteDeliveryShouldNotForwardMailsWithNoRecipientsWithGateway() throws Exception { remoteDelivery.init(FakeMailetConfig.builder() .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1") .setProperty(RemoteDeliveryConfiguration.GATEWAY, MailAddressFixture.JAMES_LOCAL) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java index 0a62579..ac56bbc 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java @@ -112,7 +112,7 @@ public class IsOverQuotaTest { public void matchShouldKeepAddressesWithTooMuchMessages() throws Exception { maxQuotaManager.setDefaultMaxMessage(0); - FakeMail fakeMail=FakeMail.builder() + FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) .build(); Collection<MailAddress> result = testee.match(fakeMail); @@ -124,7 +124,7 @@ public class IsOverQuotaTest { public void matchShouldReturnEmptyOnMessageLimit() throws Exception { maxQuotaManager.setDefaultMaxMessage(1); - FakeMail fakeMail=FakeMail.builder() + FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) .build(); Collection<MailAddress> result = testee.match(fakeMail); @@ -138,7 +138,7 @@ public class IsOverQuotaTest { QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(mailboxManager.createSystemSession(username))); maxQuotaManager.setMaxStorage(quotaRoot, 100); - FakeMail fakeMail=FakeMail.builder() + FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) .recipient(MailAddressFixture.OTHER_AT_JAMES) .size(150) @@ -156,7 +156,7 @@ public class IsOverQuotaTest { QuotaRoot quotaRoot = quotaRootResolver.getQuotaRoot(MailboxPath.inbox(mailboxManager.createSystemSession(username))); maxQuotaManager.setMaxStorage(quotaRoot, 100); - FakeMail fakeMail=FakeMail.builder() + FakeMail fakeMail = FakeMail.builder() .recipient(MailAddressFixture.ANY_AT_JAMES) .recipient(MailAddressFixture.OTHER_AT_JAMES) .size(150) http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java index 8f85bf7..380bcf8 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java @@ -52,7 +52,7 @@ public class RecipientsUtilsTest { @Test public void getRecipientsShouldReturnEmptyWhenMailetRecipientsIsEmpty() throws Exception { when(mailet.getRecipients()) - .thenReturn(ImmutableList.<MailAddress> of()); + .thenReturn(ImmutableList.<MailAddress>of()); FakeMail fakeMail = FakeMail.defaultFakeMail(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java index a304221..b17b967 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java @@ -48,26 +48,26 @@ public class SizeUtilsTest { @Test public void humanSizeShouldScaleToMegabyteWhenSizeIsBetweenMegabyteAndGigabyte() { - assertThat(humanReadableSize(1024*1024)).isEqualTo("1 MiB"); + assertThat(humanReadableSize(1024 * 1024)).isEqualTo("1 MiB"); } @Test public void humanSizeShouldScaleToGigabyteWhenSizeIsBiggerThanGigabyte() { - assertThat(humanReadableSize(1024*1024*1024)).isEqualTo("1 GiB"); + assertThat(humanReadableSize(1024 * 1024 * 1024)).isEqualTo("1 GiB"); } @Test public void humanSizeShouldCorrectlyCountKilobyte() { - assertThat(humanReadableSize(42*1024)).isEqualTo("42 KiB"); + assertThat(humanReadableSize(42 * 1024)).isEqualTo("42 KiB"); } @Test public void humanSizeShouldNotUseMoreThanOneDigitAfterComma() { - assertThat(humanReadableSize(1.42*1024)).isEqualTo("1.4 KiB"); + assertThat(humanReadableSize(1.42 * 1024)).isEqualTo("1.4 KiB"); } @Test public void humanSizeShouldNotUseMoreThanOneDigitAfterCommaAndRoundUpCorrectly() { - assertThat(humanReadableSize(1.48*1024)).isEqualTo("1.5 KiB"); + assertThat(humanReadableSize(1.48 * 1024)).isEqualTo("1.5 KiB"); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java index 15a2a48..8871ef3 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java @@ -69,7 +69,7 @@ public class SpecialAddressesUtilsTest { FakeMail mail = FakeMail.builder() .build(); - Collection<MailAddress> addresses = testee.replaceSpecialAddresses(mail, ImmutableList.<MailAddress> of()); + Collection<MailAddress> addresses = testee.replaceSpecialAddresses(mail, ImmutableList.<MailAddress>of()); assertThat(addresses).isEmpty(); } @@ -255,7 +255,7 @@ public class SpecialAddressesUtilsTest { FakeMail mail = FakeMail.builder() .build(); - List<MailAddress> addresses = testee.replaceInternetAddresses(mail, ImmutableList.<InternetAddress> of()); + List<MailAddress> addresses = testee.replaceInternetAddresses(mail, ImmutableList.<InternetAddress>of()); assertThat(addresses).isEmpty(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java index 4e647e2..8afc99d 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java @@ -53,7 +53,7 @@ public class TosUtilsTest { @Test public void getToShouldReturnEmptyWhenMailetToIsEmpty() throws Exception { when(mailet.getTo()) - .thenReturn(ImmutableList.<InternetAddress> of()); + .thenReturn(ImmutableList.<InternetAddress>of()); FakeMail fakeMail = FakeMail.defaultFakeMail(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java index 3dccb67..3d2e11d 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java @@ -88,10 +88,9 @@ public class FolderProcessor extends ProcessorAbstract { try { new MessageProcessor(message, getAccount()).process(); messagesProcessed++; - } - // Catch and report an exception but don't rethrow it, - // allowing subsequent messages to be processed. - catch (Exception ex) { + } catch (Exception ex) { + // Catch and report an exception but don't rethrow it, + // allowing subsequent messages to be processed. LOGGER.error("Exception processing message ID: {}", message.getMessageID(), ex); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java index ee3c375..814a511 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraDownloadCucumberTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features={"classpath:cucumber/DownloadEndpoint.feature", "classpath:cucumber/DownloadGet.feature", "classpath:cucumber/DownloadPost.feature"}, - glue={"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, +@CucumberOptions(features = {"classpath:cucumber/DownloadEndpoint.feature", "classpath:cucumber/DownloadGet.feature", "classpath:cucumber/DownloadPost.feature"}, + glue = {"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, tags = {"~@Ignore"}, strict = true) public class CassandraDownloadCucumberTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java index 5e7fbbc..885d8ef 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraGetMessagesMethodTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features="classpath:cucumber/GetMessages.feature", - glue={"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, +@CucumberOptions(features = "classpath:cucumber/GetMessages.feature", + glue = {"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, strict = true) public class CassandraGetMessagesMethodTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPKeywordsInconsistenciesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPKeywordsInconsistenciesTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPKeywordsInconsistenciesTest.java index c5dde12..92e40d0 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPKeywordsInconsistenciesTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPKeywordsInconsistenciesTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features="classpath:cucumber/ImapKeywordsConsistency.feature", - glue={"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, +@CucumberOptions(features = "classpath:cucumber/ImapKeywordsConsistency.feature", + glue = {"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, strict = true) public class CassandraIMAPKeywordsInconsistenciesTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPSetMessagesCompatibilityTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPSetMessagesCompatibilityTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPSetMessagesCompatibilityTest.java index c0c4d17..9aca4ea 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPSetMessagesCompatibilityTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraIMAPSetMessagesCompatibilityTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features="classpath:cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature", - glue={"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, +@CucumberOptions(features = "classpath:cucumber/ImapSetMessagesMailboxesUpdatesCompatibility.feature", + glue = {"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, strict = true) public class CassandraIMAPSetMessagesCompatibilityTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java index 1751d4b..bda4f66 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMailboxesMethodCucumberTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features= { "classpath:cucumber/MailboxModification.feature", "classpath:cucumber/SetMailboxes.feature" }, - glue= { "org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber" }, +@CucumberOptions(features = { "classpath:cucumber/MailboxModification.feature", "classpath:cucumber/SetMailboxes.feature" }, + glue = { "org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber" }, strict = true) public class CassandraSetMailboxesMethodCucumberTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMessagesMethodCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMessagesMethodCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMessagesMethodCucumberTest.java index d16ecd0..445ffa2 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMessagesMethodCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSetMessagesMethodCucumberTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features="classpath:cucumber/SetMessages.feature", - glue={"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, +@CucumberOptions(features = "classpath:cucumber/SetMessages.feature", + glue = {"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, strict = true) public class CassandraSetMessagesMethodCucumberTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSharingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSharingTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSharingTest.java index 4cace81..06a43bd 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSharingTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraSharingTest.java @@ -27,7 +27,7 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features= { +@CucumberOptions(features = { "classpath:cucumber/sharing/SharingParentMailboxWithAndWithoutChildren.feature", "classpath:cucumber/sharing/SharingChildrenWithoutSharingParent.feature", "classpath:cucumber/sharing/GetMessageAndSharing.feature", @@ -43,7 +43,7 @@ import cucumber.api.junit.Cucumber; "classpath:cucumber/sharing/SetFlagAndSharing.feature", "classpath:cucumber/sharing/RenamingMailboxAndSharing.feature", "classpath:cucumber/sharing/CopyAndSharing.feature" }, - glue= { "org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber" }, + glue = { "org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber" }, tags = {"~@Ignore"}, strict = true) public class CassandraSharingTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java index 8c9ef53..64b764f 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/cucumber/CassandraUploadCucumberTest.java @@ -27,8 +27,8 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; @RunWith(Cucumber.class) -@CucumberOptions(features={"classpath:cucumber/UploadEndpoint.feature"}, - glue={"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, +@CucumberOptions(features = {"classpath:cucumber/UploadEndpoint.feature"}, + glue = {"org.apache.james.jmap.methods.integration", "org.apache.james.jmap.cassandra.cucumber"}, tags = {"~@Ignore"}, strict = true) public class CassandraUploadCucumberTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 4c7ba30..7b6c2a3 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -384,7 +384,7 @@ public abstract class VacationIntegrationTest { .body(SECOND_NAME, equalTo("messages")) .body(SECOND_ARGUMENTS + ".list", hasSize(2)); return true; - } catch(AssertionError e) { + } catch (AssertionError e) { return false; } } @@ -393,7 +393,7 @@ public abstract class VacationIntegrationTest { try { assertOneMessageReceived(recipientToken, mailboxId, expectedTextBody, expectedFrom, expectedTo); return true; - } catch(AssertionError e) { + } catch (AssertionError e) { return false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 367a2ae..aff09e3 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -231,7 +231,7 @@ public abstract class GetMailboxesMethodTest { mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "myMailbox"); mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, alice, "myMailbox2"); - List<String> expectedMailboxes = ImmutableList.<String> builder() + List<String> expectedMailboxes = ImmutableList.<String>builder() .addAll(DefaultMailboxes.DEFAULT_MAILBOXES) .add("myMailbox") .add("myMailbox2") @@ -588,7 +588,7 @@ public abstract class GetMailboxesMethodTest { MailboxPath bobMailboxPath = MailboxPath.forUser(bob, sharedMailboxName); aclProbe.replaceRights(bobMailboxPath, alice, new Rfc4314Rights(Right.Lookup)); - List<String> expectedMailboxes = ImmutableList.<String> builder() + List<String> expectedMailboxes = ImmutableList.<String>builder() .addAll(DefaultMailboxes.DEFAULT_MAILBOXES) .add(sharedMailboxName) .build(); @@ -620,7 +620,7 @@ public abstract class GetMailboxesMethodTest { aclProbe.replaceRights(bobSharedReadMailboxPath, alice, new Rfc4314Rights(Right.Lookup)); aclProbe.replaceRights(bobSharedAdministerMailboxPath, alice, new Rfc4314Rights(Right.Administer)); - List<String> expectedMailboxes = ImmutableList.<String> builder() + List<String> expectedMailboxes = ImmutableList.<String>builder() .addAll(DefaultMailboxes.DEFAULT_MAILBOXES) .add(sharedReadMailboxName) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index 7172833..85a4c9d 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -253,7 +253,7 @@ public abstract class SetMailboxesMethodTest { } @Test - public void userShouldBeSubscribedOnCreatedMailboxWhenCreateMailbox() throws Exception{ + public void userShouldBeSubscribedOnCreatedMailboxWhenCreateMailbox() throws Exception { String requestBody = "[" + " [ \"setMailboxes\"," + --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
