Repository: james-project Updated Branches: refs/heads/master e4424ad39 -> 68c05f843
JAMES-1676 Fix Eclipse compilation & remove warnings Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/68c05f84 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/68c05f84 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/68c05f84 Branch: refs/heads/master Commit: 68c05f843c2c5eba941757048f8fd0bf650d7dde Parents: e4424ad Author: Antoine Duprat <[email protected]> Authored: Mon Feb 15 15:19:04 2016 +0100 Committer: Matthieu Baechler <[email protected]> Committed: Thu Feb 18 16:55:30 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/james/jmap/model/SetError.java | 6 ++---- .../james/jmap/methods/UpdateMessagePatchValidatorTest.java | 5 +++-- .../org/apache/james/jmap/model/SetMessagesResponseTest.java | 3 --- 3 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/68c05f84/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetError.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetError.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetError.java index f52ad15..aa520b3 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetError.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/SetError.java @@ -19,13 +19,11 @@ package org.apache.james.jmap.model; -import static org.apache.james.jmap.model.MessageProperties.MessageProperty; - import java.util.Optional; import java.util.Set; -import java.util.stream.Stream; -import org.apache.james.util.streams.Collectors; +import org.apache.james.jmap.model.MessageProperties.MessageProperty; + import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; import com.fasterxml.jackson.databind.annotation.JsonSerialize; http://git-wip-us.apache.org/repos/asf/james-project/blob/68c05f84/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchValidatorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchValidatorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchValidatorTest.java index bbeb955..10aa5fd 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchValidatorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchValidatorTest.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.methods; -import static org.assertj.core.api.Assertions.assertThat;; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -30,6 +30,7 @@ import java.util.Set; import org.apache.james.jmap.model.UpdateMessagePatch; import org.junit.Test; + import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -65,7 +66,7 @@ public class UpdateMessagePatchValidatorTest { ObjectNode emptyRootNode = new ObjectMapper().createObjectNode(); ObjectMapper mapper = mock(ObjectMapper.class); when(mapper.readValue(anyString(), eq(UpdateMessagePatch.class))) - .thenThrow(JsonMappingException.class); + .thenThrow(new JsonMappingException("Exception when parsing")); UpdateMessagePatchValidator sut = new UpdateMessagePatchValidator(mapper); // When Set<ValidationResult> result = sut.validate(emptyRootNode); http://git-wip-us.apache.org/repos/asf/james-project/blob/68c05f84/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMessagesResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMessagesResponseTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMessagesResponseTest.java index 2c02bac..e2bc7c7 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMessagesResponseTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetMessagesResponseTest.java @@ -25,11 +25,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.ZonedDateTime; import java.util.List; import java.util.stream.Collectors; -import java.util.stream.Stream; -import com.google.common.collect.ImmutableSet; import org.apache.commons.lang.NotImplementedException; -import org.junit.Ignore; import org.junit.Test; import com.google.common.collect.ImmutableList; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
