http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
index df5bc5b..1a003e3 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
@@ -102,7 +102,7 @@ public class SetMessagesUpdateProcessor implements 
SetMessagesProcessor {
         TimeMetric timeMetric = metricFactory.timer(JMAP_PREFIX + 
"SetMessagesUpdateProcessor");
 
         SetMessagesResponse.Builder responseBuilder = 
SetMessagesResponse.builder();
-        request.buildUpdatePatches(updatePatchConverter).forEach( (id, patch) 
-> {
+        request.buildUpdatePatches(updatePatchConverter).forEach((id, patch) 
-> {
                 if (patch.isValid()) {
                     update(id, patch, mailboxSession, responseBuilder);
                 } else {
@@ -144,7 +144,7 @@ public class SetMessagesUpdateProcessor implements 
SetMessagesProcessor {
                 .build();
 
             handleInvalidRequest(builder, messageId, 
ImmutableList.of(invalidPropertyMailboxIds));
-        } catch (MailboxException|IOException|MessagingException e) {
+        } catch (MailboxException | IOException | MessagingException e) {
             handleMessageUpdateException(messageId, builder, e);
         } catch (IllegalArgumentException e) {
             ValidationResult invalidPropertyKeywords = 
ValidationResult.builder()

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java
index 46b626a..6ccb8b4 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java
@@ -68,7 +68,7 @@ public class UpdateMessagePatchValidator implements 
Validator<ObjectNode> {
     }
 
     private Optional<String> 
firstFieldFrom(List<JsonMappingException.Reference> references) {
-        if(references == null) {
+        if (references == null) {
             throw new IllegalArgumentException("references");
         }
         return references.stream()

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AccessTokenRequest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AccessTokenRequest.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AccessTokenRequest.java
index 17b524f..64d1b97 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AccessTokenRequest.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/AccessTokenRequest.java
@@ -32,7 +32,7 @@ public class AccessTokenRequest {
         return new Builder();
     }
 
-    @JsonPOJOBuilder(withPrefix="")
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder {
 
         private ContinuationToken token;

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationToken.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationToken.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationToken.java
index 35cb32d..829fb08 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationToken.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationToken.java
@@ -80,7 +80,7 @@ public class ContinuationToken implements SignedExpiringToken 
{
                     .build();
         } catch (NoSuchElementException | IllegalArgumentException e) {
             throw new MalformedContinuationTokenException("Token " + 
serializedToken + " does not have enough parts", e);
-        } catch(DateTimeException e) {
+        } catch (DateTimeException e) {
             throw new MalformedContinuationTokenException("Token " + 
serializedToken + " as an incorrect date", e);
         }
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationTokenRequest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationTokenRequest.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationTokenRequest.java
index 2c60bc0..17f6937 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationTokenRequest.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/ContinuationTokenRequest.java
@@ -21,7 +21,7 @@ package org.apache.james.jmap.model;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
-@JsonDeserialize(builder=ContinuationTokenRequest.Builder.class)
+@JsonDeserialize(builder = ContinuationTokenRequest.Builder.class)
 public class ContinuationTokenRequest {
 
     public static final String UNIQUE_JSON_PATH = "/username";
@@ -30,7 +30,7 @@ public class ContinuationTokenRequest {
         return new Builder();
     }
 
-    @JsonPOJOBuilder(withPrefix="")
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder {
 
         private String username;

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java
index 7a5fc79..c7db1d0 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Keywords.java
@@ -79,7 +79,7 @@ public class Keywords {
         }
 
         public Keywords fromSet(Set<Keyword> setKeywords) {
-            validator.orElse(keywords -> {})
+            validator.orElse(keywords -> { })
                 .validate(setKeywords);
 
             return new Keywords(setKeywords.stream()

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetMessagesResponse.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetMessagesResponse.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetMessagesResponse.java
index 4d271f0..7fef42e 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetMessagesResponse.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetMessagesResponse.java
@@ -203,13 +203,13 @@ public class SetMessagesResponse implements 
Method.Response {
         responseBuilder.notCreated(getNotCreated());
         responseBuilder.notUpdated(getNotUpdated());
         responseBuilder.notDestroyed(getNotDestroyed());
-        if(! Strings.isNullOrEmpty(getAccountId())) {
+        if (! Strings.isNullOrEmpty(getAccountId())) {
             responseBuilder.accountId(getAccountId());
         }
-        if(! Strings.isNullOrEmpty(getOldState())) {
+        if (! Strings.isNullOrEmpty(getOldState())) {
             responseBuilder.accountId(getOldState());
         }
-        if(! Strings.isNullOrEmpty(getNewState())) {
+        if (! Strings.isNullOrEmpty(getNewState())) {
             responseBuilder.accountId(getAccountId());
         }
         return responseBuilder;

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java
 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java
index 76b72e8..4fce35c 100644
--- 
a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java
+++ 
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortConverter.java
@@ -86,7 +86,7 @@ public class SortConverter {
     }
 
     private static void checkField(List<String> splitToList) {
-        Preconditions.checkArgument(splitToList.size() > 0 && 
splitToList.size() <=2, "Bad sort field definition. Must contains a field and 
an optional order separated by a space");
+        Preconditions.checkArgument(splitToList.size() > 0 && 
splitToList.size() <= 2, "Bad sort field definition. Must contains a field and 
an optional order separated by a space");
     }
 
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
index c5bd6f0..2589b2a 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/AuthenticationFilterTest.java
@@ -60,7 +60,7 @@ public class AuthenticationFilterTest {
         accessTokenRepository = new 
MemoryAccessTokenRepository(TimeUnit.MILLISECONDS.convert(1, TimeUnit.HOURS));
 
         when(mockedRequest.getMethod()).thenReturn("POST");
-        List<AuthenticationStrategy> fakeAuthenticationStrategies = 
ImmutableList.of( new FakeAuthenticationStrategy(false));
+        List<AuthenticationStrategy> fakeAuthenticationStrategies = 
ImmutableList.of(new FakeAuthenticationStrategy(false));
 
         testee = new AuthenticationFilter(fakeAuthenticationStrategies, new 
NoopMetricFactory());
         filterChain = mock(FilterChain.class);
@@ -94,7 +94,7 @@ public class AuthenticationFilterTest {
 
         accessTokenRepository.addToken("[email protected]", token);
 
-        AuthenticationFilter sut = new AuthenticationFilter(ImmutableList.of( 
new FakeAuthenticationStrategy(true)), new NoopMetricFactory());
+        AuthenticationFilter sut = new 
AuthenticationFilter(ImmutableList.of(new FakeAuthenticationStrategy(true)), 
new NoopMetricFactory());
         sut.doFilter(mockedRequest, mockedResponse, filterChain);
 
         verify(filterChain).doFilter(any(ServletRequest.class), 
eq(mockedResponse));

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/crypto/AccessTokenManagerImplTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/crypto/AccessTokenManagerImplTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/crypto/AccessTokenManagerImplTest.java
index acb539b..5b80677 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/crypto/AccessTokenManagerImplTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/crypto/AccessTokenManagerImplTest.java
@@ -39,7 +39,7 @@ public class AccessTokenManagerImplTest {
         accessTokenManager = new AccessTokenManagerImpl(accessTokenRepository);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void grantShouldThrowOnNullUsername() throws Exception {
         accessTokenManager.grantAccessToken(null);
     }
@@ -55,17 +55,17 @@ public class AccessTokenManagerImplTest {
         
assertThat(accessTokenRepository.getUsernameFromToken(token).join()).isEqualTo("username");
     }
     
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void getUsernameShouldThrowWhenNullToken() throws Exception {
         accessTokenManager.getUsernameFromToken(null);
     }
 
-    @Test(expected=InvalidAccessToken.class)
+    @Test(expected = InvalidAccessToken.class)
     public void getUsernameShouldThrowWhenUnknownToken() throws Exception {
         accessTokenManager.getUsernameFromToken(AccessToken.generate());
     }
 
-    @Test(expected=InvalidAccessToken.class)
+    @Test(expected = InvalidAccessToken.class)
     public void getUsernameShouldThrowWhenOtherToken() throws Exception {
         accessTokenManager.grantAccessToken("username");
         accessTokenManager.getUsernameFromToken(AccessToken.generate());
@@ -77,7 +77,7 @@ public class AccessTokenManagerImplTest {
         
assertThat(accessTokenManager.getUsernameFromToken(token)).isEqualTo("username");
     }
     
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void isValidShouldThrowOnNullToken() throws Exception {
         accessTokenManager.isValid(null);
     }
@@ -99,7 +99,7 @@ public class AccessTokenManagerImplTest {
         assertThat(accessTokenManager.isValid(accessToken)).isTrue();
     }
     
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void revokeShouldThrowWhenNullToken() throws Exception {
         accessTokenManager.revoke(null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/MultipleObjectMapperTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/MultipleObjectMapperTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/MultipleObjectMapperTest.java
index 1fea1c1..c0634b1 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/MultipleObjectMapperTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/MultipleObjectMapperTest.java
@@ -50,7 +50,7 @@ public class MultipleObjectMapperTest {
                     .build();
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void registeringSameUniquePathShouldThrowAnException() throws 
Exception {
         new MultipleObjectMapperBuilder()
             .registerClass("/other", First.class)
@@ -68,7 +68,7 @@ public class MultipleObjectMapperTest {
         assertThat(o).isInstanceOf(First.class);
     }
 
-    @Test(expected=JsonMappingException.class)
+    @Test(expected = JsonMappingException.class)
     public void badJsonShouldThrowException() throws Exception {
         String json = "{\"bad\": \"value\"}";
         mapper.readValue(json, Object.class);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/OperatorSerializeDeserializeTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/OperatorSerializeDeserializeTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/OperatorSerializeDeserializeTest.java
index 8f84f24..b6db8bb 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/OperatorSerializeDeserializeTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/OperatorSerializeDeserializeTest.java
@@ -35,7 +35,7 @@ public class OperatorSerializeDeserializeTest {
         assertThat(operator.operator).isEqualTo(Operator.AND);
     }
 
-    @Test(expected=InvalidFormatException.class)
+    @Test(expected = InvalidFormatException.class)
     public void deserializeUnknownValue() throws Exception {
         new ObjectMapper().readValue("{\"operator\":\"UNKNOWN\"}", 
ObjectWithOperator.class);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java
index ea25479..e9b4d0d 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/mailet/SentByJmapTest.java
@@ -45,7 +45,7 @@ public class SentByJmapTest {
     }
 
     @Test
-    public void matchShouldReturnRecipientsWhenUserAttributeIsPresent() throws 
Exception{
+    public void matchShouldReturnRecipientsWhenUserAttributeIsPresent() throws 
Exception {
         MailAddress recipient = MailAddressFixture.ANY_AT_JAMES;
         FakeMail fakeMail = FakeMail.builder()
             .recipient(recipient)
@@ -58,7 +58,7 @@ public class SentByJmapTest {
     }
 
     @Test
-    public void matchShouldReturnEmptyCollectionWhenUserAttributeIsAbsent() 
throws Exception{
+    public void matchShouldReturnEmptyCollectionWhenUserAttributeIsAbsent() 
throws Exception {
         FakeMail fakeMail = FakeMail.builder()
             .recipients(MailAddressFixture.ANY_AT_JAMES)
             .build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java
index 9083dea..461fd13 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapRequestParserImplTest.java
@@ -38,7 +38,7 @@ public class JmapRequestParserImplTest {
         testee = new JmapRequestParserImpl(new ObjectMapperFactory(new 
InMemoryId.Factory(), new InMemoryMessageId.Factory()));
     }
     
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void extractJmapRequestShouldThrowWhenNullRequestClass() throws 
Exception {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).textNode("unknwonMethod"),
                 new ObjectNode(new JsonNodeFactory(false)).putObject("{\"id\": 
\"id\"}"),

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
index 37cc331..af2e5a4 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/JmapResponseWriterImplTest.java
@@ -55,7 +55,7 @@ public class JmapResponseWriterImplTest {
     }
 
     @Ignore
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void formatMethodResponseShouldWorkWhenNullJmapResponse() {
         String expectedMethod = "nwonMethod";
         String expectedClientId = "#1";

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java
index 1bb2dbb..7daee72 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/RequestHandlerTest.java
@@ -133,7 +133,7 @@ public class RequestHandlerTest {
     }
 
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void processShouldThrowWhenUnknownMethod() throws Exception {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).textNode("unknwonMethod"),
                 new ObjectNode(new JsonNodeFactory(false)).putObject("{\"id\": 
\"id\"}"),
@@ -143,7 +143,7 @@ public class RequestHandlerTest {
         
requestHandler.handle(AuthenticatedProtocolRequest.decorate(ProtocolRequest.deserialize(nodes),
 mockHttpServletRequest));
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void requestHandlerShouldThrowWhenAMethodIsRecordedTwice() {
         new RequestHandler(
                 ImmutableSet.of(
@@ -153,7 +153,7 @@ public class RequestHandlerTest {
                 jmapResponseWriter);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void requestHandlerShouldThrowWhenTwoMethodsWithSameName() {
         new RequestHandler(
                 ImmutableSet.of(

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/AttachmentTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/AttachmentTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/AttachmentTest.java
index b2e9d81..0917d23 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/AttachmentTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/AttachmentTest.java
@@ -26,27 +26,27 @@ import org.junit.Test;
 
 public class AttachmentTest {
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenBlobIdIsNull() {
         Attachment.builder().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenTypeIsNull() {
         Attachment.builder().blobId(BlobId.of("blobId")).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenNameIsNull() {
         Attachment.builder().blobId(BlobId.of("blobId")).type("type").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenSizeIsNull() {
         
Attachment.builder().blobId(BlobId.of("blobId")).type("type").name("name").build();
     }
     
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenTypeIsEmpty() {
         
Attachment.builder().blobId(BlobId.of("blobId")).type("").name("name").size(123).build();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/CreationMessageTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/CreationMessageTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/CreationMessageTest.java
index 7c4ce2d..77e16d2 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/CreationMessageTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/CreationMessageTest.java
@@ -85,7 +85,7 @@ public class CreationMessageTest {
     }
 
     @Test
-    public void validateShouldReturnErrorWhenNoRecipientSet(){
+    public void validateShouldReturnErrorWhenNoRecipientSet() {
         testedBuilder = testedBuilder
                 .subject("anything");
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/EmailerTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/EmailerTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/EmailerTest.java
index 25ca451..34b2cc2 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/EmailerTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/EmailerTest.java
@@ -26,27 +26,27 @@ import org.junit.Test;
 
 public class EmailerTest {
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenNameIsNull() {
         Emailer.builder().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenEmailIsNull() {
         Emailer.builder().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenNameIsEmpty() {
         Emailer.builder().name("").email("email@domain").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenEmailIsEmpty() {
         Emailer.builder().name("name").email("").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenEmailWithoutArobase() {
         Emailer.builder().name("name").email("email.without.arobase").build();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterOperatorTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterOperatorTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterOperatorTest.java
index 4862137..73c7e55 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterOperatorTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/FilterOperatorTest.java
@@ -31,17 +31,17 @@ import nl.jqno.equalsverifier.EqualsVerifier;
 
 public class FilterOperatorTest {
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void builderShouldThrowWhenOperatorIsNotGiven() {
         FilterOperator.builder().build();
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void builderShouldThrowWhenOperatorIsNull() {
         FilterOperator.builder().operator(null);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void builderShouldThrowWhenConditionsIsEmpty() {
         FilterOperator.builder().operator(Operator.AND).build();
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java
index 4cf79fa..14a9dbe 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxMessageListResponseTest.java
@@ -33,37 +33,37 @@ import com.google.common.collect.ImmutableList;
 
 public class GetMailboxMessageListResponseTest {
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenAccountId() {
         GetMessageListResponse.builder().accountId(null);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenCollapseThreads() {
         GetMessageListResponse.builder().collapseThreads(false);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenState() {
         GetMessageListResponse.builder().state(null);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenCanCalculateUpdates() {
         GetMessageListResponse.builder().canCalculateUpdates(false);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenPosition() {
         GetMessageListResponse.builder().position(0);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenTotal() {
         GetMessageListResponse.builder().total(0);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenThreadIds() {
         GetMessageListResponse.builder().threadIds(null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxesRequestTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxesRequestTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxesRequestTest.java
index 52e663f..30f00a2 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxesRequestTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMailboxesRequestTest.java
@@ -29,7 +29,7 @@ import com.google.common.collect.ImmutableList;
 
 public class GetMailboxesRequestTest {
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenAccountId() {
         GetMailboxesRequest.builder().accountId("1");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
index f1952e0..e79d77d 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/GetMessageListRequestTest.java
@@ -31,37 +31,37 @@ import com.google.common.collect.ImmutableList;
 
 public class GetMessageListRequestTest {
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void builderShouldThrowWhenPositionIsNegative() {
         GetMessageListRequest.builder().position(-1L);
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void builderShouldThrowWhenLimitIsNegative() {
         GetMessageListRequest.builder().limit(-1);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenAccountId() {
         GetMessageListRequest.builder().accountId(null);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenAnchor() {
         GetMessageListRequest.builder().anchor(null);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenAnchorOffset() {
         GetMessageListRequest.builder().anchorOffset(0);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenFetchThreads() {
         GetMessageListRequest.builder().fetchThreads(false);
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenFetchSearchSnippets() {
         GetMessageListRequest.builder().fetchSearchSnippets(false);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
index 2665d5a..7c92a39 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageTest.java
@@ -33,66 +33,66 @@ import com.google.common.collect.ImmutableMap;
 public class MessageTest {
 
     
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenIdIsNull() {
         Message.builder().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenBlobIdIsNull() {
         Message.builder().id(TestMessageId.of(1)).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenThreadIdIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenThreadIdIsEmpty() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenMailboxIdsIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenHeadersIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenSubjectIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().headers(ImmutableMap.of()).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenSubjectIsEmpty() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().headers(ImmutableMap.of())
             .subject("").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenSizeIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().headers(ImmutableMap.of())
             .subject("subject").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenDateIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().headers(ImmutableMap.of())
             .subject("subject").size(123).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenPreviewIsNull() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().headers(ImmutableMap.of())
             .subject("subject").size(123).date(Instant.now()).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenPreviewIsEmpty() {
         
Message.builder().id(TestMessageId.of(1)).blobId(BlobId.of("blobId")).threadId("threadId").fluentMailboxIds().headers(ImmutableMap.of())
             
.subject("subject").size(123).date(Instant.now()).preview("").build();
@@ -119,7 +119,7 @@ public class MessageTest {
         assertThat(tested).isEqualToComparingFieldByField(expected);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenAttachedMessageIsNotMatchingAttachments() {
         Attachment simpleAttachment = 
Attachment.builder().blobId(BlobId.of("blobId")).type("type").name("name").size(123).build();
         ImmutableList<Attachment> attachments = 
ImmutableList.of(simpleAttachment);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java
index b7dc6ec..087aa40 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolRequestTest.java
@@ -34,7 +34,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class ProtocolRequestTest {
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void deserializedRequestsShouldThrowWhenNotEnoughElements() throws 
Exception {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).textNode("getAccounts"),
                 new ObjectNode(new JsonNodeFactory(false)).putObject("{}")};
@@ -42,7 +42,7 @@ public class ProtocolRequestTest {
         ProtocolRequest.deserialize(nodes);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void deserializedRequestsShouldThrowWhenTooMuchElements() throws 
Exception {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).textNode("getAccounts"),
                 new ObjectNode(new JsonNodeFactory(false)).putObject("{}"),
@@ -52,7 +52,7 @@ public class ProtocolRequestTest {
         ProtocolRequest.deserialize(nodes);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void deserializedRequestsShouldThrowWhenFirstParameterIsNotString() 
throws JsonParseException, JsonMappingException, IOException {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).booleanNode(true),
                 new ObjectNode(new JsonNodeFactory(false)).putObject("{}"),
@@ -61,7 +61,7 @@ public class ProtocolRequestTest {
         ProtocolRequest.deserialize(nodes);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void deserializedRequestsShouldThrowWhenSecondParameterIsNotJson() 
throws JsonParseException, JsonMappingException, IOException {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).textNode("getAccounts"),
                 new ObjectNode(new JsonNodeFactory(false)).textNode("true"),
@@ -70,7 +70,7 @@ public class ProtocolRequestTest {
         ProtocolRequest.deserialize(nodes);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void deserializedRequestsShouldThrowWhenThirdParameterIsNotString() 
throws JsonParseException, JsonMappingException, IOException {
         JsonNode[] nodes = new JsonNode[] { new ObjectNode(new 
JsonNodeFactory(false)).textNode("getAccounts"),
                 new ObjectNode(new JsonNodeFactory(false)).putObject("{}"),

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java
index f719d51..d092b62 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ProtocolResponseTest.java
@@ -29,22 +29,22 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class ProtocolResponseTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void newInstanceShouldThrowWhenMethodIsNull() {
         new ProtocolResponse(null, new ObjectNode(JsonNodeFactory.instance), 
ClientId.of("id"));
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void newInstanceShouldThrowWhenMethodIsEmpty() {
         new ProtocolResponse(Method.Response.name(""), new 
ObjectNode(JsonNodeFactory.instance), ClientId.of("id"));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void newInstanceShouldThrowWhenResultsIsNull() {
         new ProtocolResponse(Method.Response.name("method"), null, 
ClientId.of("id"));
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void newInstanceShouldThrowWhenClientIdIsNull() {
         new ProtocolResponse(Method.Response.name("method"), new 
ObjectNode(new JsonNodeFactory(false)).putObject("{}"), null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMailboxesRequestTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMailboxesRequestTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMailboxesRequestTest.java
index e2d884f..4cbe24d 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMailboxesRequestTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMailboxesRequestTest.java
@@ -33,12 +33,12 @@ import com.google.common.collect.ImmutableMap;
 
 public class SetMailboxesRequestTest {
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenAccountId() {
         SetMailboxesRequest.builder().accountId("1");
     }
 
-    @Test(expected=NotImplementedException.class)
+    @Test(expected = NotImplementedException.class)
     public void builderShouldThrowWhenIfInState() {
         SetMailboxesRequest.builder().ifInState("1");
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java
index 41fff78..b8931b2 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SubMailboxMessageTest.java
@@ -33,22 +33,22 @@ public class SubMailboxMessageTest {
     private static final Optional<String> DEFAULT_TEXT_BODY = 
Optional.of("textBody");
     private static final Optional<String> DEFAULT_HTML_BODY = 
Optional.of("htmlBody");
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenHeadersIsNull() {
         SubMessage.builder().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenSubjectIsNull() {
         SubMessage.builder().headers(ImmutableMap.of()).build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenSubjectIsEmpty() {
         SubMessage.builder().headers(ImmutableMap.of()).subject("").build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenDateIsNull() {
         
SubMessage.builder().headers(ImmutableMap.of()).subject("subject").build();
     }
@@ -66,7 +66,7 @@ public class SubMailboxMessageTest {
         assertThat(tested).isEqualToComparingFieldByField(expected);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenAttachedMessageIsNotMatchingAttachments() {
         Attachment simpleAttachment = 
Attachment.builder().blobId(BlobId.of("blobId")).type("type").name("name").size(123).build();
         ImmutableList<Attachment> attachments = 
ImmutableList.of(simpleAttachment);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
index 384ff73..5875a5b 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/mailbox/MailboxTest.java
@@ -29,31 +29,31 @@ import org.junit.Test;
 
 public class MailboxTest {
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void idShouldThrowWhenIdIsNull() {
         Mailbox.builder()
             .id(null);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void nameShouldThrowWhenNameIsNull() {
         Mailbox.builder()
             .name(null);
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenIdIsNull() {
         Mailbox.builder().build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenNameIsNull() {
         Mailbox.builder()
             .id(InMemoryId.of(1))
             .build();
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void buildShouldThrowWhenNameIsEmpty() {
         Mailbox.builder()
             .id(InMemoryId.of(1))

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
index d53384a..776cd2b 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
@@ -93,12 +93,12 @@ public class MailFactoryTest {
         envelope = Envelope.fromMessage(jmapMessage);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void buildMailShouldThrowWhenNullMailboxMessage() throws Exception {
         testee.build(null, envelope);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void buildMailShouldThrowWhenNullJmapMessage() throws Exception {
         testee.build(message, null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailMetadataTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailMetadataTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailMetadataTest.java
index d3a5e8a..9ab5b97 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailMetadataTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailMetadataTest.java
@@ -27,12 +27,12 @@ public class MailMetadataTest {
     private static final MessageId MESSAGE_ID = TestMessageId.of(123);
     private static final String USERNAME = "username";
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void constructorShouldThrowWhenNullMessageId() {
         new MailMetadata(null, USERNAME);
     }
 
-    @Test(expected=NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void constructorShouldThrowWhenNullUsername() {
         new MailMetadata(MESSAGE_ID, null);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
index 1a11c98..2c608ba 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java
@@ -111,7 +111,7 @@ public class PostDequeueDecoratorTest {
         testee.done(true);
     }
     
-    @Test(expected=MailboxRoleNotFoundException.class)
+    @Test(expected = MailboxRoleNotFoundException.class)
     public void doneShouldThrowWhenSentDoesNotExist() throws Exception {
         MailboxSession mailboxSession = 
mailboxManager.createSystemSession(USERNAME);
         mailboxManager.createMailbox(OUTBOX_MAILBOX_PATH, mailboxSession);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
index 7acc0fa..5fffb4e 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DependencyGraphTest.java
@@ -114,7 +114,7 @@ public class DependencyGraphTest {
         assertThat(actual).extracting(Commit::getMessage).containsExactly("A", 
"B", "C", "E", "D", "F", "G");
     }
     
-    @Test(expected=CycleDetectedException.class)
+    @Test(expected = CycleDetectedException.class)
     public void getBuildChainOnTreeWithLoopShouldFail() {
         //Given
         Commit a = new Commit("A");
@@ -128,7 +128,7 @@ public class DependencyGraphTest {
         testee.getBuildChain();
     }
     
-    @Test(expected=CycleDetectedException.class)
+    @Test(expected = CycleDetectedException.class)
     public void getBuildChainOnTreeWithComplexLoopShouldFail() {
         // a - b
         // c - d - e - f

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DownloadPathTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DownloadPathTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DownloadPathTest.java
index 53eff13..530af85 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DownloadPathTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/DownloadPathTest.java
@@ -28,22 +28,22 @@ public class DownloadPathTest {
 
     @Test
     public void fromShouldThrowWhenPathIsNull() {
-        assertThatThrownBy(()-> 
DownloadPath.from(null)).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> 
DownloadPath.from(null)).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     public void fromShouldThrowWhenPathIsEmpty() {
-        assertThatThrownBy(()-> 
DownloadPath.from("")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> 
DownloadPath.from("")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     public void fromShouldThrowWhenNoBlobId() {
-        assertThatThrownBy(()-> 
DownloadPath.from("/")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> 
DownloadPath.from("/")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     public void fromShouldThrowWhenBlobIdIsEmpty() {
-        assertThatThrownBy(()-> 
DownloadPath.from("//")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> 
DownloadPath.from("//")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
@@ -74,11 +74,11 @@ public class DownloadPathTest {
 
     @Test
     public void fromShouldThrowWhenExtraPathVariables() {
-        assertThatThrownBy(()-> 
DownloadPath.from("/123456789/myName/132/456/789")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> 
DownloadPath.from("/123456789/myName/132/456/789")).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
     public void fromShouldThrowWhenExtraPathSeparator() {
-        assertThatThrownBy(()-> 
DownloadPath.from("/123456789//myName")).isInstanceOf(IllegalArgumentException.class);
+        assertThatThrownBy(() -> 
DownloadPath.from("/123456789//myName")).isInstanceOf(IllegalArgumentException.class);
     }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortingHierarchicalCollectionsTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortingHierarchicalCollectionsTest.java
 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortingHierarchicalCollectionsTest.java
index 732b05c..bf3f2ef 100644
--- 
a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortingHierarchicalCollectionsTest.java
+++ 
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/SortingHierarchicalCollectionsTest.java
@@ -87,7 +87,7 @@ public class SortingHierarchicalCollectionsTest {
         assertThat(result).containsExactly("A", "B", "C");
     }
 
-    @Test(expected=CycleDetectedException.class)
+    @Test(expected = CycleDetectedException.class)
     public void sortFromRootToLeafWithLoopShouldThrow() {
         Mailbox a = 
Mailbox.builder().name("A").id(A_ID).parentId(B_ID).build();
         Mailbox b = 
Mailbox.builder().name("B").id(B_ID).parentId(A_ID).build();
@@ -136,7 +136,7 @@ public class SortingHierarchicalCollectionsTest {
         assertThat(result).containsExactly("C", "B", "A");
     }
 
-    @Test(expected=CycleDetectedException.class)
+    @Test(expected = CycleDetectedException.class)
     public void sortFromLeafToRootWithLoopShouldThrow() {
         Mailbox a = 
Mailbox.builder().name("A").id(A_ID).parentId(B_ID).build();
         Mailbox b = 
Mailbox.builder().name("B").id(B_ID).parentId(A_ID).build();

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
index f2184f6..39323e6 100644
--- 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
+++ 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
@@ -208,7 +208,7 @@ public class IMAPServer extends 
AbstractConfigurableAsyncServer implements ImapC
     protected ChannelUpstreamHandler createCoreHandler() {
         ImapChannelUpstreamHandler coreHandler;
         Encryption secure = getEncryption();
-        if (secure!= null && secure.isStartTLS()) {
+        if (secure != null && secure.isStartTLS()) {
            coreHandler = new ImapChannelUpstreamHandler(hello, processor, 
encoder, compress, plainAuthDisallowed, secure.getContext(), 
getEnabledCipherSuites(), imapMetrics);
         } else {
            coreHandler = new ImapChannelUpstreamHandler(hello, processor, 
encoder, compress, plainAuthDisallowed, imapMetrics);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
index b744406..0eeb2ec 100644
--- 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
+++ 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
 /**
  * {@link SimpleChannelUpstreamHandler} which handles IMAP
  */
-public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler 
implements NettyConstants{
+public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler 
implements NettyConstants {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(ImapChannelUpstreamHandler.class);
 
     private final String hello;

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapHeartbeatHandler.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapHeartbeatHandler.java
 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapHeartbeatHandler.java
index 9373091..ae44ab7 100644
--- 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapHeartbeatHandler.java
+++ 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapHeartbeatHandler.java
@@ -24,7 +24,7 @@ import org.jboss.netty.handler.timeout.IdleState;
 import org.jboss.netty.handler.timeout.IdleStateAwareChannelHandler;
 import org.jboss.netty.handler.timeout.IdleStateEvent;
 
-public class ImapHeartbeatHandler extends IdleStateAwareChannelHandler{
+public class ImapHeartbeatHandler extends IdleStateAwareChannelHandler {
 
     @Override
     public void channelIdle(ChannelHandlerContext ctx, IdleStateEvent e) 
throws Exception {

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
index 696df8a..5170bc6 100644
--- 
a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
+++ 
b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
@@ -35,7 +35,7 @@ public class SwitchableDelimiterBasedFrameDecoder extends 
DelimiterBasedFrameDec
 
        @Override
        public synchronized void messageReceived(ChannelHandlerContext ctx, 
MessageEvent e) throws Exception {
-               if(this.framingEnabled) {
+               if (this.framingEnabled) {
                        super.messageReceived(ctx, e);
                } else {
                        ctx.sendUpstream(e);
@@ -49,10 +49,10 @@ public class SwitchableDelimiterBasedFrameDecoder extends 
DelimiterBasedFrameDec
 
        public synchronized void disableFraming(ChannelHandlerContext ctx) {
                this.framingEnabled = false;
-               if(this.cumulation != null && this.cumulation.readable()) {
+               if (this.cumulation != null && this.cumulation.readable()) {
                        final ChannelBuffer spareBytes = 
this.cumulation.readBytes(this.cumulation.readableBytes());
                        Channels.fireMessageReceived(ctx, spareBytes);
                }
        }
-       
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/handler/HandlersPackage.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/handler/HandlersPackage.java
 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/handler/HandlersPackage.java
index 53abc85..79c354f 100644
--- 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/handler/HandlersPackage.java
+++ 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/handler/HandlersPackage.java
@@ -30,7 +30,7 @@ import org.apache.james.protocols.api.handler.ProtocolHandler;
  * a single object.
  * This is used for the default set of CoreCommands.
  */
-public interface HandlersPackage extends ProtocolHandler{
+public interface HandlersPackage extends ProtocolHandler {
     
     /**
      * Return a List which contains a set of CommandHandlers

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
index da06bda..4fb1541 100644
--- 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
+++ 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
@@ -30,7 +30,7 @@ import org.jboss.netty.handler.execution.ExecutionHandler;
  * 
  *
  */
-public abstract class AbstractExecutorAwareChannelPipelineFactory extends 
AbstractSSLAwareChannelPipelineFactory{
+public abstract class AbstractExecutorAwareChannelPipelineFactory extends 
AbstractSSLAwareChannelPipelineFactory {
 
     public AbstractExecutorAwareChannelPipelineFactory(int timeout, int 
maxConnections, int maxConnectsPerIp, ChannelGroup group, ExecutionHandler 
eHandler, ChannelHandlerFactory frameHandlerFactory) {
         super(timeout, maxConnections, maxConnectsPerIp, group, eHandler, 
frameHandlerFactory);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
index ec99038..8efb516 100644
--- 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
+++ 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractProtocolAsyncServer.java
@@ -77,13 +77,13 @@ public abstract class AbstractProtocolAsyncServer extends 
AbstractConfigurableAs
      * 
      * @return core
      */
-    protected abstract Class< ? extends HandlersPackage> 
getCoreHandlersPackage();
+    protected abstract Class<? extends HandlersPackage> 
getCoreHandlersPackage();
     
     /**
      * Return the {@link HandlersPackage} which is responsible to load the jmx 
{@link ProtocolHandler}
      * 
      * @return jmx
      */
-    protected abstract Class< ? extends HandlersPackage> 
getJMXHandlersPackage();
+    protected abstract Class<? extends HandlersPackage> 
getJMXHandlersPackage();
 
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
index a8bcddb..594aa71 100644
--- 
a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
+++ 
b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/JMXEnabledOrderedMemoryAwareThreadPoolExecutor.java
@@ -33,7 +33,7 @@ import 
org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 /**
  * {@link OrderedMemoryAwareThreadPoolExecutor} subclass which expose 
statistics via JMX
  */
-public class JMXEnabledOrderedMemoryAwareThreadPoolExecutor extends 
OrderedMemoryAwareThreadPoolExecutor implements 
JMXEnabledOrderedMemoryAwareThreadPoolExecutorMBean{
+public class JMXEnabledOrderedMemoryAwareThreadPoolExecutor extends 
OrderedMemoryAwareThreadPoolExecutor implements 
JMXEnabledOrderedMemoryAwareThreadPoolExecutorMBean {
 
     private final String jmxPath;
     private final List<Runnable> inProgress = Collections.synchronizedList(new 
ArrayList<Runnable>());

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
 
b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
index 02a1316..510a672 100644
--- 
a/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
+++ 
b/server/protocols/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerLoader.java
@@ -19,7 +19,7 @@ import org.apache.james.metrics.api.NoopMetricFactory;
 import org.apache.james.protocols.api.handler.ProtocolHandler;
 import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
 
-public class MockProtocolHandlerLoader implements ProtocolHandlerLoader{
+public class MockProtocolHandlerLoader implements ProtocolHandlerLoader {
 
     @Override
     public ProtocolHandler load(String name, Configuration config) throws 
LoadingException {
@@ -111,7 +111,7 @@ public class MockProtocolHandlerLoader implements 
ProtocolHandlerLoader{
                 String name = null;
                 Annotation[][] paramAnnotations = 
method.getParameterAnnotations();
                 if (paramAnnotations.length == 1) {
-                    if (paramAnnotations[0].length ==1) {
+                    if (paramAnnotations[0].length == 1) {
                         if 
(paramAnnotations[0][0].annotationType().equals(Named.class)) {
                             name = ((Named) paramAnnotations[0][0]).value();
                         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java
 
b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java
index 5815482..9d1ec1b 100644
--- 
a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java
+++ 
b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerFactory.java
@@ -30,7 +30,7 @@ import 
org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
 import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
 import org.apache.james.protocols.lib.netty.AbstractServerFactory;
 
-public class LMTPServerFactory extends AbstractServerFactory{
+public class LMTPServerFactory extends AbstractServerFactory {
 
     private final ProtocolHandlerLoader loader;
     private final FileSystem fileSystem;
@@ -48,7 +48,7 @@ public class LMTPServerFactory extends AbstractServerFactory{
     }
     
     @Override
-    protected List<AbstractConfigurableAsyncServer> 
createServers(HierarchicalConfiguration config) throws Exception{
+    protected List<AbstractConfigurableAsyncServer> 
createServers(HierarchicalConfiguration config) throws Exception {
         List<AbstractConfigurableAsyncServer> servers = new ArrayList<>();
         List<HierarchicalConfiguration> configs = 
config.configurationsAt("lmtpserver");
         

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java
 
b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java
index 53f8918..605b9ec 100644
--- 
a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java
+++ 
b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServerFactory.java
@@ -22,7 +22,7 @@ import org.apache.james.filesystem.api.FileSystem;
 import org.apache.james.metrics.api.MetricFactory;
 import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
 
-public class OioLMTPServerFactory extends LMTPServerFactory{
+public class OioLMTPServerFactory extends LMTPServerFactory {
 
     public OioLMTPServerFactory(ProtocolHandlerLoader loader, FileSystem 
fileSystem, MetricFactory metricFactory) {
         super(loader, fileSystem, metricFactory);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/OioPOP3ServerFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/OioPOP3ServerFactory.java
 
b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/OioPOP3ServerFactory.java
index 3800157..76e019b 100644
--- 
a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/OioPOP3ServerFactory.java
+++ 
b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/OioPOP3ServerFactory.java
@@ -19,7 +19,7 @@
 
 package org.apache.james.pop3server.netty;
 
-public class OioPOP3ServerFactory extends POP3ServerFactory{
+public class OioPOP3ServerFactory extends POP3ServerFactory {
 
     @Override
     protected POP3Server createServer() {

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
 
b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
index 0f93fc6..b03718f 100644
--- 
a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
+++ 
b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
@@ -11,7 +11,7 @@ import 
org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
 import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
 import org.apache.james.protocols.lib.netty.AbstractServerFactory;
 
-public class POP3ServerFactory extends AbstractServerFactory{
+public class POP3ServerFactory extends AbstractServerFactory {
 
     private ProtocolHandlerLoader loader;
     private FileSystem fileSystem;
@@ -31,7 +31,7 @@ public class POP3ServerFactory extends AbstractServerFactory{
     }
     
     @Override
-    protected List<AbstractConfigurableAsyncServer> 
createServers(HierarchicalConfiguration config) throws Exception{
+    protected List<AbstractConfigurableAsyncServer> 
createServers(HierarchicalConfiguration config) throws Exception {
 
         List<AbstractConfigurableAsyncServer> servers = new ArrayList<>();
         List<HierarchicalConfiguration> configs = 
config.configurationsAt("pop3server");

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java
 
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java
index ea0e112..5ad90de 100644
--- 
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java
+++ 
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServerFactory.java
@@ -24,7 +24,7 @@ import org.apache.james.filesystem.api.FileSystem;
 import org.apache.james.metrics.api.MetricFactory;
 import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
 
-public class OioSMTPServerFactory extends SMTPServerFactory{
+public class OioSMTPServerFactory extends SMTPServerFactory {
 
     public OioSMTPServerFactory(DNSService dns, ProtocolHandlerLoader loader, 
FileSystem fileSystem, MetricFactory metricFactory) {
         super(dns, loader, fileSystem, metricFactory);

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
 
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
index df23ca4..5a07b21 100644
--- 
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
+++ 
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
@@ -52,7 +52,7 @@ public class SMTPServerFactory extends AbstractServerFactory {
     }
     
     @Override
-    protected List<AbstractConfigurableAsyncServer> 
createServers(HierarchicalConfiguration config) throws Exception{
+    protected List<AbstractConfigurableAsyncServer> 
createServers(HierarchicalConfiguration config) throws Exception {
         
         List<AbstractConfigurableAsyncServer> servers = new ArrayList<>();
         List<HierarchicalConfiguration> configs = 
config.configurationsAt("smtpserver");

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/TlsConfiguration.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/TlsConfiguration.java
 
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/TlsConfiguration.java
index d549ea3..03e73fc 100644
--- 
a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/TlsConfiguration.java
+++ 
b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/TlsConfiguration.java
@@ -39,7 +39,7 @@ public class TlsConfiguration {
         public Builder raw(String keystoreFilePath,
                            String keystorePassword,
                            String truststoreFilePath,
-                           String truststorePassword){
+                           String truststorePassword) {
             Preconditions.checkNotNull(keystoreFilePath);
             Preconditions.checkNotNull(keystorePassword);
 
@@ -50,7 +50,7 @@ public class TlsConfiguration {
             return this;
         }
 
-        public Builder selfSigned(String keystoreFilePath, String 
keystorePassword){
+        public Builder selfSigned(String keystoreFilePath, String 
keystorePassword) {
             Preconditions.checkNotNull(keystoreFilePath);
             Preconditions.checkNotNull(keystorePassword);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java
 
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java
index b3403ae..829cc14 100644
--- 
a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java
+++ 
b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/QuotaDTO.java
@@ -32,7 +32,7 @@ public class QuotaDTO {
         return new Builder();
     }
 
-    @JsonPOJOBuilder(withPrefix="")
+    @JsonPOJOBuilder(withPrefix = "")
     public static class Builder {
         private long count;
         private long size;

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
 
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
index ca4ece1..825e24a 100644
--- 
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
+++ 
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java
@@ -86,7 +86,7 @@ public class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void getCountShouldReturnStoredValue() throws Exception{
+    public void getCountShouldReturnStoredValue() throws Exception {
         int value = 42;
         maxQuotaManager.setDefaultMaxMessage(value);
 
@@ -179,7 +179,7 @@ public class GlobalQuotaRoutesTest {
     }
 
     @Test
-    public void getSizeShouldReturnStoredValue() throws Exception{
+    public void getSizeShouldReturnStoredValue() throws Exception {
         long value = 42;
         maxQuotaManager.setDefaultMaxStorage(value);
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
 
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index a0e28a4..4d7d166 100644
--- 
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ 
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -216,7 +216,7 @@ public class UserMailboxesRoutesTest {
             when(usersRepository.contains(USERNAME)).thenReturn(false);
 
             Map<String, Object> errors = when()
-                .put(MAILBOX_NAME+ "*")
+                .put(MAILBOX_NAME + "*")
             .then()
                 .statusCode(HttpStatus.BAD_REQUEST_400)
                 .contentType(ContentType.JSON)
@@ -276,7 +276,7 @@ public class UserMailboxesRoutesTest {
             when(usersRepository.contains(USERNAME)).thenReturn(false);
 
             Map<String, Object> errors = when()
-                .put(MAILBOX_NAME+ "%")
+                .put(MAILBOX_NAME + "%")
             .then()
                 .statusCode(HttpStatus.BAD_REQUEST_400)
                 .contentType(ContentType.JSON)
@@ -336,7 +336,7 @@ public class UserMailboxesRoutesTest {
             when(usersRepository.contains(USERNAME)).thenReturn(false);
 
             Map<String, Object> errors = when()
-                .put(MAILBOX_NAME+ "#")
+                .put(MAILBOX_NAME + "#")
             .then()
                 .statusCode(HttpStatus.BAD_REQUEST_400)
                 .contentType(ContentType.JSON)
@@ -396,7 +396,7 @@ public class UserMailboxesRoutesTest {
             when(usersRepository.contains(USERNAME)).thenReturn(false);
 
             Map<String, Object> errors = when()
-                .put(MAILBOX_NAME+ "&")
+                .put(MAILBOX_NAME + "&")
             .then()
                 .statusCode(HttpStatus.BAD_REQUEST_400)
                 .contentType(ContentType.JSON)

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
----------------------------------------------------------------------
diff --git 
a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
 
b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
index 5c35022..b0b7292 100644
--- 
a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
+++ 
b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/mock/MockMailQueue.java
@@ -137,7 +137,7 @@ public class MockMailQueue implements MailQueue {
         Iterator<Mail> it = queue.iterator();
 
         Mail mail = null;
-        while(it.hasNext()) {
+        while (it.hasNext()) {
             mail = it.next();
         }
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java
----------------------------------------------------------------------
diff --git 
a/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java 
b/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java
index ddd37bb..3475b02 100644
--- a/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java
+++ b/server/task/src/main/java/org/apache/james/task/MemoryTaskManager.java
@@ -54,7 +54,7 @@ public class MemoryTaskManager implements TaskManager {
 
     @Override
     public TaskId submit(Task task) {
-        return submit(task, id -> {});
+        return submit(task, id -> { });
     }
 
     @VisibleForTesting

http://git-wip-us.apache.org/repos/asf/james-project/blob/fe712f1a/server/task/src/test/java/org/apache/james/task/TaskTest.java
----------------------------------------------------------------------
diff --git a/server/task/src/test/java/org/apache/james/task/TaskTest.java 
b/server/task/src/test/java/org/apache/james/task/TaskTest.java
index 0a7a005..cd45aed 100644
--- a/server/task/src/test/java/org/apache/james/task/TaskTest.java
+++ b/server/task/src/test/java/org/apache/james/task/TaskTest.java
@@ -101,7 +101,7 @@ public class TaskTest {
     public void onCompleteShouldReturnPartialWhenPartial() {
         assertThat(
             Task.Result.PARTIAL
-                .onComplete(() -> {}))
+                .onComplete(() -> { }))
             .isEqualTo(Task.Result.PARTIAL);
     }
 
@@ -109,7 +109,7 @@ public class TaskTest {
     public void onFailureShouldReturnCompletedWhenCompleted() {
         assertThat(
             Task.Result.COMPLETED
-                .onFailure(() -> {}))
+                .onFailure(() -> { }))
             .isEqualTo(Task.Result.COMPLETED);
     }
 
@@ -117,7 +117,7 @@ public class TaskTest {
     public void onCompleteShouldReturnCompletedWhenCompleted() {
         assertThat(
             Task.Result.COMPLETED
-                .onComplete(() -> {}))
+                .onComplete(() -> { }))
             .isEqualTo(Task.Result.COMPLETED);
     }
 
@@ -125,7 +125,7 @@ public class TaskTest {
     public void onFailureShouldReturnPartialWhenPartial() {
         assertThat(
             Task.Result.PARTIAL
-                .onFailure(() -> {}))
+                .onFailure(() -> { }))
             .isEqualTo(Task.Result.PARTIAL);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to