You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/12/18 19:35:07 UTC
[31/50] [abbrv] james-project git commit: JAMES-2199 Remove redundant
is*Enabled() checks
JAMES-2199 Remove redundant is*Enabled() checks
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d4ce407c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d4ce407c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d4ce407c
Branch: refs/heads/master
Commit: d4ce407c0b63955953b104c82a5374b4700a68e2
Parents: 83a73e7
Author: Daniel Trebbien <dt...@gmail.com>
Authored: Mon Oct 30 09:48:13 2017 -0400
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 18 20:31:53 2017 +0100
----------------------------------------------------------------------
.../imap/decode/base/AbstractImapCommandParser.java | 4 +---
.../james/imap/decode/main/DefaultImapDecoder.java | 8 ++------
.../james/imap/processor/AbstractAuthProcessor.java | 12 +++---------
.../james/imap/processor/AbstractMailboxProcessor.java | 4 +---
.../apache/james/imap/processor/EnableProcessor.java | 4 +---
.../apache/james/imap/processor/ExpungeProcessor.java | 4 +---
.../james/imap/processor/SystemMessageProcessor.java | 4 +---
.../MailRepositoryStoreBeanFactory.java | 6 +-----
.../osgi/AbstractOSGIAnnotationBeanPostProcessor.java | 5 ++---
.../org/apache/james/user/jcr/JCRUsersRepository.java | 9 ++-------
.../james/mailetcontainer/impl/JamesMailSpooler.java | 3 +--
.../james/mailetcontainer/impl/JamesMailetContext.java | 3 +--
.../java/org/apache/james/fetchmail/FetchScheduler.java | 6 ++----
13 files changed, 19 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
index 14a8a2d..e2dbd41 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
@@ -83,9 +83,7 @@ public abstract class AbstractImapCommandParser implements MessagingImapCommandP
result = decode(command, request, tag, session);
} catch (DecodingException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Cannot parse protocol ", e);
- }
+ LOGGER.debug("Cannot parse protocol ", e);
result = statusResponseFactory.taggedBad(tag, command, e.getKey());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
index a3e753f..4bf20e9 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
@@ -69,9 +69,7 @@ public class DefaultImapDecoder implements ImapDecoder {
final String tag = request.tag();
message = decodeCommandTagged(request, tag, session);
} catch (DecodingException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Cannot parse tag", e);
- }
+ LOGGER.debug("Cannot parse tag", e);
message = unknownCommand(null, session);
}
return message;
@@ -86,9 +84,7 @@ public class DefaultImapDecoder implements ImapDecoder {
final String commandName = request.atom();
message = decodeCommandNamed(request, tag, commandName, session);
} catch (DecodingException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Error during initial request parsing", e);
- }
+ LOGGER.debug("Error during initial request parsing", e);
message = unknownCommand(tag, session);
}
return message;
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/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 a18b46d..1c3f161 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
@@ -121,9 +121,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
}
no(command, tag, responder, HumanReadableText.NOT_AN_ADMIN);
} catch (MailboxException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Login failed", e);
- }
+ LOGGER.info("Login failed", e);
no(command, tag, responder, HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
@@ -131,9 +129,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
private void provisionInbox(ImapSession session, MailboxManager mailboxManager, MailboxSession mailboxSession) throws MailboxException {
final MailboxPath inboxPath = PathConverter.forSession(session).buildFullPath(MailboxConstants.INBOX);
if (mailboxManager.mailboxExists(inboxPath, mailboxSession)) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("INBOX exists. No need to create it.");
- }
+ LOGGER.debug("INBOX exists. No need to create it.");
} else {
try {
Optional<MailboxId> mailboxId = mailboxManager.createMailbox(inboxPath, mailboxSession);
@@ -156,9 +152,7 @@ public abstract class AbstractAuthProcessor<M extends ImapRequest> extends Abstr
session.setAttribute(ATTRIBUTE_NUMBER_OF_FAILURES, failures);
no(command, tag, responder, failed);
} else {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Too many authentication failures. Closing connection.");
- }
+ LOGGER.info("Too many authentication failures. Closing connection.");
bye(responder, HumanReadableText.TOO_MANY_FAILURES);
session.logout();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
index 6dc6d09..159a54c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
@@ -142,9 +142,7 @@ abstract public class AbstractMailboxProcessor<M extends ImapRequest> extends Ab
protected void unsolicitedResponses(ImapSession session, ImapProcessor.Responder responder, boolean omitExpunged, boolean useUid) {
final SelectedMailbox selected = session.getSelected();
if (selected == null) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("No mailbox selected");
- }
+ LOGGER.debug("No mailbox selected");
} else {
unsolicitedResponses(session, responder, selected, omitExpunged, useUid);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
index 6d630ae..4f64b8b 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
@@ -83,9 +83,7 @@ public class EnableProcessor extends AbstractMailboxProcessor<EnableRequest> imp
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
} catch (EnableException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Unable to enable extension", e);
- }
+ LOGGER.info("Unable to enable extension", e);
taggedBad(command, tag, responder, HumanReadableText.FAILED);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
index a213cc1..c100cf2 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
@@ -99,9 +99,7 @@ public class ExpungeProcessor extends AbstractMailboxProcessor<ExpungeRequest> i
}
}
} catch (MessageRangeException e) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Expunge failed", e);
- }
+ LOGGER.debug("Expunge failed", e);
taggedBad(command, tag, responder, HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
LOGGER.error("Expunge failed for mailbox {}", session.getSelected().getPath(), e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
----------------------------------------------------------------------
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
index 0f2c9a1..632210f 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
@@ -73,9 +73,7 @@ public class SystemMessageProcessor extends AbstractChainedProcessor<SystemMessa
private void forceLogout(ImapSession imapSession) throws MailboxException {
final MailboxSession session = ImapSessionUtils.getMailboxSession(imapSession);
if (session == null) {
- if (LOGGER.isTraceEnabled()) {
- LOGGER.trace("No mailbox session so no force logout needed");
- }
+ LOGGER.trace("No mailbox session so no force logout needed");
} else {
session.close();
mailboxManager.logout(session, true);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
index 57760af..7c7699a 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
@@ -106,8 +106,6 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
String className = repConf.getString("[@class]");
- boolean infoEnabled = LOGGER.isInfoEnabled();
-
for (String protocol : repConf.getStringArray("protocols.protocol")) {
HierarchicalConfiguration defConf = null;
@@ -117,9 +115,7 @@ public class MailRepositoryStoreBeanFactory extends AbstractBeanFactory implemen
defConf = repConf.configurationAt("config");
}
- if (infoEnabled) {
- LOGGER.info("Registering Repository instance of class {} to handle {} protocol requests", className, protocol);
- }
+ LOGGER.info("Registering Repository instance of class {} to handle {} protocol requests", className, protocol);
if (classes.get(protocol) != null) {
throw new ConfigurationException("The combination of protocol and type comprise a unique key for repositories. This constraint has been violated. Please check your repository configuration.");
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
index f828ab3..94d2c25 100644
--- a/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
+++ b/server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
@@ -213,9 +213,8 @@ public abstract class AbstractOSGIAnnotationBeanPostProcessor<A extends Annotati
}
if (lookupBeanFactory) {
- if (logger.isDebugEnabled())
- logger.debug("Lookup the bean via the BeanFactory");
-
+ logger.debug("Lookup the bean via the BeanFactory");
+
final Class<?> clazz = writeMethod.getParameterTypes()[0];
Object bean;
try {
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
index 2029201..a086d4d 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
@@ -315,11 +315,8 @@ public class JCRUsersRepository extends AbstractUsersRepository {
session.logout();
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to count user", e);
- }
+ LOGGER.info("Failed to count user", e);
throw new UsersRepositoryException("Failed to count user", e);
-
}
}
@@ -356,9 +353,7 @@ public class JCRUsersRepository extends AbstractUsersRepository {
session.logout();
}
} catch (RepositoryException e) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Failed to list users", e);
- }
+ LOGGER.info("Failed to list users", e);
throw new UsersRepositoryException("Failed to list users", e);
}
return userNames.iterator();
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
index 2bbd150..c10ea60 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
@@ -196,9 +196,8 @@ public class JamesMailSpooler implements Runnable, Disposable, Configurable, Mai
});
} catch (MailQueueException e1) {
- if (active.get() && LOGGER.isErrorEnabled()) {
+ if (active.get()) {
LOGGER.error("Exception dequeue mail", e1);
-
}
} catch (InterruptedException interrupted) {
//MailSpooler is stopping
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
index 3be98f3..4c3c84c 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
@@ -177,8 +177,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
@Override
public void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException {
if (mail.getSender() == null) {
- if (LOGGER.isInfoEnabled())
- LOGGER.info("Mail to be bounced contains a null (<>) reverse path. No bounce will be sent.");
+ LOGGER.info("Mail to be bounced contains a null (<>) reverse path. No bounce will be sent.");
return;
} else {
// Bounce message goes to the reverse path, not to the Reply-To
http://git-wip-us.apache.org/repos/asf/james-project/blob/d4ce407c/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
----------------------------------------------------------------------
diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
index 3ebe423..be69206 100644
--- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
+++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
@@ -127,11 +127,9 @@ public class FetchScheduler implements FetchSchedulerMBean, Configurable {
schedulers.add(scheduler.scheduleWithFixedDelay(fetcher, 0, interval, TimeUnit.MILLISECONDS));
}
- if (LOGGER.isInfoEnabled())
- LOGGER.info("FetchMail Started");
+ LOGGER.info("FetchMail Started");
} else {
- if (LOGGER.isInfoEnabled())
- LOGGER.info("FetchMail Disabled");
+ LOGGER.info("FetchMail Disabled");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org