JAMES-1925 Fix Eclipse 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/44733357 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/44733357 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/44733357 Branch: refs/heads/master Commit: 447333577dae5c79cbabd422198a5546c208daef Parents: 11b9eee Author: Antoine Duprat <[email protected]> Authored: Tue Feb 7 10:29:14 2017 +0100 Committer: Antoine Duprat <[email protected]> Committed: Thu Feb 9 09:44:21 2017 +0100 ---------------------------------------------------------------------- .../apache/james/backends/es/ElasticSearchIndexerTest.java | 1 - .../cassandra/modules/CassandraMailboxRecentsModule.java | 1 - .../james/mailbox/elasticsearch/MailboxMappingFactory.java | 1 - .../james/mailbox/elasticsearch/query/SortConverter.java | 1 - .../james/mailbox/store/AbstractCombinationManagerTest.java | 1 - mpt/impl/imap-mailbox/elasticsearch/pom.xml | 7 ------- mpt/pom.xml | 6 +++++- .../apache/james/jmap/methods/SetMessagesUpdateProcessor.java | 6 +----- .../james/jmap/methods/SetMessagesUpdateProcessorTest.java | 4 ++-- 9 files changed, 8 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java index 60ce997..ec9582e 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchIndexerTest.java @@ -42,7 +42,6 @@ import com.google.common.collect.Lists; public class ElasticSearchIndexerTest { private static final int MINIMUM_BATCH_SIZE = 1; - private static final String CONTENT = "content"; private static final IndexName INDEX_NAME = new IndexName("index_name"); private static final TypeName TYPE_NAME = new TypeName("type_name"); private TemporaryFolder temporaryFolder = new TemporaryFolder(); http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java index 6cccbd8..14f00c7 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxRecentsModule.java @@ -20,7 +20,6 @@ package org.apache.james.mailbox.cassandra.modules; import static com.datastax.driver.core.DataType.bigint; -import static com.datastax.driver.core.DataType.list; import static com.datastax.driver.core.DataType.timeuuid; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java index ad2d16b..aaa0009 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/MailboxMappingFactory.java @@ -23,7 +23,6 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import java.io.IOException; -import org.apache.james.backends.es.ElasticSearchIndexer; import org.apache.james.backends.es.IndexCreationFactory; import org.apache.james.backends.es.NodeMappingFactory; import org.apache.james.mailbox.elasticsearch.json.JsonMessageConstants; http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java index bb11268..6daa1a8 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/query/SortConverter.java @@ -20,7 +20,6 @@ package org.apache.james.mailbox.elasticsearch.query; import org.apache.james.backends.es.NodeMappingFactory; -import org.apache.james.mailbox.elasticsearch.MailboxMappingFactory; import org.apache.james.mailbox.elasticsearch.json.JsonMessageConstants; import org.apache.james.mailbox.model.SearchQuery; import org.elasticsearch.search.sort.FieldSortBuilder; http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java index a646bc4..2bfa4dd 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractCombinationManagerTest.java @@ -92,7 +92,6 @@ public abstract class AbstractCombinationManagerTest { } @Test - @SuppressWarnings("deprecation") public void getMessageCountFromMessageManagerShouldReturnDataSetInMailboxesFromMessageIdManager() throws Exception { MessageId messageId = messageManager1.appendMessage(new ByteArrayInputStream(MAIL_CONTENT), new Date(), session, false, FLAGS).getMessageId(); http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/mpt/impl/imap-mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/elasticsearch/pom.xml b/mpt/impl/imap-mailbox/elasticsearch/pom.xml index 0a4e36f..611239e 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml +++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml @@ -129,22 +129,15 @@ <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-backends-es</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-backends-es</artifactId> - <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-backends-es</artifactId> - <version>3.0.0-beta6-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/mpt/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/pom.xml b/mpt/pom.xml index aa4edb4..4815d79 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -170,8 +170,12 @@ <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-backends-es</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-backends-es</artifactId> <type>test-jar</type> - <scope>test</scope> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/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 faf228c..d72f7c9 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 @@ -33,7 +33,6 @@ import org.apache.james.jmap.model.SetError; import org.apache.james.jmap.model.SetMessagesRequest; import org.apache.james.jmap.model.SetMessagesResponse; import org.apache.james.jmap.model.UpdateMessagePatch; -import org.apache.james.jmap.utils.SystemMailboxesProvider; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; @@ -59,18 +58,15 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor { private final UpdateMessagePatchConverter updatePatchConverter; private final MessageIdManager messageIdManager; private final Factory mailboxIdFactory; - private final SystemMailboxesProvider systemMailboxesProvider; @Inject @VisibleForTesting SetMessagesUpdateProcessor( UpdateMessagePatchConverter updatePatchConverter, MessageIdManager messageIdManager, - Factory mailboxIdFactory, - SystemMailboxesProvider systemMailboxesProvider) { + Factory mailboxIdFactory) { this.updatePatchConverter = updatePatchConverter; this.messageIdManager = messageIdManager; this.mailboxIdFactory = mailboxIdFactory; - this.systemMailboxesProvider = systemMailboxesProvider; } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/44733357/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java index 0c7ea1b..e2d2090 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessorTest.java @@ -41,7 +41,7 @@ public class SetMessagesUpdateProcessorTest { @Test public void processShouldReturnEmptyUpdatedWhenRequestHasEmptyUpdate() { - SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(null, null, null, null); + SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(null, null, null); SetMessagesRequest requestWithEmptyUpdate = SetMessagesRequest.builder().build(); SetMessagesResponse result = sut.process(requestWithEmptyUpdate, null); @@ -65,7 +65,7 @@ public class SetMessagesUpdateProcessorTest { when(mockConverter.fromJsonNode(any(ObjectNode.class))) .thenReturn(mockInvalidPatch); - SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(mockConverter, null, null, null); + SetMessagesUpdateProcessor sut = new SetMessagesUpdateProcessor(mockConverter, null, null); MessageId requestMessageId = TestMessageId.of(1); SetMessagesRequest requestWithInvalidUpdate = SetMessagesRequest.builder() .update(ImmutableMap.of(requestMessageId, JsonNodeFactory.instance.objectNode())) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
