You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/24 03:46:47 UTC
[22/38] james-project git commit: JAMES-2114 Deprecate LogEnabled API
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/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 a870d36..7a14a4b 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
@@ -49,6 +49,7 @@ import org.apache.james.queue.api.MailQueueItemDecoratorFactory;
import org.apache.james.queue.api.ManageableMailQueue;
import org.apache.mailet.Mail;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link ManageableMailQueue} implementation which use the fs to store {@link Mail}'s
@@ -57,6 +58,7 @@ import org.slf4j.Logger;
* loading the needed meta-data into memory for fast access.
*/
public class FileMailQueue implements ManageableMailQueue {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FileMailQueue.class);
private final ConcurrentHashMap<String, FileItem> keyMappings = new ConcurrentHashMap<>();
private final BlockingQueue<String> inmemoryQueue = new LinkedBlockingQueue<>();
@@ -64,7 +66,6 @@ public class FileMailQueue implements ManageableMailQueue {
private final static AtomicLong COUNTER = new AtomicLong();
private final String queueDirName;
private final File queueDir;
- private final Logger log;
private final MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory;
private final boolean sync;
@@ -73,9 +74,8 @@ public class FileMailQueue implements ManageableMailQueue {
private final static String NEXT_DELIVERY = "FileQueueNextDelivery";
private final static int SPLITCOUNT = 10;
- public FileMailQueue(MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, File parentDir, String queuename, boolean sync, Logger log) throws IOException {
+ public FileMailQueue(MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, File parentDir, String queuename, boolean sync) throws IOException {
this.mailQueueItemDecoratorFactory = mailQueueItemDecoratorFactory;
- this.log = log;
this.sync = sync;
this.queueDir = new File(parentDir, queuename);
this.queueDirName = queueDir.getAbsolutePath();
@@ -131,9 +131,8 @@ public class FileMailQueue implements ManageableMailQueue {
}
}, next - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
}
-
} catch (ClassNotFoundException | IOException e) {
- log.error("Unable to load Mail", e);
+ LOGGER.error("Unable to load Mail", e);
} finally {
if (oin != null) {
try {
@@ -360,7 +359,7 @@ public class FileMailQueue implements ManageableMailQueue {
try {
FileUtils.forceDelete(new File(getMessageFile()));
} catch (IOException e) {
- log.debug("Remove of msg file for mail failed");
+ LOGGER.debug("Remove of msg file for mail failed");
}
}
}
@@ -470,7 +469,7 @@ public class FileMailQueue implements ManageableMailQueue {
};
return true;
} catch (IOException | ClassNotFoundException e) {
- log.info("Unable to load mail", e);
+ LOGGER.info("Unable to load mail", e);
} finally {
if (in != null) {
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
index a08d152..440ba3c 100644
--- a/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
+++ b/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
@@ -25,21 +25,18 @@ import java.util.Map;
import javax.inject.Inject;
import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueueItemDecoratorFactory;
-import org.slf4j.Logger;
/**
* {@link MailQueueFactory} implementation which returns {@link FileMailQueue} instances
*/
-public class FileMailQueueFactory implements MailQueueFactory, LogEnabled {
+public class FileMailQueueFactory implements MailQueueFactory {
private final Map<String, MailQueue> queues = new HashMap<>();
private MailQueueItemDecoratorFactory mailQueueActionItemDecoratorFactory;
private FileSystem fs;
- private Logger log;
private boolean sync = true;
@Inject
@@ -66,7 +63,7 @@ public class FileMailQueueFactory implements MailQueueFactory, LogEnabled {
if (queue == null) {
synchronized (queues) {
try {
- queue = new FileMailQueue(mailQueueActionItemDecoratorFactory, fs.getFile("file://var/store/queue"), name, sync, log);
+ queue = new FileMailQueue(mailQueueActionItemDecoratorFactory, fs.getFile("file://var/store/queue"), name, sync);
queues.put(name, queue);
} catch (IOException e) {
throw new RuntimeException("Unable to access queue " + name, e);
@@ -76,10 +73,5 @@ public class FileMailQueueFactory implements MailQueueFactory, LogEnabled {
return queue;
}
- @Override
- public void setLog(Logger log) {
- this.log = log;
- }
-
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/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 629d869..f39653d 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,10 +135,9 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
protected final Metric enqueuedMailsMetric;
protected final Metric mailQueueSize;
protected final MetricFactory metricFactory;
- protected final Logger logger;
public final static String FORCE_DELIVERY = "FORCE_DELIVERY";
- public JMSMailQueue(ConnectionFactory connectionFactory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName, MetricFactory metricFactory, Logger logger) {
+ public JMSMailQueue(ConnectionFactory connectionFactory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName, MetricFactory metricFactory) {
try {
connection = connectionFactory.createConnection();
connection.start();
@@ -150,7 +149,6 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
this.metricFactory = metricFactory;
this.enqueuedMailsMetric = metricFactory.generate("enqueuedMail:" + queueName);
this.mailQueueSize = metricFactory.generate("mailQueueSize:" + queueName);
- this.logger = logger;
}
/**
@@ -400,7 +398,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
} catch (AddressException e) {
// Should never happen as long as the user does not modify the
// the header by himself
- logger.error("Unable to parse the recipient address " + token + " for mail " + mail.getName() + ", so we ignore it", e);
+ LOGGER.error("Unable to parse the recipient address " + token + " for mail " + mail.getName() + ", so we ignore it", e);
}
}
mail.setRecipients(rcpts);
@@ -421,7 +419,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
if (attrValue instanceof Serializable) {
mail.setAttribute(name, (Serializable) attrValue);
} else {
- logger.error("Not supported mail attribute " + name + " of type " + attrValue + " for mail " + mail.getName());
+ LOGGER.error("Not supported mail attribute " + name + " of type " + attrValue + " for mail " + mail.getName());
}
}
}
@@ -435,7 +433,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
} catch (AddressException e) {
// Should never happen as long as the user does not modify the
// the header by himself
- logger.error("Unable to parse the sender address " + sender + " for mail " + mail.getName() + ", so we fallback to a null sender", e);
+ LOGGER.error("Unable to parse the sender address " + sender + " for mail " + mail.getName() + ", so we fallback to a null sender", e);
mail.setSender(null);
}
}
@@ -503,7 +501,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
}
return size;
} catch (Exception e) {
- logger.error("Unable to get size of queue " + queueName, e);
+ LOGGER.error("Unable to get size of queue " + queueName, e);
throw new MailQueueException("Unable to get size of queue " + queueName, e);
} finally {
closeBrowser(browser);
@@ -545,7 +543,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
session.commit();
return count;
} catch (Exception e) {
- logger.error("Unable to flush mail", e);
+ LOGGER.error("Unable to flush mail", e);
rollback(session);
throw new MailQueueException("Unable to get size of queue " + queueName, e);
} finally {
@@ -690,7 +688,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
}
};
} catch (MessagingException | JMSException e) {
- logger.error("Unable to browse queue", e);
+ LOGGER.error("Unable to browse queue", e);
}
}
@@ -714,7 +712,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
closeBrowser(browser);
closeSession(session);
- logger.error("Unable to browse queue " + queueName, e);
+ LOGGER.error("Unable to browse queue " + queueName, e);
throw new MailQueueException("Unable to browse queue " + queueName, e);
}
}
@@ -724,7 +722,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori
try {
connection.close();
} catch (JMSException e) {
- logger.error("Error while closing session", e);
+ LOGGER.error("Error while closing session", e);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
index e023de9..823869a 100644
--- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
+++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java
@@ -45,7 +45,7 @@ public class JMSMailQueueFactory extends AbstractMailQueueFactory {
@Override
protected MailQueue createMailQueue(String name) {
- return new JMSMailQueue(connectionFactory, mailQueueItemDecoratorFactory, name, metricFactory, log);
+ return new JMSMailQueue(connectionFactory, mailQueueItemDecoratorFactory, name, metricFactory);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/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 162a5e1..56e1706 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
@@ -30,12 +30,12 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueueManagementMBean;
import org.apache.james.queue.api.ManageableMailQueue;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
@@ -43,12 +43,12 @@ import com.google.common.annotations.VisibleForTesting;
* {@link MailQueueFactory} abstract base class which take care of register the
* {@link MailQueue} implementations via JMX (if possible)
*/
-public abstract class AbstractMailQueueFactory implements MailQueueFactory, LogEnabled {
+public abstract class AbstractMailQueueFactory implements MailQueueFactory {
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMailQueueFactory.class);
public static final String MBEAN_NAME_QUEUE_PREFIX = "org.apache.james:type=component,name=queue,queue=";
protected final Map<String, MailQueue> queues = new HashMap<>();
- protected Logger log;
private boolean useJMX = true;
private MBeanServer mbeanServer;
private final List<String> mbeans = new ArrayList<>();
@@ -73,7 +73,7 @@ public abstract class AbstractMailQueueFactory implements MailQueueFactory, LogE
try {
mbeanServer.unregisterMBean(new ObjectName(mbean));
} catch (Exception e) {
- log.error("Error while destroying AbstractMailQueueFactory : ", e);
+ LOGGER.error("Error while destroying AbstractMailQueueFactory : ", e);
}
}
mbeans.clear();
@@ -137,10 +137,5 @@ public abstract class AbstractMailQueueFactory implements MailQueueFactory, LogE
}
}
-
- @Override
- public void setLog(Logger log) {
- this.log = log;
- }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/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 2682014..6ecd43b 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
@@ -69,7 +69,7 @@ public abstract class AbstractJMSMailQueueTest {
protected JMSMailQueue createQueue(ConnectionFactory factory, MailQueueItemDecoratorFactory mailQueueItemDecoratorFactory, String queueName) {
Logger log = LoggerFactory.getLogger(AbstractJMSMailQueueTest.class);
- return new JMSMailQueue(factory, mailQueueItemDecoratorFactory, queueName, new NoopMetricFactory(), log);
+ return new JMSMailQueue(factory, mailQueueItemDecoratorFactory, queueName, new NoopMetricFactory());
}
@Before
http://git-wip-us.apache.org/repos/asf/james-project/blob/16b36cbd/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
index e2becf2..90356ea 100644
--- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
+++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java
@@ -25,22 +25,19 @@ import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import java.util.concurrent.TimeUnit;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.ManageableMailQueue;
import org.apache.mailet.Mail;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.util.concurrent.TimeUnit;
public class AbstractMailQueueFactoryTest {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMailQueueFactoryTest.class);
private static final String QUEUE_1 = "queue1";
private static final String QUEUE_2 = "queue2";
private static final String QUEUE_3 = "queue3";
@@ -99,7 +96,6 @@ public class AbstractMailQueueFactoryTest {
}
};
abstractMailQueueFactory.setMbeanServer(mBeanServer);
- abstractMailQueueFactory.setLog(LOGGER);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org