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 ro...@apache.org on 2019/03/04 15:03:38 UTC
[james-project] 02/02: Fixes Eclipse and checkstyle warnings
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 407036b0036568ef2d7a3fe031fb325d79837b5a
Author: Raphael Ouazana <ra...@linagora.com>
AuthorDate: Thu Feb 28 11:26:37 2019 +0100
Fixes Eclipse and checkstyle warnings
---
.../src/test/java/org/apache/james/mailbox/MailboxManagerTest.java | 1 -
.../james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java | 1 +
.../main/java/org/apache/james/transport/mailets/ICALToHeader.java | 1 +
.../java/org/apache/james/transport/mailets/ICALToJsonAttribute.java | 2 ++
.../main/java/org/apache/james/transport/mailets/ICalendarParser.java | 1 +
.../java/org/apache/james/transport/mailets/RecoverAttachment.java | 1 +
.../main/java/org/apache/james/transport/mailets/StripAttachment.java | 1 +
.../java/org/apache/james/transport/matchers/SentByMailetTest.java | 2 --
.../core/src/test/java/org/apache/james/server/core/MailImplTest.java | 4 ++--
.../mailbox/src/main/java/org/apache/james/modules/MailboxModule.java | 3 +++
.../java/org/apache/james/queue/api/ManageableMailQueueContract.java | 1 -
.../src/main/java/org/apache/james/queue/jms/JMSMailQueue.java | 1 -
12 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
index 87272e8..4e675b0 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
@@ -1340,7 +1340,6 @@ public abstract class MailboxManagerTest<T extends MailboxManager> {
@Nested
class PreDeletion {
- private final QuotaRoot quotaRoot = QuotaRoot.quotaRoot("#private&USER_1", Optional.empty());
private MailboxPath inbox;
private MailboxId inboxId;
private MailboxId anotherMailboxId;
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
index f26e772..c69ac27 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMessageIdManagerSideEffectTest.java
@@ -128,6 +128,7 @@ public abstract class AbstractMessageIdManagerSideEffectTest {
when(preDeletionHook2.notifyDelete(any(PreDeletionHook.DeleteOperation.class)))
.thenReturn(Mono.empty());
}
+
@Test
public void deleteShouldCallEventDispatcher() throws Exception {
givenUnlimitedQuota();
diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
index 6be5782..4a4df5d 100644
--- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
+++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
@@ -61,6 +61,7 @@ import net.fortuna.ical4j.model.component.VEvent;
*/
public class ICALToHeader extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(ICALToHeader.class);
+ @SuppressWarnings("unchecked")
private static final Class<Map<String, Calendar>> MAP_STRING_CALENDAR = (Class<Map<String, Calendar>>) (Object) Map.class;
public static final String ATTRIBUTE_PROPERTY = "attribute";
diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
index 2298002..5892e86 100644
--- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
+++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java
@@ -87,7 +87,9 @@ import net.fortuna.ical4j.model.Calendar;
*/
public class ICALToJsonAttribute extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(ICALToJsonAttribute.class);
+ @SuppressWarnings("unchecked")
private static final Class<Map<String, byte[]>> MAP_STRING_BYTES_CLASS = (Class<Map<String, byte[]>>) (Object) Map.class;
+ @SuppressWarnings("unchecked")
private static final Class<Map<String, Calendar>> MAP_STRING_CALENDAR_CLASS = (Class<Map<String, Calendar>>) (Object) Map.class;
public static final String SOURCE_ATTRIBUTE_NAME = "source";
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 62318b5..5b970f1 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
@@ -68,6 +68,7 @@ import net.fortuna.ical4j.model.Calendar;
*/
public class ICalendarParser extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(ICalendarParser.class);
+ @SuppressWarnings("unchecked")
private static final Class<Map<String, byte[]>> MAP_STRING_BYTES_CLASS = (Class<Map<String, byte[]>>) (Object) Map.class;
public static final String SOURCE_ATTRIBUTE_PARAMETER_NAME = "sourceAttribute";
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
index 7e31ff1..172b766 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java
@@ -65,6 +65,7 @@ import com.github.fge.lambdas.Throwing;
@Experimental
public class RecoverAttachment extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(RecoverAttachment.class);
+ @SuppressWarnings("unchecked")
private static final Class<Map<String, byte[]>> MAP_STRING_BYTES_CLASS = (Class<Map<String, byte[]>>) (Object) Map.class;
private static final String ATTRIBUTE_PARAMETER_NAME = "attribute";
diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
index 36b2990..9239a0c 100644
--- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
+++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java
@@ -91,6 +91,7 @@ import com.google.common.collect.ImmutableMap;
*/
public class StripAttachment extends GenericMailet {
private static final Logger LOGGER = LoggerFactory.getLogger(StripAttachment.class);
+ @SuppressWarnings("unchecked")
private static final Class<Map<String, byte[]>> MAP_STRING_BYTES_CLASS = (Class<Map<String, byte[]>>) (Object) Map.class;
@SuppressWarnings("unchecked")
diff --git a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java
index 19d0015..c2a4402 100644
--- a/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java
+++ b/mailet/standard/src/test/java/org/apache/james/transport/matchers/SentByMailetTest.java
@@ -24,8 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collection;
import org.apache.james.core.MailAddress;
-import org.apache.mailet.Attribute;
-import org.apache.mailet.AttributeValue;
import org.apache.mailet.Mail;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMail;
diff --git a/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java b/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java
index 3d8ce83..675eb29 100644
--- a/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java
+++ b/server/container/core/src/test/java/org/apache/james/server/core/MailImplTest.java
@@ -283,13 +283,13 @@ public class MailImplTest extends ContractMailTest {
}
@Test
- public void MailImplShouldNotAllowSettingNullName() {
+ public void mailImplShouldNotAllowSettingNullName() {
assertThatThrownBy(() -> newMail().setName(null))
.isInstanceOf(NullPointerException.class);
}
@Test
- public void MailImplShouldNotAllowSettingEmptyName() {
+ public void mailImplShouldNotAllowSettingEmptyName() {
assertThatThrownBy(() -> newMail().setName(""))
.isInstanceOf(IllegalArgumentException.class);
}
diff --git a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
index 9f3ed0b..eea456c 100644
--- a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
+++ b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
@@ -23,6 +23,7 @@ import org.apache.james.mailbox.acl.GroupMembershipResolver;
import org.apache.james.mailbox.acl.MailboxACLResolver;
import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
+import org.apache.james.mailbox.extension.PreDeletionHook;
import org.apache.james.mailbox.store.SystemMailboxesProviderImpl;
import org.apache.james.modules.mailbox.PreDeletionHookModule;
import org.apache.james.utils.GuiceProbe;
@@ -51,6 +52,8 @@ public class MailboxModule extends AbstractModule {
bind(SystemMailboxesProviderImpl.class).in(Scopes.SINGLETON);
bind(SystemMailboxesProvider.class).to(SystemMailboxesProviderImpl.class);
+
+ Multibinder<PreDeletionHook> noPreDeletionHooks = Multibinder.newSetBinder(binder(), PreDeletionHook.class);
}
}
diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
index 808ca47..ffa826f 100644
--- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
+++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/ManageableMailQueueContract.java
@@ -36,7 +36,6 @@ import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.mailet.Attribute;
import org.apache.mailet.Mail;
import org.apache.mailet.base.MailAddressFixture;
-import org.apache.mailet.base.test.FakeMail;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
index aea5ef4..b783a40 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
@@ -403,7 +403,6 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
Optional.ofNullable(SerializationUtil.<PerRecipientHeaders>deserialize(message.getStringProperty(JAMES_MAIL_PER_RECIPIENT_HEADERS)))
.ifPresent(builder::addAllHeadersForRecipients);
- List<MailAddress> rcpts = new ArrayList<>();
String recipients = message.getStringProperty(JAMES_MAIL_RECIPIENTS);
StringTokenizer recipientTokenizer = new StringTokenizer(recipients, JAMES_MAIL_SEPARATOR);
while (recipientTokenizer.hasMoreTokens()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org