Repository: james-project Updated Branches: refs/heads/master 8c26272df -> 9edd55b14
http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java index 51813ee..5c873ba 100644 --- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java +++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java @@ -64,17 +64,17 @@ public class FileMailQueue implements ManageableMailQueue { private final ConcurrentHashMap<String, FileItem> keyMappings = new ConcurrentHashMap<>(); private final BlockingQueue<String> inmemoryQueue = new LinkedBlockingQueue<>(); private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(); - private final static AtomicLong COUNTER = new AtomicLong(); + private static final AtomicLong COUNTER = new AtomicLong(); private final String queueDirName; private final File queueDir; private final MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory; private final boolean sync; - private final static String MSG_EXTENSION = ".msg"; - private final static String OBJECT_EXTENSION = ".obj"; - private final static String NEXT_DELIVERY = "FileQueueNextDelivery"; - private final static int SPLITCOUNT = 10; - private final static SecureRandom RANDOM = new SecureRandom(); + private static final String MSG_EXTENSION = ".msg"; + private static final String OBJECT_EXTENSION = ".obj"; + private static final String NEXT_DELIVERY = "FileQueueNextDelivery"; + private static final int SPLITCOUNT = 10; + private static final SecureRandom RANDOM = new SecureRandom(); public FileMailQueue(MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, File parentDir, String queuename, boolean sync) throws IOException { this.mailQueueItemDecoratorFactory = mailQueueItemDecoratorFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java index 412d534..047f822 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java @@ -135,7 +135,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori protected final Metric enqueuedMailsMetric; protected final Metric mailQueueSize; protected final MetricFactory metricFactory; - public final static String FORCE_DELIVERY = "FORCE_DELIVERY"; + public static final String FORCE_DELIVERY = "FORCE_DELIVERY"; public JMSMailQueue(ConnectionFactory connectionFactory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName, MetricFactory metricFactory) { try { http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java index 56e1706..6d91b95 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java @@ -84,7 +84,7 @@ public abstract class AbstractMailQueueFactory implements MailQueueFactory { } @Override - public synchronized final MailQueue getQueue(String name) { + public final synchronized MailQueue getQueue(String name) { MailQueue queue = queues.get(name); http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java index ccb32f2..99bf4df 100644 --- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java +++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/jms/AbstractJMSMailQueueTest.java @@ -57,7 +57,7 @@ import org.junit.Test; */ public abstract class AbstractJMSMailQueueTest { - protected final static String QUEUE_NAME = "test"; + protected static final String QUEUE_NAME = "test"; private JMSMailQueue queue; http://git-wip-us.apache.org/repos/asf/james-project/blob/a9f462d5/server/testing/src/main/java/org/apache/james/utils/MockSpamd.java ---------------------------------------------------------------------- diff --git a/server/testing/src/main/java/org/apache/james/utils/MockSpamd.java b/server/testing/src/main/java/org/apache/james/utils/MockSpamd.java index cbe7159..c17be4d 100644 --- a/server/testing/src/main/java/org/apache/james/utils/MockSpamd.java +++ b/server/testing/src/main/java/org/apache/james/utils/MockSpamd.java @@ -43,9 +43,9 @@ public class MockSpamd implements Runnable { /** * Mailcontent which is 100% spam */ - public final static String GTUBE = "-SPAM-"; - public final static String NOT_SPAM = "Spam: False ; 3 / 5"; - public final static String SPAM = "Spam: True ; 1000 / 5"; + public static final String GTUBE = "-SPAM-"; + public static final String NOT_SPAM = "Spam: False ; 3 / 5"; + public static final String SPAM = "Spam: True ; 1000 / 5"; private ServerSocket socket; private boolean isBinded; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
