Modified: james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java (original) +++ james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java Mon Jan 4 09:40:15 2016 @@ -126,7 +126,7 @@ public class LogProviderImpl implements if (!getSupportedLogLevels().contains(loglevel)) { throw new IllegalArgumentException("Not supported loglevel given"); } else { - ((org.apache.log4j.Logger) logMap.get(component)).getRootLogger().setLevel(Level.toLevel(loglevel)); + ((org.apache.log4j.Logger) logMap.get(component)).setLevel(Level.toLevel(loglevel)); } }
Modified: james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java (original) +++ james/project/trunk/server/container/spring/src/main/java/org/apache/james/container/spring/osgi/AbstractBundleTracker.java Mon Jan 4 09:40:15 2016 @@ -140,7 +140,7 @@ public abstract class AbstractBundleTrac */ private BeanFactory getBeanFactory(final BundleContext bundleContext) throws Exception { final String filter = "(" + OsgiServicePropertiesResolver.BEAN_NAME_PROPERTY_KEY + "=" + bundleContext.getBundle().getSymbolicName() + ")"; - final ServiceReference[] applicationContextRefs = bundleContext.getServiceReferences(ApplicationContext.class.getName(), filter); + final ServiceReference<?>[] applicationContextRefs = bundleContext.getServiceReferences(ApplicationContext.class.getName(), filter); // Check if we found an ApplicationContext. If not create one if(applicationContextRefs == null || applicationContextRefs.length != 1) { Modified: james/project/trunk/server/container/util-java8/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/util-java8/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/util-java8/pom.xml (original) +++ james/project/trunk/server/container/util-java8/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-util-java8</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/container/util/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/util/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/util/pom.xml (original) +++ james/project/trunk/server/container/util/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-util</artifactId> <packaging>bundle</packaging> @@ -40,6 +39,10 @@ <artifactId>${javax.mail.artifactId}</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> Modified: james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java (original) +++ james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/BayesianAnalyzer.java Mon Jan 4 09:40:15 2016 @@ -705,21 +705,6 @@ public class BayesianAnalyzer { return (p / (p + np)); } - private boolean allSameChar(String s) { - if (s.length() < 2) { - return false; - } - - char c = s.charAt(0); - - for (int i = 1; i < s.length(); i++) { - if (s.charAt(i) != c) { - return false; - } - } - return true; - } - private boolean allDigits(String s) { for (int i = 0; i < s.length(); i++) { if (!Character.isDigit(s.charAt(i))) { Modified: james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java (original) +++ james/project/trunk/server/container/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java Mon Jan 4 09:40:15 2016 @@ -375,7 +375,6 @@ abstract public class JDBCBayesianAnalyz } private void checkTables(Connection conn) throws SQLException { - DatabaseMetaData dbMetaData = conn.getMetaData(); // Need to ask in the case that identifiers are stored, ask the // DatabaseMetaInfo. // Try UPPER, lower, and MixedCase, to see if the table is there. Modified: james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java (original) +++ james/project/trunk/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java Mon Jan 4 09:40:15 2016 @@ -21,6 +21,9 @@ package org.apache.james.util.scanner; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; + +import com.google.common.io.Closeables; + import java.net.Socket; import java.net.UnknownHostException; import java.io.BufferedReader; @@ -133,9 +136,9 @@ public class SpamAssassinInvoker { throw new MessagingException("Error communicating with spamd on " + spamdHost + ":" + spamdPort + " Exception: " + e1); } finally { try { - in.close(); - out.close(); - socket.close(); + Closeables.close(in, true); + Closeables.close(out, true); + Closeables.close(socket, true); } catch (Exception e) { // Should never happin } Modified: james/project/trunk/server/data/data-api/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-api/pom.xml (original) +++ james/project/trunk/server/data/data-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-data-api</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java (original) +++ james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTable.java Mon Jan 4 09:40:15 2016 @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.rrt.api; -import java.util.Collection; import java.util.Map; import org.apache.james.rrt.lib.Mappings; Modified: james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java (original) +++ james/project/trunk/server/data/data-api/src/main/java/org/apache/james/rrt/api/RecipientRewriteTableManagementMBean.java Mon Jan 4 09:40:15 2016 @@ -19,7 +19,6 @@ package org.apache.james.rrt.api; -import java.util.Collection; import java.util.Map; import org.apache.james.rrt.lib.Mappings; Modified: james/project/trunk/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java (original) +++ james/project/trunk/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java Mon Jan 4 09:40:15 2016 @@ -20,8 +20,10 @@ package org.apache.james.sieverepository.api; +import java.io.InputStream; +import java.util.List; + import org.apache.james.sieverepository.api.exception.DuplicateException; -import org.apache.james.sieverepository.api.exception.DuplicateUserException; import org.apache.james.sieverepository.api.exception.IsActiveException; import org.apache.james.sieverepository.api.exception.QuotaExceededException; import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; @@ -29,9 +31,6 @@ import org.apache.james.sieverepository. import org.apache.james.sieverepository.api.exception.StorageException; import org.apache.james.sieverepository.api.exception.UserNotFoundException; -import java.io.InputStream; -import java.util.List; - /** Modified: james/project/trunk/server/data/data-cassandra/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-cassandra/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-cassandra/pom.xml (original) +++ james/project/trunk/server/data/data-cassandra/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-data-cassandra</artifactId> <name>Apache James :: Server :: Data :: Cassandra Persistence</name> Modified: james/project/trunk/server/data/data-file/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/pom.xml (original) +++ james/project/trunk/server/data/data-file/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-data-file</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java (original) +++ james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java Mon Jan 4 09:40:15 2016 @@ -33,6 +33,7 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; + import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; @@ -63,7 +64,7 @@ public class FileMailRepository extends private FilePersistentStreamRepository streamRepository; private FilePersistentObjectRepository objectRepository; private String destination; - private Set keys; + private Set<String> keys; private final Object lock = new Object(); private boolean fifo; private boolean cacheKeys; // experimental: for use with write mostly @@ -106,26 +107,28 @@ public class FileMailRepository extends streamRepository.init(); if (cacheKeys) - keys = Collections.synchronizedSet(new HashSet()); + keys = Collections.synchronizedSet(new HashSet<String>()); // Finds non-matching pairs and deletes the extra files - HashSet streamKeys = new HashSet(); - for (Iterator i = streamRepository.list(); i.hasNext(); ) { + HashSet<String> streamKeys = new HashSet<String>(); + for (Iterator<String> i = streamRepository.list(); i.hasNext(); ) { streamKeys.add(i.next()); } - HashSet objectKeys = new HashSet(); - for (Iterator i = objectRepository.list(); i.hasNext(); ) { + HashSet<String> objectKeys = new HashSet<String>(); + for (Iterator<String> i = objectRepository.list(); i.hasNext(); ) { objectKeys.add(i.next()); } - Collection strandedStreams = (Collection) streamKeys.clone(); + @SuppressWarnings("unchecked") + Collection<String> strandedStreams = (Collection<String>) streamKeys.clone(); strandedStreams.removeAll(objectKeys); for (Object strandedStream : strandedStreams) { String key = (String) strandedStream; remove(key); } - Collection strandedObjects = (Collection) objectKeys.clone(); + @SuppressWarnings("unchecked") + Collection<String> strandedObjects = (Collection<String>) objectKeys.clone(); strandedObjects.removeAll(streamKeys); for (Object strandedObject : strandedObjects) { String key = (String) strandedObject; @@ -136,7 +139,7 @@ public class FileMailRepository extends // Next get a list from the object repository // and use that for the list of keys keys.clear(); - for (Iterator i = objectRepository.list(); i.hasNext(); ) { + for (Iterator<String> i = objectRepository.list(); i.hasNext(); ) { keys.add(i.next()); } } @@ -254,17 +257,17 @@ public class FileMailRepository extends } @Override - public Iterator list() { + public Iterator<String> list() { // Fix ConcurrentModificationException by cloning // the keyset before getting an iterator - final ArrayList clone; + final ArrayList<String> clone; if (keys != null) synchronized (lock) { - clone = new ArrayList(keys); + clone = new ArrayList<String>(keys); } else { - clone = new ArrayList(); - for (Iterator i = objectRepository.list(); i.hasNext(); ) { + clone = new ArrayList<String>(); + for (Iterator<String> i = objectRepository.list(); i.hasNext(); ) { clone.add(i.next()); } } Modified: james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java (original) +++ james/project/trunk/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java Mon Jan 4 09:40:15 2016 @@ -135,11 +135,6 @@ public class MBoxMailRepository implemen private static boolean BUFFERING = true; /** - * Whether 'deep debugging' is turned on. - */ - private static final boolean DEEP_DEBUG = true; - - /** * The internal list of the emails The key is an adapted MD5 checksum of the * mail */ @@ -171,7 +166,6 @@ public class MBoxMailRepository implemen /* The repository configuration */ - HierarchicalConfiguration configuration1 = configuration; String destination; this.mList = null; BUFFERING = configuration.getBoolean("[@BUFFERING]", true); Modified: james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java (original) +++ james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveDefaultRepository.java Mon Jan 4 09:40:15 2016 @@ -20,11 +20,18 @@ package org.apache.james.sieverepository.file; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.List; + +import javax.inject.Inject; + import org.apache.james.filesystem.api.FileSystem; import org.apache.james.sieverepository.api.ScriptSummary; import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.sieverepository.api.exception.DuplicateException; -import org.apache.james.sieverepository.api.exception.DuplicateUserException; import org.apache.james.sieverepository.api.exception.IsActiveException; import org.apache.james.sieverepository.api.exception.QuotaExceededException; import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; @@ -32,13 +39,6 @@ import org.apache.james.sieverepository. import org.apache.james.sieverepository.api.exception.StorageException; import org.apache.james.sieverepository.api.exception.UserNotFoundException; -import javax.inject.Inject; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.util.List; - /** * <code>SieveFileRepository</code> manages sieve scripts stored on the file system. * <p>The sieve root directory is a sub-directory of the application base directory named "sieve". Modified: james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java (original) +++ james/project/trunk/server/data/data-file/src/main/java/org/apache/james/sieverepository/file/SieveFileRepository.java Mon Jan 4 09:40:15 2016 @@ -80,10 +80,11 @@ public class SieveFileRepository impleme String script = null; Scanner scanner = null; try { - scanner = new Scanner(file, encoding).useDelimiter("\\A"); + scanner = new Scanner(file, encoding); + scanner.useDelimiter("\\A"); script = scanner.next(); } finally { - if (null != scanner) { + if (scanner != null) { scanner.close(); } } Modified: james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java (original) +++ james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/system/hbase/TablePool.java Mon Jan 4 09:40:15 2016 @@ -116,12 +116,16 @@ public class TablePool { */ private static void ensureTable(byte[] tableName, byte[] columnFamilyName) throws IOException { HBaseAdmin hbaseAdmin = new HBaseAdmin(configuration); - if (!hbaseAdmin.tableExists(tableName)) { - HTableDescriptor desc = new HTableDescriptor(tableName); - HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(columnFamilyName); - hColumnDescriptor.setMaxVersions(1); - desc.addFamily(hColumnDescriptor); - hbaseAdmin.createTable(desc); + try { + if (!hbaseAdmin.tableExists(tableName)) { + HTableDescriptor desc = new HTableDescriptor(tableName); + HColumnDescriptor hColumnDescriptor = new HColumnDescriptor(columnFamilyName); + hColumnDescriptor.setMaxVersions(1); + desc.addFamily(hColumnDescriptor); + hbaseAdmin.createTable(desc); + } + } finally { + hbaseAdmin.close(); } } } Modified: james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java (original) +++ james/project/trunk/server/data/data-hbase/src/main/java/org/apache/james/user/hbase/HBaseUsersRepository.java Mon Jan 4 09:40:15 2016 @@ -159,8 +159,7 @@ public class HBaseUsersRepository extend scan.setCaching(table.getConfiguration().getInt("hbase.client.scanner.caching", 1) * 2); resultScanner = table.getScanner(scan); int resultCount = 0; - Result result = null; - while ((result = resultScanner.next()) != null) { + while (resultScanner.next() != null) { resultCount++; } return resultCount; Modified: james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java (original) +++ james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/rrt/hbase/HBaseRecipientRewriteTableTest.java Mon Jan 4 09:40:15 2016 @@ -19,13 +19,13 @@ package org.apache.james.rrt.hbase; import java.io.IOException; + import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.mailbox.hbase.HBaseClusterSingleton; import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.AbstractRecipientRewriteTable; import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest; import org.apache.james.system.hbase.TablePool; -import org.apache.log4j.Logger; import org.junit.Before; import org.slf4j.LoggerFactory; @@ -37,10 +37,6 @@ import org.slf4j.LoggerFactory; */ public class HBaseRecipientRewriteTableTest extends AbstractRecipientRewriteTableTest { - /** - * The Logger. - */ - private static Logger logger = Logger.getLogger(HBaseRecipientRewriteTableTest.class); private static final HBaseClusterSingleton cluster = HBaseClusterSingleton.build(); @Before Modified: james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java (original) +++ james/project/trunk/server/data/data-hbase/src/test/java/org/apache/james/system/hbase/TablePoolTest.java Mon Jan 4 09:40:15 2016 @@ -18,10 +18,11 @@ ****************************************************************/ package org.apache.james.system.hbase; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; -import junit.framework.Assert; + import org.apache.james.mailbox.hbase.HBaseClusterSingleton; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -40,21 +41,21 @@ public class TablePoolTest { @Test public void testGetInstance() throws IOException { - Assert.assertNotNull(TablePool.getInstance()); + assertThat(TablePool.getInstance()).isNotNull(); } @Test public void testGetDomainlistTable() throws IOException { - Assert.assertNotNull(TablePool.getInstance().getDomainlistTable()); + assertThat(TablePool.getInstance().getDomainlistTable()).isNotNull(); } @Test public void testGetRecipientRewriteTable() throws IOException { - Assert.assertNotNull(TablePool.getInstance().getRecipientRewriteTable()); + assertThat(TablePool.getInstance().getRecipientRewriteTable()).isNotNull(); } @Test public void testGetUsersRepositoryTable() throws IOException { - Assert.assertNotNull(TablePool.getInstance().getUsersRepositoryTable()); + assertThat(TablePool.getInstance().getUsersRepositoryTable()).isNotNull(); } } Modified: james/project/trunk/server/data/data-jcr/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jcr/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jcr/pom.xml (original) +++ james/project/trunk/server/data/data-jcr/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-data-jcr</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-jdbc/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jdbc/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jdbc/pom.xml (original) +++ james/project/trunk/server/data/data-jdbc/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-data-jdbc</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java (original) +++ james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java Mon Jan 4 09:40:15 2016 @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.Serializable; import java.sql.Blob; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -491,9 +492,9 @@ public class JDBCMailRepository extends if (mc instanceof MailImpl) { oos.writeObject(((MailImpl) mc).getAttributesRaw()); } else { - HashMap temp = new HashMap(); - for (Iterator i = mc.getAttributeNames(); i.hasNext();) { - String hashKey = (String) i.next(); + HashMap<String, Serializable> temp = new HashMap<String, Serializable>(); + for (Iterator<String> i = mc.getAttributeNames(); i.hasNext();) { + String hashKey = i.next(); temp.put(hashKey, mc.getAttribute(hashKey)); } oos.writeObject(temp); @@ -573,9 +574,9 @@ public class JDBCMailRepository extends if (mc instanceof MailImpl) { oos.writeObject(((MailImpl) mc).getAttributesRaw()); } else { - HashMap temp = new HashMap(); - for (Iterator i = mc.getAttributeNames(); i.hasNext();) { - String hashKey = (String) i.next(); + HashMap<String, Serializable> temp = new HashMap<String, Serializable>(); + for (Iterator<String> i = mc.getAttributeNames(); i.hasNext();) { + String hashKey = i.next(); temp.put(hashKey, mc.getAttribute(hashKey)); } oos.writeObject(temp); @@ -613,6 +614,7 @@ public class JDBCMailRepository extends /** * @see org.apache.james.mailrepository.api.MailRepository#retrieve(String) */ + @SuppressWarnings("unchecked") public Mail retrieve(String key) throws MessagingException { if (DEEP_DEBUG) { System.err.println("retrieving " + key); @@ -642,7 +644,7 @@ public class JDBCMailRepository extends } // Determine whether attributes are used and retrieve them PreparedStatement retrieveMessageAttr = null; - HashMap attributes = null; + HashMap<String, Object> attributes = null; if (jdbcMailAttributesReady) { String retrieveMessageAttrSql = sqlQueries.getSqlString("retrieveMessageAttributesSQL", false); ResultSet rsMessageAttr = null; @@ -667,7 +669,7 @@ public class JDBCMailRepository extends if (serialized_attr != null) { ByteArrayInputStream bais = new ByteArrayInputStream(serialized_attr); ObjectInputStream ois = new ObjectInputStream(bais); - attributes = (HashMap) ois.readObject(); + attributes = (HashMap<String, Object>) ois.readObject(); ois.close(); } } catch (IOException ioe) { @@ -703,7 +705,7 @@ public class JDBCMailRepository extends mc.setSender(new MailAddress(sender)); } StringTokenizer st = new StringTokenizer(rsMessage.getString(4), "\r\n", false); - Set recipients = new HashSet(); + Set<MailAddress> recipients = new HashSet<MailAddress>(); while (st.hasMoreTokens()) { recipients.add(new MailAddress(st.nextToken())); } @@ -757,7 +759,7 @@ public class JDBCMailRepository extends /** * @see org.apache.james.mailrepository.api.MailRepository#list() */ - public Iterator list() throws MessagingException { + public Iterator<String> list() throws MessagingException { // System.err.println("listing messages"); Connection conn = null; PreparedStatement listMessages = null; @@ -768,7 +770,7 @@ public class JDBCMailRepository extends listMessages.setString(1, repositoryName); rsListMessages = listMessages.executeQuery(); - List messageList = new ArrayList(); + List<String> messageList = new ArrayList<String>(); while (rsListMessages.next() && !Thread.currentThread().isInterrupted()) { messageList.add(rsListMessages.getString(1)); } Modified: james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java (original) +++ james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java Mon Jan 4 09:40:15 2016 @@ -181,10 +181,6 @@ public class JDBCRecipientRewriteTable e throw new ConfigurationException(exceptionBuffer); } - if (urlParams.size() >= 1) { - String dataSourceName = urlParams.get(0); - } - if (urlParams.size() >= 2) { tableName = urlParams.get(1); } Modified: james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java (original) +++ james/project/trunk/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java Mon Jan 4 09:40:15 2016 @@ -358,7 +358,6 @@ public abstract class AbstractJdbcUsersR * * @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration) */ - @SuppressWarnings("unchecked") protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException { StringBuffer logBuffer; if (getLogger().isDebugEnabled()) { Modified: james/project/trunk/server/data/data-jpa/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jpa/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jpa/pom.xml (original) +++ james/project/trunk/server/data/data-jpa/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-data-jpa</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java (original) +++ james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java Mon Jan 4 09:40:15 2016 @@ -89,6 +89,7 @@ public class JPARecipientRewriteTable ex final EntityTransaction transaction = entityManager.getTransaction(); try { transaction.begin(); + @SuppressWarnings("unchecked") List<JPARecipientRewrite> virtualUsers = entityManager.createNamedQuery(queryName).setParameter("user", user).setParameter("domain", domain).getResultList(); transaction.commit(); if (virtualUsers.size() > 0) { @@ -115,6 +116,7 @@ public class JPARecipientRewriteTable ex final EntityTransaction transaction = entityManager.getTransaction(); try { transaction.begin(); + @SuppressWarnings("unchecked") List<JPARecipientRewrite> virtualUsers = entityManager.createNamedQuery("selectUserDomainMapping").setParameter("user", user).setParameter("domain", domain).getResultList(); transaction.commit(); if (virtualUsers.size() > 0) { @@ -143,6 +145,7 @@ public class JPARecipientRewriteTable ex Map<String, Mappings> mapping = new HashMap<String, Mappings>(); try { transaction.begin(); + @SuppressWarnings("unchecked") List<JPARecipientRewrite> virtualUsers = entityManager.createNamedQuery("selectAllMappings").getResultList(); transaction.commit(); for (JPARecipientRewrite virtualUser : virtualUsers) { @@ -223,7 +226,7 @@ public class JPARecipientRewriteTable ex final EntityTransaction transaction = entityManager.getTransaction(); try { transaction.begin(); - int deleted = entityManager.createNamedQuery("deleteMapping").setParameter("user", user).setParameter("domain", domain).setParameter("targetAddress", mapping).executeUpdate(); + entityManager.createNamedQuery("deleteMapping").setParameter("user", user).setParameter("domain", domain).setParameter("targetAddress", mapping).executeUpdate(); transaction.commit(); } catch (PersistenceException e) { Modified: james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java (original) +++ james/project/trunk/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java Mon Jan 4 09:40:15 2016 @@ -103,7 +103,6 @@ public class JPARecipientRewrite { * See: http://docs.oracle.com/javaee/6/tutorial/doc/bnbqa.html * Do not us this constructor, it is for JPA only. */ - @SuppressWarnings(value = "unused" ) protected JPARecipientRewrite() { } Modified: james/project/trunk/server/data/data-ldap/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-ldap/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-ldap/pom.xml (original) +++ james/project/trunk/server/data/data-ldap/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-data-ldap</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-library/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/pom.xml (original) +++ james/project/trunk/server/data/data-library/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-data-library</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java Mon Jan 4 09:40:15 2016 @@ -28,7 +28,7 @@ public class Lock { /** * An internal hash table of keys to locks */ - private final Hashtable locks = new Hashtable(); + private final Hashtable<Object, Object> locks = new Hashtable<Object, Object>(); /** * Check to see if the object is locked Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java Mon Jan 4 09:40:15 2016 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectStreamClass; -import java.io.StreamCorruptedException; /** * A special ObjectInputStream to handle highly transient classes hosted by @@ -37,8 +36,8 @@ public class ClassLoaderObjectInputStrea m_classLoader = classLoader; } - protected Class resolveClass(final ObjectStreamClass objectStreamClass) throws IOException, ClassNotFoundException { - final Class clazz = Class.forName(objectStreamClass.getName(), false, m_classLoader); + protected Class<?> resolveClass(final ObjectStreamClass objectStreamClass) throws IOException, ClassNotFoundException { + final Class<?> clazz = Class.forName(objectStreamClass.getName(), false, m_classLoader); if (null != clazz) { return clazz; // the classloader knows of the class Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/repository/file/FilePersistentObjectRepository.java Mon Jan 4 09:40:15 2016 @@ -53,9 +53,6 @@ public class FilePersistentObjectReposit try { final ObjectInputStream stream = new ObjectInputStream(inputStream); - if (stream == null) - throw new NullPointerException("Null stream returned for key: " + key); - final Object object = stream.readObject(); if (DEBUG) { getLogger().debug("returning object " + object + " for key " + key); @@ -78,15 +75,12 @@ public class FilePersistentObjectReposit try { final InputStream inputStream = getInputStream(key); - if (inputStream == null) + if (inputStream == null) { throw new NullPointerException("Null input stream returned for key: " + key); + } + final ObjectInputStream stream = new ClassLoaderObjectInputStream(classLoader, inputStream); try { - final ObjectInputStream stream = new ClassLoaderObjectInputStream(classLoader, inputStream); - - if (stream == null) - throw new NullPointerException("Null stream returned for key: " + key); - final Object object = stream.readObject(); if (DEBUG) { @@ -94,6 +88,7 @@ public class FilePersistentObjectReposit } return object; } finally { + stream.close(); inputStream.close(); } } catch (final Throwable e) { Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java Mon Jan 4 09:40:15 2016 @@ -22,7 +22,6 @@ import java.util.Map; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import javax.annotation.Resource; import javax.inject.Inject; import javax.mail.internet.ParseException; Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java Mon Jan 4 09:40:15 2016 @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.rrt.lib; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; @@ -30,8 +28,6 @@ import java.util.regex.PatternSyntaxExce import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.mailet.MailAddress; -import com.google.common.base.Joiner; - /** * This helper class contains methods for the RecipientRewriteTable implementations */ Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java Mon Jan 4 09:40:15 2016 @@ -19,7 +19,6 @@ package org.apache.james.user.lib; -import javax.annotation.Resource; import javax.inject.Inject; import org.apache.commons.configuration.ConfigurationException; Modified: james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java (original) +++ james/project/trunk/server/data/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java Mon Jan 4 09:40:15 2016 @@ -96,7 +96,6 @@ public class DigestUtil { */ public static void digestFile(String filename, String algorithm) { byte[] b = new byte[65536]; - int count = 0; int read; FileInputStream fis = null; FileOutputStream fos = null; @@ -106,7 +105,6 @@ public class DigestUtil { while (fis.available() > 0) { read = fis.read(b); md.update(b, 0, read); - count += read; } byte[] digest = md.digest(); String fileNameBuffer = filename + "." + algorithm; Modified: james/project/trunk/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java (original) +++ james/project/trunk/server/data/data-library/src/test/java/org/apache/james/sieverepository/lib/AbstractSieveRepositoryTest.java Mon Jan 4 09:40:15 2016 @@ -20,6 +20,9 @@ package org.apache.james.sieverepository import static org.assertj.core.api.Assertions.assertThat; +import java.io.IOException; +import java.io.InputStream; + import org.apache.commons.io.IOUtils; import org.apache.james.sieverepository.api.ScriptSummary; import org.apache.james.sieverepository.api.SieveRepository; @@ -28,14 +31,10 @@ import org.apache.james.sieverepository. import org.apache.james.sieverepository.api.exception.QuotaExceededException; import org.apache.james.sieverepository.api.exception.QuotaNotFoundException; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; -import org.apache.james.sieverepository.api.exception.UserNotFoundException; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.IOException; -import java.io.InputStream; - public abstract class AbstractSieveRepositoryTest { private static final String USER = "test"; Modified: james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java (original) +++ james/project/trunk/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java Mon Jan 4 09:40:15 2016 @@ -36,8 +36,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import junit.framework.Assert; - /** * Test basic behaviors of UsersFileRepository */ @@ -163,9 +161,9 @@ public abstract class AbstractUsersRepos usersRepository.addUser(login("myUsername"), "password"); try { usersRepository.addUser(login("MyUsername"), "password"); - Assert.fail("We should not be able to insert same users, even with different cases"); + fail("We should not be able to insert same users, even with different cases"); } catch (UsersRepositoryException e) { - Assert.assertTrue("The exception message must contain the username value but was=" + e.getMessage(), e. + assertTrue("The exception message must contain the username value but was=" + e.getMessage(), e. getMessage().contains("MyUsername")); } } Modified: james/project/trunk/server/dns-service/dnsservice-api/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-api/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-api/pom.xml (original) +++ james/project/trunk/server/dns-service/dnsservice-api/pom.xml Mon Jan 4 09:40:15 2016 @@ -27,7 +27,6 @@ <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-dnsservice-api</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml (original) +++ james/project/trunk/server/dns-service/dnsservice-dnsjava/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-dnsservice-dnsjava</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java (original) +++ james/project/trunk/server/dns-service/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java Mon Jan 4 09:40:15 2016 @@ -115,7 +115,6 @@ public class DNSJavaService implements D this.logger = logger; } - @SuppressWarnings("unchecked") @Override public void configure(HierarchicalConfiguration configuration) throws ConfigurationException { Modified: james/project/trunk/server/dns-service/dnsservice-library/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-library/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-library/pom.xml (original) +++ james/project/trunk/server/dns-service/dnsservice-library/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-dnsservice-library</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java (original) +++ james/project/trunk/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java Mon Jan 4 09:40:15 2016 @@ -19,12 +19,6 @@ package org.apache.james.dnsservice.library; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import org.apache.james.dnsservice.api.DNSService; -import org.apache.mailet.HostAddress; -import org.slf4j.Logger; import java.net.InetAddress; import java.net.UnknownHostException; @@ -32,6 +26,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.james.dnsservice.api.DNSService; +import org.apache.mailet.HostAddress; +import org.slf4j.Logger; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + /** * * @@ -39,22 +41,14 @@ import java.util.Map; public class MXHostAddressIterator implements Iterator<HostAddress> { private final Iterator<HostAddress> addresses; - private final Iterator<String> hosts; - private final DNSService dns; - private final boolean useSingleIP; - private final Logger logger; - private final int defaultPort; - + public MXHostAddressIterator(Iterator<String> hosts, DNSService dns, boolean useSingleIP, Logger logger) { this(hosts, 25, dns, useSingleIP, logger); } public MXHostAddressIterator(Iterator<String> hosts, int defaultPort, DNSService dns, boolean useSingleIP, Logger logger) { - this.hosts = checkNotNull(hosts, "Hosts is null"); - this.dns = checkNotNull(dns, "Dns is null"); - this.useSingleIP = useSingleIP; - this.logger = logger; - this.defaultPort = defaultPort; + checkNotNull(hosts, "Hosts is null"); + checkNotNull(dns, "Dns is null"); final List<HostAddress> hAddresses = Lists.newArrayList(); while (hosts.hasNext()) { Modified: james/project/trunk/server/karaf/features/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/karaf/features/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/karaf/features/pom.xml (original) +++ james/project/trunk/server/karaf/features/pom.xml Mon Jan 4 09:40:15 2016 @@ -37,7 +37,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> <executions> <execution> <id>filter</id> @@ -72,7 +71,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.7</version> <executions> <execution> <id>attach-artifacts</id> Modified: james/project/trunk/server/mailet/mailetcontainer-api/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-api/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-api/pom.xml (original) +++ james/project/trunk/server/mailet/mailetcontainer-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-mailetcontainer-api</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java Mon Jan 4 09:40:15 2016 @@ -21,6 +21,7 @@ package org.apache.james.mailetcontainer import java.util.Collection; import javax.mail.MessagingException; import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; @@ -48,7 +49,7 @@ public class ExceptionThrowingMatcher im } @Override - public Collection match(Mail arg0) throws MessagingException { + public Collection<MailAddress> match(Mail arg0) throws MessagingException { throw new MessagingException(); } } Modified: james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java Mon Jan 4 09:40:15 2016 @@ -18,16 +18,6 @@ ****************************************************************/ package org.apache.james.mailetcontainer.api.mock; -import org.apache.mailet.HostAddress; -import org.apache.mailet.LookupException; -import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; -import org.apache.mailet.MailetContext; -import org.apache.mailet.TemporaryLookupException; - -import javax.mail.MessagingException; -import javax.mail.internet.AddressException; -import javax.mail.internet.MimeMessage; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -35,6 +25,16 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.mail.MessagingException; +import javax.mail.internet.AddressException; +import javax.mail.internet.MimeMessage; + +import org.apache.mailet.HostAddress; +import org.apache.mailet.LookupException; +import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; +import org.apache.mailet.MailetContext; + public class MockMailetContext implements MailetContext { private final Map<String, Object> attributes = new HashMap<String, Object>(); @@ -61,7 +61,7 @@ public class MockMailetContext implement } @Override - public Iterator getAttributeNames() { + public Iterator<String> getAttributeNames() { return attributes.keySet().iterator(); } @@ -70,7 +70,7 @@ public class MockMailetContext implement * was "localhost". Otherwise and empty {@link Collection} is returned */ @Override - public Collection getMailServers(String host) { + public Collection<String> getMailServers(String host) { List<String> servers = new ArrayList<String>(); if ("localhost".equalsIgnoreCase(host)) { servers.add("mx.localhost"); @@ -99,7 +99,7 @@ public class MockMailetContext implement } @Override - public Iterator getSMTPHostAddresses(String arg0) { + public Iterator<HostAddress> getSMTPHostAddresses(String arg0) { return new ArrayList<HostAddress>().iterator(); } @@ -169,12 +169,12 @@ public class MockMailetContext implement } @Override - public void sendMail(MailAddress arg0, Collection arg1, MimeMessage arg2) throws MessagingException { + public void sendMail(MailAddress arg0, Collection<MailAddress> arg1, MimeMessage arg2) throws MessagingException { throw new UnsupportedOperationException("Not implemented"); } @Override - public void sendMail(MailAddress arg0, Collection arg1, MimeMessage arg2, String arg3) throws MessagingException { + public void sendMail(MailAddress arg0, Collection<MailAddress> arg1, MimeMessage arg2, String arg3) throws MessagingException { throw new UnsupportedOperationException("Not implemented"); } Modified: james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java Mon Jan 4 09:40:15 2016 @@ -54,7 +54,7 @@ public class MockMatcher implements Matc } @Override - public Collection match(Mail mail) throws MessagingException { + public Collection<MailAddress> match(Mail mail) throws MessagingException { List<MailAddress> match = new ArrayList<MailAddress>(); Iterator<MailAddress> rcpts = mail.getRecipients().iterator(); Modified: james/project/trunk/server/mailet/mailetcontainer-camel/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/pom.xml?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/pom.xml (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/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-mailetcontainer-camel</artifactId> <packaging>bundle</packaging> Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java Mon Jan 4 09:40:15 2016 @@ -396,8 +396,7 @@ public class JamesMailetContext implemen sendMail(sender, recipients, message); } - @SuppressWarnings("unchecked") - public void sendMail(MailAddress sender, Collection recipients, MimeMessage message) throws MessagingException { + public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage message) throws MessagingException { sendMail(sender, recipients, message, Mail.DEFAULT); } @@ -409,8 +408,7 @@ public class JamesMailetContext implemen processorList.service(mail); } - @SuppressWarnings("unchecked") - public void sendMail(MailAddress sender, Collection recipients, MimeMessage message, String state) throws MessagingException { + public void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage message, String state) throws MessagingException { MailImpl mail = new MailImpl(MailImpl.getId(), sender, recipients, message); try { mail.setState(state); Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java Mon Jan 4 09:40:15 2016 @@ -71,7 +71,6 @@ public class MailetConfigImpl implements /** * @return an iterator over the set of configuration parameter names. */ - @SuppressWarnings("unchecked") public Iterator<String> getInitParameterNames() { Iterator<String> it = configuration.getKeys(); List<String> params = new ArrayList<String>(); @@ -124,7 +123,6 @@ public class MailetConfigImpl implements * @param newConfiguration * the new Configuration for the mailet */ - @SuppressWarnings("unchecked") public void setConfiguration(Configuration newConfiguration) { DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java Mon Jan 4 09:40:15 2016 @@ -76,10 +76,9 @@ public class ProcessorUtil { * when the <code>Collection</code> contains objects that are * not <code>MailAddress</code> objects */ - @SuppressWarnings("rawtypes") - public static void verifyMailAddresses(Collection col) throws MessagingException { + public static void verifyMailAddresses(Collection<MailAddress> col) throws MessagingException { try { - MailAddress addresses[] = (MailAddress[]) col.toArray(new MailAddress[col.size()]); + MailAddress addresses[] = col.toArray(new MailAddress[col.size()]); // Why is this here? According to the javadoc for // java.util.Collection.toArray(Object[]), this should Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java Mon Jan 4 09:40:15 2016 @@ -27,6 +27,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; @@ -136,7 +137,7 @@ public class CamelMailetProcessor extend String state = getState(); Logger logger = getLogger(); - RouteDefinition processorDef = from(getEndpoint()).routeId(state).inOnly() + RouteDefinition processorDef = from(getEndpoint()).routeId(state).setExchangePattern(ExchangePattern.InOnly) // store the logger in properties .setProperty(MatcherSplitter.LOGGER_PROPERTY, constant(getLogger())); Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java Mon Jan 4 09:40:15 2016 @@ -56,7 +56,6 @@ public class CamelProcessor implements P /** * Call the wrapped mailet for the exchange */ - @SuppressWarnings("unchecked") public void process(Exchange exchange) throws Exception { Mail mail = exchange.getIn().getBody(Mail.class); long start = System.currentTimeMillis(); Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherSplitter.java Mon Jan 4 09:40:15 2016 @@ -69,7 +69,6 @@ public class MatcherSplitter { * @return mailMessageList * @throws MessagingException */ - @SuppressWarnings("unchecked") @Handler public List<Mail> split(@Property(MATCHER_PROPERTY) Matcher matcher, @Property(ON_MATCH_EXCEPTION_PROPERTY) String onMatchException, @Property(LOGGER_PROPERTY) Logger logger, @Property(MAILETCONTAINER_PROPERTY) CamelMailetProcessor container, @Body Mail mail) throws MessagingException { Collection<MailAddress> matchedRcpts = null; Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java Mon Jan 4 09:40:15 2016 @@ -136,7 +136,6 @@ public class JMXStateMailetProcessorList * @throws JMException * @throws MalformedObjectNameException */ - @SuppressWarnings("unchecked") private void registerMatchers(String parentMBeanName, Iterator<Matcher> matchers, int nestingLevel) throws JMException { int i = 0; Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java Mon Jan 4 09:40:15 2016 @@ -74,7 +74,6 @@ public final class MailetManagement exte /** * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetParameters() */ - @SuppressWarnings("unchecked") public String[] getMailetParameters() { List<String> parameterList = new ArrayList<String>(); Iterator<String> iterator = config.getInitParameterNames(); Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java Mon Jan 4 09:40:15 2016 @@ -41,20 +41,20 @@ public class And extends GenericComposit * @return Collection of Recipient from the And composition results of the * child Matchers. */ - public Collection match(Mail mail) throws MessagingException { - Collection finalResult = null; + public Collection<MailAddress> match(Mail mail) throws MessagingException { + Collection<MailAddress> finalResult = null; Matcher matcher; boolean first = true; - for (Iterator matcherIter = iterator(); matcherIter.hasNext();) { - matcher = (Matcher) (matcherIter.next()); - Collection result = matcher.match(mail); + for (Iterator<Matcher> matcherIter = iterator(); matcherIter.hasNext();) { + matcher = (matcherIter.next()); + Collection<MailAddress> result = matcher.match(mail); if (result == null) { // short-circuit // log("Matching with " + // matcher.getMatcherConfig().getMatcherName() + // " result.size()=0"); - return new ArrayList(0); + return new ArrayList<MailAddress>(0); } if (result.size() == 0) { return result; @@ -77,7 +77,7 @@ public class And extends GenericComposit // them // Ensure that the finalResult only contains recipients // in the result collection - Collection newResult = new ArrayList(); + Collection<MailAddress> newResult = new ArrayList<MailAddress>(); MailAddress recipient; for (Object aFinalResult : finalResult) { recipient = (MailAddress) aFinalResult; Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/CompositeMatcher.java Mon Jan 4 09:40:15 2016 @@ -56,7 +56,7 @@ public interface CompositeMatcher extend /** * @return Iterator if child Matchers */ - Iterator iterator(); + Iterator<Matcher> iterator(); /** * Add a child matcher to this composite matcher. This is called by Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/GenericCompositeMatcher.java Mon Jan 4 09:40:15 2016 @@ -45,11 +45,11 @@ public abstract class GenericCompositeMa /** * @return Iterator for the child matchers */ - public Iterator iterator() { + public Iterator<Matcher> iterator() { return matchers.iterator(); } // the collection used to store the child-matchers - private final Collection matchers = new ArrayList(); + private final Collection<Matcher> matchers = new ArrayList<Matcher>(); } Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java Mon Jan 4 09:40:15 2016 @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; import org.apache.mailet.Mail; @@ -39,19 +40,19 @@ public class Not extends GenericComposit * @return Collectiom of Recipient from the Negated composition of the child * Matcher(s). */ - public Collection match(Mail mail) throws MessagingException { - Collection finalResult = mail.getRecipients(); + public Collection<MailAddress> match(Mail mail) throws MessagingException { + Collection<MailAddress> finalResult = mail.getRecipients(); Matcher matcher; - for (Iterator matcherIter = iterator(); matcherIter.hasNext();) { - matcher = (Matcher) (matcherIter.next()); + for (Iterator<Matcher> matcherIter = iterator(); matcherIter.hasNext();) { + matcher = (matcherIter.next()); // log("Matching with " + // matcher.getMatcherConfig().getMatcherName()); - Collection result = matcher.match(mail); + Collection<MailAddress> result = matcher.match(mail); if (result == finalResult) { // Not is an empty list finalResult = null; } else if (result != null) { - finalResult = new ArrayList(finalResult); + finalResult = new ArrayList<MailAddress>(finalResult); finalResult.removeAll(result); } } Modified: james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java?rev=1722812&r1=1722811&r2=1722812&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java (original) +++ james/project/trunk/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java Mon Jan 4 09:40:15 2016 @@ -38,8 +38,8 @@ public class Or extends GenericComposite * @return Collection of Recipient from the Or composition results of the * child matchers. */ - public Collection match(Mail mail) throws MessagingException { - Collection finalResult = null; + public Collection<MailAddress> match(Mail mail) throws MessagingException { + Collection<MailAddress> finalResult = null; Matcher matcher; boolean first = true; @@ -48,17 +48,17 @@ public class Or extends GenericComposite // Loop through until the finalResult is full or all the child matchers // have been executed - for (Iterator matcherIter = iterator(); matcherIter.hasNext();) { - matcher = (Matcher) matcherIter.next(); + for (Iterator<Matcher> matcherIter = iterator(); matcherIter.hasNext();) { + matcher = matcherIter.next(); // log("Matching with " // + matcher // .getMatcherConfig() // .getMatcherName() // ); - Collection result = matcher.match(mail); + Collection<MailAddress> result = matcher.match(mail); if (first) { if (result == null) { - result = new ArrayList(0); + result = new ArrayList<MailAddress>(0); } finalResult = result; first = false; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
