JAMES-2034 fix import on james-server-jmap

apache · May 31, 2017 · 1925eeb · 1925eeb
1 parent 1e1ff59
commit 1925eeb
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 45 deletions.
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java
@@ -20,11 +20,11 @@
 package org.apache.james.jmap.json;
 
 
+import java.util.function.Predicate;
+
 import com.fasterxml.jackson.databind.ser.PropertyWriter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 
-import java.util.function.Predicate;
-
 public class FieldNamePropertyFilter extends SimpleBeanPropertyFilter {
 
     private final Predicate<String> predicate;

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/ObjectMapperFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/ObjectMapperFactory.java
@@ -20,22 +20,11 @@
 package org.apache.james.jmap.json;
 
 import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Set;
 import java.util.TimeZone;
 
 import javax.inject.Inject;
 
-import com.fasterxml.jackson.databind.ser.SerializerFactory;
-import com.fasterxml.jackson.datatype.jsr310.JSR310Module;
-import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.apache.james.mailbox.model.MailboxId;
 import org.apache.james.mailbox.model.MessageId;
 

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponseWriter.java
@@ -19,10 +19,10 @@
 
 package org.apache.james.jmap.methods;
 
-import org.apache.james.jmap.model.ProtocolResponse;
-
 import java.util.stream.Stream;
 
+import org.apache.james.jmap.model.ProtocolResponse;
+
 public interface JmapResponseWriter {
 
     Stream<ProtocolResponse> formatMethodResponse(Stream<JmapResponse> jmapResponse);

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java
@@ -29,8 +29,8 @@
 
 import org.apache.james.jmap.model.CreationMessage;
 import org.apache.james.jmap.model.CreationMessage.DraftEmailer;
-import org.apache.james.mailbox.model.MessageAttachment;
 import org.apache.james.jmap.model.CreationMessageId;
+import org.apache.james.mailbox.model.MessageAttachment;
 import org.apache.james.mime4j.Charsets;
 import org.apache.james.mime4j.codec.DecodeMonitor;
 import org.apache.james.mime4j.codec.EncoderUtil;

diff --git a/...otocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchConverter.java b/...otocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchConverter.java
@@ -20,9 +20,11 @@
 package org.apache.james.jmap.methods;
 
 import java.io.IOException;
+
 import javax.inject.Inject;
 
 import org.apache.james.jmap.model.UpdateMessagePatch;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.annotations.VisibleForTesting;

diff --git a/...otocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java b/...otocols/jmap/src/main/java/org/apache/james/jmap/methods/UpdateMessagePatchValidator.java
@@ -23,11 +23,13 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+
 import javax.inject.Inject;
 
 import org.apache.james.jmap.json.ObjectMapperFactory;
 import org.apache.james.jmap.model.MessageProperties;
 import org.apache.james.jmap.model.UpdateMessagePatch;
+
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValueWithId.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValueWithId.java
@@ -21,8 +21,8 @@
 
 import org.apache.james.jmap.model.CreationMessage;
 import org.apache.james.jmap.model.CreationMessageId;
-import org.apache.james.jmap.model.SetError;
 import org.apache.james.jmap.model.Message;
+import org.apache.james.jmap.model.SetError;
 
 public class ValueWithId<T> {
 

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/GetMailboxesResponse.java
@@ -23,9 +23,9 @@
 
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.james.jmap.methods.Method;
+import org.apache.james.jmap.model.mailbox.Mailbox;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.james.jmap.model.mailbox.Mailbox;
 
 public class GetMailboxesResponse implements Method.Response {
 

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxCreationId.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxCreationId.java
@@ -19,10 +19,10 @@
 
 package org.apache.james.jmap.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
-
 import java.util.Objects;
 
+import com.fasterxml.jackson.annotation.JsonValue;
+
 public class MailboxCreationId {
 
     public static MailboxCreationId of(String creationId) {

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxFactory.java
@@ -23,7 +23,6 @@
 
 import javax.inject.Inject;
 
-import com.google.common.base.Preconditions;
 import org.apache.james.jmap.model.mailbox.Mailbox;
 import org.apache.james.jmap.model.mailbox.Role;
 import org.apache.james.jmap.model.mailbox.SortOrder;
@@ -37,6 +36,7 @@
 import org.apache.james.mailbox.model.MailboxPath;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 
 public class MailboxFactory {

diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MailboxProperty.java
@@ -18,11 +18,11 @@
  ****************************************************************/
 package org.apache.james.jmap.model;
 
-import com.google.common.base.Preconditions;
-
 import java.util.Arrays;
 import java.util.Optional;
 
+import com.google.common.base.Preconditions;
+
 public enum MailboxProperty implements Property {
     ID("id"),
     NAME("name"),

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjects.java
@@ -20,10 +20,6 @@
 package org.apache.james.jmap.json;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
 import java.util.Optional;
 
 import org.apache.james.jmap.model.BlobId;

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
@@ -24,7 +24,6 @@
 import java.util.Collection;
 
 import org.apache.james.jmap.send.MailMetadata;
-import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.base.MailAddressFixture;
 import org.apache.mailet.base.test.FakeMail;

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
@@ -19,10 +19,9 @@
 
 package org.apache.james.jmap.methods;
 
-import static org.mockito.Mockito.mock;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.mockito.Mockito.mock;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...ols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java b/...ols/jmap/src/test/java/org/apache/james/jmap/methods/SetMailboxesUpdateProcessorTest.java
@@ -25,10 +25,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.apache.james.metrics.api.MetricFactory;
-import org.apache.james.metrics.api.NoopMetricFactory;
-import org.mockito.Mockito;
-
 import java.util.Optional;
 
 import org.apache.james.jmap.model.MailboxFactory;
@@ -44,8 +40,11 @@
 import org.apache.james.mailbox.SubscriptionManager;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.inmemory.InMemoryId;
+import org.apache.james.metrics.api.MetricFactory;
+import org.apache.james.metrics.api.NoopMetricFactory;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class SetMailboxesUpdateProcessorTest {
 

diff --git a/...ols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchConverterTest.java b/...ols/jmap/src/test/java/org/apache/james/jmap/methods/UpdateMessagePatchConverterTest.java
@@ -23,8 +23,8 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.apache.james.jmap.model.UpdateMessagePatch;
 import org.junit.Test;

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ClientIdTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/ClientIdTest.java
@@ -18,7 +18,8 @@
  ****************************************************************/
 package org.apache.james.jmap.model;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.junit.Test;
 

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxPropertyTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MailboxPropertyTest.java
@@ -18,12 +18,12 @@
  ****************************************************************/
 package org.apache.james.jmap.model;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Optional;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.Test;
 
 public class MailboxPropertyTest {
 

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessagePropertiesTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessagePropertiesTest.java
@@ -23,8 +23,8 @@
 
 import java.util.Optional;
 
-import org.apache.james.jmap.model.MessageProperties.MessageProperty;
 import org.apache.james.jmap.model.MessageProperties.HeaderProperty;
+import org.apache.james.jmap.model.MessageProperties.MessageProperty;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableSet;

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetErrorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/SetErrorTest.java
@@ -19,14 +19,15 @@
 
 package org.apache.james.jmap.model;
 
+import static org.apache.james.jmap.model.MessageProperties.MessageProperty;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.apache.james.jmap.model.MessageProperties.MessageProperty;
 
 import java.util.Optional;
 import java.util.Set;
 
 import org.junit.Test;
+
 import com.google.common.collect.ImmutableSet;
 
 public class SetErrorTest {

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
@@ -23,8 +23,6 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.james.mailbox.inmemory.InMemoryId;

diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/UpdateMessagePatchTest.java
@@ -24,6 +24,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+
 import javax.mail.Flags;
 
 import org.junit.Test;

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
@@ -18,12 +18,11 @@
  ****************************************************************/
 package org.apache.james.jmap.send;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.time.Instant;
 import java.util.Collection;