You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/01/24 01:26:16 UTC
[02/10] james-project git commit: Fix Eclipse warnings
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/4a59c1b2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4a59c1b2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4a59c1b2
Branch: refs/heads/master
Commit: 4a59c1b216bd8cd7c284cb6c472cf5cadaa97e32
Parents: 35b7fe3
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Jan 19 10:27:45 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Jan 23 10:05:14 2017 +0100
----------------------------------------------------------------------
.../cassandra/mail/CassandraMessageIdDAO.java | 1 -
.../CassandraCombinationManagerTestSystem.java | 6 ++----
.../store/AbstractCombinationManagerTest.java | 1 +
mailet/icalendar/pom.xml | 5 +----
.../james/transport/mailets/ICalendarParser.java | 2 ++
.../mailets/ICALToJsonAttributeTest.java | 3 +--
.../transport/mailets/ICalendarParserTest.java | 18 ++++--------------
mailet/standard/pom.xml | 1 -
8 files changed, 11 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
index 9a6acc7..e7d5a34 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
@@ -69,7 +69,6 @@ import com.google.common.collect.ImmutableSet;
public class CassandraMessageIdDAO {
- private static final String MOD_SEQ_CONDITION = "modSeqCondition";
private static final String IMAP_UID_GTE = IMAP_UID + "_GTE";
private static final String IMAP_UID_LTE = IMAP_UID + "_LTE";
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java
index d3387fd..42ef8e5 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraCombinationManagerTestSystem.java
@@ -31,7 +31,7 @@ import org.apache.james.mailbox.store.event.MailboxEventDispatcher;
import org.apache.james.mailbox.store.mail.model.Mailbox;
public class CassandraCombinationManagerTestSystem extends CombinationManagerTestSystem {
- private final CassandraMessageId.Factory messageIdFactory;
+
private final CassandraMailboxSessionMapperFactory mapperFactory;
private final CassandraMailboxManager cassandraMailboxManager;
@@ -39,14 +39,12 @@ public class CassandraCombinationManagerTestSystem extends CombinationManagerTes
CassandraMailboxSessionMapperFactory mapperFactory = CassandraTestSystemFixture.createMapperFactory();
return new CassandraCombinationManagerTestSystem(CassandraTestSystemFixture.createMessageIdManager(mapperFactory, quotaManager, dispatcher),
- new CassandraMessageId.Factory(),
mapperFactory,
CassandraTestSystemFixture.createMailboxManager(mapperFactory));
}
- private CassandraCombinationManagerTestSystem(MessageIdManager messageIdManager, CassandraMessageId.Factory messageIdFactory, CassandraMailboxSessionMapperFactory mapperFactory, MailboxManager cassandraMailboxManager) {
+ private CassandraCombinationManagerTestSystem(MessageIdManager messageIdManager, CassandraMailboxSessionMapperFactory mapperFactory, MailboxManager cassandraMailboxManager) {
super(cassandraMailboxManager, messageIdManager);
- this.messageIdFactory = messageIdFactory;
this.mapperFactory = mapperFactory;
this.cassandraMailboxManager = (CassandraMailboxManager)cassandraMailboxManager;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/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 2bfa4dd..a646bc4 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,6 +92,7 @@ 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/4a59c1b2/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index 7c35346..c79b2aa 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -170,17 +170,14 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson-data.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson-data.version}</version>
</dependency>
<dependency>
<groupId>com.github.steveash.guavate</groupId>
<artifactId>guavate</artifactId>
- <version>${guavate.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -216,7 +213,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>${assertj-3.version}</version>
+ <version>${assertj-3.version}</version><!--$NO-MVN-MAN-VER$-->
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
index 6930556..e9302f9 100644
--- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
+++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICalendarParser.java
@@ -33,6 +33,7 @@ import org.apache.mailet.base.GenericMailet;
import com.github.steveash.guavate.Guavate;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
+
import net.fortuna.ical4j.data.CalendarBuilder;
import net.fortuna.ical4j.data.ParserException;
import net.fortuna.ical4j.model.Calendar;
@@ -92,6 +93,7 @@ public class ICalendarParser extends GenericMailet {
}
@Override
+ @SuppressWarnings("unchecked")
public void service(Mail mail) throws MessagingException {
Object icsAttachmentsObj = mail.getAttribute(sourceAttributeName);
if (icsAttachmentsObj == null || !(icsAttachmentsObj instanceof Map)) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
index f100584..fdddcaa 100644
--- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
+++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java
@@ -231,7 +231,6 @@ public class ICALToJsonAttributeTest {
.isNull();
}
- @SuppressWarnings("unchecked")
@Test
public void serviceShouldAttachEmptyListWhenNoRecipient() throws Exception {
testee.init(FakeMailetConfig.builder().build());
@@ -246,7 +245,7 @@ public class ICALToJsonAttributeTest {
.build();
testee.service(mail);
- assertThat((Map) mail.getAttribute(ICALToJsonAttribute.DEFAULT_DESTINATION_ATTRIBUTE_NAME))
+ assertThat((Map<?,?>) mail.getAttribute(ICALToJsonAttribute.DEFAULT_DESTINATION_ATTRIBUTE_NAME))
.isEmpty();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
----------------------------------------------------------------------
diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
index c65f69f..a57e8cc 100644
--- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
+++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
@@ -28,14 +28,13 @@ import javax.mail.MessagingException;
import org.apache.mailet.Mail;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailetConfig;
-import org.apache.mailet.base.test.MimeMessageBuilder;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
+
import net.fortuna.ical4j.model.Calendar;
public class ICalendarParserTest {
@@ -45,22 +44,11 @@ public class ICalendarParserTest {
private static final String DESTINATION_CUSTOM_ATTRIBUTE = "ics.dest.attribute";
private static final String SOURCE_CUSTOM_ATTRIBUTE = "ics.source.attribute";
- private static final String CONTENT_TRANSFER_ENCODING_VALUE ="8bit";
-
- private static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
- private static final String CONTENT_TYPE = "Content-Type";
- private static final String TEXT_CALENDAR_CHARSET_UTF_8 = "text/calendar; charset=utf-8";
-
private static final String RIGHT_ICAL_VALUE = "BEGIN:VCALENDAR\n" +
"END:VCALENDAR";
private static final String WRONG_ICAL_VALUE = "anyValue";
- private static MimeMessageBuilder.Header[] CALENDAR_HEADERS = {
- new MimeMessageBuilder.Header(CONTENT_TRANSFER_ENCODING, CONTENT_TRANSFER_ENCODING_VALUE),
- new MimeMessageBuilder.Header(CONTENT_TYPE, TEXT_CALENDAR_CHARSET_UTF_8)
- };
-
@Rule
public ExpectedException expectedException = ExpectedException.none();
@@ -157,7 +145,7 @@ public class ICalendarParserTest {
mailet.service(mail);
- assertThat((Map<String, Calendar>)mail.getAttribute(DESTINATION_CUSTOM_ATTRIBUTE))
+ assertThat((Map<?, ?>)mail.getAttribute(DESTINATION_CUSTOM_ATTRIBUTE))
.isEmpty();
}
@@ -180,6 +168,7 @@ public class ICalendarParserTest {
}
@Test
+ @SuppressWarnings("unchecked")
public void serviceShouldReturnRightMapOfCalendarWhenRightAttachments() throws Exception {
FakeMailetConfig mailetConfiguration = FakeMailetConfig.builder()
.mailetName("ICalendarParser")
@@ -203,6 +192,7 @@ public class ICalendarParserTest {
}
@Test
+ @SuppressWarnings("unchecked")
public void serviceShouldFilterResultWhenErrorParsing() throws Exception {
FakeMailetConfig mailetConfiguration = FakeMailetConfig.builder()
.mailetName("ICalendarParser")
http://git-wip-us.apache.org/repos/asf/james-project/blob/4a59c1b2/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index 9b99bc3..f939e85 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -48,7 +48,6 @@
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org