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 ro...@apache.org on 2016/11/23 13:50:19 UTC
[16/46] james-project git commit: JAMES-1854 MailetContextLog is not
needed
JAMES-1854 MailetContextLog is not needed
As MailetContext already expose its logger
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9ac1ca71
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9ac1ca71
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9ac1ca71
Branch: refs/heads/master
Commit: 9ac1ca717bcabfb8e6c65bbd76373f4398eb59d0
Parents: 9c03133
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Oct 31 14:32:07 2016 +0100
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Fri Nov 18 18:46:46 2016 +0700
----------------------------------------------------------------------
.../james/transport/mailets/LocalDelivery.java | 2 +-
.../james/transport/mailets/RemoteDelivery.java | 10 +-
.../transport/mailets/SieveLocalDelivery.java | 2 +-
.../mailets/SieveToRecipientFolder.java | 2 +-
.../transport/mailets/ToRecipientFolder.java | 2 +-
.../james/transport/mailets/ToSenderFolder.java | 3 +-
.../mailets/delivery/MailboxAppender.java | 11 +-
.../matchers/AbstractStorageQuota.java | 13 +-
.../james/transport/util/MailetContextLog.java | 734 -------------------
.../mailets/delivery/LocalDeliveryTest.java | 12 +-
.../mailets/delivery/MailboxAppenderTest.java | 3 +-
.../mailets/delivery/SieveIntegrationTest.java | 2 +-
.../mailets/delivery/ToRecipientFolderTest.java | 2 +-
13 files changed, 29 insertions(+), 769 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
index 3b80d76..9f20812 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
@@ -96,7 +96,7 @@ public class LocalDelivery extends GenericMailet {
.build();
mailDispatcher = MailDispatcher.builder()
.mailStorer(SimpleMailStorer.builder()
- .mailboxAppender(new MailboxAppender(mailboxManager, getMailetContext()))
+ .mailboxAppender(new MailboxAppender(mailboxManager, getMailetContext().getLogger()))
.usersRepository(usersRepository)
.folder("INBOX")
.log(log)
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
index 3b5c943..8c6637e 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
@@ -65,7 +65,6 @@ import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueue.MailQueueException;
import org.apache.james.queue.api.MailQueue.MailQueueItem;
import org.apache.james.queue.api.MailQueueFactory;
-import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.transport.util.Patterns;
import org.apache.james.util.TimeConverter;
import org.apache.mailet.HostAddress;
@@ -73,6 +72,7 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
import org.apache.mailet.base.GenericMailet;
+import org.slf4j.Logger;
/**
* <p>The RemoteDelivery mailet delivers messages to a remote SMTP server able to deliver or forward messages to their final
@@ -250,7 +250,7 @@ public class RemoteDelivery extends GenericMailet implements Runnable {
private String heloName;
- private MailetContextLog logAdapter;
+ private Logger logger;
private boolean usePriority;
@@ -280,7 +280,7 @@ public class RemoteDelivery extends GenericMailet implements Runnable {
// Set isDebug flag.
isDebug = (getInitParameter("debug") == null) ? false : Boolean.valueOf(getInitParameter("debug"));
- logAdapter = new MailetContextLog(getMailetContext(), isDebug);
+ logger = getMailetContext().getLogger();
// Create list of Delay Times.
ArrayList<Delay> delayTimesList = new ArrayList<Delay>();
@@ -897,7 +897,7 @@ public class RemoteDelivery extends GenericMailet implements Runnable {
// Lookup the possible targets
try {
- targetServers = new MXHostAddressIterator(dnsServer.findMXRecords(host).iterator(), dnsServer, false, logAdapter);
+ targetServers = new MXHostAddressIterator(dnsServer.findMXRecords(host).iterator(), dnsServer, false, logger);
} catch (TemporaryResolutionException e) {
log("Temporary problem looking up mail server for host: " + host);
String exceptionBuffer = "Temporary problem looking up mail server for host: " + host + ". I cannot determine where to send this message.";
@@ -1614,7 +1614,7 @@ public class RemoteDelivery extends GenericMailet implements Runnable {
private Iterator<HostAddress> getGatewaySMTPHostAddresses(Collection<String> gatewayServers) {
Iterator<String> gateways = gatewayServers.iterator();
- return new MXHostAddressIterator(gateways, dnsServer, false, logAdapter);
+ return new MXHostAddressIterator(gateways, dnsServer, false, logger);
}
protected String getHeloName() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
index 5a53209..4da3436 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveLocalDelivery.java
@@ -104,7 +104,7 @@ public class SieveLocalDelivery extends GenericMailet {
String folder = "INBOX";
mailDispatcher = MailDispatcher.builder()
.mailStorer(SieveMailStorer.builder()
- .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext()), folder, usersRepository, getMailetContext()))
+ .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext().getLogger()), folder, usersRepository, getMailetContext()))
.usersRepository(usersRepository)
.resourceLocator(ResourceLocatorImpl.instanciate(usersRepository, sieveRepository))
.mailetContext(getMailetContext())
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
index b0b0642..8f5d258 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SieveToRecipientFolder.java
@@ -93,7 +93,7 @@ public class SieveToRecipientFolder extends GenericMailet {
String folder = getInitParameter(FOLDER_PARAMETER, "INBOX");
mailDispatcher = MailDispatcher.builder()
.mailStorer(SieveMailStorer.builder()
- .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext()), folder, usersRepository, getMailetContext()))
+ .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, getMailetContext().getLogger()), folder, usersRepository, getMailetContext()))
.usersRepository(usersRepository)
.resourceLocator(ResourceLocatorImpl.instanciate(usersRepository, sieveRepository))
.mailetContext(getMailetContext())
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
index 6bc7835..e63a843 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToRecipientFolder.java
@@ -84,7 +84,7 @@ public class ToRecipientFolder extends GenericMailet {
.build();
mailDispatcher = MailDispatcher.builder()
.mailStorer(SimpleMailStorer.builder()
- .mailboxAppender(new MailboxAppender(mailboxManager, getMailetContext()))
+ .mailboxAppender(new MailboxAppender(mailboxManager, getMailetContext().getLogger()))
.usersRepository(usersRepository)
.folder(getInitParameter(FOLDER_PARAMETER, "INBOX"))
.log(log)
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
index 113671c..222c9cf 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java
@@ -32,7 +32,6 @@ import org.apache.james.mailbox.exception.BadCredentialsException;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxConstants;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.mailet.Mail;
@@ -99,7 +98,7 @@ public class ToSenderFolder extends GenericMailet {
final MailboxSession session;
try {
- session = mailboxManager.createSystemSession(username, new MailetContextLog(getMailetContext()));
+ session = mailboxManager.createSystemSession(username, getMailetContext().getLogger());
} catch (BadCredentialsException e) {
throw new MessagingException("Unable to authenticate to mailbox", e);
} catch (MailboxException e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
index ac5bdf1..9c08f46 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailboxAppender.java
@@ -32,8 +32,7 @@ import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.BadCredentialsException;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.transport.util.MailetContextLog;
-import org.apache.mailet.MailetContext;
+import org.slf4j.Logger;
import com.google.common.base.Strings;
@@ -42,11 +41,11 @@ public class MailboxAppender {
private static final Flags FLAGS = null;
private final MailboxManager mailboxManager;
- private final MailetContext mailetContext;
+ private final Logger logger;
- public MailboxAppender(MailboxManager mailboxManager, MailetContext mailetContext) {
+ public MailboxAppender(MailboxManager mailboxManager, Logger logger) {
this.mailboxManager = mailboxManager;
- this.mailetContext = mailetContext;
+ this.logger = logger;
}
public void append(MimeMessage mail, String user, String folder) throws MessagingException {
@@ -101,7 +100,7 @@ public class MailboxAppender {
public MailboxSession createMailboxSession(String user) throws MessagingException {
try {
- return mailboxManager.createSystemSession(user, new MailetContextLog(mailetContext));
+ return mailboxManager.createSystemSession(user, logger);
} catch (BadCredentialsException e) {
throw new MessagingException("Unable to authenticate to mailbox", e);
} catch (MailboxException e) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
index d6fc198..6ea1350 100755
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.mailbox.model.MailboxQuery;
import org.apache.james.mailbox.model.MessageRange;
import org.apache.james.mailbox.model.MessageResult;
-import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.mailet.Mail;
@@ -83,8 +82,6 @@ abstract public class AbstractStorageQuota extends AbstractQuotaMatcher {
*/
private UsersRepository localUsers;
- private MailetContextLog log;
-
/**
* Checks the recipient.<br>
* Does a <code>super.isRecipientChecked</code> and checks that the
@@ -100,14 +97,6 @@ abstract public class AbstractStorageQuota extends AbstractQuotaMatcher {
return super.isRecipientChecked(recipient) && (mailetContext.isLocalEmail(recipient));
}
- @Override
- public void init() throws MessagingException {
- super.init();
-
- // init the log
- log = new MailetContextLog(getMailetContext());
- }
-
/**
* Gets the storage used in the recipient's inbox.
*
@@ -133,7 +122,7 @@ abstract public class AbstractStorageQuota extends AbstractQuotaMatcher {
catch (UsersRepositoryException e) {
throw new MessagingException("Unable to access UsersRepository", e);
}
- session = manager.createSystemSession(username, log);
+ session = manager.createSystemSession(username, getMailetContext().getLogger());
manager.startProcessingRequest(session);
// get all mailboxes for the user to calculate the size
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
deleted file mode 100644
index 4a59f1a..0000000
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
+++ /dev/null
@@ -1,734 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-package org.apache.james.transport.util;
-
-import org.apache.mailet.MailetContext;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-
-/**
- * {@link Logger} implementation which delegate the logging to a
- * {@link MailetContext}
- */
-public class MailetContextLog implements Logger {
-
- private final boolean isDebug;
- private final MailetContext context;
-
- public MailetContextLog(MailetContext context, boolean isDebug) {
- this.context = context;
- this.isDebug = isDebug;
- }
-
- public MailetContextLog(MailetContext context) {
- this(context, false);
-
- }
-
- /**
- * Only log if {@link #isDebugEnabled()} is true
- */
- public void debug(String arg0) {
- if (isDebug) {
- debugLog(arg0);
- }
- }
-
- /**
- * Only log if {@link #isDebugEnabled()} is true
- */
- public void debug(String arg0, Throwable arg1) {
- if (isDebug) {
- debugLog(arg0, arg1);
- }
- }
-
- /**
- * @see org.slf4j.Logger#error(java.lang.String)
- */
- public void error(String arg0) {
- errorLog(arg0);
-
- }
-
- /**
- * @see org.slf4j.Logger#error(java.lang.String, java.lang.Throwable)
- */
- public void error(String arg0, Throwable arg1) {
- errorLog(arg0, arg1);
-
- }
-
- /**
- * @see org.slf4j.Logger#info(java.lang.String)
- */
- public void info(String arg0) {
- infoLog(arg0);
-
- }
-
- /**
- * @see org.slf4j.Logger#info(java.lang.String, java.lang.Throwable)
- */
- public void info(String arg0, Throwable arg1) {
- infoLog(arg0, arg1);
-
- }
-
- /**
- * Return true if debug logging is enabled
- */
- public boolean isDebugEnabled() {
- return isDebug;
- }
-
- /**
- * Enabled, return true
- */
- public boolean isErrorEnabled() {
- return true;
- }
-
- /**
- * Enabled, return true
- */
- public boolean isFatalEnabled() {
- return true;
- }
-
- /**
- * Enabled, return true
- */
- public boolean isInfoEnabled() {
- return true;
-
- }
-
- /**
- * Not enabled return false
- */
- public boolean isTraceEnabled() {
- return false;
- }
-
- /**
- * Enabled, return true
- */
- public boolean isWarnEnabled() {
- return true;
- }
-
- /**
- * @see org.slf4j.Logger#warn(java.lang.String)
- */
- public void warn(String arg0) {
- warnLog(arg0);
-
- }
-
- /**
- * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Throwable)
- */
- public void warn(String arg0, Throwable arg1) {
- warnLog(arg0, arg1);
-
- }
-
- /**
- * @see org.slf4j.Logger#getName()
- */
- public String getName() {
- return context.toString();
- }
-
- /**
- * Do nothing
- */
- public void trace(String msg) {
- }
-
- /**
- * Do nothing
- */
- public void trace(String format, Object arg) {
- }
-
- /**
- * Do nothing
- */
- public void trace(String format, Object arg1, Object arg2) {
- }
-
- /**
- * Do nothing
- */
- public void trace(String format, Object... argArray) {
- }
-
- /**
- * Do nothing
- */
- public void trace(String msg, Throwable t) {
- }
-
- /**
- * Do nothing
- */
- public boolean isTraceEnabled(Marker marker) {
- return false;
- }
-
- /**
- * Do nothing
- */
- public void trace(Marker marker, String msg) {
- }
-
- /**
- * Do nothing
- */
- public void trace(Marker marker, String format, Object arg) {
- }
-
- /**
- * Do nothing
- */
- public void trace(Marker marker, String format, Object arg1, Object arg2) {
- }
-
- /**
- * Do nothing
- */
- public void trace(Marker marker, String format, Object... argArray) {
- }
-
- /**
- * Do nothing
- */
- public void trace(Marker marker, String msg, Throwable t) {
- }
-
- /**
- * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object)
- */
- public void debug(String format, Object arg) {
- if (isDebug) {
- debugLog(format, arg);
- }
- }
-
- /**
- * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object,
- * java.lang.Object)
- */
- public void debug(String format, Object arg1, Object arg2) {
- if (isDebug) {
- debugLog(format, arg1, arg2);
- }
- }
-
- /**
- * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object[])
- */
- public void debug(String format, Object... argArray) {
- if (isDebug) {
- debugLog(format, argArray);
- }
- }
-
- /**
- * @see org.slf4j.Logger#isDebugEnabled(org.slf4j.Marker)
- */
- public boolean isDebugEnabled(Marker marker) {
- return isDebug;
- }
-
- /**
- * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String)
- */
- public void debug(Marker marker, String msg) {
- if (isDebug) {
- debugLog(marker, msg);
- }
- }
-
- /**
- * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String,
- * java.lang.Object)
- */
- public void debug(Marker marker, String format, Object arg) {
- if (isDebug) {
- debugLog(marker, format, arg);
- }
- }
-
- /**
- * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String,
- * java.lang.Object, java.lang.Object)
- */
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- if (isDebug) {
- debugLog(marker, format, arg1, arg2);
- }
- }
-
- /**
- * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String,
- * java.lang.Object[])
- */
- public void debug(Marker marker, String format, Object... argArray) {
- if (isDebug) {
- debugLog(marker, format, argArray);
- }
- }
-
- /**
- * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String,
- * java.lang.Throwable)
- */
- public void debug(Marker marker, String msg, Throwable t) {
- if (isDebug) {
- debugLog(marker, msg, t);
- }
- }
-
- /**
- * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object)
- */
- public void info(String format, Object arg) {
- infoLog(format, arg);
- }
-
- /**
- * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object,
- * java.lang.Object)
- */
- public void info(String format, Object arg1, Object arg2) {
- infoLog(format, arg1, arg2);
- }
-
- /**
- * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object[])
- */
- public void info(String format, Object... argArray) {
- infoLog(format, argArray);
- }
-
- /**
- * @see org.slf4j.Logger#isInfoEnabled(org.slf4j.Marker)
- */
- public boolean isInfoEnabled(Marker marker) {
- return true;
- }
-
- /**
- * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String)
- */
- public void info(Marker marker, String msg) {
- infoLog(marker, msg);
- }
-
- /**
- * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String,
- * java.lang.Object)
- */
- public void info(Marker marker, String format, Object arg) {
- infoLog(marker, format, arg);
- }
-
- /**
- * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String,
- * java.lang.Object, java.lang.Object)
- */
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- infoLog(marker, format, arg1, arg2);
- }
-
- /**
- * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String,
- * java.lang.Object[])
- */
- public void info(Marker marker, String format, Object... argArray) {
- infoLog(marker, format, argArray);
- }
-
- /**
- * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String,
- * java.lang.Throwable)
- */
- public void info(Marker marker, String msg, Throwable t) {
- infoLog(marker, msg, t);
- }
-
- /**
- * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object)
- */
- public void warn(String format, Object arg) {
- warnLog(format, arg);
- }
-
- /**
- * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object[])
- */
- public void warn(String format, Object... argArray) {
- warnLog(format, argArray);
- }
-
- /**
- * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object,
- * java.lang.Object)
- */
- public void warn(String format, Object arg1, Object arg2) {
- warnLog(format, arg1, arg2);
- }
-
- /**
- * @see org.slf4j.Logger#isWarnEnabled(org.slf4j.Marker)
- */
- public boolean isWarnEnabled(Marker marker) {
- return true;
- }
-
- /**
- * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String)
- */
- public void warn(Marker marker, String msg) {
- warnLog(marker, msg);
- }
-
- /**
- * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String,
- * java.lang.Object)
- */
- public void warn(Marker marker, String format, Object arg) {
- warnLog(marker, format, arg);
- }
-
- /**
- * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String,
- * java.lang.Object, java.lang.Object)
- */
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- warnLog(marker, format, arg1, arg2);
- }
-
- /**
- * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String,
- * java.lang.Object[])
- */
- public void warn(Marker marker, String format, Object... argArray) {
- warnLog(marker, format, argArray);
- }
-
- /**
- * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String,
- * java.lang.Throwable)
- */
- public void warn(Marker marker, String msg, Throwable t) {
- warnLog(marker, msg, t);
- }
-
- /**
- * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object)
- */
- public void error(String format, Object arg) {
- errorLog(format, arg);
- }
-
- /**
- * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object,
- * java.lang.Object)
- */
- public void error(String format, Object arg1, Object arg2) {
- errorLog(format, arg1, arg2);
- }
-
- /**
- * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object[])
- */
- public void error(String format, Object... argArray) {
- errorLog(format, argArray);
- }
-
- /**
- * @see org.slf4j.Logger#isErrorEnabled(org.slf4j.Marker)
- */
- public boolean isErrorEnabled(Marker marker) {
- return true;
- }
-
- /**
- * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String)
- */
- public void error(Marker marker, String msg) {
- errorLog(marker, msg);
- }
-
- /**
- * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String,
- * java.lang.Object)
- */
- public void error(Marker marker, String format, Object arg) {
- errorLog(marker, format, arg);
- }
-
- /**
- * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String,
- * java.lang.Object, java.lang.Object)
- */
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- errorLog(marker, format, arg1, arg2);
- }
-
- /**
- * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String,
- * java.lang.Object[])
- */
- public void error(Marker marker, String format, Object... argArray) {
- errorLog(marker, format, argArray);
- }
-
- /**
- * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String,
- * java.lang.Throwable)
- */
- public void error(Marker marker, String msg, Throwable t) {
- errorLog(marker, msg, t);
- }
-
- private void debugLog(Marker marker, String msg, Object... obj) {
- StringBuilder s = new StringBuilder("[");
- s.append(marker.toString()).append("] ").append(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.DEBUG, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.DEBUG, s.toString());
- }
- }
-
- private void debugLog(String msg, Object... obj) {
- StringBuilder s = new StringBuilder(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.DEBUG, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.DEBUG, s.toString());
- }
- }
-
- private void errorLog(Marker marker, String msg, Object... obj) {
- StringBuilder s = new StringBuilder("[");
- s.append(marker.toString()).append("] ").append(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.ERROR, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.ERROR, s.toString());
- }
- }
-
- private void errorLog(String msg, Object... obj) {
- StringBuilder s = new StringBuilder(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.ERROR, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.ERROR, s.toString());
- }
- }
-
- private void infoLog(Marker marker, String msg, Object... obj) {
- StringBuilder s = new StringBuilder("[");
- s.append(marker.toString()).append("] ").append(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.INFO, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.INFO, s.toString());
- }
- }
-
- private void infoLog(String msg, Object... obj) {
- StringBuilder s = new StringBuilder(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.INFO, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.INFO, s.toString());
- }
- }
-
- private void warnLog(Marker marker, String msg, Object... obj) {
- StringBuilder s = new StringBuilder("[");
- s.append(marker.toString()).append("] ").append(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.WARN, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.WARN, s.toString());
- }
- }
-
- private void warnLog(String msg, Object... obj) {
- StringBuilder s = new StringBuilder(msg);
- Throwable t = null;
- if (obj != null) {
- s.append(" args=[");
- boolean first = true;
- for (Object o : obj) {
- if (o instanceof Throwable) {
- t = (Throwable) o;
- } else {
- if (first) {
- s.append(o.toString());
- first = false;
- } else {
- s.append(", ").append(o.toString());
- }
- }
- }
- s.append("]");
- }
- if (t != null) {
- context.log(MailetContext.LogLevel.WARN, s.toString(), t);
- } else {
- context.log(MailetContext.LogLevel.WARN, s.toString());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
index 748d8d0..89a89a2 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/LocalDeliveryTest.java
@@ -58,7 +58,9 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.Mailet;
import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -146,6 +148,12 @@ public class LocalDeliveryTest {
@Parameterized.Parameter
public Parameter parameter;
+ private FakeMailetConfig config;
+
+ @Before
+ public void setUp() {
+ config = new FakeMailetConfig("Local delivery", FakeMailContext.builder().logger(mock(Logger.class)).build());
+ }
@Test
public void mailShouldBeWellDeliveredByDefaultToUserWhenVirtualHostingIsTurnedOn() throws Exception {
@@ -161,7 +169,7 @@ public class LocalDeliveryTest {
// When
Mail mail = createMail();
- parameter.getMailet().init(new FakeMailetConfig());
+ parameter.getMailet().init(config);
parameter.getMailet().service(mail);
// Then
@@ -181,7 +189,7 @@ public class LocalDeliveryTest {
// When
Mail mail = createMail();
- parameter.getMailet().init(new FakeMailetConfig());
+ parameter.getMailet().init(config);
parameter.getMailet().service(mail);
// Then
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
index 2a76fec..184f0ea 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderTest.java
@@ -86,8 +86,7 @@ public class MailboxAppenderTest {
integrationResources = new InMemoryIntegrationResources();
integrationResources.init();
mailboxManager = new ManagerTestResources(integrationResources).getMailboxManager();
- MailetContext mailetContext = mock(MailetContext.class);
- testee = new MailboxAppender(mailboxManager, mailetContext);
+ testee = new MailboxAppender(mailboxManager, mock(Logger.class));
session = mailboxManager.createSystemSession("TEST", LOGGER);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
index a601b31..f5008a6 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
@@ -109,7 +109,7 @@ public class SieveIntegrationTest {
.resourceLocator(resourceLocator)
.usersRepository(usersRepository)
.folder("INBOX")
- .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, fakeMailContext), "INBOX", usersRepository, fakeMailContext))
+ .sievePoster(new SievePoster(new MailboxAppender(mailboxManager, mock(Logger.class)), "INBOX", usersRepository, fakeMailContext))
.log(mock(Log.class))
.mailetContext(fakeMailContext)
.build();
http://git-wip-us.apache.org/repos/asf/james-project/blob/9ac1ca71/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
index e1db93b..e2f3d27 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/ToRecipientFolderTest.java
@@ -151,7 +151,7 @@ public class ToRecipientFolderTest {
@Before
public void setUp() throws Exception {
- mailetConfig = new FakeMailetConfig("RecipientFolderTest", FakeMailContext.defaultContext());
+ mailetConfig = new FakeMailetConfig("RecipientFolderTest", FakeMailContext.builder().logger(mock(Logger.class)).build());
messageManager = mock(MessageManager.class);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org