Repository: james-project Updated Branches: refs/heads/master 8bba513c3 -> f8993a19f
fix recently introduced 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/26912fd5 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/26912fd5 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/26912fd5 Branch: refs/heads/master Commit: 26912fd501c9a5770f0d097bc29cd61159f8b7ff Parents: 1ce2308 Author: Matthieu Baechler <[email protected]> Authored: Thu Oct 20 17:01:03 2016 +0200 Committer: Matthieu Baechler <[email protected]> Committed: Thu Oct 20 17:01:03 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/james/transport/matchers/UserIs.java | 8 +++----- .../james/transport/mailets/RemoveMailAttributeTest.java | 5 +---- .../org/apache/james/mpt/onami/test/GuiceMockModule.java | 1 + .../java/org/apache/james/mpt/onami/test/OnamiSuite.java | 5 +---- .../james/transport/mailets/jsieve/ActionDispatcher.java | 10 +++++----- .../james/transport/mailets/jsieve/SieveMailAdapter.java | 9 ++++----- .../transport/mailets/jsieve/SieveMailboxMailet.java | 3 +-- .../james/transport/mailets/jsieve/VacationAction.java | 2 +- .../integration/cucumber/GetMessagesMethodStepdefs.java | 1 - server/protocols/jmap/pom.xml | 1 - 10 files changed, 17 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java index b857c14..a764d5a 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/UserIs.java @@ -19,15 +19,13 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.base.GenericRecipientMatcher; -import org.apache.mailet.MailAddress; - import java.util.Set; -import java.util.StringTokenizer; -import java.util.Vector; import javax.mail.MessagingException; +import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericRecipientMatcher; + import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java index e88036c..292440d 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java @@ -20,10 +20,9 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; + import javax.mail.MessagingException; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetException; @@ -33,8 +32,6 @@ import org.apache.mailet.base.test.FakeMailetConfig; import org.junit.Before; import org.junit.Test; -import java.io.Serializable; - public class RemoveMailAttributeTest { private static final String ATTRIBUTE_1 = "attribute1"; http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/GuiceMockModule.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/GuiceMockModule.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/GuiceMockModule.java index a0ab7ae..b88aa67 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/GuiceMockModule.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/GuiceMockModule.java @@ -93,6 +93,7 @@ public class GuiceMockModule extends AbstractModule { checkState(!isTypeConflicts, " Found multiple annotation @%s for type: %s; binding skipped!.", Mock.class.getSimpleName(), type); for (final Field field : fields) { + @SuppressWarnings("rawtypes") final TypeLiteral literal = TypeLiteral.get(type); final Mock annoBy = field.getAnnotation(Mock.class); final Object mock = this.mockedFields.get(field); http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/OnamiSuite.java ---------------------------------------------------------------------- diff --git a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/OnamiSuite.java b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/OnamiSuite.java index d55f503..977f8ff 100644 --- a/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/OnamiSuite.java +++ b/mpt/onami-test/src/main/java/org/apache/james/mpt/onami/test/OnamiSuite.java @@ -129,8 +129,6 @@ public class OnamiSuite extends Suite { private static final Logger LOGGER = Logger.getLogger(OnamiSuite.class.getName()); - private Injector injector; - private final List<Module> allModules; private final Map<Field, Object> mocked = new HashMap<Field, Object>(1); @@ -195,7 +193,7 @@ public class OnamiSuite extends Suite { LOGGER.finer(" #### Creating injector ####"); } - this.injector = createInjector(allModules); + createInjector(allModules); super.run(notifier); this.flush(); @@ -218,7 +216,6 @@ public class OnamiSuite extends Suite { * {@inheritDoc} */ private void flush() { - this.injector = null; this.allModules.clear(); this.mocked.clear(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java index 61f8953..f6e157c 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionDispatcher.java @@ -42,7 +42,7 @@ public class ActionDispatcher { * handle the Action. * <Action, MailAction> */ - private ConcurrentMap<Class, MailAction> fieldMailActionMap; + private ConcurrentMap<Class<?>, MailAction> fieldMailActionMap; /** * Constructor for ActionDispatcher. @@ -73,7 +73,7 @@ public class ActionDispatcher { * * @return Map */ - public ConcurrentMap<Class, MailAction> getMethodMap() { + public ConcurrentMap<Class<?>, MailAction> getMethodMap() { return fieldMailActionMap; } @@ -82,8 +82,8 @@ public class ActionDispatcher { * * @return Map */ - private ConcurrentMap<Class, MailAction> defaultMethodMap() { - final ConcurrentMap<Class, MailAction> actionMap = new ConcurrentHashMap<Class, MailAction>(4); + private ConcurrentMap<Class<?>, MailAction> defaultMethodMap() { + final ConcurrentMap<Class<?>, MailAction> actionMap = new ConcurrentHashMap<Class<?>, MailAction>(4); actionMap.put(ActionFileInto.class, new FileIntoAction()); actionMap.put(ActionKeep.class, new KeepAction()); actionMap.put(ActionRedirect.class, new RedirectAction()); @@ -97,7 +97,7 @@ public class ActionDispatcher { * * @param mailActionMap <Action, MailAction> not null */ - protected void setMethodMap(ConcurrentMap<Class, MailAction> mailActionMap) { + protected void setMethodMap(ConcurrentMap<Class<?>, MailAction> mailActionMap) { fieldMailActionMap = mailActionMap; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index 897b6d6..e70bd6d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -178,7 +178,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC { final List<Action> actions = getActions(); for (final Action action: actions) { - getMailetContext().log("Executing action: " + action.toString()); + getMailetContext().log(MailetContext.LogLevel.INFO, "Executing action: " + action.toString()); try { dispatcher.execute(action, getMail(), this); @@ -231,9 +231,8 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC Set<String> headerNames = new HashSet<String>(); try { - Enumeration allHeaders = getMessage().getAllHeaders(); - while (allHeaders.hasMoreElements()) - { + Enumeration<?> allHeaders = getMessage().getAllHeaders(); + while (allHeaders.hasMoreElements()) { headerNames.add(((Header) allHeaders.nextElement()).getName()); } return new ArrayList<String>(headerNames); @@ -445,7 +444,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC poster.post(uri, mail); } - public void post(MailAddress sender, Collection recipients, MimeMessage mail) throws MessagingException { + public void post(MailAddress sender, Collection<MailAddress> recipients, MimeMessage mail) throws MessagingException { getMailetContext().sendMail(sender, recipients, mail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailboxMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailboxMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailboxMailet.java index 33ef4d4..d58938b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailboxMailet.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailboxMailet.java @@ -224,7 +224,6 @@ public class SieveMailboxMailet extends GenericMailet { * @throws MessagingException * if an error occurs while storing the mail */ - @SuppressWarnings("unchecked") @Override public void service(Mail mail) throws MessagingException { Collection<MailAddress> recipients = mail.getRecipients(); @@ -245,7 +244,7 @@ public class SieveMailboxMailet extends GenericMailet { + ">")); } - Enumeration headers; + Enumeration<?> headers; InternetHeaders deliveredTo = new InternetHeaders(); if (deliveryHeader != null) { // Copy any Delivered-To headers from the message http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java index 153144e..6819364 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java @@ -88,7 +88,7 @@ public class VacationAction implements MailAction { } private boolean isMailingList(Mail mail) throws MessagingException { - Enumeration enumeration = mail.getMessage().getAllHeaderLines(); + Enumeration<?> enumeration = mail.getMessage().getAllHeaderLines(); while (enumeration.hasMoreElements()) { String headerName = (String) enumeration.nextElement(); if (headerName.startsWith("List-")) { http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java index 6bd40c2..5bbc254 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java @@ -35,7 +35,6 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.mail.Flags; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.http.HttpResponse; import org.apache.http.client.fluent.Request; http://git-wip-us.apache.org/repos/asf/james-project/blob/26912fd5/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 60c4c42..0b84a70 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -188,7 +188,6 @@ <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-mime4j-dom</artifactId> - <version>${apache-mime4j.version}</version> </dependency> <dependency> <groupId>org.apache.james</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
