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 ad...@apache.org on 2017/12/18 19:35:16 UTC
[40/50] [abbrv] james-project git commit: JAMES-2199 Remove
is*Enabled() checks and switch to parameterized logging
JAMES-2199 Remove is*Enabled() checks and switch to parameterized logging
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/04657f2d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/04657f2d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/04657f2d
Branch: refs/heads/master
Commit: 04657f2d495d8d00c9355ea7b71e3c08a96b64b7
Parents: d4ce407
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Mon Oct 30 11:28:15 2017 -0400
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 18 20:31:54 2017 +0100
----------------------------------------------------------------------
.../api/handler/CommandDispatcher.java | 8 +--
.../api/handler/CommandHandlerResultLogger.java | 6 +-
.../imap/decode/main/DefaultImapDecoder.java | 12 +---
.../imap/decode/parser/UidCommandParser.java | 4 +-
.../james/imap/encode/FetchResponseEncoder.java | 4 +-
.../james/imap/encode/base/EndImapEncoder.java | 8 +--
.../imap/main/AbstractImapRequestHandler.java | 4 +-
.../imap/processor/AbstractAuthProcessor.java | 8 +--
.../processor/AbstractMailboxProcessor.java | 6 +-
.../processor/AbstractSelectionProcessor.java | 8 +--
.../imap/processor/AuthenticateProcessor.java | 4 +-
.../james/imap/processor/CreateProcessor.java | 8 +--
.../james/imap/processor/DeleteProcessor.java | 8 +--
.../james/imap/processor/RenameProcessor.java | 12 +---
.../james/imap/processor/SearchProcessor.java | 4 +-
.../james/imap/processor/StatusProcessor.java | 4 +-
.../james/imap/processor/StoreProcessor.java | 15 +----
.../imap/processor/SubscribeProcessor.java | 4 +-
.../imap/processor/UnsubscribeProcessor.java | 4 +-
.../processor/base/UnknownRequestProcessor.java | 4 +-
.../imap/processor/fetch/FetchProcessor.java | 14 +----
.../decode/main/ImapRequestStreamHandler.java | 4 +-
.../protocols/smtp/core/MailCmdHandler.java | 25 +-------
.../protocols/smtp/core/RcptCmdHandler.java | 27 +--------
.../smtp/core/esmtp/AuthCmdHandler.java | 9 +--
.../smtp/core/esmtp/MailSizeEsmtpExtension.java | 27 +--------
...AbstractOSGIAnnotationBeanPostProcessor.java | 10 +---
.../mailrepository/file/FileMailRepository.java | 19 ++----
.../james/user/file/UsersFileRepository.java | 9 +--
.../james/user/jcr/JCRUsersRepository.java | 29 ++-------
.../mailrepository/jdbc/JDBCMailRepository.java | 62 +++++---------------
.../rrt/jdbc/JDBCRecipientRewriteTable.java | 20 ++-----
.../user/jdbc/AbstractJdbcUsersRepository.java | 29 ++-------
.../mailetcontainer/impl/JamesMailSpooler.java | 25 +++-----
.../impl/JamesMailetContext.java | 8 +--
.../lib/AbstractStateMailetProcessor.java | 36 ++++--------
.../mailets/jsieve/FileIntoAction.java | 11 +---
.../mailets/jsieve/RedirectAction.java | 6 +-
.../org/apache/james/fetchmail/FetchMail.java | 20 ++-----
.../james/fetchmail/MessageProcessor.java | 36 +++---------
.../james/jmap/AuthenticationServlet.java | 4 +-
.../netty/ImapChannelUpstreamHandler.java | 4 +-
.../smtpserver/fastfail/URIRBLHandler.java | 8 +--
43 files changed, 129 insertions(+), 448 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 00b87bf..63e3ad7 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -101,9 +101,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
if (command == null) {
return null;
}
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Lookup command handler for command: " + command);
- }
+ LOGGER.debug("Lookup command handler for command: {}", command);
List<CommandHandler<Session>> handlers = commandHandlerMap.get(command);
if(handlers == null) {
handlers = commandHandlerMap.get(getUnknownCommandHandlerIdentifier());
@@ -175,9 +173,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
* @return response
*/
protected Response dispatchCommandHandlers(Session session, Request request) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(getClass().getName() + " received: " + request.getCommand());
- }
+ LOGGER.debug("{} received: {}", getClass().getName(), request.getCommand());
List<CommandHandler<Session>> commandHandlers = getCommandHandlers(request.getCommand(), session);
// fetch the command handlers registered to the command
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
index 37f0410..123bafe 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultLogger.java
@@ -36,11 +36,7 @@ public class CommandHandlerResultLogger implements ProtocolHandlerResultHandler<
public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
if (handler instanceof CommandHandler) {
- String logmessage = handler.getClass().getName() + ": " + response.toString();
-
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(logmessage);
- }
+ LOGGER.debug("{}: {}", handler.getClass().getName(), response);
}
return response;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
index 4bf20e9..1638b8b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
@@ -77,9 +77,7 @@ public class DefaultImapDecoder implements ImapDecoder {
private ImapMessage decodeCommandTagged(ImapRequestLineReader request, String tag, ImapSession session) {
ImapMessage message;
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Got <tag>: " + tag);
- }
+ LOGGER.debug("Got <tag>: {}", tag);
try {
final String commandName = request.atom();
message = decodeCommandNamed(request, tag, commandName, session);
@@ -116,14 +114,10 @@ public class DefaultImapDecoder implements ImapDecoder {
private ImapMessage decodeCommandNamed(ImapRequestLineReader request, String tag, String commandName, ImapSession session) {
ImapMessage message;
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Got <command>: " + commandName);
- }
+ LOGGER.debug("Got <command>: {}", commandName);
final ImapCommandParser command = imapCommands.getParser(commandName);
if (command == null) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Missing command implementation for commmand " + commandName);
- }
+ LOGGER.info("Missing command implementation for commmand {}", commandName);
message = unknownCommand(tag, session);
} else {
message = command.parse(request, tag, session);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
index 0a27d13..7c41b71 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/parser/UidCommandParser.java
@@ -76,9 +76,7 @@ public class UidCommandParser extends AbstractImapCommandParser implements Deleg
if (helperCommand == null || !(helperCommand instanceof AbstractUidCommandParser)) {
throw new DecodingException(HumanReadableText.ILLEGAL_ARGUMENTS, "Invalid UID command: '" + commandName + "'");
}
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Got <command>: UID " + commandName);
- }
+ LOGGER.debug("Got <command>: UID {}", commandName);
final AbstractUidCommandParser uidEnabled = (AbstractUidCommandParser) helperCommand;
return uidEnabled.decode(request, tag, true, session);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
index 5ad9e1e..d936837 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/FetchResponseEncoder.java
@@ -203,9 +203,7 @@ public class FetchResponseEncoder extends AbstractChainedImapEncoder {
final String value = params.get(name);
if (value == null) {
LOGGER.warn("Disposition parameter name has no value.");
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Disposition parameter " + name + " has no matching value");
- }
+ LOGGER.debug("Disposition parameter {} has no matching value", name);
} else {
composer.quote(name);
composer.quote(value);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
index f3da6f4..7a48f73 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
@@ -42,12 +42,8 @@ public class EndImapEncoder implements ImapEncoder {
* org.apache.james.imap.api.process.ImapSession)
*/
public void encode(ImapMessage message, ImapResponseComposer composer, ImapSession session) throws IOException {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("Unknown message " + message);
- }
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Chain end reached for " + message);
- }
+ LOGGER.warn("Unknown message {}", message);
+ LOGGER.debug("Chain end reached for {}", message);
composer.untaggedNoResponse("Unknown message in pipeline", null);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java b/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
index 0b88f53..fb3cc90 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/main/AbstractImapRequestHandler.java
@@ -63,9 +63,7 @@ public abstract class AbstractImapRequestHandler {
} else {
result = false;
LOGGER.info(failure.getMessage());
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Failed to write " + message, failure);
- }
+ LOGGER.debug("Failed to write {}", message, failure);
}
return result;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
index 1c3f161..a891aa9 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
@@ -111,14 +111,10 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
manageFailureCount(session, tag, command, responder, failed);
}
} catch (UserDoesNotExistException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("User " + authenticationAttempt.getAuthenticationId() + " does not exist", e);
- }
+ LOGGER.info("User {} does not exist", authenticationAttempt.getAuthenticationId(), e);
no(command, tag, responder, HumanReadableText.USER_DOES_NOT_EXIST);
} catch (NotAdminException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("User " + authenticationAttempt.getDelegateUserName() + " is not an admin", e);
- }
+ LOGGER.info("User {} is not an admin", authenticationAttempt.getDelegateUserName(), e);
no(command, tag, responder, HumanReadableText.NOT_AN_ADMIN);
} catch (MailboxException e) {
LOGGER.info("Login failed", e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index 159a54c..56a2653 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -244,9 +244,7 @@ abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
final MessageUid uid = mr.getUid();
int msn = selected.msn(uid);
if (msn == SelectedMailbox.NO_SUCH_MESSAGE) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("No message found with uid " + uid + " in the uid<->msn mapping for mailbox " + selected.getPath().getFullName(mailboxSession.getPathDelimiter()) +" , this may be because it was deleted by a concurrent session. So skip it..");
- }
+ LOGGER.debug("No message found with uid {} in the uid<->msn mapping for mailbox {}. This may be because it was deleted by a concurrent session. So skip it..", uid, selected.getPath().getFullName(mailboxSession.getPathDelimiter()));
// skip this as it was not found in the mapping
@@ -319,7 +317,7 @@ abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
}
private void handleResponseException(ImapProcessor.Responder responder, MailboxException e, HumanReadableText message, ImapSession session) {
- LOGGER.error(message.toString(), e);
+ LOGGER.error("{}", message, e);
// TODO: consider whether error message should be passed to the user
final StatusResponse response = factory.untaggedNo(message);
responder.respond(response);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
index 75936d2..89be98c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractSelectionProcessor.java
@@ -140,9 +140,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
while(unseen(responder, firstUnseen, selected, ImapSessionUtils.getMailboxSession(session)) == false) {
// if we not was able to get find the unseen within 5 retries we should just not send it
if (retryCount == 5) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Unable to uid for unseen message " + firstUnseen + " in mailbox " + selected.getPath());
- }
+ LOGGER.info("Unable to uid for unseen message {} in mailbox {}", firstUnseen, selected.getPath());
break;
}
firstUnseen = selectMailbox(fullMailboxPath, session).getFirstUnseen();
@@ -368,9 +366,7 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ
int msn = selected.msn(unseenUid);
if (msn == SelectedMailbox.NO_SUCH_MESSAGE) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("No message found with uid " + unseenUid + " in mailbox " + selected.getPath().getFullName(session.getPathDelimiter()));
- }
+ LOGGER.debug("No message found with uid {} in mailbox {}", unseenUid, selected.getPath().getFullName(session.getPathDelimiter()));
return false;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
index 63efe03..89e2531 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
@@ -87,9 +87,7 @@ public class AuthenticateProcessor extends AbstractAuthProcessor<AuthenticateReq
}
}
} else {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug ("Unsupported authentication mechanism '" + authType + "'");
- }
+ LOGGER.debug("Unsupported authentication mechanism '{}'", authType);
no(command, tag, responder, HumanReadableText.UNSUPPORTED_AUTHENTICATION_MECHANISM);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
index eb0f983..c32fae3 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
@@ -62,14 +62,10 @@ public class CreateProcessor extends AbstractMailboxProcessor<CreateRequest> {
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
} catch (MailboxExistsException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Create failed for mailbox " + mailboxPath + " as it already exists", e);
- }
+ LOGGER.debug("Create failed for mailbox {} as it already exists", mailboxPath, e);
no(command, tag, responder, HumanReadableText.MAILBOX_EXISTS);
} catch (TooLongMailboxNameException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("The mailbox name length is over limit: " + mailboxPath.getName(), e);
- }
+ LOGGER.debug("The mailbox name length is over limit: {}", mailboxPath.getName(), e);
taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME);
} catch (MailboxException e) {
LOGGER.error("Create failed for mailbox {}", mailboxPath, e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
index 676f025..fce0489 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
@@ -68,14 +68,10 @@ public class DeleteProcessor extends AbstractMailboxProcessor<DeleteRequest> {
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
} catch (MailboxNotFoundException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Delete failed for mailbox " + mailboxPath + " as it not exist", e);
- }
+ LOGGER.debug("Delete failed for mailbox {} as it doesn't exist", mailboxPath, e);
no(command, tag, responder, HumanReadableText.FAILURE_NO_SUCH_MAILBOX);
} catch (TooLongMailboxNameException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("The mailbox name length is over limit: " + mailboxPath.getName(), e);
- }
+ LOGGER.debug("The mailbox name length is over limit: {}", mailboxPath.getName(), e);
taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME);
} catch (MailboxException e) {
LOGGER.error("Delete failed for mailbox {}", mailboxPath, e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
index bff1745..7dc9a0f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
@@ -73,19 +73,13 @@ public class RenameProcessor extends AbstractMailboxProcessor<RenameRequest> {
okComplete(command, tag, responder);
unsolicitedResponses(session, responder, false);
} catch (MailboxExistsException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Rename from " + existingPath + " to " + newPath + " failed because the target mailbox exists", e);
- }
+ LOGGER.debug("Rename from {} to {} failed because the target mailbox exists", existingPath, newPath, e);
no(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_EXISTS);
} catch (MailboxNotFoundException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Rename from " + existingPath + " to " + newPath + " failed because the source mailbox not exists", e);
- }
+ LOGGER.debug("Rename from {} to {} failed because the source mailbox doesn't exist", existingPath, newPath, e);
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (TooLongMailboxNameException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("The mailbox name length is over limit: " + newPath.getName(), e);
- }
+ LOGGER.debug("The mailbox name length is over limit: {}", newPath.getName(), e);
taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME);
} catch (MailboxException e) {
LOGGER.error("Rename from {} to {} failed", existingPath, newPath, e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
index bcb42ea..5548952 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
@@ -202,9 +202,7 @@ public class SearchProcessor extends AbstractMailboxProcessor<SearchRequest> imp
unsolicitedResponses(session, responder, omitExpunged, useUids);
okComplete(command, tag, responder);
} catch (MessageRangeException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Search failed in mailbox " + session.getSelected().getPath() + " because of an invalid sequence-set ", e);
- }
+ LOGGER.debug("Search failed in mailbox {} because of an invalid sequence-set ", session.getSelected().getPath(), e);
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
LOGGER.error("Search failed in mailbox {}", session.getSelected().getPath(), e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
index fda04df..174a745 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
@@ -64,9 +64,7 @@ public class StatusProcessor extends AbstractMailboxProcessor<StatusRequest> {
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
try {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Status called on mailbox named " + mailboxPath);
- }
+ LOGGER.debug("Status called on mailbox named {}", mailboxPath);
final MailboxManager mailboxManager = getMailboxManager();
final MessageManager mailbox = mailboxManager.getMailbox(mailboxPath, ImapSessionUtils.getMailboxSession(session));
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
index 698720f..1efe3ef 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
@@ -61,8 +61,6 @@ import org.apache.james.util.MDCBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-
public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
private static final Logger LOGGER = LoggerFactory.getLogger(StoreProcessor.class);
@@ -216,14 +214,10 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
}
}
} catch (MessageRangeException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Store failed for mailbox " + session.getSelected().getPath() + " because of an invalid sequence-set " + ImmutableList.copyOf(idSet), e);
- }
+ LOGGER.debug("Store failed for mailbox {} because of an invalid sequence-set {}", session.getSelected().getPath(), idSet, e);
taggedBad(imapCommand, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("Store failed for mailbox " + session.getSelected().getPath() + " and sequence-set " + ImmutableList.copyOf(idSet), e);
- }
+ LOGGER.error("Store failed for mailbox {} and sequence-set {}", session.getSelected().getPath(), idSet, e);
no(imapCommand, tag, responder, HumanReadableText.SAVE_FAILED);
}
}
@@ -297,10 +291,7 @@ public class StoreProcessor extends AbstractMailboxProcessor<StoreRequest> {
final int msn = selected.msn(uid);
if (msn == SelectedMailbox.NO_SUCH_MESSAGE) {
- if(LOGGER.isDebugEnabled()) {
- LOGGER.debug("No message found with uid " + uid + " in the uid<->msn mapping for mailbox " + selected.getPath().getFullName(mailboxSession.getPathDelimiter()) +" , this may be because it was deleted by a concurrent session. So skip it..");
-
- }
+ LOGGER.debug("No message found with uid {} in the uid<->msn mapping for mailbox {}. This may be because it was deleted by a concurrent session. So skip it..", uid, selected.getPath().getFullName(mailboxSession.getPathDelimiter()));
// skip this as it was not found in the mapping
//
// See IMAP-346
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
index 36b63ce..6bbe84c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
@@ -62,9 +62,7 @@ public class SubscribeProcessor extends AbstractSubscriptionProcessor<SubscribeR
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Subscribe failed for mailbox " + mailboxName, e);
- }
+ LOGGER.info("Subscribe failed for mailbox {}", mailboxName, e);
unsolicitedResponses(session, responder, false);
no(command, tag, responder, HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
index 675947a..529020c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
@@ -62,9 +62,7 @@ public class UnsubscribeProcessor extends AbstractSubscriptionProcessor<Unsubscr
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Unsubscribe failed for mailbox " + mailboxName, e);
- }
+ LOGGER.info("Unsubscribe failed for mailbox {}", mailboxName, e);
unsolicitedResponses(session, responder, false);
no(command, tag, responder, HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
index 75f99dd..7f246fa 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/base/UnknownRequestProcessor.java
@@ -42,9 +42,7 @@ public class UnknownRequestProcessor implements ImapProcessor {
}
public ImapResponseMessage process(ImapMessage message) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Unknown message: " + message);
- }
+ LOGGER.debug("Unknown message: {}", message);
final ImapResponseMessage result;
if (message instanceof ImapRequest) {
ImapRequest request = (ImapRequest) message;
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
index c5644d7..858b83f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
@@ -55,8 +55,6 @@ import org.apache.james.util.MDCBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-
public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
private static final Logger LOGGER = LoggerFactory.getLogger(FetchProcessor.class);
@@ -133,14 +131,10 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
unsolicitedResponses(session, responder, omitExpunged, useUids);
okComplete(command, tag, responder);
} catch (MessageRangeException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Fetch failed for mailbox " + session.getSelected().getPath() + " because of invalid sequence-set " + ImmutableList.copyOf(idSet), e);
- }
+ LOGGER.debug("Fetch failed for mailbox {} because of invalid sequence-set {}", session.getSelected().getPath(), idSet, e);
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("Fetch failed for mailbox " + session.getSelected().getPath() + " and sequence-set " + ImmutableList.copyOf(idSet), e);
- }
+ LOGGER.error("Fetch failed for mailbox {} and sequence-set {}", session.getSelected().getPath(), idSet, e);
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
@@ -180,9 +174,7 @@ public class FetchProcessor extends AbstractMailboxProcessor<FetchRequest> {
} catch (MessageRangeException e) {
// we can't for whatever reason find the message so
// just skip it and log it to debug
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Unable to find message with uid " + result.getUid(), e);
- }
+ LOGGER.debug("Unable to find message with uid {}", result.getUid(), e);
} catch (MailboxException e) {
// we can't for whatever reason find parse all requested parts of the message. This may because it was deleted while try to access the parts.
// So we just skip it
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
index cd8ce27..f720a6a 100644
--- a/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
+++ b/protocols/imap/src/test/java/org/apache/james/imap/decode/main/ImapRequestStreamHandler.java
@@ -85,9 +85,7 @@ public final class ImapRequestStreamHandler extends AbstractImapRequestHandler {
} catch (DecodingException e) {
// Cannot clean up. No recovery is therefore possible.
// Abandon connection.
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Fault during clean up: " + e.getMessage());
- }
+ LOGGER.info("Fault during clean up: {}", e.getMessage());
LOGGER.debug("Abandoning after fault in clean up", e);
abandon(output, session);
return false;
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
index 4d3cb54..89bb5a4 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
@@ -216,26 +216,13 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
}
} else {
// Unexpected option attached to the Mail command
- if (LOGGER.isDebugEnabled()) {
- StringBuilder debugBuffer = new StringBuilder(128)
- .append(
- "MAIL command had unrecognized/unexpected option ")
- .append(mailOptionName).append(
- " with value ").append(
- mailOptionValue);
- LOGGER.debug(debugBuffer.toString());
- }
+ LOGGER.debug("MAIL command had unrecognized/unexpected option {} with value {}", mailOptionName, mailOptionValue);
}
}
}
if (session.getConfiguration().useAddressBracketsEnforcement()
&& (!sender.startsWith("<") || !sender.endsWith(">"))) {
- if (LOGGER.isInfoEnabled()) {
- StringBuilder errorBuffer = new StringBuilder(128).append(
- "Error parsing sender address: ").append(sender)
- .append(": did not start and end with < >");
- LOGGER.info(errorBuffer.toString());
- }
+ LOGGER.info("Error parsing sender address: {}: did not start and end with < >", sender);
return SYNTAX_ERROR;
}
MailAddress senderAddress = null;
@@ -259,13 +246,7 @@ public class MailCmdHandler extends AbstractHookableCmdHandler<MailHook> {
try {
senderAddress = new MailAddress(sender);
} catch (Exception pe) {
- if (LOGGER.isInfoEnabled()) {
- StringBuilder errorBuffer = new StringBuilder(256)
- .append("Error parsing sender address: ")
- .append(sender).append(": ").append(
- pe.getMessage());
- LOGGER.info(errorBuffer.toString());
- }
+ LOGGER.info("Error parsing sender address: {}", sender, pe);
return SYNTAX_ERROR_ADDRESS;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
index 562686c..568f5c0 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
@@ -144,13 +144,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
}
if (session.getConfiguration().useAddressBracketsEnforcement()
&& (!recipient.startsWith("<") || !recipient.endsWith(">"))) {
- if (LOGGER.isInfoEnabled()) {
- StringBuilder errorBuffer = new StringBuilder(192).append(
- "Error parsing recipient address: ").append(
- "Address did not start and end with < >").append(
- getContext(session, null, recipient));
- LOGGER.info(errorBuffer.toString());
- }
+ LOGGER.info("Error parsing recipient address: Address did not start and end with < >{}", getContext(session, null, recipient));
return SYNTAX_ERROR_DELIVERY;
}
MailAddress recipientAddress = null;
@@ -170,13 +164,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
try {
recipientAddress = new MailAddress(recipient);
} catch (Exception pe) {
- if (LOGGER.isInfoEnabled()) {
- StringBuilder errorBuffer = new StringBuilder(192).append(
- "Error parsing recipient address: ").append(
- getContext(session, recipientAddress, recipient))
- .append(pe.getMessage());
- LOGGER.info(errorBuffer.toString());
- }
+ LOGGER.info("Error parsing recipient address{}", getContext(session, recipientAddress, recipient), pe);
/*
* from RFC2822; 553 Requested action not taken: mailbox name
* not allowed (e.g., mailbox syntax incorrect)
@@ -199,16 +187,7 @@ public class RcptCmdHandler extends AbstractHookableCmdHandler<RcptHook> impleme
rcptOptionValue = rcptOption.substring(equalIndex + 1);
}
// Unexpected option attached to the RCPT command
- if (LOGGER.isDebugEnabled()) {
- StringBuilder debugBuffer = new StringBuilder(128)
- .append(
- "RCPT command had unrecognized/unexpected option ")
- .append(rcptOptionName).append(" with value ")
- .append(rcptOptionValue).append(
- getContext(session, recipientAddress,
- recipient));
- LOGGER.debug(debugBuffer.toString());
- }
+ LOGGER.debug("RCPT command had unrecognized/unexpected option {} with value {}{}", rcptOptionName, rcptOptionValue, getContext(session, recipientAddress, recipient));
return new SMTPResponse(
SMTPRetCode.PARAMETER_NOT_IMPLEMENTED,
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
index 818a1a5..acacc70 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
@@ -487,14 +487,7 @@ public class AuthCmdHandler
* @param initialResponse the initial response line passed in with the AUTH command
*/
private Response doUnknownAuth(SMTPSession session, String authType, String initialResponse) {
- if (LOGGER.isInfoEnabled()) {
- StringBuilder errorBuffer =
- new StringBuilder(128)
- .append("AUTH method ")
- .append(authType)
- .append(" is an unrecognized authentication type");
- LOGGER.info(errorBuffer.toString());
- }
+ LOGGER.info("AUTH method {} is an unrecognized authentication type", authType);
return UNKNOWN_AUTH_TYPE;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
index 10fd3cf..0158422 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
@@ -122,24 +122,11 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
// This is a malformed option value. We return an error
return SYNTAX_ERROR;
}
- if (LOGGER.isDebugEnabled()) {
- StringBuilder debugBuffer = new StringBuilder(128).append(
- "MAIL command option SIZE received with value ").append(
- size).append(".");
- LOGGER.debug(debugBuffer.toString());
- }
+ LOGGER.debug("MAIL command option SIZE received with value {}.", size);
long maxMessageSize = session.getConfiguration().getMaxMessageSize();
if ((maxMessageSize > 0) && (size > maxMessageSize)) {
// Let the client know that the size limit has been hit.
- StringBuilder errorBuffer = new StringBuilder(256).append(
- "Rejected message from ").append(
- tempSender != null ? tempSender : null).append(
- " from ")
- .append(session.getRemoteAddress().getAddress().getHostAddress()).append(" of size ")
- .append(size).append(
- " exceeding system maximum message size of ")
- .append(maxMessageSize).append("based on SIZE option.");
- LOGGER.error(errorBuffer.toString());
+ LOGGER.error("Rejected message from {} from {} of size {} exceeding system maximum message size of {} based on SIZE option.", (tempSender != null ? tempSender : null), session.getRemoteAddress().getAddress().getHostAddress(), size, maxMessageSize);
return QUOTA_EXCEEDED;
} else {
@@ -208,15 +195,7 @@ public class MailSizeEsmtpExtension implements MailParametersHook, EhloExtension
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
Boolean failed = (Boolean) session.getAttachment(MESG_FAILED, State.Transaction);
if (failed != null && failed.booleanValue()) {
-
- StringBuilder errorBuffer = new StringBuilder(256).append(
- "Rejected message from ").append(
- session.getAttachment(SMTPSession.SENDER, State.Transaction).toString())
- .append(" from ").append(session.getRemoteAddress().getAddress().getHostAddress())
- .append(" exceeding system maximum message size of ")
- .append(
- session.getConfiguration().getMaxMessageSize());
- LOGGER.error(errorBuffer.toString());
+ LOGGER.error("Rejected message from {} from {} exceeding system maximum message size of {}", session.getAttachment(SMTPSession.SENDER, State.Transaction), session.getRemoteAddress().getAddress().getHostAddress(), session.getConfiguration().getMaxMessageSize());
return QUOTA_EXCEEDED;
} else {
return HookResult.declined();
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
index 94d2c25..34cd951 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
@@ -144,8 +144,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
*/
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (logger.isDebugEnabled())
- logger.debug("processing [" + bean.getClass().getName() + ", " + beanName + "]");
+ logger.debug("processing [{}, {}]", bean.getClass().getName(), beanName);
// Catch FactoryBean created instances.
if (!(bean instanceof FactoryBean) && beanFactory.containsBean(BeanFactory.FACTORY_BEAN_PREFIX + beanName)) {
injectServices(bean, beanName);
@@ -160,9 +159,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
A s = AnnotationUtils.getAnnotation(method, getAnnotation());
if (s != null && method.getParameterTypes().length == 1) {
try {
- if (logger.isDebugEnabled())
- logger.debug("Processing annotation [" + s + "] for [" + bean.getClass().getName() + "."
- + method.getName() + "()] on bean [" + beanName + "]");
+ logger.debug("Processing annotation [{}] for [{}.{}()] on bean [{}]", s, bean.getClass().getName(), method.getName(), beanName);
method.invoke(bean, getServiceImporter(s, method, beanName).getObject());
}
catch (Exception e) {
@@ -182,8 +179,7 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
A s = hasAnnotatedProperty(pd);
if (s != null && !pvs.contains(pd.getName())) {
try {
- if (logger.isDebugEnabled())
- logger.debug("Processing annotation [" + s + "] for [" + beanName + "." + pd.getName() + "]");
+ logger.debug("Processing annotation [{}] for [{}.{}]", s, beanName, pd.getName());
FactoryBean importer = getServiceImporter(s, pd.getWriteMethod(), beanName);
// BPPs are created in stageOne(), even though they are run in stageTwo(). This check means that
// the call to getObject() will not fail with ServiceUnavailable. This is safe to do because
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
index 15aced6..a10b3ce 100644
--- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
@@ -83,9 +83,7 @@ public class FileMailRepository extends AbstractMailRepository {
protected void doConfigure(HierarchicalConfiguration config) throws org.apache.commons.configuration.ConfigurationException {
super.doConfigure(config);
destination = config.getString("[@destinationURL]");
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("FileMailRepository.destinationURL: " + destination);
- }
+ LOGGER.debug("FileMailRepository.destinationURL: {}", destination);
fifo = config.getBoolean("[@FIFO]", false);
cacheKeys = config.getBoolean("[@CACHEKEYS]", true);
// ignore model
@@ -145,13 +143,9 @@ public class FileMailRepository extends AbstractMailRepository {
keys.add(i.next());
}
}
- if (LOGGER.isDebugEnabled()) {
- String logBuffer = getClass().getName() + " created in " + destination;
- LOGGER.debug(logBuffer);
- }
+ LOGGER.debug("{} created in {}", getClass().getName(), destination);
} catch (Exception e) {
- final String message = "Failed to retrieve Store component:" + e.getMessage();
- LOGGER.error(message, e);
+ LOGGER.error("Failed to retrieve Store component:{}", e.getMessage(), e);
throw e;
}
}
@@ -228,15 +222,12 @@ public class FileMailRepository extends AbstractMailRepository {
try {
mc = (Mail) objectRepository.get(key);
} catch (RuntimeException re) {
- StringBuilder exceptionBuffer = new StringBuilder(128);
if (re.getCause() instanceof Error) {
- exceptionBuffer.append("Error when retrieving mail, not deleting: ").append(re.toString());
+ LOGGER.warn("Error when retrieving mail, not deleting: {}", re, re);
} else {
- exceptionBuffer.append("Exception retrieving mail: ").append(re.toString()).append(", so we're deleting it.");
+ LOGGER.warn("Exception retrieving mail: {}, so we're deleting it.", re, re);
remove(key);
}
- final String errorMessage = exceptionBuffer.toString();
- LOGGER.warn(errorMessage, re);
return null;
}
MimeMessageStreamRepositorySource source = new MimeMessageStreamRepositorySource(streamRepository, destination, key);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
index 262bb4a..815b174 100644
--- a/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
+++ b/server/data/data-file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
@@ -98,14 +98,9 @@ public class UsersFileRepository extends AbstractJamesUsersRepository {
objectRepository.setFileSystem(fileSystem);
objectRepository.configure(objectConfiguration);
objectRepository.init();
- if (LOGGER.isDebugEnabled()) {
- String logBuffer = this.getClass().getName() + " created in " + destination;
- LOGGER.debug(logBuffer);
- }
+ LOGGER.debug("{} created in {}", getClass().getName(), destination);
} catch (Exception e) {
- if (LOGGER.isErrorEnabled()) {
- LOGGER.error("Failed to initialize repository:" + e.getMessage(), e);
- }
+ LOGGER.error("Failed to initialize repository: {}", e.getMessage(), e);
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
index a086d4d..35245d8 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
@@ -115,9 +115,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to add user: " + username, e);
- }
+ LOGGER.info("Failed to add user: {}", username, e);
user = null;
}
return user;
@@ -169,9 +167,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to add user: " + userName, e);
- }
+ LOGGER.info("Failed to add user: {}", userName, e);
throw new UsersRepositoryException("Failed to add user: " + userName, e);
}
@@ -203,11 +199,8 @@ public class JCRUsersRepository extends AbstractUsersRepository {
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to remove user: " + username, e);
- }
+ LOGGER.info("Failed to remove user: {}", username, e);
throw new UsersRepositoryException("Failed to remove user: " + username, e);
-
}
}
@@ -231,9 +224,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
session.logout();
}
} catch (PathNotFoundException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("User not found: " + name, e);
- }
+ LOGGER.debug("User not found: {}", name, e);
} catch (RepositoryException e) {
throw new UsersRepositoryException("Failed to search for user: " + name, e);
@@ -282,13 +273,9 @@ public class JCRUsersRepository extends AbstractUsersRepository {
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to search user: " + username, e);
- }
+ LOGGER.info("Failed to search user: {}", username, e);
throw new UsersRepositoryException("Failed to search for user: " + username, e);
-
}
-
}
/**
@@ -403,13 +390,9 @@ public class JCRUsersRepository extends AbstractUsersRepository {
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to add user: " + lowerCasedUsername, e);
- }
+ LOGGER.info("Failed to add user: {}", lowerCasedUsername, e);
throw new UsersRepositoryException("Failed to add user: " + lowerCasedUsername, e);
-
}
-
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index 9a67212..73ebd94 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -163,9 +163,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
super.doConfigure(configuration);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(this.getClass().getName() + ".configure()");
- }
+ LOGGER.debug("{}.configure()", getClass().getName());
destination = configuration.getString("[@destinationURL]");
// normalize the destination, to simplify processing.
@@ -209,10 +207,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
}
}
- if (LOGGER.isDebugEnabled()) {
- String logBuffer = "Parsed URL: table = '" + tableName + "', repositoryName = '" + repositoryName + "'";
- LOGGER.debug(logBuffer);
- }
+ LOGGER.debug("Parsed URL: table = '{}', repositoryName = '{}'", tableName, repositoryName);
inMemorySizeLimit = configuration.getInt("inMemorySizeLimit", 409600000);
@@ -237,10 +232,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
@Override
@PostConstruct
public void init() throws Exception {
- StringBuffer logBuffer;
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(this.getClass().getName() + ".initialize()");
- }
+ LOGGER.debug("{}.initialize()", getClass().getName());
try {
if (filestore != null) {
@@ -255,15 +247,10 @@ public class JDBCMailRepository extends AbstractMailRepository {
sr.configure(streamConfiguration);
sr.init();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Got filestore for JdbcMailRepository: " + filestore);
- }
+ LOGGER.debug("Got filestore for JdbcMailRepository: {}", filestore);
}
- if (LOGGER.isDebugEnabled()) {
- String logBuf = this.getClass().getName() + " created according to " + destination;
- LOGGER.debug(logBuf);
- }
+ LOGGER.debug("{} created according to {}", getClass().getName(), destination);
} catch (Exception e) {
String message = "Failed to retrieve Store component:" + e.getMessage();
LOGGER.error(message, e);
@@ -287,10 +274,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
throw e;
}
- if (LOGGER.isDebugEnabled()) {
- logBuffer = new StringBuffer(128).append("Reading SQL resources from file: ").append(sqlFileName).append(", section ").append(this.getClass().getName()).append(".");
- LOGGER.debug(logBuffer.toString());
- }
+ LOGGER.debug("Reading SQL resources from file: {}, section {}.", sqlFileName, getClass().getName());
// Build the statement parameters
Map<String, String> sqlParameters = new HashMap<>();
@@ -314,10 +298,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
createStatement = conn.prepareStatement(sqlQueries.getSqlString("createTable", true));
createStatement.execute();
- if (LOGGER.isInfoEnabled()) {
- logBuffer = new StringBuffer(64).append("JdbcMailRepository: Created table '").append(tableName).append("'.");
- LOGGER.info(logBuffer.toString());
- }
+ LOGGER.info("JdbcMailRepository: Created table '{}'.", tableName);
}
checkJdbcAttributesSupport(dbMetaData);
@@ -383,14 +364,12 @@ public class JDBCMailRepository extends AbstractMailRepository {
}
if (hasUpdateMessageAttributesSQL && hasRetrieveMessageAttributesSQL) {
jdbcMailAttributesReady = true;
- if (LOGGER.isInfoEnabled()) {
- logBuffer.append("JDBC Mail Attributes support ready.");
- LOGGER.info(logBuffer.toString());
- }
+ logBuffer.append("JDBC Mail Attributes support ready.");
+ LOGGER.info("{}", logBuffer);
} else {
jdbcMailAttributesReady = false;
logBuffer.append("JDBC Mail Attributes support not activated. " + "Missing both 'updateMessageAttributesSQL' " + "and 'retrieveMessageAttributesSQL' " + "statements for table '").append(tableName).append("' in sqlResources.xml. ").append("Will not persist in the repository '").append(repositoryName).append("'.");
- LOGGER.warn(logBuffer.toString());
+ LOGGER.warn("{}", logBuffer);
}
}
@@ -638,10 +617,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
System.err.println("ran the query " + key);
}
if (!rsMessage.next()) {
- if (LOGGER.isDebugEnabled()) {
- String debugBuffer = "Did not find a record " + key + " in " + repositoryName;
- LOGGER.debug(debugBuffer);
- }
+ LOGGER.debug("Did not find a record {} in {}", key, repositoryName);
return null;
}
// Determine whether attributes are used and retrieve them
@@ -675,20 +651,13 @@ public class JDBCMailRepository extends AbstractMailRepository {
ois.close();
}
} catch (IOException ioe) {
- if (LOGGER.isDebugEnabled()) {
- String debugBuffer = "Exception reading attributes " + key + " in " + repositoryName;
- LOGGER.debug(debugBuffer, ioe);
- }
+ LOGGER.debug("Exception reading attributes {} in {}", key, repositoryName, ioe);
}
} else {
- if (LOGGER.isDebugEnabled()) {
- String debugBuffer = "Did not find a record (attributes) " + key + " in " + repositoryName;
- LOGGER.debug(debugBuffer);
- }
+ LOGGER.debug("Did not find a record (attributes) {} in {}", key, repositoryName);
}
} catch (SQLException sqle) {
- String errorBuffer = "Error retrieving message" + sqle.getMessage() + sqle.getErrorCode() + sqle.getSQLState() + sqle.getNextException();
- LOGGER.error(errorBuffer);
+ LOGGER.error("Error retrieving message{}{}{}{}", sqle.getMessage(), sqle.getErrorCode(), sqle.getSQLState(), String.valueOf(sqle.getNextException()));
} finally {
theJDBCUtil.closeJDBCResultSet(rsMessageAttr);
theJDBCUtil.closeJDBCStatement(retrieveMessageAttr);
@@ -721,8 +690,7 @@ public class JDBCMailRepository extends AbstractMailRepository {
mc.setMessage(message);
return mc;
} catch (SQLException sqle) {
- String errorBuffer = "Error retrieving message" + sqle.getMessage() + sqle.getErrorCode() + sqle.getSQLState() + sqle.getNextException();
- LOGGER.error(errorBuffer);
+ LOGGER.error("Error retrieving message{}{}{}{}", sqle.getMessage(), sqle.getErrorCode(), sqle.getSQLState(), String.valueOf(sqle.getNextException()));
LOGGER.debug("Failed to retrieve mail", sqle);
throw new MessagingException("Exception while retrieving mail: " + sqle.getMessage(), sqle);
} catch (Exception me) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
index fccd1e7..e9f017e 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
@@ -81,10 +81,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
@PostConstruct
public void init() throws Exception {
- StringBuffer logBuffer;
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(this.getClass().getName() + ".initialize()");
- }
+ LOGGER.debug("{}.initialize()", getClass().getName());
// Test the connection to the database, by getting the DatabaseMetaData.
Connection conn = dataSource.getConnection();
@@ -102,10 +99,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
throw e;
}
- if (LOGGER.isDebugEnabled()) {
- logBuffer = new StringBuffer(128).append("Reading SQL resources from file: ").append(sqlFileName).append(", section ").append(this.getClass().getName()).append(".");
- LOGGER.debug(logBuffer.toString());
- }
+ LOGGER.debug("Reading SQL resources from file: {}, section {}.", sqlFileName, getClass().getName());
// Build the statement parameters
Map<String, String> sqlParameters = new HashMap<>();
@@ -128,10 +122,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
createStatement = conn.prepareStatement(sqlQueries.getSqlString("createTable", true));
createStatement.execute();
- if (LOGGER.isInfoEnabled()) {
- logBuffer = new StringBuffer(64).append("JdbcVirtalUserTable: Created table '").append(tableName).append("'.");
- LOGGER.info(logBuffer.toString());
- }
+ LOGGER.info("JdbcVirtalUserTable: Created table '{}'.", tableName);
}
} finally {
@@ -185,10 +176,7 @@ public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
tableName = urlParams.get(1);
}
- if (LOGGER.isDebugEnabled()) {
- String logBuffer = "Parsed URL: table = '" + tableName + "'";
- LOGGER.debug(logBuffer);
- }
+ LOGGER.debug("Parsed URL: table = '{}'", tableName);
sqlFileName = conf.getString("sqlFile");
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
index 42c4032..596c3b9 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
@@ -247,11 +247,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
*/
@PostConstruct
public void init() throws Exception {
- StringBuffer logBuffer;
- if (LOGGER.isDebugEnabled()) {
- logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(".initialize()");
- LOGGER.debug(logBuffer.toString());
- }
+ LOGGER.debug("{}.initialize()", getClass().getName());
theJDBCUtil = new JDBCUtil();
@@ -269,10 +265,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
throw e;
}
- if (LOGGER.isDebugEnabled()) {
- logBuffer = new StringBuffer(256).append("Reading SQL resources from: ").append(m_sqlFileName).append(", section ").append(this.getClass().getName()).append(".");
- LOGGER.debug(logBuffer.toString());
- }
+ LOGGER.debug("Reading SQL resources from: {}, section {}.", m_sqlFileName, getClass().getName());
SqlResources sqlStatements = new SqlResources();
sqlStatements.init(sqlFile, this.getClass().getName(), conn, m_sqlParameters);
@@ -322,12 +315,9 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
theJDBCUtil.closeJDBCStatement(createStatement);
}
- logBuffer = new StringBuffer(128).append(this.getClass().getName()).append(": Created table \'").append(tableName).append("\'.");
- LOGGER.info(logBuffer.toString());
+ LOGGER.info("{}: Created table '{}'.", getClass().getName(), tableName);
} else {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Using table: " + tableName);
- }
+ LOGGER.debug("Using table: {}", tableName);
}
} finally {
@@ -358,11 +348,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
* @see org.apache.james.user.lib.AbstractJamesUsersRepository#doConfigure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
protected void doConfigure(HierarchicalConfiguration configuration) throws ConfigurationException {
- StringBuffer logBuffer;
- if (LOGGER.isDebugEnabled()) {
- logBuffer = new StringBuffer(64).append(this.getClass().getName()).append(".configure()");
- LOGGER.debug(logBuffer.toString());
- }
+ LOGGER.debug("{}.configure()", getClass().getName());
// Parse the DestinationURL for the name of the datasource,
// the table to use, and the (optional) repository Key.
@@ -399,10 +385,7 @@ public abstract class AbstractJdbcUsersRepository extends AbstractJamesUsersRepo
throw new ConfigurationException("Malformed destinationURL - " + "Must be of the format \"db://<data-source>[/<table>[/<key>]]\".");
}
- if (LOGGER.isDebugEnabled()) {
- logBuffer = new StringBuffer(128).append("Parsed URL: table = '").append(m_sqlParameters.get("table")).append("', key = '").append(m_sqlParameters.get("key")).append("'");
- LOGGER.debug(logBuffer.toString());
- }
+ LOGGER.debug("Parsed URL: table = '{}', key = '{}'", m_sqlParameters.get("table"), m_sqlParameters.get("key"));
// Get the SQL file location
m_sqlFileName = configuration.getString("sqlFile", null);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
index c10ea60..6721922 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
@@ -124,10 +124,7 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
queue = queueFactory.getQueue(MailQueueFactory.SPOOL);
- if (LOGGER.isInfoEnabled()) {
- String infoBuffer = getClass().getName() + " uses " + numThreads + " Thread(s)";
- LOGGER.info(infoBuffer);
- }
+ LOGGER.info("{} uses {} Thread(s)", getClass().getName(), numThreads);
active.set(true);
workerService = JMXEnabledThreadPoolExecutor.newFixedThreadPool("org.apache.james:type=component,component=mailetcontainer,name=mailspooler,sub-type=threadpool", "spooler", numThreads);
@@ -145,11 +142,8 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
*/
@Override
public void run() {
-
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Run " + getClass().getName() + ": " + Thread.currentThread().getName());
- LOGGER.info("Queue=" + queue.toString());
- }
+ LOGGER.info("Run {}: {}", getClass().getName(), Thread.currentThread().getName());
+ LOGGER.info("Queue={}", queue);
while (active.get()) {
@@ -165,17 +159,14 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
processingActive.incrementAndGet();
Mail mail = queueItem.getMail();
- if (LOGGER.isDebugEnabled()) {
- String debugBuffer = "==== Begin processing mail " + mail.getName() + "====";
- LOGGER.debug(debugBuffer);
- }
+ LOGGER.debug("==== Begin processing mail {} ====", mail.getName());
try {
mailProcessor.service(mail);
queueItem.done(true);
} catch (Exception e) {
- if (active.get() && LOGGER.isErrorEnabled()) {
- LOGGER.error("Exception processing mail while spooling " + e.getMessage(), e);
+ if (active.get()) {
+ LOGGER.error("Exception processing mail while spooling {}", e.getMessage(), e);
}
queueItem.done(false);
@@ -184,8 +175,8 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
mail = null;
}
} catch (Throwable e) {
- if (active.get() && LOGGER.isErrorEnabled()) {
- LOGGER.error("Exception processing mail while spooling " + e.getMessage(), e);
+ if (active.get()) {
+ LOGGER.error("Exception processing mail while spooling {}", e.getMessage(), e);
}
} finally {
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
index 4c3c84c..70f2411 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
@@ -182,8 +182,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
} else {
// Bounce message goes to the reverse path, not to the Reply-To
// address
- if (LOGGER.isInfoEnabled())
- LOGGER.info("Processing a bounce request for a message with a reverse path of " + mail.getSender().toString());
+ LOGGER.info("Processing a bounce request for a message with a reverse path of {}", mail.getSender());
}
MailImpl reply = rawBounce(mail, message);
@@ -464,11 +463,10 @@ public class JamesMailetContext implements MailetContext, Configurable {
try {
this.postmaster = new MailAddress(postMasterAddress);
if (!domains.containsDomain(postmaster.getDomain())) {
- String warnBuffer = "The specified postmaster address ( " + postmaster + " ) is not a local " +
+ LOGGER.warn("The specified postmaster address ( {} ) is not a local " +
"address. This is not necessarily a problem, but it does mean that emails addressed to " +
"the postmaster will be routed to another server. For some configurations this may " +
- "cause problems.";
- LOGGER.warn(warnBuffer);
+ "cause problems.", postmaster);
}
} catch (AddressException e) {
throw new ConfigurationException("Postmaster address " + postMasterAddress + "is invalid", e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
index aa0e0e7..5911261 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
@@ -138,14 +138,10 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
for (MatcherMailetPair pair : pairs) {
Mailet mailet = pair.getMailet();
Matcher matcher = pair.getMatcher();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Shutdown matcher " + matcher.getMatcherInfo());
- }
+ LOGGER.debug("Shutdown matcher {}", matcher.getMatcherInfo());
matcher.destroy();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Shutdown mailet " + mailet.getMailetInfo());
- }
+ LOGGER.debug("Shutdown mailet {}", mailet.getMailetInfo());
mailet.destroy();
}
@@ -347,35 +343,23 @@ public abstract class AbstractStateMailetProcessor implements MailProcessor, Con
}
// The matcher itself should log that it's been inited.
- if (LOGGER.isInfoEnabled()) {
- String infoBuffer = "Matcher " + matcherName + " instantiated.";
- LOGGER.info(infoBuffer.toString());
- }
+ LOGGER.info("Matcher {} instantiated.", matcherName);
} catch (MessagingException ex) {
// **** Do better job printing out exception
- if (LOGGER.isErrorEnabled()) {
- String errorBuffer = "Unable to init matcher " + matcherName + ": " + ex.toString();
- LOGGER.error(errorBuffer.toString(), ex);
- if (ex.getNextException() != null) {
- LOGGER.error("Caused by nested exception: ", ex.getNextException());
- }
+ LOGGER.error("Unable to init matcher {}", matcherName, ex);
+ if (ex.getNextException() != null) {
+ LOGGER.error("Caused by nested exception: ", ex.getNextException());
}
throw new ConfigurationException("Unable to init matcher " + matcherName, ex);
}
try {
mailet = mailetLoader.getMailet(createMailetConfig(mailetClassName, c));
- if (LOGGER.isInfoEnabled()) {
- String infoBuffer = "Mailet " + mailetClassName + " instantiated.";
- LOGGER.info(infoBuffer.toString());
- }
+ LOGGER.info("Mailet {} instantiated.", mailetClassName);
} catch (MessagingException ex) {
// **** Do better job printing out exception
- if (LOGGER.isErrorEnabled()) {
- String errorBuffer = "Unable to init mailet " + mailetClassName + ": " + ex.toString();
- LOGGER.error(errorBuffer.toString(), ex);
- if (ex.getNextException() != null) {
- LOGGER.error("Caused by nested exception: ", ex.getNextException());
- }
+ LOGGER.error("Unable to init mailet {}", mailetClassName, ex);
+ if (ex.getNextException() != null) {
+ LOGGER.error("Caused by nested exception: ", ex.getNextException());
}
throw new ConfigurationException("Unable to init mailet " + mailetClassName, ex);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/04657f2d/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
index 6c10428..53d2f59 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
@@ -88,18 +88,11 @@ public class FileIntoAction implements MailAction {
delivered = true;
}
catch (MessagingException ex) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Error while storing mail into. "+destinationMailbox, ex);
- }
+ LOGGER.debug("Error while storing mail into {}.", destinationMailbox, ex);
throw ex;
}
if (delivered) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Filed Message ID: "
- + aMail.getMessage().getMessageID()
- + " into destination: \""
- + destinationMailbox + "\"");
- }
+ LOGGER.debug("Filed Message ID: {} into destination: \"{}\"", aMail.getMessage().getMessageID(), destinationMailbox);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org