http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java index 8ec5ccf..795269d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysisFeeder.java @@ -217,7 +217,7 @@ public class BayesianAnalysisFeeder extends GenericMailet { if (maxSizeParam != null) { setMaxSize(Integer.parseInt(maxSizeParam)); } - LOGGER.debug("maxSize: " + getMaxSize()); + LOGGER.debug("maxSize: {}", getMaxSize()); initDb(); @@ -258,7 +258,7 @@ public class BayesianAnalysisFeeder extends GenericMailet { String messageId = message.getMessageID(); if (message.getSize() > getMaxSize()) { - LOGGER.debug(messageId + " Feeding HAM/SPAM ignored because message size > " + getMaxSize() + ": " + message.getSize()); + LOGGER.debug("{} Feeding HAM/SPAM ignored because message size > {}: {}", messageId, getMaxSize(), message.getSize()); return; } @@ -283,14 +283,14 @@ public class BayesianAnalysisFeeder extends GenericMailet { analyzer.clear(); if ("ham".equalsIgnoreCase(feedType)) { - LOGGER.debug(messageId + " Feeding HAM"); + LOGGER.debug("{} Feeding HAM", messageId); // Process the stream as ham (not spam). analyzer.addHam(br); // Update storage statistics. analyzer.updateHamTokens(conn); } else { - LOGGER.debug(messageId + " Feeding SPAM"); + LOGGER.debug("{} Feeding SPAM", messageId); // Process the stream as spam. analyzer.addSpam(br); @@ -302,7 +302,7 @@ public class BayesianAnalysisFeeder extends GenericMailet { if (conn != null && dbUpdated && !conn.getAutoCommit()) { conn.commit(); dbUpdated = false; - LOGGER.debug(messageId + " Training ended successfully"); + LOGGER.debug("{} Training ended successfully", messageId); JDBCBayesianAnalyzer.touchLastDatabaseUpdateTime(); }
http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java index 9ba3b46..5c5b503 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java @@ -240,7 +240,7 @@ public class Bounce extends GenericMailet implements RedirectNotify { passThrough(originalMail); } else { if (getInitParameters().isDebug()) { - LOGGER.debug("Processing a bounce request for a message with a reverse path. The bounce will be sent to " + originalMail.getSender().toString()); + LOGGER.debug("Processing a bounce request for a message with a reverse path. The bounce will be sent to {}", originalMail.getSender()); } ProcessRedirectNotify.from(this).process(originalMail); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index 13b0e9a..d3413d5 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -315,7 +315,7 @@ public class DSNBounce extends GenericMailet implements RedirectNotify { private List<MailAddress> getSenderAsList(Mail originalMail) { MailAddress reversePath = originalMail.getSender(); if (getInitParameters().isDebug()) { - LOGGER.debug("Processing a bounce request for a message with a reverse path. The bounce will be sent to " + reversePath); + LOGGER.debug("Processing a bounce request for a message with a reverse path. The bounce will be sent to {}", reversePath); } return ImmutableList.of(reversePath); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java index cbcf816..4495c5b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java @@ -188,9 +188,9 @@ public class RecipientRewriteTableProcessor { if (!remoteAddress.isEmpty()) { try { mailetContext.sendMail(sender, remoteAddress, message); - LOGGER.info("Mail for " + recipient + " forwarded to " + remoteAddress); + LOGGER.info("Mail for {} forwarded to {}", recipient, remoteAddress); } catch (MessagingException ex) { - LOGGER.warn("Error forwarding mail to " + remoteAddress); + LOGGER.warn("Error forwarding mail to {}", remoteAddress); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/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 1650b44..ab47aa1 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 @@ -161,7 +161,7 @@ public class RemoteDelivery extends GenericMailet { if (configuration.isBindUsed()) RemoteDeliverySocketFactory.setBindAdress(configuration.getBindAddress()); } catch (UnknownHostException e) { - LOGGER.error("Invalid bind setting (" + configuration.getBindAddress() + "): ", e); + LOGGER.error("Invalid bind setting ({}): ", configuration.getBindAddress(), e); } if (startThreads == THREAD_STATE.START_THREADS) { initDeliveryThreads(); @@ -190,7 +190,7 @@ public class RemoteDelivery extends GenericMailet { @Override public void service(Mail mail) throws MessagingException { if (configuration.isDebug()) { - LOGGER.debug("Remotely delivering mail " + mail.getName()); + LOGGER.debug("Remotely delivering mail {}", mail.getName()); } if (configuration.isUsePriority()) { mail.setAttribute(MailPrioritySupport.MAIL_PRIORITY, MailPrioritySupport.HIGH_PRIORITY); @@ -202,19 +202,19 @@ public class RemoteDelivery extends GenericMailet { serviceWithGateway(mail); } } else { - LOGGER.debug("Mail " + mail.getName() + " from " + mail.getSender() + " has no recipients and can not be remotely delivered"); + LOGGER.debug("Mail {} from {} has no recipients and can not be remotely delivered", mail.getName(), mail.getSender()); } mail.setState(Mail.GHOST); } private void serviceWithGateway(Mail mail) { if (configuration.isDebug()) { - LOGGER.debug("Sending mail to " + mail.getRecipients() + " via " + configuration.getGatewayServer()); + LOGGER.debug("Sending mail to {} via {}", mail.getRecipients(), configuration.getGatewayServer()); } try { queue.enQueue(mail); } catch (MailQueueException e) { - LOGGER.error("Unable to queue mail " + mail.getName() + " for recipients + " + mail.getRecipients(), e); + LOGGER.error("Unable to queue mail {} for recipients {}", mail.getName(), mail.getRecipients(), e); } } @@ -228,14 +228,14 @@ public class RemoteDelivery extends GenericMailet { private void serviceSingleServer(Mail mail, String originalName, Map.Entry<String, Collection<MailAddress>> entry) { if (configuration.isDebug()) { - LOGGER.debug("Sending mail to " + entry.getValue() + " on host " + entry.getKey()); + LOGGER.debug("Sending mail to {} on host {}", entry.getValue(), entry.getKey()); } mail.setRecipients(entry.getValue()); mail.setName(originalName + NAME_JUNCTION + entry.getKey()); try { queue.enQueue(mail); } catch (MailQueueException e) { - LOGGER.error("Unable to queue mail " + mail.getName() + " for recipients + " + mail.getRecipients(), e); + LOGGER.error("Unable to queue mail {} for recipients {}", mail.getName(), mail.getRecipients(), e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java index 21e9de0..8ce3db9 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java @@ -90,7 +90,7 @@ public class SPF extends GenericMailet { mail.setAttribute(EXPLANATION_ATTRIBUTE, result.getExplanation()); mail.setAttribute(RESULT_ATTRIBUTE, result.getResult()); - LOGGER.debug("ip:" + remoteAddr + " from:" + sender + " helo:" + helo + " = " + result.getResult()); + LOGGER.debug("ip:{} from:{} helo:{} = {}", remoteAddr, sender, helo, result.getResult()); if (addHeader) { try { MimeMessage msg = mail.getMessage(); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/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 3635080..166360f 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 @@ -86,7 +86,7 @@ public class ToSenderFolder extends GenericMailet { mailboxAppender.append(mail.getMessage(), username, folder); - LOGGER.error("Local delivery with ToSenderFolder mailet for mail " + mail.getName() + " with sender " + sender.toString() + " in folder " + folder); + LOGGER.error("Local delivery with ToSenderFolder mailet for mail {} with sender {} in folder {}", mail.getName(), sender, folder); } private String retrieveUser(MailAddress sender) throws MessagingException { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java index e7b2d13..db5e4f6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java @@ -184,7 +184,7 @@ public class WhiteListManager extends GenericMailet { */ public void init() throws MessagingException { automaticInsert = Boolean.valueOf(getInitParameter("automaticInsert")); - LOGGER.debug("automaticInsert: " + automaticInsert); + LOGGER.debug("automaticInsert: {}", automaticInsert); displayFlag = getInitParameter("displayFlag"); insertFlag = getInitParameter("insertFlag"); @@ -193,7 +193,7 @@ public class WhiteListManager extends GenericMailet { String whitelistManagerAddressString = getInitParameter("whitelistManagerAddress"); if (whitelistManagerAddressString != null) { whitelistManagerAddressString = whitelistManagerAddressString.trim(); - LOGGER.debug("whitelistManagerAddress: " + whitelistManagerAddressString); + LOGGER.debug("whitelistManagerAddress: {}", whitelistManagerAddressString); try { whitelistManagerAddress = new MailAddress(whitelistManagerAddressString); } catch (javax.mail.internet.ParseException pe) { @@ -202,19 +202,19 @@ public class WhiteListManager extends GenericMailet { if (displayFlag != null) { displayFlag = displayFlag.trim(); - LOGGER.debug("displayFlag: " + displayFlag); + LOGGER.debug("displayFlag: {}", displayFlag); } else { LOGGER.debug("displayFlag is null"); } if (insertFlag != null) { insertFlag = insertFlag.trim(); - LOGGER.debug("insertFlag: " + insertFlag); + LOGGER.debug("insertFlag: {}", insertFlag); } else { LOGGER.debug("insertFlag is null"); } if (removeFlag != null) { removeFlag = removeFlag.trim(); - LOGGER.debug("removeFlag: " + removeFlag); + LOGGER.debug("removeFlag: {}", removeFlag); } else { LOGGER.debug("removeFlag is null"); } @@ -224,7 +224,7 @@ public class WhiteListManager extends GenericMailet { String repositoryPath = getInitParameter("repositoryPath"); if (repositoryPath != null) { - LOGGER.debug("repositoryPath: " + repositoryPath); + LOGGER.debug("repositoryPath: {}", repositoryPath); } else { throw new MessagingException("repositoryPath is null"); } @@ -507,7 +507,7 @@ public class WhiteListManager extends GenericMailet { } if (dbUpdated) { - LOGGER.debug("Insertion request issued by " + senderMailAddress); + LOGGER.debug("Insertion request issued by {}", senderMailAddress); } // Commit our changes if necessary. if (conn != null && dbUpdated && !conn.getAutoCommit()) { @@ -628,7 +628,7 @@ public class WhiteListManager extends GenericMailet { } if (dbUpdated) { - LOGGER.debug("Removal request issued by " + senderMailAddress); + LOGGER.debug("Removal request issued by {}", senderMailAddress); } // Commit our changes if necessary. if (conn != null && dbUpdated && !conn.getAutoCommit()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index be6bf21..9bb63ce 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -174,7 +174,7 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC { final List<Action> actions = getActions(); for (final Action action: actions) { - LOGGER.info("Executing action: " + action.toString()); + LOGGER.info("Executing action: {}", action); try { dispatcher.execute(action, getMail(), this); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java index 614ddf7..9c67bc4 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java @@ -80,7 +80,7 @@ public class VacationAction implements MailAction { try { return new MailAddress(address); } catch (AddressException e) { - LOGGER.warn("Mail address " + address + " was not well formatted : " + e.getLocalizedMessage()); + LOGGER.warn("Mail address {} was not well formatted : {}", address, e.getLocalizedMessage()); return null; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java index 73340ab..f7207f7 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java @@ -135,7 +135,7 @@ public class VacationReply { try { return new MailAddress(address); } catch (AddressException e) { - LOGGER.warn("Mail address " + address + " was not well formatted : " + e.getLocalizedMessage()); + LOGGER.warn("Mail address {} was not well formatted : {}", address, e.getLocalizedMessage()); return null; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java index 0a1f25f..23df7b2 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailMessageAlteringUtils.java @@ -113,7 +113,7 @@ public class MailMessageAlteringUtils { multipart.addBodyPart(contentPartRoot); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("attachmentType:" + mailet.getInitParameters().getAttachmentType()); + LOGGER.debug("attachmentType:{}", mailet.getInitParameters().getAttachmentType()); } if (!mailet.getInitParameters().getAttachmentType().equals(TypeCode.NONE)) { multipart.addBodyPart(getAttachmentPart(originalMessage, head)); @@ -192,7 +192,7 @@ public class MailMessageAlteringUtils { } if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("inline:" + mailet.getInitParameters().getInLineType()); + LOGGER.debug("inline:{}", mailet.getInitParameters().getInLineType()); } switch (mailet.getInitParameters().getInLineType()) { case ALL: http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java index 90c7b75..f3847e6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java @@ -120,7 +120,7 @@ public class MailModifier { InternetAddress[] internetAddresses = MailAddressUtils.toInternetAddressArray(mailAddresses); mail.getMessage().setRecipients(Message.RecipientType.TO, internetAddresses); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("apparentlyTo set to: " + internetAddresses); + LOGGER.debug("apparentlyTo set to: {}", (Object) internetAddresses); } } } @@ -148,7 +148,7 @@ public class MailModifier { } else { mail.getMessage().setReplyTo(new InternetAddress[] { replyTo.toInternetAddress() }); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("replyTo set to: " + replyTo); + LOGGER.debug("replyTo set to: {}", replyTo); } } } @@ -170,7 +170,7 @@ public class MailModifier { } else { mail.setSender(reversePath); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("reversePath set to: " + reversePath); + LOGGER.debug("reversePath set to: {}", reversePath); } } } @@ -186,7 +186,7 @@ public class MailModifier { if (messageId != null) { mail.getMessage().setHeader(RFC2822Headers.IN_REPLY_TO, messageId); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("IN_REPLY_TO set to: " + messageId); + LOGGER.debug("IN_REPLY_TO set to: {}", messageId); } } } @@ -197,7 +197,7 @@ public class MailModifier { mail.getMessage().setFrom(sender.get().toInternetAddress()); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("sender set to: " + sender); + LOGGER.debug("sender set to: {}", sender); } } } @@ -213,7 +213,7 @@ public class MailModifier { if (messageId != null) { mail.getMessage().setHeader(RFC2822Headers.MESSAGE_ID, messageId); if (mailet.getInitParameters().isDebug()) { - LOGGER.debug("MESSAGE_ID restored to: " + messageId); + LOGGER.debug("MESSAGE_ID restored to: {}", messageId); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java index 3ec875b..4dd04e1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java @@ -51,7 +51,7 @@ public class AddressesArrayToMailAddressListConverter { try { return Optional.of(new MailAddress(address.toString())); } catch (AddressException e) { - LOGGER.debug("Can't parse unsent address " + address, e); + LOGGER.debug("Can't parse unsent address {}", address, e); return Optional.empty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java index ce2539c..5b40cc1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/Bouncer.java @@ -65,7 +65,7 @@ public class Bouncer { private void bounceWithMailetContext(Mail mail, Exception ex) { - LOGGER.debug("Sending failure message " + mail.getName()); + LOGGER.debug("Sending failure message {}", mail.getName()); try { mailetContext.bounce(mail, explanationText(mail, ex)); } catch (MessagingException me) { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java index f3b6870..c2f0640 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java @@ -265,7 +265,7 @@ public class MailDelivrer { EnhancedMessagingException enhancedMessagingException = new EnhancedMessagingException(me); if (me.getClass().getName().endsWith(".SMTPAddressFailedException") || me.getClass().getName().endsWith(".SMTPAddressSucceededException")) { LOGGER.debug("ADDRESS :[{}] Address:[{}] Command : [{}] RetCode[{}] Response [{}]", - enhancedMessagingException.computeAction(), me.toString(), enhancedMessagingException.computeAddress(), + enhancedMessagingException.computeAction(), me, enhancedMessagingException.computeAddress(), enhancedMessagingException.computeCommand(), enhancedMessagingException.getReturnCode()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java index c58017e..2d2445e 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractNetworkMatcher.java @@ -56,7 +56,7 @@ public abstract class AbstractNetworkMatcher extends GenericMatcher { public void init() throws MessagingException { if (getCondition() != null) { authorizedNetworks = new NetMatcher(getCondition(), dnsServer); - LOGGER.info("Authorized addresses: " + authorizedNetworks); + LOGGER.info("Authorized addresses: {}", authorizedNetworks); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java index c05b790..d0846d0 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java @@ -117,7 +117,7 @@ public abstract class AbstractSQLWhitelistMatcher extends GenericMatcher { repositoryPath = st.nextToken().trim(); } if (repositoryPath != null) { - LOGGER.info("repositoryPath: " + repositoryPath); + LOGGER.info("repositoryPath: {}", repositoryPath); } else { throw new MessagingException("repositoryPath is null"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java index c28eee0..0bc343a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java @@ -46,7 +46,7 @@ public class SenderInFakeDomain extends AbstractNetworkMatcher { if (servers.size() == 0) { // No records...could not deliver to this domain, so matches // criteria. - LOGGER.info("No MX, A, or CNAME record found for domain: " + domain); + LOGGER.info("No MX, A, or CNAME record found for domain: {}", domain); return mail.getRecipients(); } else if (matchNetwork(servers.iterator().next())) { /* @@ -65,8 +65,8 @@ public class SenderInFakeDomain extends AbstractNetworkMatcher { * 203.119.4.6/32 # .PH TLD (.ph) * */ - LOGGER.info("Banned IP found for domain: " + domain); - LOGGER.info(" --> :" + servers.iterator().next()); + LOGGER.info("Banned IP found for domain: {}", domain); + LOGGER.info(" --> :{}", servers.iterator().next()); return mail.getRecipients(); } else { // Some servers were found... the domain is not fake. http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java index 05507ae..5c6ecc9 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java @@ -137,7 +137,7 @@ public class SpecialAddressesUtils { try { builder.add(new MailAddress(replyTo)); } catch (ParseException pe) { - LOGGER.warn("Unable to parse a \"REPLY_TO\" header address in the original message: " + replyTo + "; ignoring."); + LOGGER.warn("Unable to parse a \"REPLY_TO\" header address in the original message: {}; ignoring.", replyTo); } } return builder.build(); @@ -236,7 +236,7 @@ public class SpecialAddressesUtils { InternetAddress[] originalToInternetAddresses = InternetAddress.parse(toHeader, false); return MailAddressUtils.from(originalToInternetAddresses); } catch (MessagingException ae) { - LOGGER.warn("Unable to parse a \"TO\" header address in the original message: " + toHeader + "; ignoring."); + LOGGER.warn("Unable to parse a \"TO\" header address in the original message: {}; ignoring.", toHeader); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java index 00d27e6..baaf24c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java @@ -56,6 +56,6 @@ public class HelloWorldMailet implements Mailet { @Override public void service(Mail mail) throws MessagingException { LOGGER.info("Hello, World!"); - LOGGER.info( "You have mail from " + mail.getSender().getLocalPart()); + LOGGER.info("You have mail from {}", mail.getSender().getLocalPart()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java index 23596ca..ac1a950 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java @@ -75,7 +75,7 @@ public class FolderProcessor extends ProcessorAbstract { try { open(); } catch (MessagingException ex) { - LOGGER.error(getFetchTaskName() + " Failed to open folder!"); + LOGGER.error("{} Failed to open folder!", getFetchTaskName()); throw ex; } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java index a035ecf..d853917 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java @@ -75,7 +75,7 @@ public class StoreProcessor extends ProcessorAbstract { // Get the Folder folder = store.getFolder(getJavaMailFolderName()); if (folder == null) - LOGGER.error(getFetchTaskName() + " No default folder"); + LOGGER.error("{} No default folder", getFetchTaskName()); // Process the Folder new FolderProcessor(folder, getAccount()).process(); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java index 85e3647..0d9b89a 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java @@ -168,7 +168,7 @@ public class AuthenticationServlet extends HttpServlet { if (authenticate(request, username)) { returnAccessTokenResponse(resp, username); } else { - LOG.info("Authentication failure for " + username); + LOG.info("Authentication failure for {}", username); returnUnauthorizedResponse(resp); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java index 4b9857b..9fa4875 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java @@ -104,7 +104,7 @@ public class DefaultMailboxesProvisioningFilter implements Filter { private void createMailbox(MailboxPath mailboxPath, MailboxSession session) { try { Optional<MailboxId> mailboxId = mailboxManager.createMailbox(mailboxPath, session); - LOGGER.info("Provisioning " + mailboxPath + ". " + mailboxId + " created."); + LOGGER.info("Provisioning {}. {} created.", mailboxPath, mailboxId); } catch (MailboxExistsException e) { LOGGER.info("Mailbox {} have been created concurrently", mailboxPath); } catch (MailboxException e) { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/crypto/JamesSignatureHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/crypto/JamesSignatureHandler.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/crypto/JamesSignatureHandler.java index deb2426..4224c08 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/crypto/JamesSignatureHandler.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/crypto/JamesSignatureHandler.java @@ -100,7 +100,7 @@ public class JamesSignatureHandler implements SignatureHandler { } catch (NoSuchAlgorithmException | InvalidKeyException e) { throw Throwables.propagate(e); } catch (SignatureException e) { - LOGGER.warn("Attempt to use a malformed signature '"+ signature + "' for source '" + source + "'", e); + LOGGER.warn("Attempt to use a malformed signature '{}' for source '{}'", signature, source, e); return false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java index f0313ed..b7415bd 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/GetMessagesMethod.java @@ -156,7 +156,7 @@ public class GetMessagesMethod implements Method { try { return Stream.of(messageFactory.fromMetaDataWithContent(metaDataWithContent)); } catch (Exception e) { - LOGGER.error("Can not convert metaData with content to Message for " + metaDataWithContent.getMessageId(), e); + LOGGER.error("Can not convert metaData with content to Message for {}", metaDataWithContent.getMessageId(), e); return Stream.of(); } }; @@ -182,7 +182,7 @@ public class GetMessagesMethod implements Method { .keywords(keywords) .build()); } catch (Exception e) { - LOGGER.error("Can not convert MessageResults to MetaData with content for messageId " + firstMessageResult.getMessageId() + " in " + mailboxIds, e); + LOGGER.error("Can not convert MessageResults to MetaData with content for messageId {} in {}", firstMessageResult.getMessageId(), mailboxIds, e); return Stream.of(); } }; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java index 0a079e3..c00c1f4 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/MIMEMessageConverter.java @@ -218,7 +218,7 @@ public class MIMEMessageConverter { return createMultipartAlternativeBody(newMessage); } } catch (IOException e) { - LOGGER.error("Error while creating textBody \n"+ newMessage.getTextBody().get() +"\n or htmlBody \n" + newMessage.getHtmlBody().get(), e); + LOGGER.error("Error while creating textBody \n{}\n or htmlBody \n{}", newMessage.getTextBody().get(), newMessage.getHtmlBody().get(), e); throw Throwables.propagate(e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java index 02ae2d2..d793ece 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java @@ -305,7 +305,7 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor { private void handleInvalidRequest(SetMessagesResponse.Builder responseBuilder, MessageId messageId, List<ValidationResult> validationErrors) { - LOGGER.error("Invalid update request for message #", messageId.toString()); + LOGGER.error("Invalid update request for message #{}", messageId); String formattedValidationErrorMessage = validationErrors.stream() .map(err -> err.getProperty() + ": " + err.getErrorMessage()) http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java index d909f29..a423928 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Rights.java @@ -82,7 +82,7 @@ public class Rights { Arrays.stream(values()) .filter(jmapRight -> jmapRight.right == right) .findAny(), - () -> LOGGER.warn("Non handled right '" + right + "'")); + () -> LOGGER.warn("Non handled right '{}'", right)); } public static Right forChar(char c) { @@ -193,7 +193,7 @@ public class Rights { return false; } if (key.getNameType() != MailboxACL.NameType.user) { - LOGGER.info(key.getNameType() + " is not supported. Only 'user' is."); + LOGGER.info("{} is not supported. Only 'user' is.", key.getNameType()); return false; } return true; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java index 20fbdad..bfac1af 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/send/PostDequeueDecorator.java @@ -85,7 +85,7 @@ public class PostDequeueDecorator extends MailQueueItemDecorator { moveFromOutboxToSentWithSeenFlag(messageId, mailboxSession); getMail().setAttribute(IS_DELIVERED, IS_DELIVERED); } catch (MailShouldBeInOutboxException e) { - LOG.info("Message does not exist on Outbox anymore, it could have already been sent {}", e); + LOG.info("Message does not exist on Outbox anymore, it could have already been sent {}", e.toString()); } catch (MailboxException e) { throw new MailQueueException(e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jwt/src/main/java/org/apache/james/jwt/JwtTokenVerifier.java ---------------------------------------------------------------------- diff --git a/server/protocols/jwt/src/main/java/org/apache/james/jwt/JwtTokenVerifier.java b/server/protocols/jwt/src/main/java/org/apache/james/jwt/JwtTokenVerifier.java index 2fe9233..1516295 100644 --- a/server/protocols/jwt/src/main/java/org/apache/james/jwt/JwtTokenVerifier.java +++ b/server/protocols/jwt/src/main/java/org/apache/james/jwt/JwtTokenVerifier.java @@ -72,7 +72,7 @@ public class JwtTokenVerifier { .parseClaimsJws(token); return true; } catch (JwtException e) { - LOGGER.info("Jwt validation failed for claim " + attributeName + " to " + expectedValue, e); + LOGGER.info("Jwt validation failed for claim {} to {}", attributeName, expectedValue, e); return false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/jwt/src/main/java/org/apache/james/jwt/PublicKeyReader.java ---------------------------------------------------------------------- diff --git a/server/protocols/jwt/src/main/java/org/apache/james/jwt/PublicKeyReader.java b/server/protocols/jwt/src/main/java/org/apache/james/jwt/PublicKeyReader.java index 779fa1a..c5c2932 100644 --- a/server/protocols/jwt/src/main/java/org/apache/james/jwt/PublicKeyReader.java +++ b/server/protocols/jwt/src/main/java/org/apache/james/jwt/PublicKeyReader.java @@ -46,7 +46,7 @@ public class PublicKeyReader { if (readPEM instanceof SubjectPublicKeyInfo) { return Optional.of(new JcaPEMKeyConverter().getPublicKey((SubjectPublicKeyInfo) readPEM)); } - LOGGER.warn("Key is not an instance of SubjectPublicKeyInfo but of " + readPEM); + LOGGER.warn("Key is not an instance of SubjectPublicKeyInfo but of {}", readPEM); return Optional.empty(); } catch (IOException e) { LOGGER.warn("Error when reading the PEM file", e); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java index 5f21580..afa0de8 100644 --- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java +++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java @@ -104,7 +104,7 @@ public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler imp public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception { try (Closeable closeable = IMAPMDCContext.from(ctx, attributes)) { InetSocketAddress address = (InetSocketAddress) ctx.getChannel().getRemoteAddress(); - LOGGER.info("Connection closed for " + address.getAddress().getHostAddress()); + LOGGER.info("Connection closed for {}", address.getAddress().getHostAddress()); // remove the stored attribute for the channel to free up resources // See JAMES-1195 @@ -121,7 +121,7 @@ public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler imp public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception { try (Closeable closeable = IMAPMDCContext.from(ctx, attributes)) { InetSocketAddress address = (InetSocketAddress) ctx.getChannel().getRemoteAddress(); - LOGGER.info("Connection established from " + address.getAddress().getHostAddress()); + LOGGER.info("Connection established from {}", address.getAddress().getHostAddress()); imapConnectionsMetric.increment(); ImapResponseComposer response = new ImapResponseComposerImpl(new ChannelImapResponseWriter(ctx.getChannel())); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java index 2241783..9d0a1ca 100644 --- a/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java +++ b/server/protocols/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java @@ -156,7 +156,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe enabled = config.getBoolean("[@enabled]", true); if (!enabled) { - LOGGER.info(getServiceType() + " disabled by configuration"); + LOGGER.info("{} disabled by configuration", getServiceType()); return; } @@ -177,7 +177,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe } address = new InetSocketAddress(ip, port); - LOGGER.info(getServiceType() + " bound to: " + ip + ":" + port); + LOGGER.info("{} bound to: {}:{}", getServiceType(), ip, port); bindAddresses.add(address); } @@ -268,7 +268,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe mbeanServer = ManagementFactory.getPlatformMBeanServer(); registerMBean(); - LOGGER.info("Init " + getServiceType() + " done"); + LOGGER.info("Init {} done", getServiceType()); } @@ -277,7 +277,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe @PreDestroy public final void destroy() { - LOGGER.info("Dispose " + getServiceType()); + LOGGER.info("Dispose {}", getServiceType()); if (isEnabled()) { unbind(); @@ -289,7 +289,7 @@ public abstract class AbstractConfigurableAsyncServer extends AbstractAsyncServe unregisterMBean(); } - LOGGER.info("Dispose " + getServiceType() + " done"); + LOGGER.info("Dispose {} done", getServiceType()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java index 8a5dadb..9a300ec 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/hook/MailboxDeliverToRecipientHandler.java @@ -88,7 +88,7 @@ public class MailboxDeliverToRecipientHandler implements DeliverToRecipientHook // create inbox if not exist if (!mailboxManager.mailboxExists(inbox, mailboxSession)) { Optional<MailboxId> mailboxId = mailboxManager.createMailbox(inbox, mailboxSession); - LOGGER.info("Provisioning INBOX. " + mailboxId + " created."); + LOGGER.info("Provisioning INBOX. {} created.", mailboxId); } mailboxManager.getMailbox(MailboxPath.inbox(mailboxSession), mailboxSession).appendMessage(envelope.getMessageInputStream(), new Date(), mailboxSession, true, null); mailboxManager.endProcessingRequest(mailboxSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java index 1c2e0c2..8a5944d 100644 --- a/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java +++ b/server/protocols/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java @@ -74,7 +74,7 @@ public class LMTPServer extends AbstractProtocolAsyncServer implements LMTPServe // by 1024, to put it in bytes maxMessageSize = configuration.getLong("maxmessagesize", maxMessageSize) * 1024; if (maxMessageSize > 0) { - LOGGER.info("The maximum allowed message size is " + maxMessageSize + " bytes."); + LOGGER.info("The maximum allowed message size is {} bytes.", maxMessageSize); } else { LOGGER.info("No maximum message size is enforced for this server."); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java index cc7a279..4ba1496 100644 --- a/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java +++ b/server/protocols/protocols-pop3/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java @@ -77,7 +77,7 @@ public class PassCmdHandler extends AbstractPassCmdHandler { // check if the mailbox exists, if not create it if (!manager.mailboxExists(inbox, mSession)) { Optional<MailboxId> mailboxId = manager.createMailbox(inbox, mSession); - LOGGER.info("Provisioning INBOX. " + mailboxId + " created."); + LOGGER.info("Provisioning INBOX. {} created.", mailboxId); } MessageManager mailbox = manager.getMailbox(MailboxPath.inbox(mSession), mSession); return new MailboxAdapter(manager, mailbox, mSession); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java index f82523e..ec32246 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java @@ -166,7 +166,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib OutputStream out; out = mmiss.getWritableOutputStream(); for (MessageHook rawHandler : mHandlers) { - LOGGER.debug("executing james message handler " + rawHandler); + LOGGER.debug("executing james message handler {}", rawHandler); long start = System.currentTimeMillis(); HookResult hRes = rawHandler.onMessage(session, new MailToMailEnvelopeWrapper(mail, out)); @@ -174,7 +174,7 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib if (rHooks != null) { for (HookResultHook rHook : rHooks) { - LOGGER.debug("executing hook " + rHook); + LOGGER.debug("executing hook {}", rHook); hRes = rHook.onHookResult(session, hRes, executionTime, rawHandler); } } @@ -189,13 +189,13 @@ public class DataLineJamesMessageHookHandler implements DataLineFilter, Extensib } for (JamesMessageHook messageHandler : messageHandlers) { - LOGGER.debug("executing james message handler " + messageHandler); + LOGGER.debug("executing james message handler {}", messageHandler); long start = System.currentTimeMillis(); HookResult hRes = messageHandler.onMessage(session, mail); long executionTime = System.currentTimeMillis() - start; if (rHooks != null) { for (HookResultHook rHook : rHooks) { - LOGGER.debug("executing hook " + rHook); + LOGGER.debug("executing hook {}", rHook); hRes = rHook.onHookResult(session, hRes, executionTime, messageHandler); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java index 0db5feb..449716e 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/TLDLookup.java @@ -94,7 +94,7 @@ public class TLDLookup { LOGGER.error("Caught exception", ex); } } - LOGGER.debug("initTwoPartTLDs size=" + set.size()); + LOGGER.debug("initTwoPartTLDs size={}", set.size()); return set; } @@ -108,14 +108,14 @@ public class TLDLookup { for (String multiPartTLD : multiPartTLDs) { try { if (multiPartTLD.matches("^" + tld3 + "$")) { - LOGGER.debug("adding \"" + multiPartTLD + "\""); + LOGGER.debug("adding \"{}\"", multiPartTLD); set.add(multiPartTLD); } } catch (Exception ex) { LOGGER.error("Caught exception", ex); } } - LOGGER.debug("initThreePartTLDs size=" + set.size()); + LOGGER.debug("initThreePartTLDs size={}", set.size()); return set; } @@ -161,7 +161,7 @@ public class TLDLookup { "org.ws", "gov.ws", "edu.ws", "ac.yu", "co.yu", "edu.yu", "org.yu", "com.ye", "net.ye", "org.ye", "gov.ye", "edu.ye", "mil.ye", "ac.za", "alt.za", "bourse.za", "city.za", "co.za", "edu.za", "gov.za", "law.za", "mil.za", "net.za", "ngo.za", "nom.za", "org.za", "school.za", "tm.za", "web.za", "co.zw", "ac.zw", "org.zw", "gov.zw", "eu.org", "au.com", "br.com", "cn.com", "de.com", "de.net", "eu.com", "gb.com", "gb.net", "hu.com", "no.com", "qc.com", "ru.com", "sa.com", "se.com", "uk.com", "uk.net", "us.com", "uy.com", "za.com", "dk.org", "tel.no", "fax.nr", "mob.nr", "mobil.nr", "mobile.nr", "tel.nr", "tlf.nr", "e164.arpa" }; - LOGGER.debug("array size=" + tmp.length); + LOGGER.debug("array size={}", tmp.length); return tmp; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java index e8fa8bf..0a9ee32 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java @@ -374,7 +374,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot if ((wNetworks == null) || (!wNetworks.matchInetNetwork(session.getRemoteAddress().getAddress().getHostAddress()))) { return super.doRcpt(session, sender, rcpt); } else { - LOGGER.info("IpAddress " + session.getRemoteAddress().getAddress().getHostAddress() + " is whitelisted. Skip greylisting."); + LOGGER.info("IpAddress {} is whitelisted. Skip greylisting.", session.getRemoteAddress().getAddress().getHostAddress()); } return new HookResult(HookReturnCode.DECLINED); } @@ -406,7 +406,7 @@ public class JDBCGreylistHandler extends AbstractGreylistHandler implements Prot wList.add(aWhitelistArray.trim()); } wNetworks = new NetMatcher(wList, dnsService); - LOGGER.info("Whitelisted addresses: " + getWhiteListedNetworks().toString()); + LOGGER.info("Whitelisted addresses: {}", getWhiteListedNetworks()); } // Get the SQL file location http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java index f5f3e2e..dde058d 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java @@ -128,7 +128,7 @@ public class SPFHandler implements JamesMessageHook, MailHook, RcptHook, Protoco // Store the header session.setAttachment(SPF_HEADER, result.getHeaderText(), State.Transaction); - LOGGER.info("Result for " + ip + " - " + sender + " - " + heloEhlo + " = " + spfResult); + LOGGER.info("Result for {} - {} - {} = {}", ip, sender, heloEhlo, spfResult); // Check if we should block! if ((spfResult.equals(SPFErrorConstants.FAIL_CONV)) || (spfResult.equals(SPFErrorConstants.SOFTFAIL_CONV) && blockSoftFail) || (spfResult.equals(SPFErrorConstants.PERM_ERROR_CONV) && blockPermError)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java index 259cbac..690d751 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java @@ -151,10 +151,10 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { */ private HashSet<String> scanMailForDomains(MimePart part, SMTPSession session) throws MessagingException, IOException { HashSet<String> domains = new HashSet<>(); - LOGGER.debug("mime type is: \"" + part.getContentType() + "\""); + LOGGER.debug("mime type is: \"{}\"", part.getContentType()); if (part.isMimeType("text/plain") || part.isMimeType("text/html")) { - LOGGER.debug("scanning: \"" + part.getContent().toString() + "\""); + LOGGER.debug("scanning: \"{}\"", part.getContent()); HashSet<String> newDom = URIScanner.scanContentForDomains(domains, part.getContent().toString()); // Check if new domains are found and add the domains @@ -164,10 +164,10 @@ public class URIRBLHandler implements JamesMessageHook, ProtocolHandler { } else if (part.isMimeType("multipart/*")) { MimeMultipart multipart = (MimeMultipart) part.getContent(); int count = multipart.getCount(); - LOGGER.debug("multipart count is: " + count); + LOGGER.debug("multipart count is: {}", count); for (int index = 0; index < count; index++) { - LOGGER.debug("recursing index: " + index); + LOGGER.debug("recursing index: {}", index); MimeBodyPart mimeBodyPart = (MimeBodyPart) multipart.getBodyPart(index); HashSet<String> newDomains = scanMailForDomains(mimeBodyPart, session); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java index 16d49e8..be303db 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.java @@ -251,9 +251,9 @@ public class URIScanner { mat = emailAddrPattern.matcher(content); while (mat.find()) { String found = mat.group(); - LOGGER.debug("******** mailfound=\"" + found + "\""); + LOGGER.debug("******** mailfound=\"{}\"", found); found = "mailto://"; + found; - LOGGER.debug("*******6 mailfoundfound=\"" + found + "\" after cleanup 6"); + LOGGER.debug("*******6 mailfoundfound=\"{}\" after cleanup 6", found); String host = hostFromUriStr(found); if (null != host) { @@ -278,7 +278,7 @@ public class URIScanner { * could be found */ static protected String hostFromUriStr(String uriStr) { - LOGGER.debug("hostFromUriStr(\"" + uriStr + "\")"); + LOGGER.debug("hostFromUriStr(\"{}\")", uriStr); String host = null; URI uri; try { @@ -304,7 +304,7 @@ public class URIScanner { * @return the registrar domain portion of the supplied host string */ static protected String domainFromHost(String host) { - LOGGER.debug("domainFromHost(\"" + host + "\")"); + LOGGER.debug("domainFromHost(\"{}\")", host); String domain = null; Matcher mat; @@ -313,7 +313,7 @@ public class URIScanner { if (mat.find()) { // reverse the octets now domain = mat.group(5) + "." + mat.group(4) + "." + mat.group(3) + "." + mat.group(2); - LOGGER.debug("domain=\"" + domain + "\""); + LOGGER.debug("domain=\"{}\"", domain); return domain; } @@ -323,7 +323,7 @@ public class URIScanner { String tld = mat.group(2); if (TLDLookup.isThreePartTLD(tld)) { domain = mat.group(1); - LOGGER.debug("domain=\"" + domain + ", tld=\"" + tld + "\""); + LOGGER.debug("domain=\"{}, tld=\"{}\"", domain, tld); return domain; } } @@ -334,7 +334,7 @@ public class URIScanner { String tld = mat.group(2); if (TLDLookup.isTwoPartTLD(tld)) { domain = mat.group(1); - LOGGER.debug("domain=\"" + domain + ", tld=\"" + tld + "\""); + LOGGER.debug("domain=\"{}, tld=\"{}\"", domain, tld); return domain; } } @@ -344,7 +344,7 @@ public class URIScanner { if (mat.find()) { String tld = mat.group(2); domain = mat.group(1); - LOGGER.debug("domain=\"" + domain + ", tld=\"" + tld + "\""); + LOGGER.debug("domain=\"{}, tld=\"{}\"", domain, tld); return domain; } return domain; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java index 882f0c0..c218eee 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java @@ -108,7 +108,7 @@ public class ValidRcptHandler extends AbstractValidRcptHandler implements Protoc } else { if (useVut) { - LOGGER.debug("Unknown user " + username + " check if its an alias"); + LOGGER.debug("Unknown user {} check if it's an alias", username); try { Mappings targetString = vut.getMappings(recipient.getLocalPart(), recipient.getDomain()); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java index 10df4e1..18c4fb8 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java @@ -134,7 +134,7 @@ public class ValidRcptMX implements RcptHook, ProtocolHandler { setBannedNetworks(bannedNetworks, dnsService); - LOGGER.info("Invalid MX Networks: " + bNetwork.toString()); + LOGGER.info("Invalid MX Networks: {}", bNetwork); } else { throw new ConfigurationException("Please configure at least on invalid MX network"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java index 8539dee..2d85eea 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java @@ -87,7 +87,7 @@ public class SMTPCommandHandlerStats extends AbstractCommandHandlerStats impleme } } catch (NumberFormatException e) { - LOGGER.error("Error while reading SMTP return code " + response.getRetCode(), e); + LOGGER.error("Error while reading SMTP return code {}", response.getRetCode(), e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java index 277f882..aad6429 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java @@ -162,14 +162,14 @@ public class SMTPServer extends AbstractProtocolAsyncServer implements SMTPServe if (authorizedNetworks != null) { - LOGGER.info("Authorized addresses: " + authorizedNetworks.toString()); + LOGGER.info("Authorized addresses: {}", authorizedNetworks); } // get the message size limit from the conf file and multiply // by 1024, to put it in bytes maxMessageSize = configuration.getLong("maxmessagesize", maxMessageSize) * 1024; if (maxMessageSize > 0) { - LOGGER.info("The maximum allowed message size is " + maxMessageSize + " bytes."); + LOGGER.info("The maximum allowed message size is {} bytes.", maxMessageSize); } else { LOGGER.info("No maximum message size is enforced for this server."); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java index ce4b504..88af3a3 100644 --- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java +++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java @@ -629,12 +629,12 @@ public class SMTPServerTest { @Override public void protocolCommandSent(ProtocolCommandEvent event) { - LOGGER.debug("> " + event.getMessage().trim()); + LOGGER.debug("> {}", event.getMessage().trim()); } @Override public void protocolReplyReceived(ProtocolCommandEvent event) { - LOGGER.debug("< " + event.getMessage().trim()); + LOGGER.debug("< {}", event.getMessage().trim()); } }); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java index e5a47b8..fe5d22a 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java @@ -107,7 +107,7 @@ public class WebAdminServer implements Configurable { if (configuration.isEnabled()) { service.before(new CORSFilter(configuration.getUrlCORSOrigin())); new CORSRoute().define(service); - LOGGER.info("Web admin set up to enable CORS from " + configuration.getUrlCORSOrigin()); + LOGGER.info("Web admin set up to enable CORS from {}", configuration.getUrlCORSOrigin()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java index 7e35cdb..193beb6 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java @@ -124,7 +124,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport { mail.setAttribute(JAMES_QUEUE_NAME, queueName); } catch (MalformedURLException e) { // Ignore on error - LOGGER.debug("Unable to get url from blobmessage for mail " + mail.getName()); + LOGGER.debug("Unable to get url from blobmessage for mail {}", mail.getName()); } MimeMessageSource source = new MimeMessageBlobMessageSource(blobMessage); mail.setMessage(new MimeMessageCopyOnWriteProxy(source)); @@ -243,7 +243,7 @@ public class ActiveMQMailQueue extends JMSMailQueue implements ActiveMQSupport { // https://issues.apache.org/activemq/browse/AMQ-3018 ((ActiveMQBlobMessage) m).deleteFile(); } catch (Exception e) { - LOGGER.error("Unable to delete blob file for message " + m, e); + LOGGER.error("Unable to delete blob file for message {}", m, e); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java index 4cd4f02..412d534 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java @@ -398,7 +398,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori } catch (AddressException e) { // Should never happen as long as the user does not modify the // the header by himself - LOGGER.error("Unable to parse the recipient address " + token + " for mail " + mail.getName() + ", so we ignore it", e); + LOGGER.error("Unable to parse the recipient address {} for mail {}, so we ignore it", token, mail.getName(), e); } } mail.setRecipients(rcpts); @@ -419,7 +419,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori if (attrValue instanceof Serializable) { mail.setAttribute(name, (Serializable) attrValue); } else { - LOGGER.error("Not supported mail attribute " + name + " of type " + attrValue + " for mail " + mail.getName()); + LOGGER.error("Not supported mail attribute {} of type {} for mail {}", name, attrValue, mail.getName()); } } } @@ -433,7 +433,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori } catch (AddressException e) { // Should never happen as long as the user does not modify the // the header by himself - LOGGER.error("Unable to parse the sender address " + sender + " for mail " + mail.getName() + ", so we fallback to a null sender", e); + LOGGER.error("Unable to parse the sender address {} for mail {}, so we fallback to a null sender", sender, mail.getName(), e); mail.setSender(null); } } @@ -501,7 +501,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori } return size; } catch (Exception e) { - LOGGER.error("Unable to get size of queue " + queueName, e); + LOGGER.error("Unable to get size of queue {}", queueName, e); throw new MailQueueException("Unable to get size of queue " + queueName, e); } finally { closeBrowser(browser); @@ -712,7 +712,7 @@ public class JMSMailQueue implements ManageableMailQueue, JMSSupport, MailPriori closeBrowser(browser); closeSession(session); - LOGGER.error("Unable to browse queue " + queueName, e); + LOGGER.error("Unable to browse queue {}", queueName, e); throw new MailQueueException("Unable to browse queue " + queueName, e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
