JAMES-2199 Utilize parameterized logging and remove toString() calls As suggested in the SLF4J FAQ: https://www.slf4j.org/faq.html#logging_performance .. parameterized logging can improve the efficiency of logger calls when logging at the specified level is disabled.
toString() is called automatically: https://www.slf4j.org/faq.html#string_contents Some exception/throwable objects were converted to a string to work around a regression introduced in SLF4J version 1.7.15. See: http://mailman.qos.ch/pipermail/slf4j-user/2017-August/001639.html These changes were suggested by SLF4J Helper for NetBeans IDE: http://plugins.netbeans.org/plugin/72557/ Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/741ff584 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/741ff584 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/741ff584 Branch: refs/heads/master Commit: 741ff58468d683f379bc8c669dea41a3c8b840a0 Parents: 8d5c53b Author: Daniel Trebbien <[email protected]> Authored: Thu Oct 19 21:36:23 2017 -0500 Committer: Antoine Duprat <[email protected]> Committed: Mon Dec 18 20:31:49 2017 +0100 ---------------------------------------------------------------------- .../james/backends/es/IndexCreationFactory.java | 2 +- .../search/ElasticSearchSearcher.java | 2 +- .../mailbox/hbase/HBaseClusterSingleton.java | 2 +- .../hbase/mail/HBaseMailboxMapperTest.java | 4 +-- .../mail/HBaseMailboxMessageMapperTest.java | 2 +- .../hbase/user/HBaseSubscriptionMapperTest.java | 8 ++--- .../james/mailbox/maildir/MaildirFolder.java | 8 ++--- .../maildir/mail/MaildirMailboxMapper.java | 2 +- .../mailbox/store/StoreMailboxManager.java | 20 ++++++------ .../mailbox/store/StoreMessageIdManager.java | 2 +- .../mailbox/store/StoreMessageManager.java | 2 +- .../store/StoreMessageResultIterator.java | 2 +- .../store/event/SynchronousEventDelivery.java | 6 ++-- .../RegisteredDelegatingMailboxListener.java | 6 ++-- .../store/search/LazyMessageSearchIndex.java | 2 +- .../search/ListeningMessageSearchIndex.java | 6 ++-- .../mailbox/store/search/MessageSearches.java | 2 +- .../search/comparator/SentDateComparator.java | 2 +- .../james/mailbox/indexer/ReIndexerImpl.java | 2 +- .../james/ai/classic/BayesianAnalysis.java | 6 ++-- .../ai/classic/BayesianAnalysisFeeder.java | 10 +++--- .../james/ai/classic/JDBCBayesianAnalyzer.java | 4 +-- .../james/transport/mailets/AbstractSign.java | 12 ++++---- .../james/transport/mailets/SMIMESign.java | 2 +- .../james/transport/mailets/ICALToHeader.java | 4 +-- .../transport/mailets/ICALToJsonAttribute.java | 10 +++--- .../james/transport/mailets/AddFooter.java | 5 ++- .../transport/mailets/AmqpForwardAttribute.java | 4 +-- .../james/transport/mailets/ClamAVScan.java | 31 +++++++++---------- .../transport/mailets/ContentReplacer.java | 2 +- .../james/transport/mailets/HeadersToHTTP.java | 6 ++-- .../james/transport/mailets/LogMessage.java | 2 +- .../transport/mailets/MimeDecodingMailet.java | 4 +-- .../transport/mailets/RecoverAttachment.java | 3 +- .../transport/mailets/SerialiseToHTTP.java | 4 +-- .../transport/mailets/StripAttachment.java | 4 +-- .../transport/mailets/UseHeaderRecipients.java | 6 ++-- .../matchers/AbstractQuotaMatcher.java | 4 +-- .../matchers/AttachmentFileNameIs.java | 4 +-- .../james/mpt/protocol/ProtocolSession.java | 2 +- .../api/future/FutureResponseImpl.java | 2 +- .../imap/processor/AbstractAuthProcessor.java | 2 +- .../processor/AbstractSelectionProcessor.java | 4 +-- .../james/imap/processor/AppendProcessor.java | 6 ++-- .../james/imap/processor/CloseProcessor.java | 2 +- .../james/imap/processor/CreateProcessor.java | 2 +- .../imap/processor/DeleteACLProcessor.java | 2 +- .../james/imap/processor/DeleteProcessor.java | 2 +- .../james/imap/processor/ExpungeProcessor.java | 2 +- .../james/imap/processor/GetACLProcessor.java | 2 +- .../imap/processor/GetAnnotationProcessor.java | 2 +- .../james/imap/processor/IdleProcessor.java | 2 +- .../james/imap/processor/LSubProcessor.java | 2 +- .../james/imap/processor/ListProcessor.java | 2 +- .../imap/processor/ListRightsProcessor.java | 2 +- .../james/imap/processor/LogoutProcessor.java | 2 +- .../james/imap/processor/MyRightsProcessor.java | 2 +- .../james/imap/processor/RenameProcessor.java | 2 +- .../james/imap/processor/SearchProcessor.java | 2 +- .../james/imap/processor/SetACLProcessor.java | 2 +- .../imap/processor/SetAnnotationProcessor.java | 6 ++-- .../james/imap/processor/StatusProcessor.java | 2 +- .../imap/processor/SystemMessageProcessor.java | 2 +- .../processor/base/SelectedMailboxImpl.java | 2 +- .../imap/processor/fetch/FetchProcessor.java | 2 +- .../netty/BasicChannelUpstreamHandler.java | 4 +-- .../pop3/core/AbstractPassCmdHandler.java | 2 +- .../smtp/core/AbstractHookableCmdHandler.java | 4 +-- .../smtp/core/DataLineMessageHookHandler.java | 4 +-- .../smtp/core/esmtp/AuthCmdHandler.java | 8 ++--- .../core/fastfail/AbstractGreylistHandler.java | 10 +++--- .../core/fastfail/AbstractValidRcptHandler.java | 4 +-- .../smtp/core/fastfail/DNSRBLHandler.java | 2 +- .../smtp/core/fastfail/MaxRcptHandler.java | 2 +- .../smtp/core/fastfail/SpamTrapHandler.java | 6 ++-- .../fastfail/SupressDuplicateRcptHandler.java | 2 +- .../java/org/apache/james/cli/ServerCmd.java | 2 +- .../modules/mailbox/CassandraSessionModule.java | 2 +- .../james/utils/FileConfigurationProvider.java | 2 +- .../utils/InMemoryMailRepositoryStore.java | 2 +- .../apache/james/utils/ExtendedClassLoader.java | 2 +- .../mailbox/MailboxManagerManagement.java | 4 +-- .../spring/osgi/AbstractBundleTracker.java | 6 ++-- .../container/spring/tool/James23Importer.java | 2 +- .../util/streams/SwarmGenericContainer.java | 2 +- .../util/bayesian/JDBCBayesianAnalyzer.java | 4 +-- .../util/retry/naming/LoggingRetryHandler.java | 4 +-- .../mailrepository/file/FileMailRepository.java | 2 +- .../mailrepository/file/MBoxMailRepository.java | 32 ++++++++++---------- .../james/rrt/jpa/JPARecipientRewriteTable.java | 2 +- .../domainlist/lib/AbstractDomainList.java | 8 ++--- .../lib/AbstractMailRepository.java | 4 +-- .../repository/file/AbstractFileRepository.java | 6 ++-- .../file/FilePersistentObjectRepository.java | 6 ++-- .../rrt/lib/AbstractRecipientRewriteTable.java | 18 +++++------ .../dnsservice/dnsjava/DNSJavaService.java | 6 ++-- .../library/netmatcher/NetMatcher.java | 4 +-- .../mailetcontainer/impl/JamesMailSpooler.java | 6 ++-- .../impl/JamesMailetContext.java | 2 +- .../impl/camel/CamelMailetProcessor.java | 2 +- .../lib/AbstractStateCompositeProcessor.java | 2 +- .../mailets/AbstractRecipientRewriteTable.java | 2 +- .../transport/mailets/BayesianAnalysis.java | 4 +-- .../mailets/BayesianAnalysisFeeder.java | 10 +++--- .../apache/james/transport/mailets/Bounce.java | 2 +- .../james/transport/mailets/DSNBounce.java | 2 +- .../mailets/RecipientRewriteTableProcessor.java | 4 +-- .../james/transport/mailets/RemoteDelivery.java | 14 ++++----- .../org/apache/james/transport/mailets/SPF.java | 2 +- .../james/transport/mailets/ToSenderFolder.java | 2 +- .../transport/mailets/WhiteListManager.java | 16 +++++----- .../mailets/jsieve/SieveMailAdapter.java | 2 +- .../mailets/jsieve/VacationAction.java | 2 +- .../transport/mailets/jsieve/VacationReply.java | 2 +- .../redirect/MailMessageAlteringUtils.java | 4 +-- .../mailets/redirect/MailModifier.java | 12 ++++---- ...ddressesArrayToMailAddressListConverter.java | 2 +- .../mailets/remoteDelivery/Bouncer.java | 2 +- .../mailets/remoteDelivery/MailDelivrer.java | 2 +- .../matchers/AbstractNetworkMatcher.java | 2 +- .../matchers/AbstractSQLWhitelistMatcher.java | 2 +- .../transport/matchers/SenderInFakeDomain.java | 6 ++-- .../transport/util/SpecialAddressesUtils.java | 4 +-- .../james/samples/mailets/HelloWorldMailet.java | 2 +- .../apache/james/fetchmail/FolderProcessor.java | 2 +- .../apache/james/fetchmail/StoreProcessor.java | 2 +- .../james/jmap/AuthenticationServlet.java | 2 +- .../DefaultMailboxesProvisioningFilter.java | 2 +- .../jmap/crypto/JamesSignatureHandler.java | 2 +- .../james/jmap/methods/GetMessagesMethod.java | 4 +-- .../jmap/methods/MIMEMessageConverter.java | 2 +- .../methods/SetMessagesUpdateProcessor.java | 2 +- .../apache/james/jmap/model/mailbox/Rights.java | 4 +-- .../james/jmap/send/PostDequeueDecorator.java | 2 +- .../org/apache/james/jwt/JwtTokenVerifier.java | 2 +- .../org/apache/james/jwt/PublicKeyReader.java | 2 +- .../netty/ImapChannelUpstreamHandler.java | 4 +-- .../netty/AbstractConfigurableAsyncServer.java | 10 +++--- .../hook/MailboxDeliverToRecipientHandler.java | 2 +- .../james/lmtpserver/netty/LMTPServer.java | 2 +- .../james/pop3server/core/PassCmdHandler.java | 2 +- .../DataLineJamesMessageHookHandler.java | 8 ++--- .../org/apache/james/smtpserver/TLDLookup.java | 8 ++--- .../fastfail/JDBCGreylistHandler.java | 4 +-- .../james/smtpserver/fastfail/SPFHandler.java | 2 +- .../smtpserver/fastfail/URIRBLHandler.java | 8 ++--- .../james/smtpserver/fastfail/URIScanner.java | 16 +++++----- .../smtpserver/fastfail/ValidRcptHandler.java | 2 +- .../james/smtpserver/fastfail/ValidRcptMX.java | 2 +- .../smtpserver/jmx/SMTPCommandHandlerStats.java | 2 +- .../james/smtpserver/netty/SMTPServer.java | 4 +-- .../apache/james/smtpserver/SMTPServerTest.java | 4 +-- .../apache/james/webadmin/WebAdminServer.java | 2 +- .../james/queue/activemq/ActiveMQMailQueue.java | 4 +-- .../apache/james/queue/jms/JMSMailQueue.java | 10 +++--- 155 files changed, 335 insertions(+), 342 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java ---------------------------------------------------------------------- diff --git a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java index 3fedaea..0727f23 100644 --- a/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java +++ b/backends-common/elasticsearch/src/main/java/org/apache/james/backends/es/IndexCreationFactory.java @@ -119,7 +119,7 @@ public class IndexCreationFactory { .execute() .actionGet(); } catch (IndexAlreadyExistsException exception) { - LOGGER.info("Index [" + indexName + "] already exist"); + LOGGER.info("Index [{}] already exist", indexName); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java index acf7baf..e4d8c76 100644 --- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java +++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/search/ElasticSearchSearcher.java @@ -131,7 +131,7 @@ public class ElasticSearchSearcher { mailboxIdFactory.fromString(mailboxId.getValue()), MessageUid.of(uidAsNumber.longValue()))); } else { - LOGGER.warn("Can not extract UID, MessageID and/or MailboxId for search result " + hit.getId()); + LOGGER.warn("Can not extract UID, MessageID and/or MailboxId for search result {}", hit.getId()); return Optional.empty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java index a69a9b8..7fd2419 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/HBaseClusterSingleton.java @@ -78,7 +78,7 @@ public final class HBaseClusterSingleton { int permBits = 0777 & ~umaskBits; String perms = Integer.toString(permBits, 8); - LOG.info("Setting dfs.datanode.data.dir.perm to " + perms); + LOG.info("Setting dfs.datanode.data.dir.perm to {}", perms); htu.getConfiguration().set("dfs.datanode.data.dir.perm", perms); } else { LOG.warn("Failed running umask command in a shell, nonzero return value"); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java index dca113b..596bd45 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMapperTest.java @@ -129,7 +129,7 @@ public class HBaseMailboxMapperTest { LOG.info("findMailboxByPath"); HBaseMailbox mailbox; for (MailboxPath path : pathsList) { - LOG.info("Searching for " + path); + LOG.info("Searching for {}", path); mailbox = (HBaseMailbox) mapper.findMailboxByPath(path); assertEquals(path, new MailboxPath(mailbox.getNamespace(), mailbox.getUser(), mailbox.getName())); } @@ -139,7 +139,7 @@ public class HBaseMailboxMapperTest { LOG.info("findMailboxById"); HBaseMailbox mailbox; for (MailboxId id : idsList) { - LOG.info("Searching for " + id.serialize()); + LOG.info("Searching for {}", id.serialize()); mailbox = (HBaseMailbox) mapper.findMailboxById(id); assertEquals(mailbox.getMailboxId(), id); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java index a788a94..c3832fe 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/mail/HBaseMailboxMessageMapperTest.java @@ -217,7 +217,7 @@ public class HBaseMailboxMessageMapperTest { LOG.info("add"); // The tables should be deleted every time the tests run. long msgCount = messageMapper.countMessagesInMailbox(MBOXES.get(1)); - LOG.info(msgCount + " " + MESSAGE_NO.size()); + LOG.info("{} {}", msgCount, MESSAGE_NO.size()); assertEquals(MESSAGE_NO.size(), msgCount); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java index 7a8cc8b..5abdedf 100644 --- a/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java +++ b/mailbox/hbase/src/test/java/org/apache/james/mailbox/hbase/user/HBaseSubscriptionMapperTest.java @@ -118,7 +118,7 @@ public class HBaseSubscriptionMapperTest { subscription = new SimpleSubscription(user, mailbox); mailboxes.add(subscription); mapper.save(subscription); - LOG.info("Adding subscription " + subscription); + LOG.info("Adding subscription {}", subscription); } } } @@ -175,7 +175,7 @@ public class HBaseSubscriptionMapperTest { @SuppressWarnings("unused") final SimpleSubscription fake1 = new SimpleSubscription("user1", "FAKEBOX"); final SimpleSubscription fake2 = new SimpleSubscription("fakeUser", "INBOX"); for (String user : subscriptionList.keySet()) { - LOG.info("Searching for all subscriptions for user: " + user); + LOG.info("Searching for all subscriptions for user: {}", user); final List<Subscription> found = mapper.findSubscriptionsForUser(user); assertEquals(subscriptionList.get(user).size(), found.size()); // TODO: patch Subscription to implement equals @@ -198,9 +198,9 @@ public class HBaseSubscriptionMapperTest { final HTable subscriptions = new HTable(mapperFactory.getClusterConfiguration(), SUBSCRIPTIONS_TABLE); for (String user : subscriptionList.keySet()) { - LOG.info("Deleting subscriptions for user: " + user); + LOG.info("Deleting subscriptions for user: {}", user); for (SimpleSubscription subscription : subscriptionList.get(user)) { - LOG.info("Deleting subscription : " + subscription); + LOG.info("Deleting subscription : {}", subscription); mapper.delete(subscription); final Get get = new Get(Bytes.toBytes(subscription.getUser())); final Result result = subscriptions.get(get); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java index 0d3f4cb..9aa0e2c 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java @@ -344,7 +344,7 @@ public class MaildirFolder { int gap = line.indexOf(" "); if (gap == -1) { // there must be some issues in the file if no gap can be found - LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++); + LOGGER.info("Corrupted entry in uid-file {} line {}", uidList, lineNumber++); continue; } @@ -510,7 +510,7 @@ public class MaildirFolder { if (gap == -1) { // there must be some issues in the file if no gap can be found // there must be some issues in the file if no gap can be found - LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lines.size()); + LOGGER.info("Corrupted entry in uid-file {} line {}", uidList, lines.size()); continue; } @@ -637,7 +637,7 @@ public class MaildirFolder { if (gap == -1) { // there must be some issues in the file if no gap can be found - LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++); + LOGGER.info("Corrupted entry in uid-file {} line {}", uidList, lineNumber++); continue; } @@ -861,7 +861,7 @@ public class MaildirFolder { int gap = line.indexOf(" "); if (gap == -1) { // there must be some issues in the file if no gap can be found - LOGGER.info("Corrupted entry in uid-file " + uidList + " line " + lineNumber++); + LOGGER.info("Corrupted entry in uid-file {} line {}", uidList, lineNumber++); continue; } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java index e9b9e1d..93983c0 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMailboxMapper.java @@ -105,7 +105,7 @@ public class MaildirMailboxMapper extends NonTransactionalMapper implements Mail FileUtils.forceDelete(file); } } catch (IOException e) { - LOGGER.error("Error while deleting file " + file, e); + LOGGER.error("Error while deleting file {}", file, e); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index 954186c..e063236 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -440,11 +440,11 @@ public class StoreMailboxManager implements MailboxManager { Mailbox mailboxRow = mapper.findMailboxByPath(mailboxPath); if (mailboxRow == null) { - LOGGER.info("Mailbox '" + mailboxPath + "' not found."); + LOGGER.info("Mailbox '{}' not found.", mailboxPath); throw new MailboxNotFoundException(mailboxPath); } else { - LOGGER.debug("Loaded mailbox " + mailboxPath); + LOGGER.debug("Loaded mailbox {}", mailboxPath); return createMessageManager(mailboxRow, session); } @@ -457,16 +457,16 @@ public class StoreMailboxManager implements MailboxManager { Mailbox mailboxRow = mapper.findMailboxById(mailboxId); if (mailboxRow == null) { - LOGGER.info("Mailbox '" + mailboxId.serialize() + "' not found."); + LOGGER.info("Mailbox '{}' not found.", mailboxId.serialize()); throw new MailboxNotFoundException(mailboxId); } if (! assertUserHasAccessTo(mailboxRow, session)) { - LOGGER.info("Mailbox '" + mailboxId.serialize() + "' does not belong to user '" + session.getUser() + "' but to '" + mailboxRow.getUser()); + LOGGER.info("Mailbox '{}' does not belong to user '{}' but to '{}'", mailboxId.serialize(), session.getUser(), mailboxRow.getUser()); throw new MailboxNotFoundException(mailboxId); } - LOGGER.debug("Loaded mailbox " + mailboxId.serialize()); + LOGGER.debug("Loaded mailbox {}", mailboxId.serialize()); return createMessageManager(mailboxRow, session); } @@ -486,7 +486,7 @@ public class StoreMailboxManager implements MailboxManager { @Override public Optional<MailboxId> createMailbox(MailboxPath mailboxPath, MailboxSession mailboxSession) throws MailboxException { - LOGGER.debug("createMailbox " + mailboxPath); + LOGGER.debug("createMailbox {}", mailboxPath); if (mailboxPath.getName().isEmpty()) { LOGGER.warn("Ignoring mailbox with empty name"); } else { @@ -521,7 +521,7 @@ public class StoreMailboxManager implements MailboxManager { @Override public void deleteMailbox(final MailboxPath mailboxPath, final MailboxSession session) throws MailboxException { - LOGGER.info("deleteMailbox " + mailboxPath); + LOGGER.info("deleteMailbox {}", mailboxPath); assertIsOwner(session, mailboxPath); final MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(session); @@ -544,7 +544,7 @@ public class StoreMailboxManager implements MailboxManager { @Override public void renameMailbox(MailboxPath from, MailboxPath to, MailboxSession session) throws MailboxException { - LOGGER.debug("renameMailbox " + from + " to " + to); + LOGGER.debug("renameMailbox {} to {}", from, to); if (mailboxExists(to, session)) { throw new MailboxExistsException(to.toString()); } @@ -556,7 +556,7 @@ public class StoreMailboxManager implements MailboxManager { private void assertIsOwner(MailboxSession mailboxSession, MailboxPath mailboxPath) throws MailboxNotFoundException { if (!mailboxPath.belongsTo(mailboxSession)) { - LOGGER.info("Mailbox " + mailboxPath.asString() + " does not belong to " + mailboxSession.getUser().getUserName()); + LOGGER.info("Mailbox {} does not belong to {}", mailboxPath.asString(), mailboxSession.getUser().getUserName()); throw new MailboxNotFoundException(mailboxPath.asString()); } } @@ -585,7 +585,7 @@ public class StoreMailboxManager implements MailboxManager { mapper.save(sub); dispatcher.mailboxRenamed(session, fromPath, sub); - LOGGER.debug("Rename mailbox sub-mailbox " + subOriginalName + " to " + subNewName); + LOGGER.debug("Rename mailbox sub-mailbox {} to {}", subOriginalName, subNewName); } return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java index 3cc54ad..14a0126 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageIdManager.java @@ -348,7 +348,7 @@ public class StoreMessageIdManager implements MessageIdManager { .findFirst(); if (mailboxForbidden.isPresent()) { - LOGGER.info("Mailbox with Id " + mailboxForbidden.get() + " does not belong to " + mailboxSession.getUser().getUserName()); + LOGGER.info("Mailbox with Id {} does not belong to {}", mailboxForbidden.get(), mailboxSession.getUser().getUserName()); throw new MailboxNotFoundException(mailboxForbidden.get()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java index 03edb61..777b28f 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java @@ -448,7 +448,7 @@ public class StoreMessageManager implements org.apache.james.mailbox.MessageMana try { return messageParser.retrieveAttachments(contentIn); } catch (Exception e) { - LOG.warn("Error while parsing mail's attachments: " + e.getMessage(), e); + LOG.warn("Error while parsing mail's attachments: {}", e.getMessage(), e); return ImmutableList.of(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java index 22da87c..7e50cba 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageResultIterator.java @@ -73,7 +73,7 @@ public class StoreMessageResultIterator implements MessageResultIterator { this.batchSizes = batchSizes; this.type = range.getType(); this.ftype = getFetchType(group); - LOGGER.debug("batchSizes used: " + batchSizes); + LOGGER.debug("batchSizes used: {}", batchSizes); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java index aca62f9..8f2b883 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/SynchronousEventDelivery.java @@ -32,10 +32,8 @@ public class SynchronousEventDelivery implements EventDelivery { try { mailboxListener.event(event); } catch(Throwable throwable) { - LOGGER.error("Error while processing listener " - + mailboxListener.getClass().getCanonicalName() - + " for " - + event.getClass().getCanonicalName(), + LOGGER.error("Error while processing listener {} for {}", + mailboxListener.getClass().getCanonicalName(), event.getClass().getCanonicalName(), throwable); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java index a16434f..16aafc9 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/event/distributed/RegisteredDelegatingMailboxListener.java @@ -109,7 +109,7 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin deliverToMailboxPathRegisteredListeners(event); sendToRemoteJames(event); } catch (Throwable t) { - LOGGER.error("Error while delegating event " + event.getClass().getCanonicalName(), t); + LOGGER.error("Error while delegating event {}", event.getClass().getCanonicalName(), t); } } @@ -158,14 +158,14 @@ public class RegisteredDelegatingMailboxListener implements DistributedDelegatin try { serializedEvent = eventSerializer.serializeEvent(event); } catch (Exception e) { - LOGGER.error("Unable to serialize " + event.getClass().getCanonicalName(), e); + LOGGER.error("Unable to serialize {}", event.getClass().getCanonicalName(), e); return; } for (Topic topic : topics) { try { publisher.publish(topic, serializedEvent); } catch (Throwable t) { - LOGGER.error("Unable to send serialized event to topic " + topic); + LOGGER.error("Unable to send serialized event to topic {}", topic); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java index 6ff7cea..5262c88 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java @@ -115,7 +115,7 @@ public class LazyMessageSearchIndex extends ListeningMessageSearchIndex { try { add(session, mailbox, message); } catch (MailboxException e) { - LOGGER.error("Unable to index message " + message.getUid() + " in mailbox " + mailbox.getName(), e); + LOGGER.error("Unable to index message {} in mailbox {}", message.getUid(), mailbox.getName(), e); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java index 64d8473..33dcecc 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/ListeningMessageSearchIndex.java @@ -91,7 +91,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, try { delete(session, expunged.getMailbox(), expunged.getUids()); } catch (MailboxException e) { - LOGGER.error("Unable to deleted messages " + expunged.getUids() + " from index for mailbox " + expunged.getMailbox(), e); + LOGGER.error("Unable to deleted messages {} from index for mailbox {}", expunged.getUids(), expunged.getMailbox(), e); } } else if (event instanceof EventFactory.FlagsUpdatedImpl) { EventFactory.FlagsUpdatedImpl flagsUpdated = (EventFactory.FlagsUpdatedImpl) event; @@ -100,7 +100,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, try { update(session, mailbox, flagsUpdated.getUpdatedFlags()); } catch (MailboxException e) { - LOGGER.error("Unable to update flags in index for mailbox " + mailbox, e); + LOGGER.error("Unable to update flags in index for mailbox {}", mailbox, e); } } } else if (event instanceof EventFactory.MailboxDeletionImpl) { @@ -132,7 +132,7 @@ public abstract class ListeningMessageSearchIndex implements MessageSearchIndex, try { add(session, mailbox, message); } catch (MailboxException e) { - LOGGER.error("Unable to index message " + message.getUid() + " for mailbox " + mailbox, e); + LOGGER.error("Unable to index message {} for mailbox {}", message.getUid(), mailbox, e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java index cb14f67..3cfc9ef 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java @@ -116,7 +116,7 @@ public class MessageSearches implements Iterable<SimpleMessageSearchIndex.Search builder.add(m); } } catch (MailboxException e) { - LOGGER.error("Unable to search message " + m.getUid(), e); + LOGGER.error("Unable to search message {}", m.getUid(), e); } } return builder.build() http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java index 3a897f7..8f7ab13 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/comparator/SentDateComparator.java @@ -53,7 +53,7 @@ public class SentDateComparator extends AbstractHeaderComparator { sanitizeDateStringHeaderValue(value), ImapDateTimeFormatter.rfc5322())); } catch (Exception e) { - LOGGER.info("Can not parse receive date " + value); + LOGGER.info("Can not parse receive date {}", value); return Optional.empty(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java ---------------------------------------------------------------------- diff --git a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java index 6f68663..d99cc6d 100644 --- a/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java +++ b/mailbox/tool/src/main/java/org/apache/james/mailbox/indexer/ReIndexerImpl.java @@ -110,7 +110,7 @@ public class ReIndexerImpl implements ReIndexer { MessageRange.all(), MessageMapper.FetchType.Full, NO_LIMIT)); - LOGGER.info("Finish to reindex " + path); + LOGGER.info("Finish to reindex {}", path); } finally { mailboxManager.removeListener(path, mailboxRegistration, mailboxSession); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java index 5acc119..8aa08ad 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysis.java @@ -241,7 +241,7 @@ public class BayesianAnalysis extends GenericMailet { if (maxSizeParam != null) { setMaxSize(Integer.parseInt(maxSizeParam)); } - LOGGER.debug("maxSize: " + getMaxSize()); + LOGGER.debug("maxSize: {}", getMaxSize()); String tag = getInitParameter("tagSubject"); if (tag != null && tag.equals("false")) { @@ -332,7 +332,7 @@ public class BayesianAnalysis extends GenericMailet { saveChanges(message); } catch (Exception e) { - LOGGER.error("Exception: " + e.getMessage(), e); + LOGGER.error("Exception: {}", e.getMessage(), e); throw new MessagingException("Exception thrown", e); } } @@ -392,7 +392,7 @@ public class BayesianAnalysis extends GenericMailet { message.setSubject(toAppend + " " + subject, "iso-8859-1"); } } catch (MessagingException ex) { - LOGGER.error("Failure to append to subject phrase: '" + toAppend + "'", ex); + LOGGER.error("Failure to append to subject phrase: '{}'", toAppend, ex); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java index cd00733..44f413e 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/BayesianAnalysisFeeder.java @@ -213,7 +213,7 @@ public class BayesianAnalysisFeeder extends GenericMailet { if (maxSizeParam != null) { setMaxSize(Integer.parseInt(maxSizeParam)); } - LOGGER.debug("maxSize: " + getMaxSize()); + LOGGER.debug("maxSize: {}", getMaxSize()); initDb(); @@ -254,7 +254,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; } @@ -279,14 +279,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); @@ -298,7 +298,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/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java ---------------------------------------------------------------------- diff --git a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java index 366e0d5..4ca0e12 100644 --- a/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java +++ b/mailet/ai/src/main/java/org/apache/james/ai/classic/JDBCBayesianAnalyzer.java @@ -158,7 +158,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer { } } // Verbose. - LOGGER.debug("Ham tokens count: " + ham.size()); + LOGGER.debug("Ham tokens count: {}", ham.size()); rs.close(); pstmt.close(); @@ -178,7 +178,7 @@ public class JDBCBayesianAnalyzer extends BayesianAnalyzer { } // Verbose. - LOGGER.debug("Spam tokens count: " + spam.size()); + LOGGER.debug("Spam tokens count: {}", spam.size()); rs.close(); pstmt.close(); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java index e4ed9cd..a019526 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/AbstractSign.java @@ -202,7 +202,7 @@ public abstract class AbstractSign extends GenericMailet { throw new MessagingException("The specified <keyHolderClass> does not exist: " + keyHolderClassName); } if (isDebug()) { - LOGGER.debug("keyHolderClass: " + getKeyHolderClass()); + LOGGER.debug("keyHolderClass: {}", getKeyHolderClass()); } } @@ -309,7 +309,7 @@ public abstract class AbstractSign extends GenericMailet { setKeyHolder((KeyHolder)keyHolderConstructor.newInstance(parameters)); if (isDebug()) { - LOGGER.debug("Subject Distinguished Name: " + getKeyHolder().getSignerDistinguishedName()); + LOGGER.debug("Subject Distinguished Name: {}", getKeyHolder().getSignerDistinguishedName()); } if (getKeyHolder().getSignerAddress() == null) { @@ -538,7 +538,7 @@ public abstract class AbstractSign extends GenericMailet { mail.setAttribute(SMIMEAttributeNames.SMIME_SIGNER_ADDRESS, getKeyHolder().getSignerAddress()); if (isDebug()) { - LOGGER.debug("Message signed, reverse-path: " + mail.getSender() + ", Id: " + messageId); + LOGGER.debug("Message signed, reverse-path: {}, Id: {}", mail.getSender(), messageId); } } catch (MessagingException me) { @@ -583,7 +583,7 @@ public abstract class AbstractSign extends GenericMailet { String authUser = (String) mail.getAttribute(Mail.SMTP_AUTH_USER_ATTRIBUTE_NAME); // was the sender user SMTP authorized? if (authUser == null) { - LOGGER.info("Can not sign mail for sender <" + mail.getSender() + "> as he is not a SMTP authenticated user"); + LOGGER.info("Can not sign mail for sender <{}> as he is not a SMTP authenticated user", mail.getSender()); return false; } @@ -598,7 +598,7 @@ public abstract class AbstractSign extends GenericMailet { // is the reverse-path user different from the SMTP authorized user? String username = getUsername(reversePath); if (!username.equals(authUser)) { - LOGGER.info("SMTP logged in as <" + authUser + "> but pretend to be sender <" + username + ">"); + LOGGER.info("SMTP logged in as <{}> but pretend to be sender <{}>", authUser, username); return false; } // is there no "From:" address same as the reverse-path? @@ -661,7 +661,7 @@ public abstract class AbstractSign extends GenericMailet { try { mailAddress = new MailAddress(aFromArray); } catch (ParseException pe) { - LOGGER.info("Unable to parse a \"FROM\" header address: " + aFromArray.toString() + "; ignoring."); + LOGGER.info("Unable to parse a \"FROM\" header address: {}; ignoring.", aFromArray); continue; } if (mailAddress.equals(reversePath)) { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java ---------------------------------------------------------------------- diff --git a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java index bf7d464..3f76915 100644 --- a/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java +++ b/mailet/crypto/src/main/java/org/apache/james/transport/mailets/SMIMESign.java @@ -137,7 +137,7 @@ public class SMIMESign extends Sign { throw new MessagingException(keyHolderClassName + "does not exist."); } if (isDebug()) { - LOGGER.debug("keyHolderClass: " + getKeyHolderClass()); + LOGGER.debug("keyHolderClass: {}", getKeyHolderClass()); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java index a4d287f..1b87bd4 100644 --- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java +++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java @@ -97,7 +97,7 @@ public class ICALToHeader extends GenericMailet { .ifPresent(Throwing.<Calendar>consumer(calendar -> writeToHeaders(calendar, mail)) .sneakyThrow()); } catch (ClassCastException e) { - LOGGER.error("Received a mail with " + attribute + " not being an ICAL object for mail " + mail.getName(), e); + LOGGER.error("Received a mail with {} not being an ICAL object for mail {}", attribute, mail.getName(), e); } } @@ -126,7 +126,7 @@ public class ICALToHeader extends GenericMailet { try { mimeMessage.addHeader(headerName, property.getValue()); } catch (MessagingException e) { - LOGGER.error("Could not add header " + headerName + " with value " + property.getValue(), e); + LOGGER.error("Could not add header {} with value {}", headerName, property.getValue(), e); } } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java index 023199f..5fb3a94 100644 --- a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java +++ b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToJsonAttribute.java @@ -143,7 +143,7 @@ public class ICALToJsonAttribute extends GenericMailet { } Optional<String> sender = retrieveSender(mail); if (!sender.isPresent()) { - LOGGER.info("Skipping " + mail.getName() + " because no sender and no from"); + LOGGER.info("Skipping {} because no sender and no from", mail.getName()); return; } try { @@ -155,7 +155,7 @@ public class ICALToJsonAttribute extends GenericMailet { .collect(Guavate.toImmutableMap(Pair::getKey, Pair::getValue)); mail.setAttribute(destinationAttributeName, (Serializable) jsonsInByteForm); } catch (ClassCastException e) { - LOGGER.error("Received a mail with " + sourceAttributeName + " not being an ICAL object for mail " + mail.getName(), e); + LOGGER.error("Received a mail with {} not being an ICAL object for mail {}", sourceAttributeName, mail.getName(), e); } } @@ -181,10 +181,10 @@ public class ICALToJsonAttribute extends GenericMailet { try { return Stream.of(objectMapper.writeValueAsString(ical)); } catch (JsonProcessingException e) { - LOGGER.error("Error while serializing Calendar for mail " + mailName, e); + LOGGER.error("Error while serializing Calendar for mail {}", mailName, e); return Stream.of(); } catch (Exception e) { - LOGGER.error("Exception caught while attaching ICAL to the email as JSON for mail " + mailName, e); + LOGGER.error("Exception caught while attaching ICAL to the email as JSON for mail {}", mailName, e); return Stream.of(); } } @@ -193,7 +193,7 @@ public class ICALToJsonAttribute extends GenericMailet { Calendar calendar = entry.getValue(); byte[] rawICal = rawCalendars.get(entry.getKey()); if (rawICal == null) { - LOGGER.debug("Cannot find matching raw ICAL from key: " + entry.getKey()); + LOGGER.debug("Cannot find matching raw ICAL from key: {}", entry.getKey()); return Stream.of(); } try { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java index c0cc1b1..2161fbb 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java @@ -69,11 +69,10 @@ public class AddFooter extends GenericMailet { if (attachFooter(message)) { message.saveChanges(); } else { - LOGGER.info("Unable to add footer to mail " + mail.getName()); + LOGGER.info("Unable to add footer to mail {}", mail.getName()); } } catch (UnsupportedEncodingException e) { - LOGGER.warn("UnsupportedEncoding Unable to add footer to mail " - + mail.getName(), e); + LOGGER.warn("UnsupportedEncoding Unable to add footer to mail {}", mail.getName(), e); } catch (IOException ioe) { throw new MessagingException("Could not read message", ioe); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/AmqpForwardAttribute.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AmqpForwardAttribute.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AmqpForwardAttribute.java index 0c6fb7d..04be8ba 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AmqpForwardAttribute.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AmqpForwardAttribute.java @@ -112,9 +112,9 @@ public class AmqpForwardAttribute extends GenericMailet { try { sendContent(content); } catch (IOException e) { - LOGGER.error("IOException while writing to AMQP: " + e.getMessage(), e); + LOGGER.error("IOException while writing to AMQP: {}", e.getMessage(), e); } catch (TimeoutException e) { - LOGGER.error("TimeoutException while writing to AMQP: " + e.getMessage(), e); + LOGGER.error("TimeoutException while writing to AMQP: {}", e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java index 8aec378..2c162ab 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ClamAVScan.java @@ -301,7 +301,7 @@ public class ClamAVScan extends GenericMailet { protected void initHost() throws UnknownHostException { setHost(getInitParameter("host")); if (isDebug()) { - LOGGER.debug("host: " + getHost()); + LOGGER.debug("host: {}", getHost()); } } @@ -340,7 +340,7 @@ public class ClamAVScan extends GenericMailet { String portParam = getInitParameter("port"); setPort((portParam == null) ? DEFAULT_PORT : Integer.parseInt(portParam)); if (isDebug()) { - LOGGER.debug("port: " + getPort()); + LOGGER.debug("port: {}", getPort()); } } @@ -371,7 +371,7 @@ public class ClamAVScan extends GenericMailet { String maxPingsParam = getInitParameter("maxPings"); setMaxPings((maxPingsParam == null) ? DEFAULT_MAX_PINGS : Integer.parseInt(maxPingsParam)); if (isDebug()) { - LOGGER.debug("maxPings: " + getMaxPings()); + LOGGER.debug("maxPings: {}", getMaxPings()); } } @@ -402,7 +402,7 @@ public class ClamAVScan extends GenericMailet { String pingIntervalMilliParam = getInitParameter("pingIntervalMilli"); setPingIntervalMilli((pingIntervalMilliParam == null) ? DEFAULT_PING_INTERVAL_MILLI : Integer.parseInt(pingIntervalMilliParam)); if (isDebug()) { - LOGGER.debug("pingIntervalMilli: " + getPingIntervalMilli()); + LOGGER.debug("pingIntervalMilli: {}", getPingIntervalMilli()); } } @@ -433,7 +433,7 @@ public class ClamAVScan extends GenericMailet { String streamBufferSizeParam = getInitParameter("streamBufferSize"); setStreamBufferSize((streamBufferSizeParam == null) ? DEFAULT_STREAM_BUFFER_SIZE : Integer.parseInt(streamBufferSizeParam)); if (isDebug()) { - LOGGER.debug("streamBufferSize: " + getStreamBufferSize()); + LOGGER.debug("streamBufferSize: {}", getStreamBufferSize()); } } @@ -538,7 +538,7 @@ public class ClamAVScan extends GenericMailet { do { if (usedAddresses.size() >= getAddressesCount()) { String logText = "Unable to connect to CLAMD. All addresses failed."; - LOGGER.debug(logText + " Giving up."); + LOGGER.debug("{} Giving up.", logText); throw new MessagingException(logText); } address = getNextAddress(); @@ -547,8 +547,7 @@ public class ClamAVScan extends GenericMailet { // get the socket return new Socket(address, getPort()); } catch (IOException ioe) { - LOGGER.error("Exception caught acquiring main socket to CLAMD on " - + address + " on port " + getPort() + ": ", ioe); + LOGGER.error("Exception caught acquiring main socket to CLAMD on {} on port {}: ", address, getPort(), ioe); getNextAddress(); // retry } @@ -686,7 +685,7 @@ public class ClamAVScan extends GenericMailet { } else { if (isDebug()) { - LOGGER.debug("OK (by CLAMD on " + socket.getInetAddress() + ")"); + LOGGER.debug("OK (by CLAMD on {})", socket.getInetAddress()); } mail.setAttribute(MAIL_ATTRIBUTE_NAME, "false"); @@ -702,7 +701,7 @@ public class ClamAVScan extends GenericMailet { } } catch (Exception ex) { - LOGGER.error("Exception caught calling CLAMD on " + socket.getInetAddress() + ": " + ex.getMessage(), ex); + LOGGER.error("Exception caught calling CLAMD on {}: {}", socket.getInetAddress(), ex.getMessage(), ex); throw new MessagingException("Exception caught", ex); } finally { IOUtils.closeQuietly(reader); @@ -738,16 +737,16 @@ public class ClamAVScan extends GenericMailet { int ping = 1; for (; ; ) { if (isDebug()) { - LOGGER.debug("Trial #" + ping + "/" + getMaxPings() + " - creating socket connected to " + address + " on port " + getPort()); + LOGGER.debug("Trial #{}/{} - creating socket connected to {} on port {}", ping, getMaxPings(), address, getPort()); } try { socket = new Socket(address, getPort()); break; } catch (ConnectException ce) { - LOGGER.debug("Trial #" + ping + "/" + getMaxPings() + " - exception caught: " + ce.toString() + " while creating socket connected to " + address + " on port " + getPort()); + LOGGER.debug("Trial #{}/{} - exception caught: {} while creating socket connected to {} on port {}", ping, getMaxPings(), ce, address, getPort()); ping++; if (ping <= getMaxPings()) { - LOGGER.debug("Waiting " + getPingIntervalMilli() + " milliseconds before retrying ..."); + LOGGER.debug("Waiting {} milliseconds before retrying ...", getPingIntervalMilli()); Thread.sleep(getPingIntervalMilli()); } else { break; @@ -765,7 +764,7 @@ public class ClamAVScan extends GenericMailet { BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "ASCII")); PrintWriter writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream())), true); - LOGGER.debug("Sending: \"PING\" to " + address + " ..."); + LOGGER.debug("Sending: \"PING\" to {} ...", address); writer.println("PING"); writer.flush(); @@ -774,7 +773,7 @@ public class ClamAVScan extends GenericMailet { String answer = reader.readLine(); if (answer != null) { answer = answer.trim(); - LOGGER.debug("Received: \"" + answer + "\""); + LOGGER.debug("Received: \"{}\"", answer); answer = answer.trim(); if (answer.equals("PONG")) { pongReceived = true; @@ -809,7 +808,7 @@ public class ClamAVScan extends GenericMailet { try { port = Integer.parseInt(portSubstring); } catch (NumberFormatException nfe) { - LOGGER.error("Can not parse port from substring " + portSubstring); + LOGGER.error("Can not parse port from substring {}", portSubstring); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java index 22424e4..6efa549 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java @@ -69,7 +69,7 @@ public class ContentReplacer { private String replaceFirst(ReplacingPattern replacingPattern, Matcher matcher) { if (debug) { - LOGGER.debug("Subject rule match: " + replacingPattern.getMatcher()); + LOGGER.debug("Subject rule match: {}", replacingPattern.getMatcher()); } return matcher.replaceFirst(replacingPattern.getSubstitution()); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java index 029615e..a575b35 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/HeadersToHTTP.java @@ -109,10 +109,10 @@ public class HeadersToHTTP extends GenericMailet { */ public void service(Mail mail) { try { - LOGGER.debug(mail.getName() + "HeadersToHTTP: Starting"); + LOGGER.debug("{} HeadersToHTTP: Starting", mail.getName()); MimeMessage message = mail.getMessage(); HashSet<NameValuePair> pairs = getNameValuePairs(message); - LOGGER.debug(mail.getName() + "HeadersToHTTP: " + pairs.size() + " named value pairs found"); + LOGGER.debug("{} HeadersToHTTP: {} named value pairs found", mail.getName(), pairs.size()); String result = httpPost(pairs); if (passThrough) { addHeader(mail, true, result); @@ -147,7 +147,7 @@ public class HeadersToHTTP extends GenericMailet { HttpUriRequest request = RequestBuilder.post(url).addParameters(pairs.toArray(new NameValuePair[0])).build(); clientResponse = client.execute(request); String result = clientResponse.getStatusLine().getStatusCode() + ": " + clientResponse.getStatusLine(); - LOGGER.debug("HeadersToHTTP: " + result); + LOGGER.debug("HeadersToHTTP: {}", result); return result; } finally { IOUtils.closeQuietly(clientResponse); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java index bbf6a05..4997a24 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/LogMessage.java @@ -87,7 +87,7 @@ public class LogMessage extends GenericMailet { @Override public void service(Mail mail) { - logger.info("Logging mail " + mail.getName()); + logger.info("Logging mail {}", mail.getName()); logComment(); try { MimeMessage message = mail.getMessage(); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java index c4fc0a4..34fd70b 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java @@ -84,8 +84,8 @@ public class MimeDecodingMailet extends GenericMailet { Serializable attributeContent = mail.getAttribute(attribute); if (! (attributeContent instanceof Map)) { LOGGER.debug("Invalid attribute found into attribute " - + attribute + "class Map expected but " - + attributeContent.getClass() + " found."); + + "{} class Map expected but " + + "{} found.", attribute, attributeContent.getClass()); return ImmutableMap.of(); } return (Map<String, byte[]>) attributeContent; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java index 853395d..8f9ede6 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/RecoverAttachment.java @@ -79,8 +79,7 @@ public class RecoverAttachment extends GenericMailet { + " is a mandatory parameter"); } - LOGGER.debug("RecoverAttachment is initialised with attribute [" + attributeName - + "]"); + LOGGER.debug("RecoverAttachment is initialised with attribute [{}]", attributeName); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java index 11b8151..8c2dfdc 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/SerialiseToHTTP.java @@ -159,7 +159,7 @@ public class SerialiseToHTTP extends GenericMailet { if( data.length>1 && data[1]!=null ) { requestBuilder.addParameter(data[1].getName(),data[1].getValue()); - LOGGER.debug( data[1].getName() + "::" + data[1].getValue() ); + LOGGER.debug("{}::{}", data[1].getName(), data[1].getValue()); } CloseableHttpClient client = HttpClientBuilder.create().build(); @@ -168,7 +168,7 @@ public class SerialiseToHTTP extends GenericMailet { clientResponse = client.execute(requestBuilder.build()); if (clientResponse.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { - LOGGER.debug("POST failed: " + clientResponse.getStatusLine()); + LOGGER.debug("POST failed: {}", clientResponse.getStatusLine()); return clientResponse.getStatusLine().toString(); } return null; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java index 8e87239..b3ed2f0 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/StripAttachment.java @@ -411,7 +411,7 @@ public class StripAttachment extends GenericMailet { boolean result = isMatchingPattern(name, regExPattern).orElse(false) || !isMatchingPattern(name, notRegExPattern).orElse(true); - LOGGER.debug("attachment " + name + " " + ((result) ? "matches" : "does not match")); + LOGGER.debug("attachment {} {}", name, (result) ? "matches" : "does not match"); return result; } @@ -440,7 +440,7 @@ public class StripAttachment extends GenericMailet { try { File outputFile = outputFile(part, fileName); - LOGGER.debug("saving content of " + outputFile.getName() + "..."); + LOGGER.debug("saving content of {}...", outputFile.getName()); IOUtils.copy(part.getInputStream(), new FileOutputStream(outputFile)); return Optional.of(outputFile.getName()); http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java index ef1e20c..20c5656 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/UseHeaderRecipients.java @@ -99,7 +99,7 @@ public class UseHeaderRecipients extends GenericMailet { mail.setRecipients(headersAddresses(message)); if (isDebug) { - LOGGER.debug("All recipients = " + mail.getRecipients()); + LOGGER.debug("All recipients = {}", mail.getRecipients()); LOGGER.debug("Reprocessing mail using recipients in message headers"); } @@ -140,7 +140,7 @@ public class UseHeaderRecipients extends GenericMailet { */ private Collection<MailAddress> getHeaderMailAddresses(MimeMessage message, String name) throws MessagingException { if (isDebug) { - LOGGER.debug("Checking " + name + " headers"); + LOGGER.debug("Checking {} headers", name); } String[] headers = message.getHeader(name); ImmutableList.Builder<MailAddress> addresses = ImmutableList.builder(); @@ -163,7 +163,7 @@ public class UseHeaderRecipients extends GenericMailet { ImmutableList.Builder<MailAddress> result = ImmutableList.builder(); for (String headerPart : headerParts) { if (isDebug) { - LOGGER.debug("Address = " + headerPart); + LOGGER.debug("Address = {}", headerPart); } result.addAll(readMailAddresses(headerPart)); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java index 5539786..b0109e3 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AbstractQuotaMatcher.java @@ -79,10 +79,10 @@ abstract public class AbstractQuotaMatcher extends GenericMatcher { protected boolean isOverQuota(MailAddress address, Mail mail) { try { boolean over = getQuota(address, mail) < getUsed(address, mail); - if (over) LOGGER.info(address + " is over quota."); + if (over) LOGGER.info("{} is over quota.", address); return over; } catch (Throwable e) { - LOGGER.error("Exception checking quota for: " + address, e); + LOGGER.error("Exception checking quota for: {}", address, e); return false; } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java index c505816..91c9530 100755 --- a/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/matchers/AttachmentFileNameIs.java @@ -201,7 +201,7 @@ public class AttachmentFileNameIs extends GenericMatcher { // check the file name if (matchFound(fileName)) { if (isDebug) { - LOGGER.debug("matched " + fileName); + LOGGER.debug("matched {}", fileName); } return true; } @@ -257,7 +257,7 @@ public class AttachmentFileNameIs extends GenericMatcher { String fileName = zipEntry.getName(); if (matchFound(fileName)) { if (isDebug) { - LOGGER.debug("matched " + part.getFileName() + "(" + fileName + ")"); + LOGGER.debug("matched {}({})", part.getFileName(), fileName); } return true; } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java ---------------------------------------------------------------------- diff --git a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java index 1f7c4ce..3305ff8 100644 --- a/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java +++ b/mpt/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java @@ -579,7 +579,7 @@ public class ProtocolSession implements ProtocolInteractor { if (stopwatch == null) { throw new InvalidServerResponseException("TIMER '" + timerName + "' undefined"); } - LOGGER.info("Time spent in '" + timerName + "': " + stopwatch.elapsed(TimeUnit.MILLISECONDS) + " ms"); + LOGGER.info("Time spent in '{}': {} ms", timerName, stopwatch.elapsed(TimeUnit.MILLISECONDS)); } private void reset() throws InvalidServerResponseException { http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java ---------------------------------------------------------------------- diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java index 09859c4..5019344 100644 --- a/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java +++ b/protocols/api/src/main/java/org/apache/james/protocols/api/future/FutureResponseImpl.java @@ -155,7 +155,7 @@ public class FutureResponseImpl implements FutureResponse{ try { listener.onResponse(this); } catch (Throwable e) { - logger.warn("An exception was thrown by the listener " + listener, e); + logger.warn("An exception was thrown by the listener {}", listener, e); } } listeners = null; http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/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 16af520..a18b46d 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 @@ -137,7 +137,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr } else { try { Optional<MailboxId> mailboxId = mailboxManager.createMailbox(inboxPath, mailboxSession); - LOGGER.info("Provisioning INBOX. " + mailboxId + " created."); + LOGGER.info("Provisioning INBOX. {} created.", mailboxId); } catch (MailboxExistsException e) { LOGGER.warn("Mailbox INBOX created by concurrent call. Safe to ignore this exception."); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/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 e68fd6a..75936d2 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 @@ -92,10 +92,10 @@ abstract class AbstractSelectionProcessor<M extends AbstractMailboxSelectionRequ } catch (MailboxNotFoundException e) { - LOGGER.debug("Select failed as mailbox does not exist " + mailboxName, e); + LOGGER.debug("Select failed as mailbox does not exist {}", mailboxName, e); responder.respond(statusResponseFactory.taggedNo(tag, command, HumanReadableText.FAILURE_NO_SUCH_MAILBOX)); } catch (MailboxException e) { - LOGGER.error("Select failed for mailbox " + mailboxName , e); + LOGGER.error("Select failed for mailbox {}", mailboxName, e); no(command, tag, responder, HumanReadableText.SELECT); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java index 1ec493d..b5705ed 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AppendProcessor.java @@ -84,7 +84,7 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> { // consume message on exception consume(messageIn); - LOGGER.debug("Append failed for mailbox " + mailboxPath, e); + LOGGER.debug("Append failed for mailbox {}", mailboxPath, e); // Indicates that the mailbox does not exist // So TRY CREATE @@ -94,7 +94,7 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> { // consume message on exception consume(messageIn); - LOGGER.error("Append failed for mailbox " + mailboxPath, e); + LOGGER.error("Append failed for mailbox {}", mailboxPath, e); // Some other issue no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING); @@ -156,7 +156,7 @@ public class AppendProcessor extends AbstractMailboxProcessor<AppendRequest> { // So TRY CREATE tryCreate(session, tag, command, responder, e); } catch (MailboxException e) { - LOGGER.error("Unable to append message to mailbox " + mailboxPath, e); + LOGGER.error("Unable to append message to mailbox {}", mailboxPath, e); // Some other issue no(command, tag, responder, HumanReadableText.SAVE_FAILED); } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java index 77f226f..4594157 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/CloseProcessor.java @@ -63,7 +63,7 @@ public class CloseProcessor extends AbstractMailboxProcessor<CloseRequest> { } } catch (MailboxException e) { - LOGGER.error("Close failed for mailbox " + session.getSelected().getPath() , e); + LOGGER.error("Close failed for mailbox {}", session.getSelected().getPath(), e); no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/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 ad53f7b..eb0f983 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 @@ -72,7 +72,7 @@ public class CreateProcessor extends AbstractMailboxProcessor<CreateRequest> { } taggedBad(command, tag, responder, HumanReadableText.FAILURE_MAILBOX_NAME); } catch (MailboxException e) { - LOGGER.error("Create failed for mailbox " + mailboxPath, e); + LOGGER.error("Create failed for mailbox {}", mailboxPath, e); no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/741ff584/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java index 8526bf0..6459656 100644 --- a/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java +++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/DeleteACLProcessor.java @@ -134,7 +134,7 @@ public class DeleteACLProcessor extends AbstractMailboxProcessor<DeleteACLReques } catch (MailboxNotFoundException e) { no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND); } catch (MailboxException e) { - LOGGER.error(command.getName() +" failed for mailbox " + mailboxName, e); + LOGGER.error("{} failed for mailbox {}", command.getName(), mailboxName, e); no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
