Repository: james-project Updated Branches: refs/heads/master a15752fd1 -> 5f30b315f
JAMES-1779 remove 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/74880229 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/74880229 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/74880229 Branch: refs/heads/master Commit: 74880229f81609a5d67c4ecd72793bbf43ce965e Parents: a15752f Author: Matthieu Baechler <matthieu.baech...@linagora.com> Authored: Wed Jun 22 15:29:19 2016 +0200 Committer: Antoine Duprat <adup...@linagora.com> Committed: Tue Jun 28 09:44:22 2016 +0200 ---------------------------------------------------------------------- .../org/apache/james/mailbox/MailboxManagerStressTest.java | 1 - .../org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java | 2 +- .../james/mailbox/maildir/MaildirMailboxManagerTests.java | 9 +++++---- .../james/mailbox/store/mail/model/MailboxMapperTest.java | 3 --- .../james/mailbox/store/mail/model/MessageMapperTest.java | 3 --- .../james/mailbox/store/mail/model/MessageMoveTest.java | 3 --- pom.xml | 1 - .../src/main/java/org/apache/james/jmap/JMAPModule.java | 1 - .../apache/james/modules/server/WebAdminServerModule.java | 1 - 9 files changed, 6 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java index b6dca58..649255e 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/MailboxManagerStressTest.java @@ -20,7 +20,6 @@ package org.apache.james.mailbox; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java index 4a4e6cf..79786c1 100644 --- a/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java +++ b/mailbox/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java @@ -50,7 +50,7 @@ import com.google.common.base.Throwables; @RunWith(ContractSuite.class) @ContractImpl(JCRMailboxManager.class) -public class JCRMailboxManagerTest extends MailboxManagerTest { +public class JCRMailboxManagerTest extends MailboxManagerTest<JCRMailboxManager> { private static final String JACKRABBIT_HOME = "target/jackrabbit"; http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTests.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTests.java b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTests.java index cd9c6c1..1369f64 100644 --- a/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTests.java +++ b/mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTests.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.maildir; import java.io.IOException; +import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxManagerTest; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; @@ -48,7 +49,7 @@ import com.google.common.base.Throwables; public class MaildirMailboxManagerTests { - public static abstract class MaildirMailboxManagerTest extends MailboxManagerTest { + public static abstract class MaildirMailboxManagerTest<T extends MailboxManager> extends MailboxManagerTest<T> { protected StoreMailboxManager createMailboxManager(String configuration, TemporaryFolder temporaryFolder) throws MailboxException, IOException { MaildirStore store = new MaildirStore(temporaryFolder.newFolder().getPath() + configuration, new JVMMailboxPathLocker()); MaildirMailboxSessionMapperFactory mf = new MaildirMailboxSessionMapperFactory(store); @@ -67,7 +68,7 @@ public class MaildirMailboxManagerTests { @RunWith(ContractSuite.class) @ContractImpl(StoreMailboxManager.class) - public static class DomainUser extends MaildirMailboxManagerTest { + public static class DomainUser extends MaildirMailboxManagerTest<StoreMailboxManager> { @Rule public TemporaryFolder tmpFolder = new TemporaryFolder(); private IProducer<StoreMailboxManager> producer = new IProducer<StoreMailboxManager>() { @@ -97,7 +98,7 @@ public class MaildirMailboxManagerTests { @Ignore @RunWith(ContractSuite.class) @ContractImpl(StoreMailboxManager.class) - public static class User extends MaildirMailboxManagerTest { + public static class User extends MaildirMailboxManagerTest<StoreMailboxManager> { @Rule public TemporaryFolder tmpFolder = new TemporaryFolder(); private IProducer<StoreMailboxManager> producer = new IProducer<StoreMailboxManager>() { @@ -126,7 +127,7 @@ public class MaildirMailboxManagerTests { @RunWith(ContractSuite.class) @ContractImpl(StoreMailboxManager.class) - public static class FullUser extends MaildirMailboxManagerTest { + public static class FullUser extends MaildirMailboxManagerTest<StoreMailboxManager> { @Rule public TemporaryFolder tmpFolder = new TemporaryFolder(); private IProducer<StoreMailboxManager> producer = new IProducer<StoreMailboxManager>() { http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java index a7964b9..2bf50c4 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MailboxMapperTest.java @@ -27,13 +27,10 @@ import java.util.List; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; import org.junit.rules.ExpectedException; import org.xenei.junit.contract.Contract; import org.xenei.junit.contract.ContractTest; http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index 4354830..f0d614b 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -38,7 +38,6 @@ import org.apache.james.mailbox.model.MessageMetaData; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.UpdatedFlags; import org.apache.james.mailbox.store.FlagsUpdateCalculator; -import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; @@ -46,9 +45,7 @@ import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage; import org.junit.After; import org.junit.Assume; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; import org.junit.rules.ExpectedException; import org.xenei.junit.contract.Contract; import org.xenei.junit.contract.ContractTest; http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java index 86e81f1..e394d1f 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java @@ -30,16 +30,13 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageMetaData; import org.apache.james.mailbox.model.MessageRange; -import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage; import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; import org.junit.rules.ExpectedException; import org.xenei.junit.contract.Contract; import org.xenei.junit.contract.ContractTest; http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e90f8b1..da67acb 100644 --- a/pom.xml +++ b/pom.xml @@ -1086,7 +1086,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> <configuration> <signature> <groupId>org.codehaus.mojo.signature</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java index 9621cda..bc27408 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.jmap; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; import java.util.Optional; http://git-wip-us.apache.org/repos/asf/james-project/blob/74880229/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java index cf78598..8fb0a6a 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/server/WebAdminServerModule.java @@ -25,7 +25,6 @@ import static org.apache.james.webadmin.WebAdminServer.WEBADMIN_PORT; import java.io.FileNotFoundException; import java.util.List; -import java.util.Set; import org.apache.commons.configuration.ConfigurationException; import org.apache.james.lifecycle.api.Configurable; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
