Modified: james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMECheckSignature.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMECheckSignature.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMECheckSignature.java (original) +++ james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMECheckSignature.java Mon Jan 4 09:40:15 2016 @@ -24,7 +24,6 @@ package org.apache.james.transport.maile import java.io.IOException; import java.security.cert.X509Certificate; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import javax.mail.MessagingException;
Modified: james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMEDecrypt.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMEDecrypt.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMEDecrypt.java (original) +++ james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/mailet/SMIMEDecrypt.java Mon Jan 4 09:40:15 2016 @@ -113,6 +113,7 @@ public class SMIMEDecrypt extends Generi if (message.isMimeType("application/x-pkcs7-mime") || message.isMimeType("application/pkcs7-mime")) { try { SMIMEEnveloped env = new SMIMEEnveloped(message); + @SuppressWarnings("unchecked") Collection<RecipientInformation> recipients = env.getRecipientInfos().getRecipients(); Iterator<RecipientInformation> iter = recipients.iterator(); while (iter.hasNext()) { Modified: james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java (original) +++ james/project/trunk/mailet/crypto/src/main/java/org/apache/james/transport/matcher/IsX509CertificateSubject.java Mon Jan 4 09:40:15 2016 @@ -25,14 +25,13 @@ import java.security.Principal; import java.security.cert.X509Certificate; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import javax.mail.MessagingException; -import org.apache.mailet.base.GenericMatcher; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.apache.mailet.base.GenericMatcher; /** * <p> @@ -63,6 +62,7 @@ public class IsX509CertificateSubject ex check = condition.substring(pos+1, condition.length()); } + @SuppressWarnings("unchecked") public Collection<MailAddress> match(Mail mail) throws MessagingException { List<X509Certificate> certificates; Modified: james/project/trunk/mailet/mailetdocs-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/mailetdocs-maven-plugin/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/mailetdocs-maven-plugin/pom.xml (original) +++ james/project/trunk/mailet/mailetdocs-maven-plugin/pom.xml Mon Jan 4 09:40:15 2016 @@ -28,7 +28,6 @@ </parent> <artifactId>mailetdocs-maven-plugin</artifactId> - <version>2.5.1-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Apache James :: Mailetdocs Maven Plugin</name> Modified: james/project/trunk/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java (original) +++ james/project/trunk/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java Mon Jan 4 09:40:15 2016 @@ -249,6 +249,7 @@ public class DefaultDescriptorsExtractor } + @SuppressWarnings("unchecked") private JavaClass[] javaClasses(MavenProject project) { JavaDocBuilder builder = new JavaDocBuilder(); for (String s : (Iterable<String>) project.getCompileSourceRoots()) { Modified: james/project/trunk/mailet/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/pom.xml (original) +++ james/project/trunk/mailet/pom.xml Mon Jan 4 09:40:15 2016 @@ -27,7 +27,6 @@ <version>1.8.3-SNAPSHOT</version> </parent> - <groupId>org.apache.james</groupId> <artifactId>apache-mailet</artifactId> <version>2.5.1-SNAPSHOT</version> <packaging>pom</packaging> Modified: james/project/trunk/mailet/standard/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/standard/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/standard/pom.xml (original) +++ james/project/trunk/mailet/standard/pom.xml Mon Jan 4 09:40:15 2016 @@ -28,7 +28,6 @@ </parent> <artifactId>apache-mailet-standard</artifactId> - <version>2.5.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>Apache James :: Standard Mailets</name> Modified: james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java (original) +++ james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClassifyBounce.java Mon Jan 4 09:40:15 2016 @@ -69,7 +69,7 @@ public class ClassifyBounce extends Gene public void service(Mail mail) { try { MimeMessage message = mail.getMessage(); - Classifier classifier = this.new Classifier(message); + Classifier classifier = new Classifier(message); String classification = classifier.getClassification(); //if ( !classification.equals("Normal") ) { message.setHeader(headerName, classification); @@ -89,7 +89,7 @@ public class ClassifyBounce extends Gene return "SetMimeHeader Mailet"; } - private class Classifier { + private static class Classifier { public Classifier(Message message) throws MessagingException { subject = message.getSubject(); @@ -377,11 +377,9 @@ public class ClassifyBounce extends Gene private String text; public final static int TYPE_NORMAL = 1; - public final static int TYPE_SPAM = 2; // should be trapped elsewhere public final static int TYPE_OUT_OF_OFFICE = 3; public final static int TYPE_DELIVERY_FAILURE = 4; public final static int TYPE_MAILBOX_FULL = 5; - public final static int TYPE_OUTBOUND = 6; } Modified: james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java (original) +++ james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java Mon Jan 4 09:40:15 2016 @@ -22,6 +22,7 @@ package org.apache.james.transport.mailets; import java.util.Enumeration; + import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; @@ -29,7 +30,6 @@ import org.apache.mailet.base.GenericMai import org.apache.mailet.Mail; import java.io.InputStream; -import java.lang.StringBuffer; /** * Logs Message Headers and/or Body. @@ -105,7 +105,8 @@ public class LogMessage extends GenericM * @param message */ private String getMessageHeaders(MimeMessage message) throws MessagingException { - Enumeration heads = message.getAllHeaderLines(); + @SuppressWarnings("unchecked") + Enumeration<String> heads = message.getAllHeaderLines(); StringBuilder headBuffer = new StringBuilder(1024).append("\n"); while(heads.hasMoreElements()) { headBuffer.append(heads.nextElement().toString()).append("\n"); Modified: james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java (original) +++ james/project/trunk/mailet/standard/src/main/java/org/apache/james/transport/matchers/RelayLimit.java Mon Jan 4 09:40:15 2016 @@ -29,6 +29,7 @@ import org.apache.mailet.MailAddress; import javax.mail.Header; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; + import java.util.Collection; import java.util.Enumeration; @@ -51,7 +52,7 @@ public class RelayLimit extends GenericM public Collection<MailAddress> match(Mail mail) throws javax.mail.MessagingException { MimeMessage mm = mail.getMessage(); int count = 0; - for (Enumeration<Header> e = mm.getAllHeaders(); e.hasMoreElements();) { + for (@SuppressWarnings("unchecked") Enumeration<Header> e = mm.getAllHeaders(); e.hasMoreElements();) { Header hdr = e.nextElement(); if (hdr.getName().equals(RFC2822Headers.RECEIVED)) { count++; Modified: james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java (original) +++ james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java Mon Jan 4 09:40:15 2016 @@ -85,7 +85,7 @@ public abstract class AbstractSenderIsTe return r; } - public void setRecipients(Collection recipients) { + public void setRecipients(Collection<MailAddress> recipients) { throw new UnsupportedOperationException( "Unimplemented mock service"); } Modified: james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java (original) +++ james/project/trunk/mailet/standard/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java Mon Jan 4 09:40:15 2016 @@ -35,7 +35,6 @@ import org.junit.Test; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -151,13 +150,13 @@ public class HostIsLocalTest { "Unimplemented mock service"); } - public void sendMail(MailAddress sender, Collection recipients, + public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg) throws MessagingException { throw new UnsupportedOperationException( "Unimplemented mock service"); } - public void sendMail(MailAddress sender, Collection recipients, + public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage msg, String state) throws MessagingException { throw new UnsupportedOperationException( "Unimplemented mock service"); @@ -178,12 +177,6 @@ public class HostIsLocalTest { "Unimplemented mock service"); } - public void storeMail(MailAddress arg0, MailAddress arg1, - MimeMessage arg2) throws MessagingException { - // TODO Auto-generated method stub - - } - public void log(LogLevel level, String message) { throw new UnsupportedOperationException( "Unimplemented mock service"); Modified: james/project/trunk/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java (original) +++ james/project/trunk/mpt/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java Mon Jan 4 09:40:15 2016 @@ -201,8 +201,7 @@ public class MailProtocolTestTask extend throw new BuildException("Scripts can be specified either by the script attribute or as resource collections but not both."); } - for(final Iterator it=users.iterator();it.hasNext();) { - final AddUser user = (AddUser) it.next(); + for(AddUser user: users) { user.validate(); } @@ -229,8 +228,7 @@ public class MailProtocolTestTask extend } private void doExecute() throws BuildException { - for (final Iterator it=users.iterator();it.hasNext();) { - final AddUser userAdder = (AddUser) it.next(); + for (AddUser userAdder: users) { userAdder.execute(); } @@ -242,7 +240,7 @@ public class MailProtocolTestTask extend scripts.add(new FileResource(script)); } - for (final Iterator it=scripts.iterator();it.hasNext();) { + for (final Iterator<?> it = scripts.iterator(); it.hasNext();) { final Resource resource = (Resource) it.next(); try { final Runner runner = new Runner(); Modified: james/project/trunk/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java (original) +++ james/project/trunk/mpt/app/src/main/java/org/apache/james/mpt/app/Main.java Mon Jan 4 09:40:15 2016 @@ -89,7 +89,6 @@ public class Main { } } - @SuppressWarnings("static-access") private static Options buildOptions() { final Options options = new Options(); Modified: james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java (original) +++ james/project/trunk/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java Mon Jan 4 09:40:15 2016 @@ -27,7 +27,6 @@ import java.nio.channels.ServerSocketCha import java.nio.channels.SocketChannel; import java.nio.charset.Charset; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedList; import java.util.Queue; @@ -109,8 +108,7 @@ public class DiscardProtocol { synchronized (queue) { stop(); - for (Iterator it=queue.iterator();it.hasNext();) { - final Server server = (Server) it.next(); + for (Server server: queue) { server.abort(); } queue.clear(); @@ -134,8 +132,7 @@ public class DiscardProtocol { LOG.warn("Failed to close socket", e); } socket = null; - for (Iterator it = runningServers.iterator(); it.hasNext();) { - final Server server = (Server) it.next(); + for (Server server: runningServers) { server.abort(); } } @@ -214,10 +211,6 @@ public class DiscardProtocol { } - public SocketChannel getSocketChannel() { - return socketChannel; - } - public void setSocketChannel(SocketChannel socketChannel) { this.socketChannel = socketChannel; } Modified: james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/host/ElasticSearchHostSystem.java Mon Jan 4 09:40:15 2016 @@ -122,7 +122,11 @@ public class ElasticSearchHostSystem ext throw Throwables.propagate(e); } - final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new StoreSubscriptionManager(factory), new NoQuotaManager(), new DefaultQuotaRootResolver(factory)); + final ImapProcessor defaultImapProcessorFactory = + DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, + new StoreSubscriptionManager(factory), + new NoQuotaManager(), + new DefaultQuotaRootResolver(factory)); configure(new DefaultImapDecoderFactory().buildImapDecoder(), new DefaultImapEncoderFactory().buildImapEncoder(), defaultImapProcessorFactory); Modified: james/project/trunk/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java Mon Jan 4 09:40:15 2016 @@ -103,7 +103,12 @@ public class HBaseHostSystem extends Jam SubscriptionManager subscriptionManager = new StoreSubscriptionManager(mapperFactory); - final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, subscriptionManager, new NoQuotaManager(), new DefaultQuotaRootResolver(mapperFactory)); + final ImapProcessor defaultImapProcessorFactory = + DefaultImapProcessorFactory.createDefaultProcessor( + mailboxManager, + subscriptionManager, + new NoQuotaManager(), + new DefaultQuotaRootResolver(mapperFactory)); resetUserMetaData(); Modified: james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTestModule.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTestModule.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTestModule.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTestModule.java Mon Jan 4 09:40:15 2016 @@ -18,13 +18,13 @@ ****************************************************************/ package org.apache.james.mpt.imapmailbox.inmemory; -import com.google.inject.AbstractModule; -import com.google.inject.Provides; -import com.google.inject.Singleton; import org.apache.james.mpt.api.HostSystem; import org.apache.james.mpt.api.ImapHostSystem; import org.apache.james.mpt.imapmailbox.inmemory.host.InMemoryEventAsynchronousHostSystem; -import org.apache.james.mpt.imapmailbox.inmemory.host.InMemoryHostSystem; + +import com.google.inject.AbstractModule; +import com.google.inject.Provides; +import com.google.inject.Singleton; public class InMemoryMailboxEventAsynchronousTestModule extends AbstractModule { Modified: james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryEventAsynchronousHostSystem.java Mon Jan 4 09:40:15 2016 @@ -87,7 +87,7 @@ public class InMemoryEventAsynchronousHo perUserMaxQuotaManager.setDefaultMaxStorage(5L * 1024L * 1024L * 1024L); InMemoryCurrentQuotaManager currentQuotaManager = new InMemoryCurrentQuotaManager( - new CurrentQuotaCalculator(factory, quotaRootResolver), + new CurrentQuotaCalculator<InMemoryId>(factory, quotaRootResolver), mailboxManager); StoreQuotaManager quotaManager = new StoreQuotaManager(); Modified: james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java Mon Jan 4 09:40:15 2016 @@ -85,7 +85,7 @@ public class InMemoryHostSystem extends perUserMaxQuotaManager.setDefaultMaxStorage(5L * 1024L * 1024L * 1024L); InMemoryCurrentQuotaManager currentQuotaManager = new InMemoryCurrentQuotaManager( - new CurrentQuotaCalculator(factory, quotaRootResolver), + new CurrentQuotaCalculator<InMemoryId>(factory, quotaRootResolver), mailboxManager); StoreQuotaManager quotaManager = new StoreQuotaManager(); Modified: james/project/trunk/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java Mon Jan 4 09:40:15 2016 @@ -94,7 +94,11 @@ public class JCRHostSystem extends James mailboxManager = new JCRMailboxManager(mf, userManager, locker, aclResolver, groupMembershipResolver); mailboxManager.init(); - final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new JCRSubscriptionManager(mf), new NoQuotaManager(), new DefaultQuotaRootResolver(mf)); + final ImapProcessor defaultImapProcessorFactory = + DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, + new JCRSubscriptionManager(mf), + new NoQuotaManager(), + new DefaultQuotaRootResolver(mf)); resetUserMetaData(); MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("TestLog")); mailboxManager.startProcessingRequest(session); Modified: james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java Mon Jan 4 09:40:15 2016 @@ -20,7 +20,6 @@ package org.apache.james.mpt.imapmailbox import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; import org.apache.onami.test.annotation.GuiceModules; -import org.junit.Ignore; @GuiceModules({ JpaMailboxTestModule.class }) public class JpaMailboxTest extends AbstractMailboxTest { Modified: james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java Mon Jan 4 09:40:15 2016 @@ -127,7 +127,12 @@ public class JPAHostSystem extends James SubscriptionManager subscriptionManager = new JPASubscriptionManager(mf); - final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, subscriptionManager, new NoQuotaManager(), new DefaultQuotaRootResolver(mf)); + final ImapProcessor defaultImapProcessorFactory = + DefaultImapProcessorFactory.createDefaultProcessor( + mailboxManager, + subscriptionManager, + new NoQuotaManager(), + new DefaultQuotaRootResolver(mf)); resetUserMetaData(); Modified: james/project/trunk/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java (original) +++ james/project/trunk/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java Mon Jan 4 09:40:15 2016 @@ -72,7 +72,12 @@ public class MaildirHostSystem extends J mailboxManager = new StoreMailboxManager<MaildirId>(mailboxSessionMapperFactory, userManager, locker, aclResolver, groupMembershipResolver); mailboxManager.init(); - final ImapProcessor defaultImapProcessorFactory = DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, sm, new NoQuotaManager(), new DefaultQuotaRootResolver(mailboxSessionMapperFactory)); + final ImapProcessor defaultImapProcessorFactory = + DefaultImapProcessorFactory.createDefaultProcessor( + mailboxManager, + sm, + new NoQuotaManager(), + new DefaultQuotaRootResolver(mailboxSessionMapperFactory)); configure(new DefaultImapDecoderFactory().buildImapDecoder(), new DefaultImapEncoderFactory().buildImapEncoder(), defaultImapProcessorFactory); Modified: james/project/trunk/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java (original) +++ james/project/trunk/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/host/FileHostSystem.java Mon Jan 4 09:40:15 2016 @@ -1,19 +1,18 @@ package org.apache.james.mpt.managesieve.file.host; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + import org.apache.commons.io.FileUtils; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.mpt.host.JamesManageSieveHostSystem; import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.sieverepository.file.SieveFileRepository; -import org.apache.james.user.api.UsersRepository; import org.apache.james.user.memory.MemoryUsersRepository; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; - public class FileHostSystem extends JamesManageSieveHostSystem { private static final String SIEVE_ROOT = FileSystem.FILE_PROTOCOL + "sieve"; Modified: james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java (original) +++ james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java Mon Jan 4 09:40:15 2016 @@ -398,6 +398,11 @@ public abstract class ImapRequestLineRea // ignore on close } } + try { + out.close(); + } catch (IOException e) { + // ignore on close + } } } Modified: james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java (original) +++ james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java Mon Jan 4 09:40:15 2016 @@ -28,7 +28,6 @@ import org.apache.james.imap.decode.Dele import org.apache.james.imap.decode.ImapCommandParser; import org.apache.james.imap.decode.ImapCommandParserFactory; import org.apache.james.imap.decode.MessagingImapCommandParser; -import org.apache.james.imap.processor.GetQuotaRootProcessor; /** * A factory for ImapCommand instances, provided based on the command name. Modified: james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java (original) +++ james/project/trunk/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java Mon Jan 4 09:40:15 2016 @@ -228,8 +228,6 @@ public class StoreProcessor extends Abst final boolean isSignedPlus = request.isSignedPlus(); final boolean isSignedMinus = request.isSignedMinus(); final long unchangedSince = request.getUnchangedSince(); - final boolean replace; - final boolean value; final MessageManager.FlagsUpdateMode mode; if (isSignedMinus) { mode = MessageManager.FlagsUpdateMode.REMOVE; Modified: james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java (original) +++ james/project/trunk/protocols/imap/src/test/java/org/apache/james/imap/processor/DeleteACLProcessorTest.java Mon Jan 4 09:40:15 2016 @@ -40,7 +40,6 @@ import org.apache.james.mailbox.exceptio import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxACL.EditMode; import org.apache.james.mailbox.model.MailboxACL.MailboxACLEntryKey; -import org.apache.james.mailbox.model.MailboxACL.MailboxACLRights; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SimpleMailboxACL; import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights; Modified: james/project/trunk/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java (original) +++ james/project/trunk/protocols/imap/src/test/java/org/apache/james/protocols/imap/utils/DecoderUtilsTest.java Mon Jan 4 09:40:15 2016 @@ -19,10 +19,12 @@ package org.apache.james.protocols.imap.utils; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -32,7 +34,6 @@ import javax.mail.Flags; import org.apache.commons.lang.time.FastDateFormat; import org.apache.james.protocols.imap.DecodingException; -import org.apache.james.protocols.imap.utils.DecoderUtils; import org.junit.Test; public class DecoderUtilsTest { Modified: james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java (original) +++ james/project/trunk/protocols/managesieve/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java Mon Jan 4 09:40:15 2016 @@ -20,11 +20,7 @@ package org.apache.james.managesieve.api.commands; -import org.apache.james.managesieve.api.AuthenticationRequiredException; import org.apache.james.managesieve.api.Session; -import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; -import org.apache.james.sieverepository.api.exception.StorageException; -import org.apache.james.sieverepository.api.exception.UserNotFoundException; /** * @see <a href=http://tools.ietf.org/html/rfc5804#section-2.8>RFC 5804 SETACTIVE Command</a> Modified: james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java (original) +++ james/project/trunk/protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/TopCmdHandler.java Mon Jan 4 09:40:15 2016 @@ -93,12 +93,7 @@ public class TopCmdHandler extends RetrC if (deletedUidList.contains(uid) == false) { InputStream message = new CountingBodyInputStream(new ExtraDotInputStream(new CRLFTerminatedInputStream(session.getUserMailbox().getMessage(uid))), lines); - if (message != null) { - return new POP3StreamResponse(POP3Response.OK_RESPONSE, "Message follows", message); - } else { - StringBuilder exceptionBuffer = new StringBuilder(64).append("Message (").append(num).append(") does not exist."); - return new POP3Response(POP3Response.ERR_RESPONSE, exceptionBuffer.toString()); - } + return new POP3StreamResponse(POP3Response.OK_RESPONSE, "Message follows", message); } else { StringBuilder responseBuffer = new StringBuilder(64).append("Message (").append(num).append(") already deleted."); Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java (original) +++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraDomainListModule.java Mon Jan 4 09:40:15 2016 @@ -21,7 +21,6 @@ package org.apache.james.modules.data; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.cassandra.CassandraDomainList; -import org.apache.james.modules.protocols.IMAPServerModule; import org.apache.james.utils.ConfigurationPerformer; import org.apache.james.utils.ConfigurationProvider; import org.slf4j.Logger; @@ -29,7 +28,6 @@ import org.slf4j.LoggerFactory; import com.google.inject.AbstractModule; import com.google.inject.Inject; -import com.google.inject.Scope; import com.google.inject.Scopes; import com.google.inject.Singleton; import com.google.inject.multibindings.Multibinder; Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java (original) +++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java Mon Jan 4 09:40:15 2016 @@ -39,6 +39,7 @@ import org.apache.james.mailbox.store.ma import org.apache.james.mailbox.store.mail.MessageMapperFactory; import org.apache.james.mailbox.store.mail.ModSeqProvider; import org.apache.james.mailbox.store.mail.UidProvider; +import org.apache.james.mailbox.store.mail.model.MailboxId; import com.google.inject.AbstractModule; import com.google.inject.Provides; @@ -55,6 +56,7 @@ public class CassandraMailboxModule exte bind(new TypeLiteral<MessageMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class); bind(new TypeLiteral<MailboxMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class); bind(new TypeLiteral<MailboxSessionMapperFactory<CassandraId>>(){}).to(CassandraMailboxSessionMapperFactory.class); + bind(new TypeLiteral<MailboxSessionMapperFactory<? extends MailboxId>>(){}).to(CassandraMailboxSessionMapperFactory.class); bind(new TypeLiteral<ModSeqProvider<CassandraId>>(){}).to(new TypeLiteral<CassandraModSeqProvider>(){}); bind(new TypeLiteral<UidProvider<CassandraId>>(){}).to(new TypeLiteral<CassandraUidProvider>(){}); Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/QuotaModule.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/QuotaModule.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/QuotaModule.java (original) +++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/modules/server/QuotaModule.java Mon Jan 4 09:40:15 2016 @@ -25,13 +25,14 @@ import org.apache.james.mailbox.store.qu import org.apache.james.mailbox.store.quota.NoQuotaManager; import com.google.inject.AbstractModule; +import com.google.inject.Scopes; public class QuotaModule extends AbstractModule { @Override protected void configure() { bind(QuotaManager.class).to(NoQuotaManager.class); - bind(QuotaRootResolver.class).to(DefaultQuotaRootResolver.class); + bind(QuotaRootResolver.class).to(DefaultQuotaRootResolver.class).in(Scopes.SINGLETON);; } } Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceGenericLoader.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceGenericLoader.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceGenericLoader.java (original) +++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceGenericLoader.java Mon Jan 4 09:40:15 2016 @@ -32,6 +32,7 @@ public class GuiceGenericLoader<T> { } public T instanciate(String className) throws Exception { + @SuppressWarnings("unchecked") Class<T> clazz = (Class<T>) ClassLoader.getSystemClassLoader().loadClass(constructFullName(className)); return injector.getInstance(clazz); } Modified: james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java (original) +++ james/project/trunk/server/container/cassandra-guice/src/main/java/org/apache/james/utils/GuiceProtocolHandlerLoader.java Mon Jan 4 09:40:15 2016 @@ -49,6 +49,7 @@ public class GuiceProtocolHandlerLoader private ProtocolHandler createProtocolHandler(String name) throws LoadingException { try { + @SuppressWarnings("unchecked") Class<ProtocolHandler> clazz = (Class<ProtocolHandler>) ClassLoader.getSystemClassLoader().loadClass(name); return injector.getInstance(clazz); } catch (ClassNotFoundException e) { Modified: james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java (original) +++ james/project/trunk/server/container/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java Mon Jan 4 09:40:15 2016 @@ -18,17 +18,15 @@ ****************************************************************/ package org.apache.james.cli.probe; -import org.apache.james.adapter.mailbox.SerializableQuota; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.model.Quota; -import org.apache.james.mailbox.model.QuotaRoot; - import java.io.Closeable; import java.util.Collection; import java.util.Map; import org.apache.james.rrt.lib.Mappings; +import org.apache.james.adapter.mailbox.SerializableQuota; +import org.apache.james.mailbox.exception.MailboxException; + public interface ServerProbe extends Closeable { /** * Add a user to this mail server. Modified: james/project/trunk/server/container/core/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/pom.xml (original) +++ james/project/trunk/server/container/core/pom.xml Mon Jan 4 09:40:15 2016 @@ -28,7 +28,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-core</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailHeaders.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailHeaders.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailHeaders.java (original) +++ james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailHeaders.java Mon Jan 4 09:40:15 2016 @@ -76,6 +76,7 @@ public class MailHeaders extends Interne * @param out * the OutputStream to which to write the headers */ + @SuppressWarnings("unchecked") public void writeTo(OutputStream out) throws MessagingException { MimeMessageUtil.writeHeadersTo(getAllHeaderLines(), out); } @@ -109,6 +110,7 @@ public class MailHeaders extends Interne * @see javax.mail.internet.InternetHeaders#addHeader(java.lang.String, * java.lang.String) */ + @SuppressWarnings("unchecked") public synchronized void addHeader(String arg0, String arg1) { if (RFC2822Headers.RETURN_PATH.equalsIgnoreCase(arg0)) { headers.add(0, new InternetHeader(arg0, arg1)); Modified: james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailImpl.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailImpl.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailImpl.java (original) +++ james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MailImpl.java Mon Jan 4 09:40:15 2016 @@ -27,6 +27,7 @@ import org.apache.mailet.MailAddress; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import javax.mail.internet.ParseException; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -88,7 +89,7 @@ public class MailImpl implements Disposa /** * The collection of recipients to whom this mail was sent. */ - private Collection recipients; + private Collection<MailAddress> recipients; /** * The identifier for this mail message */ @@ -126,7 +127,7 @@ public class MailImpl implements Disposa * @param sender the sender for this MailImpl * @param recipients the collection of recipients of this MailImpl */ - public MailImpl(String name, MailAddress sender, Collection recipients) { + public MailImpl(String name, MailAddress sender, Collection<MailAddress> recipients) { this(); this.name = name; this.sender = sender; @@ -134,7 +135,7 @@ public class MailImpl implements Disposa // Copy the recipient list if (recipients != null) { - this.recipients = new ArrayList(); + this.recipients = new ArrayList<MailAddress>(); this.recipients.addAll(recipients); } } @@ -154,6 +155,7 @@ public class MailImpl implements Disposa * @param newName * @throws MessagingException */ + @SuppressWarnings("unchecked") public MailImpl(Mail mail, String newName) throws MessagingException { this(newName, mail.getSender(), mail.getRecipients(), mail.getMessage()); setRemoteHost(mail.getRemoteHost()); @@ -161,11 +163,11 @@ public class MailImpl implements Disposa setLastUpdated(mail.getLastUpdated()); try { if (mail instanceof MailImpl) { - setAttributesRaw((HashMap) cloneSerializableObject(((MailImpl) mail).getAttributesRaw())); + setAttributesRaw((HashMap<String, Object>) cloneSerializableObject(((MailImpl) mail).getAttributesRaw())); } else { HashMap<String, Object> attribs = new HashMap<String, Object>(); - for (Iterator i = mail.getAttributeNames(); i.hasNext(); ) { - String hashKey = (String) i.next(); + for (Iterator<String> i = mail.getAttributeNames(); i.hasNext(); ) { + String hashKey = i.next(); attribs.put(hashKey, cloneSerializableObject(mail.getAttribute(hashKey))); } setAttributesRaw(attribs); @@ -188,7 +190,7 @@ public class MailImpl implements Disposa * @param recipients the collection of recipients of this MailImpl * @param messageIn a stream containing the message source */ - public MailImpl(String name, MailAddress sender, Collection recipients, InputStream messageIn) throws MessagingException { + public MailImpl(String name, MailAddress sender, Collection<MailAddress> recipients, InputStream messageIn) throws MessagingException { this(name, sender, recipients); MimeMessageSource source = new MimeMessageInputStreamSource(name, messageIn); // if MimeMessageCopyOnWriteProxy throws an error in the constructor we @@ -210,7 +212,7 @@ public class MailImpl implements Disposa * @param recipients the collection of recipients of this MailImpl * @param message the MimeMessage associated with this MailImpl */ - public MailImpl(String name, MailAddress sender, Collection recipients, MimeMessage message) { + public MailImpl(String name, MailAddress sender, Collection<MailAddress> recipients, MimeMessage message) { this(name, sender, recipients); this.setMessage(new MimeMessageCopyOnWriteProxy(message)); } @@ -286,7 +288,7 @@ public class MailImpl implements Disposa * @return the recipients of this MailImpl */ @Override - public Collection getRecipients() { + public Collection<MailAddress> getRecipients() { return recipients; } @@ -398,7 +400,7 @@ public class MailImpl implements Disposa * @param recipients the recipients for this MailImpl */ @Override - public void setRecipients(Collection recipients) { + public void setRecipients(Collection<MailAddress> recipients) { this.recipients = recipients; } @@ -479,6 +481,7 @@ public class MailImpl implements Disposa * @throws ClassNotFoundException ? * @throws ClassCastException if the serialized objects are not of the appropriate type */ + @SuppressWarnings("unchecked") private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { try { Object obj = in.readObject(); @@ -492,7 +495,7 @@ public class MailImpl implements Disposa } catch (ParseException pe) { throw new IOException("Error parsing sender address: " + pe.getMessage()); } - recipients = (Collection) in.readObject(); + recipients = (Collection<MailAddress>) in.readObject(); state = (String) in.readObject(); errorMessage = (String) in.readObject(); name = (String) in.readObject(); @@ -502,7 +505,7 @@ public class MailImpl implements Disposa // the following is under try/catch to be backwards compatible // with messages created with James version <= 2.2.0a8 try { - attributes = (HashMap) in.readObject(); + attributes = (HashMap<String, Object>) in.readObject(); } catch (OptionalDataException ode) { if (ode.eof) { attributes = new HashMap<String, Object>(); @@ -591,7 +594,7 @@ public class MailImpl implements Disposa } @Override - public Iterator getAttributeNames() { + public Iterator<String> getAttributeNames() { return attributes.keySet().iterator(); } Modified: james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java (original) +++ james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java Mon Jan 4 09:40:15 2016 @@ -298,33 +298,39 @@ public class MimeMessageCopyOnWriteProxy return getWrappedMessage().getHeader(name, delimiter); } + @SuppressWarnings("unchecked") @Override - public Enumeration getAllHeaders() throws MessagingException { + public Enumeration<String> getAllHeaders() throws MessagingException { return getWrappedMessage().getAllHeaders(); } + @SuppressWarnings("unchecked") @Override - public Enumeration getMatchingHeaders(String[] names) throws MessagingException { + public Enumeration<String> getMatchingHeaders(String[] names) throws MessagingException { return getWrappedMessage().getMatchingHeaders(names); } + @SuppressWarnings("unchecked") @Override - public Enumeration getNonMatchingHeaders(String[] names) throws MessagingException { + public Enumeration<String> getNonMatchingHeaders(String[] names) throws MessagingException { return getWrappedMessage().getNonMatchingHeaders(names); } + @SuppressWarnings("unchecked") @Override - public Enumeration getAllHeaderLines() throws MessagingException { + public Enumeration<String> getAllHeaderLines() throws MessagingException { return getWrappedMessage().getAllHeaderLines(); } + @SuppressWarnings("unchecked") @Override - public Enumeration getMatchingHeaderLines(String[] names) throws MessagingException { + public Enumeration<String> getMatchingHeaderLines(String[] names) throws MessagingException { return getWrappedMessage().getMatchingHeaderLines(names); } + @SuppressWarnings("unchecked") @Override - public Enumeration getNonMatchingHeaderLines(String[] names) throws MessagingException { + public Enumeration<String> getNonMatchingHeaderLines(String[] names) throws MessagingException { return getWrappedMessage().getNonMatchingHeaderLines(names); } Modified: james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java (original) +++ james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageUtil.java Mon Jan 4 09:40:15 2016 @@ -199,7 +199,8 @@ public class MimeMessageUtil { */ private static void writeHeadersTo(MimeMessage message, OutputStream headerOs, String[] ignoreList) throws MessagingException { // Write the headers (minus ignored ones) - Enumeration headers = message.getNonMatchingHeaderLines(ignoreList); + @SuppressWarnings("unchecked") + Enumeration<String> headers = message.getNonMatchingHeaderLines(ignoreList); writeHeadersTo(headers, headerOs); } @@ -212,8 +213,7 @@ public class MimeMessageUtil { * the OutputStream to which the headers get written * @throws MessagingException */ - @SuppressWarnings("unchecked") - public static void writeHeadersTo(Enumeration headers, OutputStream headerOs) throws MessagingException { + public static void writeHeadersTo(Enumeration<String> headers, OutputStream headerOs) throws MessagingException { try { IOUtils.copy(new InternetHeadersInputStream(headers), headerOs); } catch (IOException e) { @@ -302,7 +302,7 @@ public class MimeMessageUtil { // messages each time). size = message.getSize(); if (size != -1) { - Enumeration e = message.getAllHeaderLines(); + Enumeration<?> e = message.getAllHeaderLines(); if (e.hasMoreElements()) { size += 2; } Modified: james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java (original) +++ james/project/trunk/server/container/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java Mon Jan 4 09:40:15 2016 @@ -314,7 +314,9 @@ public class MimeMessageWrapper extends saveChanges(); myHeaders = headers; } - IOUtils.copy(new InternetHeadersInputStream(myHeaders.getNonMatchingHeaderLines(ignoreList)), headerOs); + @SuppressWarnings("unchecked") + Enumeration<String> filteredHeaders = myHeaders.getNonMatchingHeaderLines(ignoreList); + IOUtils.copy(new InternetHeadersInputStream(filteredHeaders), headerOs); IOUtils.copy(in, bodyOs); } finally { IOUtils.closeQuietly(in); @@ -330,7 +332,9 @@ public class MimeMessageWrapper extends if (headers == null) { loadHeaders(); } - IOUtils.copy(new InternetHeadersInputStream(headers.getNonMatchingHeaderLines(ignoreList)), headerOs); + @SuppressWarnings("unchecked") + Enumeration<String> filteredHeaders = headers.getNonMatchingHeaderLines(ignoreList); + IOUtils.copy(new InternetHeadersInputStream(filteredHeaders), headerOs); if (preLoad && !messageParsed) { loadMessage(); @@ -446,48 +450,54 @@ public class MimeMessageWrapper extends return headers.getHeader(name, delimiter); } + @SuppressWarnings("unchecked") @Override - public Enumeration getAllHeaders() throws MessagingException { + public Enumeration<String> getAllHeaders() throws MessagingException { if (headers == null) { loadHeaders(); } return headers.getAllHeaders(); } + @SuppressWarnings("unchecked") @Override - public Enumeration getMatchingHeaders(String[] names) throws MessagingException { + public Enumeration<String> getMatchingHeaders(String[] names) throws MessagingException { if (headers == null) { loadHeaders(); } return headers.getMatchingHeaders(names); } + @SuppressWarnings("unchecked") @Override - public Enumeration getNonMatchingHeaders(String[] names) throws MessagingException { + public Enumeration<String> getNonMatchingHeaders(String[] names) throws MessagingException { if (headers == null) { loadHeaders(); } return headers.getNonMatchingHeaders(names); } + @SuppressWarnings("unchecked") @Override - public Enumeration getAllHeaderLines() throws MessagingException { + public Enumeration<String> getAllHeaderLines() throws MessagingException { if (headers == null) { loadHeaders(); } return headers.getAllHeaderLines(); } + @SuppressWarnings("unchecked") @Override - public Enumeration getMatchingHeaderLines(String[] names) throws MessagingException { + public Enumeration<String> getMatchingHeaderLines(String[] names) throws MessagingException { if (headers == null) { loadHeaders(); } return headers.getMatchingHeaderLines(names); } + @SuppressWarnings("unchecked") @Override - public Enumeration getNonMatchingHeaderLines(String[] names) throws MessagingException { + public Enumeration<String> getNonMatchingHeaderLines(String[] names) throws MessagingException { if (headers == null) { loadHeaders(); } @@ -655,7 +665,6 @@ public class MimeMessageWrapper extends * @throws MessagingException */ - @SuppressWarnings("unchecked") public synchronized InputStream getMessageInputStream() throws MessagingException { if (!messageParsed && !isModified() && source != null) { try { Modified: james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailHeadersTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailHeadersTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailHeadersTest.java (original) +++ james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailHeadersTest.java Mon Jan 4 09:40:15 2016 @@ -33,7 +33,8 @@ public class MailHeadersTest { getBytes())); header.setHeader(RFC2822Headers.RETURN_PATH, "<test@test>"); header.setHeader(RFC2822Headers.FROM, "<te...@test.de>"); - Enumeration h = header.getAllHeaderLines(); + @SuppressWarnings("unchecked") + Enumeration<String> h = header.getAllHeaderLines(); assertEquals(h.nextElement(), "Return-Path: <test@test>"); assertEquals(h.nextElement(), "From: <te...@test.de>"); Modified: james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java (original) +++ james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MailImplTest.java Mon Jan 4 09:40:15 2016 @@ -48,7 +48,7 @@ public class MailImplTest extends MailTe @Test public void testConstr2() throws MessagingException { - ArrayList recepients = new ArrayList(); + ArrayList<MailAddress> recepients = new ArrayList<MailAddress>(); String name = MailUtil.newId(); String sender = "sender@localhost"; MailAddress senderMailAddress = new MailAddress(sender); @@ -66,7 +66,7 @@ public class MailImplTest extends MailTe @Test public void testConstr3() throws MessagingException { - ArrayList recepients = new ArrayList(); + ArrayList<MailAddress> recepients = new ArrayList<MailAddress>(); String name = MailUtil.newId(); String sender = "sender@localhost"; MailAddress senderMailAddress = new MailAddress(sender); Modified: james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java (original) +++ james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java Mon Jan 4 09:40:15 2016 @@ -52,7 +52,7 @@ public class MimeMessageCopyOnWriteProxy @Test public void testMessageCloning1() throws Exception { - ArrayList r = new ArrayList(); + ArrayList<MailAddress> r = new ArrayList<MailAddress>(); r.add(new MailAddress("recipi...@test.com")); MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources( content + sep + body); @@ -78,7 +78,7 @@ public class MimeMessageCopyOnWriteProxy @Test public void testMessageCloning2() throws Exception { - ArrayList r = new ArrayList(); + ArrayList<MailAddress> r = new ArrayList<MailAddress>(); r.add(new MailAddress("recipi...@test.com")); MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources( content + sep + body); @@ -128,7 +128,7 @@ public class MimeMessageCopyOnWriteProxy */ @Test public void testMessageAvoidCloning() throws Exception { - ArrayList r = new ArrayList(); + ArrayList<MailAddress> r = new ArrayList<MailAddress>(); r.add(new MailAddress("recipi...@test.com")); MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources( content + sep + body); @@ -164,7 +164,7 @@ public class MimeMessageCopyOnWriteProxy */ @Test public void testMessageCloning3() throws Exception { - ArrayList r = new ArrayList(); + ArrayList<MailAddress> r = new ArrayList<MailAddress>(); r.add(new MailAddress("recipi...@test.com")); MimeMessage m = new MimeMessage(Session.getDefaultInstance(new Properties(null))); m.setText("CIPS"); @@ -185,7 +185,7 @@ public class MimeMessageCopyOnWriteProxy @Test public void testMessageDisposing() throws Exception { - ArrayList r = new ArrayList(); + ArrayList<MailAddress> r = new ArrayList<MailAddress>(); r.add(new MailAddress("recipi...@test.com")); MimeMessageCopyOnWriteProxy messageFromSources = (MimeMessageCopyOnWriteProxy) getMessageFromSources( content + sep + body); @@ -207,7 +207,7 @@ public class MimeMessageCopyOnWriteProxy @Test public void testNPE1() throws MessagingException, InterruptedException { - ArrayList recipients = new ArrayList(); + ArrayList<MailAddress> recipients = new ArrayList<MailAddress>(); recipients.add(new MailAddress("recipi...@test.com")); MimeMessageCopyOnWriteProxy mw = new MimeMessageCopyOnWriteProxy(new MimeMessageInputStreamSource("test", new SharedByteArrayInputStream(("Return-path: ret...@test.com\r\n" + "Content-Transfer-Encoding: plain\r\n" + "Subject: test\r\n\r\n" + "Body Text testNPE1\r\n"). Modified: james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java (original) +++ james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java Mon Jan 4 09:40:15 2016 @@ -426,7 +426,8 @@ public class MimeMessageTest { public void testHeaderOrder() throws Exception { MimeMessage message = getSimpleMessage(); message.setHeader(RFC2822Headers.RETURN_PATH, "<t...@test.de>"); - Enumeration h = message.getAllHeaderLines(); + @SuppressWarnings("unchecked") + Enumeration<String> h = message.getAllHeaderLines(); assertEquals(h.nextElement(), "Return-Path: <t...@test.de>"); LifecycleUtil.dispose(message); Modified: james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java (original) +++ james/project/trunk/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java Mon Jan 4 09:40:15 2016 @@ -18,22 +18,24 @@ ****************************************************************/ package org.apache.james.core; -import org.apache.james.lifecycle.api.LifecycleUtil; -import org.apache.mailet.base.RFC2822Headers; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import javax.mail.util.SharedByteArrayInputStream; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.util.Enumeration; -import org.junit.After; -import static org.junit.Assert.*; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; +import javax.mail.util.SharedByteArrayInputStream; + +import org.apache.james.lifecycle.api.LifecycleUtil; +import org.apache.mailet.base.RFC2822Headers; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,26 +57,10 @@ public class MimeMessageWrapperTest exte return messageParsed; } - public MailHeaders getInnerHeaders() { - return (MailHeaders) headers; - } - - public boolean isHeadersLoadable() { - return headersLoadable; - } - public void setHeadersLoadable(boolean headersLoadable) { this.headersLoadable = headersLoadable; } - public boolean isMessageLoadable() { - return messageLoadable; - } - - public void setMessageLoadable(boolean messageLoadable) { - this.messageLoadable = messageLoadable; - } - @Override protected synchronized void loadHeaders() throws MessagingException { if (headersLoadable) { @@ -84,14 +70,6 @@ public class MimeMessageWrapperTest exte } } - protected synchronized MailHeaders loadHeaders(InputStream is) throws MessagingException { - if (headersLoadable) { - return (MailHeaders) super.createInternetHeaders(is); - } else { - throw new IllegalStateException("headersLoadable disabled"); - } - } - @Override public synchronized void loadMessage() throws MessagingException { if (messageLoadable) { @@ -229,10 +207,12 @@ public class MimeMessageWrapperTest exte public void testReplaceReturnPathOnBadMessage() throws Exception { MimeMessage message = getMessageWithBadReturnPath(); message.setHeader(RFC2822Headers.RETURN_PATH, "<t...@test.de>"); - Enumeration e = message.getMatchingHeaderLines(new String[]{"Return-Path"}); + @SuppressWarnings("unchecked") + Enumeration<String> e = message.getMatchingHeaderLines(new String[]{"Return-Path"}); assertEquals("Return-Path: <t...@test.de>", e.nextElement()); assertFalse(e.hasMoreElements()); - Enumeration h = message.getAllHeaderLines(); + @SuppressWarnings("unchecked") + Enumeration<String> h = message.getAllHeaderLines(); assertEquals("Return-Path: <t...@test.de>", h.nextElement()); assertFalse(h.nextElement().toString().startsWith("Return-Path:")); LifecycleUtil.dispose(message); @@ -243,11 +223,13 @@ public class MimeMessageWrapperTest exte MimeMessage message = getMessageWithBadReturnPath(); message.addHeader(RFC2822Headers.RETURN_PATH, "<t...@test.de>"); // test that we have now 2 return-paths - Enumeration e = message.getMatchingHeaderLines(new String[]{"Return-Path"}); + @SuppressWarnings("unchecked") + Enumeration<String> e = message.getMatchingHeaderLines(new String[]{"Return-Path"}); assertEquals("Return-Path: <t...@test.de>", e.nextElement()); assertEquals("Return-Path: <mybadret...@example.com>", e.nextElement()); // test that return-path is the first line - Enumeration h = message.getAllHeaderLines(); + @SuppressWarnings("unchecked") + Enumeration<String> h = message.getAllHeaderLines(); assertEquals("Return-Path: <t...@test.de>", h.nextElement()); LifecycleUtil.dispose(message); } Modified: james/project/trunk/server/container/lifecycle-api/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/lifecycle-api/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/lifecycle-api/pom.xml (original) +++ james/project/trunk/server/container/lifecycle-api/pom.xml Mon Jan 4 09:40:15 2016 @@ -28,7 +28,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-lifecycle-api</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/container/mailbox-adapter/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/mailbox-adapter/pom.xml (original) +++ james/project/trunk/server/container/mailbox-adapter/pom.xml Mon Jan 4 09:40:15 2016 @@ -90,7 +90,6 @@ <artifactId>apache-james-mailbox-store</artifactId> <type>test-jar</type> <scope>test</scope> - <version>${mailbox.version}</version> </dependency> </dependencies> Modified: james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagementMBean.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagementMBean.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagementMBean.java (original) +++ james/project/trunk/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/ReIndexerManagementMBean.java Mon Jan 4 09:40:15 2016 @@ -20,8 +20,6 @@ package org.apache.james.adapter.mailbox; import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.indexer.ReIndexer; -import org.apache.james.mailbox.model.MailboxPath; public interface ReIndexerManagementMBean { Modified: james/project/trunk/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java (original) +++ james/project/trunk/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/MailboxManagementTest.java Mon Jan 4 09:40:15 2016 @@ -85,6 +85,7 @@ public class MailboxManagementTest { assertThat(inMemoryMapperFactory.createMailboxMapper(session).list()).isEmpty(); } + @SuppressWarnings("unchecked") @Test public void deleteMailboxesShouldNotDeleteMailboxesBelongingToNotPrivateNamespace() throws Exception { Mailbox<InMemoryId> mailbox = new SimpleMailbox<InMemoryId>(new MailboxPath("#top", USER, "name"), UID_VALIDITY); @@ -93,6 +94,7 @@ public class MailboxManagementTest { assertThat(inMemoryMapperFactory.createMailboxMapper(session).list()).containsExactly(mailbox); } + @SuppressWarnings("unchecked") @Test public void deleteMailboxesShouldNotDeleteMailboxesBelongingToOtherUsers() throws Exception { Mailbox<InMemoryId> mailbox = new SimpleMailbox<InMemoryId>(new MailboxPath(MailboxConstants.USER_NAMESPACE, "userbis", "name"), UID_VALIDITY); @@ -134,6 +136,7 @@ public class MailboxManagementTest { assertThat(inMemoryMapperFactory.createMailboxMapper(session).findMailboxByPath(new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, "name"))).isNotNull(); } + @SuppressWarnings("unchecked") @Test public void createMailboxShouldNotThrowIfMailboxAlreadyExist() throws Exception { MailboxPath path = new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, "name"); @@ -207,6 +210,7 @@ public class MailboxManagementTest { assertThat(inMemoryMapperFactory.createMailboxMapper(session).list()).isEmpty(); } + @SuppressWarnings("unchecked") @Test public void deleteMailboxShouldNotDeleteGivenMailboxIfWrongNamespace() throws Exception { Mailbox<InMemoryId> mailbox = new SimpleMailbox<InMemoryId>(new MailboxPath("#top", USER, "name"), UID_VALIDITY); @@ -215,6 +219,7 @@ public class MailboxManagementTest { assertThat(inMemoryMapperFactory.createMailboxMapper(session).list()).containsOnly(mailbox); } + @SuppressWarnings("unchecked") @Test public void deleteMailboxShouldNotDeleteGivenMailboxIfWrongUser() throws Exception { Mailbox<InMemoryId> mailbox = new SimpleMailbox<InMemoryId>(new MailboxPath(MailboxConstants.USER_NAMESPACE, "userbis", "name"), UID_VALIDITY); @@ -223,6 +228,7 @@ public class MailboxManagementTest { assertThat(inMemoryMapperFactory.createMailboxMapper(session).list()).containsOnly(mailbox); } + @SuppressWarnings("unchecked") @Test public void deleteMailboxShouldNotDeleteGivenMailboxIfWrongName() throws Exception { Mailbox<InMemoryId> mailbox = new SimpleMailbox<InMemoryId>(new MailboxPath(MailboxConstants.USER_NAMESPACE, USER, "wrong_name"), UID_VALIDITY); Modified: james/project/trunk/server/container/spring/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/spring/pom.xml (original) +++ james/project/trunk/server/container/spring/pom.xml Mon Jan 4 09:40:15 2016 @@ -28,7 +28,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-spring</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java (original) +++ james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java Mon Jan 4 09:40:15 2016 @@ -32,6 +32,7 @@ import org.slf4j.Logger; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import javax.annotation.PostConstruct; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -105,7 +106,6 @@ public class MailRepositoryStoreBeanFact * @param repConf the Configuration object used to register the repository * @throws ConfigurationException if an error occurs accessing the Configuration object */ - @SuppressWarnings("unchecked") public synchronized void registerRepository(HierarchicalConfiguration repConf) throws ConfigurationException { String className = repConf.getString("[@class]"); @@ -199,6 +199,7 @@ public class MailRepositoryStoreBeanFact try { // Use the classloader which is used for bean instance stuff + @SuppressWarnings("unchecked") Class<MailRepository> clazz = (Class<MailRepository>) getBeanFactory().getBeanClassLoader().loadClass(repClass); reply = (MailRepository) getBeanFactory().autowire(clazz, ConfigurableListableBeanFactory.AUTOWIRE_AUTODETECT, false); Modified: james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java (original) +++ james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java Mon Jan 4 09:40:15 2016 @@ -24,11 +24,8 @@ import org.apache.commons.configuration. import org.apache.james.container.spring.lifecycle.ConfigurationProvider; import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException; -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.BeanDefinitionRegistry; /** --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org