From 8e52fc171e8e7c0d267ed40a84c90aa415afbb17 Mon Sep 17 00:00:00 2001 From: Rene Cordier Date: Tue, 10 Sep 2019 16:49:16 +0700 Subject: [PATCH] JSIEVE-112 Replace commons-logging by slf4j --- core/pom.xml | 4 +- .../org/apache/jsieve/BaseSieveContext.java | 18 +---- .../main/java/org/apache/jsieve/Command.java | 14 ++-- .../apache/jsieve/ConfigurationManager.java | 28 ++----- .../org/apache/jsieve/ScriptCoordinate.java | 64 +++++----------- .../java/org/apache/jsieve/SieveContext.java | 8 -- .../java/org/apache/jsieve/SieveFactory.java | 31 +++----- .../apache/jsieve/SieveParserVisitorImpl.java | 6 +- .../src/main/java/org/apache/jsieve/Test.java | 9 +-- .../org/apache/jsieve/commands/Require.java | 2 +- .../jsieve/commands/extensions/Log.java | 73 ++++++------------- .../commands/extensions/LogLevelTags.java | 2 - .../org/apache/jsieve/tests/AbstractTest.java | 13 ++-- .../java/org/apache/jsieve/tests/Not.java | 2 +- .../java/org/apache/jsieve/tests/Size.java | 2 +- .../org/apache/jsieve/AddressParseTest.java | 13 ++-- .../test/java/org/apache/jsieve/LogTest.java | 17 ----- .../SieveParserVisitorImplQuoteTest.java | 17 ++--- .../commands/optional/FileIntoTest.java | 16 ++-- .../apache/jsieve/utils/SieveMailAdapter.java | 11 +-- pom.xml | 25 +------ util/pom.xml | 4 +- .../jsieve/util/NodeToSieveAdapter.java | 11 ++- 23 files changed, 120 insertions(+), 270 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index ba74dbb35..1c966b69a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -52,8 +52,8 @@ apache-mime4j-core - commons-logging - commons-logging + org.slf4j + slf4j-api diff --git a/core/src/main/java/org/apache/jsieve/BaseSieveContext.java b/core/src/main/java/org/apache/jsieve/BaseSieveContext.java index 8edc5977d..e66afb7c8 100644 --- a/core/src/main/java/org/apache/jsieve/BaseSieveContext.java +++ b/core/src/main/java/org/apache/jsieve/BaseSieveContext.java @@ -19,8 +19,6 @@ package org.apache.jsieve; -import org.apache.commons.logging.Log; - /** * Bean based implementation of context. */ @@ -38,17 +36,14 @@ public class BaseSieveContext extends SieveContext { private final TestManager testManager; - private final Log log; - public BaseSieveContext(final CommandManager commandManager, final ComparatorManager comparatorManager, - final TestManager testManager, final Log log) { + final TestManager testManager) { this.commandStateManager = new CommandStateManager(); this.conditionManager = new ConditionManager(); this.testManager = testManager; this.commandManager = commandManager; this.comparatorManager = comparatorManager; - this.log = log; } /** @@ -69,9 +64,6 @@ public ScriptCoordinate getCoordinate() { @Override public void setCoordinate(ScriptCoordinate coordinate) { this.coordinate = coordinate; - if (coordinate != null) { - coordinate.setLog(getLog()); - } } /** @@ -98,14 +90,6 @@ public void setConditionManager(ConditionManager conditionManager) { this.conditionManager = conditionManager; } - /** - * @see SieveContext#getLog() - */ - @Override - public Log getLog() { - return log; - } - /** * @see SieveContext#getComparatorManager() */ diff --git a/core/src/main/java/org/apache/jsieve/Command.java b/core/src/main/java/org/apache/jsieve/Command.java index 8d2590419..4dc12a082 100644 --- a/core/src/main/java/org/apache/jsieve/Command.java +++ b/core/src/main/java/org/apache/jsieve/Command.java @@ -19,9 +19,10 @@ package org.apache.jsieve; -import org.apache.commons.logging.Log; import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.mail.MailAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -31,6 +32,7 @@ * command = identifier arguments ( ";" / block ) */ public class Command implements Executable { + private static final Logger LOGGER = LoggerFactory.getLogger(Command.class); /** The name of this Command */ private String fieldName; @@ -143,13 +145,9 @@ protected void setBlock(Block block) { /** * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext) */ - public Object execute(MailAdapter mail, SieveContext context) - throws SieveException { - Log log = context.getLog(); - if (log.isDebugEnabled()) { - log.debug(toString()); - coordinate.debugDiagnostics(log); - } + public Object execute(MailAdapter mail, SieveContext context) throws SieveException { + LOGGER.debug(toString()); + coordinate.debugDiagnostics(); // commands are executed after the parsing phase // recursively from the top level block // so need to use the coordinate recorded from the parse diff --git a/core/src/main/java/org/apache/jsieve/ConfigurationManager.java b/core/src/main/java/org/apache/jsieve/ConfigurationManager.java index e83e9e901..a4031eb9a 100644 --- a/core/src/main/java/org/apache/jsieve/ConfigurationManager.java +++ b/core/src/main/java/org/apache/jsieve/ConfigurationManager.java @@ -19,10 +19,6 @@ package org.apache.jsieve; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.xml.sax.SAXException; - import java.io.IOException; import java.io.InputStream; import java.util.Map; @@ -30,6 +26,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.SAXException; + /** *

* ConfigurationManager parses the XML statements @@ -97,9 +97,7 @@ public class ConfigurationManager { */ private int initialConcurrencyLevel = DEFAULT_INITIAL_CONCURRENCY_LEVEL; - private static final Log LOG = LogFactory.getLog("org.apache.jsieve"); - - private Log log = LOG; + private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationManager.class); /** * Constructor for ConfigurationManager. @@ -111,12 +109,10 @@ public ConfigurationManager() throws SieveConfigurationException { try { parse(); } catch (SAXException e) { - if (log.isErrorEnabled()) - log.error("Exception processing Configuration: ", e); + LOGGER.error("Exception processing Configuration: ", e); throw new SieveConfigurationException(e); } catch (IOException e) { - if (log.isErrorEnabled()) - log.error("Exception processing Configuration: ", e); + LOGGER.error("Exception processing Configuration: ", e); throw new SieveConfigurationException(e); } } @@ -284,16 +280,8 @@ public TestManager getTestManager() { return new TestManagerImpl(fieldTestMap); } - public Log getLog() { - return log; - } - - public void setLog(Log log) { - this.log = log; - } - public SieveFactory build() { return new SieveFactory(getCommandManager(), getComparatorManager(), - getTestManager(), getLog()); + getTestManager()); } } diff --git a/core/src/main/java/org/apache/jsieve/ScriptCoordinate.java b/core/src/main/java/org/apache/jsieve/ScriptCoordinate.java index cb1e7245a..c564d1569 100644 --- a/core/src/main/java/org/apache/jsieve/ScriptCoordinate.java +++ b/core/src/main/java/org/apache/jsieve/ScriptCoordinate.java @@ -19,9 +19,10 @@ package org.apache.jsieve; -import org.apache.commons.logging.Log; import org.apache.jsieve.exception.CommandException; import org.apache.jsieve.exception.SyntaxException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Specifies the positional extent of an element within the script being @@ -29,6 +30,7 @@ * starts and at which it ends. */ public final class ScriptCoordinate { + private static final Logger LOGGER = LoggerFactory.getLogger(ScriptCoordinate.class); private final int startLineNumber; @@ -38,8 +40,6 @@ public final class ScriptCoordinate { private final int endColumnNumber; - private Log log; - public ScriptCoordinate(final int startLineNumber, final int startColumnNumber, final int endLineNumber, final int endColumnNumber) { @@ -50,14 +50,6 @@ public ScriptCoordinate(final int startLineNumber, this.endColumnNumber = endColumnNumber; } - public Log getLog() { - return log; - } - - public void setLog(Log logger) { - this.log = logger; - } - /** * Gets the number of the column where the elements ends. * @@ -99,18 +91,14 @@ public int getStartLineNumber() { * of the script position. The message should end with a full stop. * * @param message - * CharSequence containing the base message, not + * String containing the base message, not * null * @return SyntaxException with details of the script * position appended to the message, not null */ - public SyntaxException syntaxException(CharSequence message) { - if (log != null) { - if (log.isWarnEnabled()) { - log.warn(message); - } - logDiagnosticsInfo(log); - } + public SyntaxException syntaxException(String message) { + LOGGER.warn(message); + logDiagnosticsInfo(); final String fullMessage = addStartLineAndColumn(message); return new SyntaxException(fullMessage); } @@ -120,18 +108,14 @@ public SyntaxException syntaxException(CharSequence message) { * of the script position. The message should end with a full stop. * * @param message - * CharSequence containing the base message, not + * String containing the base message, not * null * @return CommandException with details of the script * position appended to the message, not null */ - public CommandException commandException(CharSequence message) { - if (log != null) { - if (log.isWarnEnabled()) { - log.warn(message); - } - logDiagnosticsInfo(log); - } + public CommandException commandException(String message) { + LOGGER.warn(message); + logDiagnosticsInfo(); final String fullMessage = addStartLineAndColumn(message); return new CommandException(fullMessage); } @@ -162,31 +146,17 @@ public String addStartLineAndColumn(CharSequence message) { /** * Logs diagnotic information about the script coordinate. - * - * @param logger - * Log, not null */ - public void logDiagnosticsInfo(Log logger) { - if (logger.isInfoEnabled()) { - logger.info("Expression starts line " + startLineNumber - + " column " + startColumnNumber); - logger.info("Expression ends line " + endLineNumber + " column " - + endColumnNumber); - } + public void logDiagnosticsInfo() { + LOGGER.info("Expression starts line {} column {}", startLineNumber, startColumnNumber); + LOGGER.info("Expression ends line {} column {}", endLineNumber, endColumnNumber); } /** * Logs diagnotic information about the script coordinate. - * - * @param logger - * Log, not null */ - public void debugDiagnostics(Log logger) { - if (logger.isDebugEnabled()) { - logger.debug("Expression starts line " + startLineNumber - + " column " + startColumnNumber); - logger.debug("Expression ends line " + endLineNumber + " column " - + endColumnNumber); - } + public void debugDiagnostics() { + LOGGER.debug("Expression starts line {} column {}", startLineNumber, startColumnNumber); + LOGGER.debug("Expression ends line {} column {}", endLineNumber, endColumnNumber); } } diff --git a/core/src/main/java/org/apache/jsieve/SieveContext.java b/core/src/main/java/org/apache/jsieve/SieveContext.java index 17a6cff83..4e8afdde7 100644 --- a/core/src/main/java/org/apache/jsieve/SieveContext.java +++ b/core/src/main/java/org/apache/jsieve/SieveContext.java @@ -19,8 +19,6 @@ package org.apache.jsieve; -import org.apache.commons.logging.Log; - /** * Context for sieve operations. * @@ -77,10 +75,4 @@ public abstract class SieveContext { * @return test manager, not null */ public abstract TestManager getTestManager(); - - /** - * Gets the log. - * @return log, not null - */ - public abstract Log getLog(); } diff --git a/core/src/main/java/org/apache/jsieve/SieveFactory.java b/core/src/main/java/org/apache/jsieve/SieveFactory.java index ef4ff1411..4f5d883ce 100644 --- a/core/src/main/java/org/apache/jsieve/SieveFactory.java +++ b/core/src/main/java/org/apache/jsieve/SieveFactory.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.exception.StopException; import org.apache.jsieve.mail.ActionKeep; @@ -33,6 +32,8 @@ import org.apache.jsieve.parser.generated.SieveParser; import org.apache.jsieve.parser.generated.SieveParserVisitor; import org.apache.jsieve.parser.generated.SimpleNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -65,6 +66,7 @@ *

*/ public class SieveFactory { + private static final Logger LOGGER = LoggerFactory.getLogger(SieveFactory.class); private final CommandManager commandManager; @@ -72,19 +74,16 @@ public class SieveFactory { private final TestManager testManager; - private final Log log; - /** * Constructor for SieveFactory. */ public SieveFactory(final CommandManager commandManager, final ComparatorManager comparatorManager, - final TestManager testManager, final Log log) { + final TestManager testManager) { super(); this.commandManager = commandManager; this.comparatorManager = comparatorManager; this.testManager = testManager; - this.log = log; } /** @@ -107,16 +106,10 @@ public Node parse(InputStream inputStream) throws ParseException { node.jjtAccept(visitor, null); return node; } catch (ParseException ex) { - if (log.isErrorEnabled()) - log.error("Parse failed. Reason: " + ex.getMessage()); - if (log.isDebugEnabled()) - log.debug("Parse failed.", ex); + LOGGER.error("Parse failed.", ex); throw ex; } catch (SieveException ex) { - if (log.isErrorEnabled()) - log.error("Parse failed. Reason: " + ex.getMessage()); - if (log.isDebugEnabled()) - log.debug("Parse failed.", ex); + LOGGER.error("Parse failed.", ex); throw new ParseException(ex.getMessage()); } } @@ -144,7 +137,7 @@ public Node parse(InputStream inputStream) throws ParseException { public void evaluate(MailAdapter mail, Node startNode) throws SieveException { final SieveContext context = new BaseSieveContext(commandManager, - comparatorManager, testManager, log); + comparatorManager, testManager); try { // Ensure that the context is set on the mail mail.setContext(context); @@ -157,10 +150,7 @@ public void evaluate(MailAdapter mail, Node startNode) } catch (StopException ex) { // Stop is OK } catch (SieveException ex) { - if (log.isErrorEnabled()) - log.error("Evaluation failed. Reason: " + ex.getMessage()); - if (log.isDebugEnabled()) - log.debug("Evaluation failed.", ex); + LOGGER.error("Evaluation failed.", ex); throw ex; } @@ -174,10 +164,7 @@ public void evaluate(MailAdapter mail, Node startNode) try { mail.executeActions(); } catch (SieveException ex) { - if (log.isErrorEnabled()) - log.error("Evaluation failed. Reason: " + ex.getMessage()); - if (log.isDebugEnabled()) - log.debug("Evaluation failed.", ex); + LOGGER.error("Evaluation failed.", ex); throw ex; } } finally { diff --git a/core/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java b/core/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java index 51e58196f..555f031ac 100644 --- a/core/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java +++ b/core/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java @@ -37,6 +37,8 @@ import org.apache.jsieve.parser.generated.ASTtest_list; import org.apache.jsieve.parser.generated.SieveParserVisitor; import org.apache.jsieve.parser.generated.SimpleNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -63,6 +65,8 @@ *

*/ public class SieveParserVisitorImpl implements SieveParserVisitor { + private static final Logger LOGGER = LoggerFactory.getLogger(SieveParserVisitorImpl.class); + private final SieveContext context; /** @@ -131,7 +135,7 @@ else if (next instanceof TestList) else if (next instanceof Argument) { argList.add((Argument)next); } else { - context.getLog().error("Expected an 'Argument' but was " + next); + LOGGER.error("Expected an 'Argument' but was {}", next); } } diff --git a/core/src/main/java/org/apache/jsieve/Test.java b/core/src/main/java/org/apache/jsieve/Test.java index a7a785832..cb49fb981 100644 --- a/core/src/main/java/org/apache/jsieve/Test.java +++ b/core/src/main/java/org/apache/jsieve/Test.java @@ -19,11 +19,12 @@ package org.apache.jsieve; -import org.apache.commons.logging.Log; import org.apache.jsieve.exception.LookupException; import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.mail.MailAdapter; import org.apache.jsieve.tests.ExecutableTest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -33,6 +34,7 @@ * test = identifier arguments */ public class Test implements Executable { + private static final Logger LOGGER = LoggerFactory.getLogger(Test.class); /** The name of this Test */ private String fieldName; @@ -57,10 +59,7 @@ public Object execute(MailAdapter mail, SieveContext context) * @throws SieveException */ public boolean isTestPassed(MailAdapter mail, SieveContext context) throws SieveException { - Log log = context.getLog(); - if (log.isDebugEnabled()) { - log.debug(toString()); - } + LOGGER.debug(toString()); final String name = getName(); final ExecutableTest test = context.getTestManager().getTest(name); return test.execute(mail, getArguments(), context); diff --git a/core/src/main/java/org/apache/jsieve/commands/Require.java b/core/src/main/java/org/apache/jsieve/commands/Require.java index 141d025a9..05217062a 100644 --- a/core/src/main/java/org/apache/jsieve/commands/Require.java +++ b/core/src/main/java/org/apache/jsieve/commands/Require.java @@ -136,7 +136,7 @@ protected void validateArguments(Arguments arguments, SieveContext context) List args = arguments.getArgumentList(); if (args.size() != 1) throw context.getCoordinate().syntaxException( - new StringBuilder("Exactly 1 argument permitted. Found ").append(args.size())); + new StringBuilder("Exactly 1 argument permitted. Found ").append(args.size()).toString()); Argument argument = args.get(0); if (!(argument instanceof StringListArgument)) diff --git a/core/src/main/java/org/apache/jsieve/commands/extensions/Log.java b/core/src/main/java/org/apache/jsieve/commands/extensions/Log.java index 6081a6567..2e8d87278 100644 --- a/core/src/main/java/org/apache/jsieve/commands/extensions/Log.java +++ b/core/src/main/java/org/apache/jsieve/commands/extensions/Log.java @@ -21,7 +21,6 @@ import static org.apache.jsieve.commands.extensions.LogLevelTags.DEBUG_TAG; import static org.apache.jsieve.commands.extensions.LogLevelTags.ERROR_TAG; -import static org.apache.jsieve.commands.extensions.LogLevelTags.FATAL_TAG; import static org.apache.jsieve.commands.extensions.LogLevelTags.INFO_TAG; import static org.apache.jsieve.commands.extensions.LogLevelTags.TRACE_TAG; import static org.apache.jsieve.commands.extensions.LogLevelTags.WARN_TAG; @@ -39,6 +38,8 @@ import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.exception.SyntaxException; import org.apache.jsieve.mail.MailAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -51,6 +52,8 @@ *

*/ public class Log extends AbstractCommand { + private static final Logger LOGGER = LoggerFactory.getLogger(Log.class); + /** * Constructor for Log. */ @@ -81,10 +84,9 @@ protected Object executeBasic(MailAdapter mail, Arguments arguments, // LogLevel? if (null == logLevel - && (tag.equals(FATAL_TAG) || tag.equals(ERROR_TAG) - || tag.equals(WARN_TAG) || tag.equals(INFO_TAG) - || tag.equals(DEBUG_TAG) || tag - .equals(TRACE_TAG))) + && (tag.equals(ERROR_TAG) + || tag.equals(WARN_TAG) || tag.equals(INFO_TAG) + || tag.equals(DEBUG_TAG) || tag.equals(TRACE_TAG))) logLevel = tag; else throw context.getCoordinate().syntaxException( @@ -128,92 +130,63 @@ protected Object executeBasic(MailAdapter mail, Arguments arguments, protected void log(String logLevel, String message, SieveContext context) throws SyntaxException { if (logLevel.equals(INFO_TAG)) - logInfo(message, context); + logInfo(message); else if (logLevel.equals(ERROR_TAG)) - logError(message, context); + logError(message); else if (logLevel.equals(WARN_TAG)) - logWarn(message, context); + logWarn(message); else if (logLevel.equals(DEBUG_TAG)) - logDebug(message, context); - else if (logLevel.equals(FATAL_TAG)) - logFatal(message, context); + logDebug(message); else if (logLevel.equals(TRACE_TAG)) - logTrace(message, context); + logTrace(message); else throw context.getCoordinate().syntaxException( - new StringBuilder("Unsupported logging level: ").append (logLevel)); - } - - /** - * Method logFatal. - * - * @param message not null - * @param sieveContext not null - */ - protected void logFatal(String message, SieveContext sieveContext) { - org.apache.commons.logging.Log log = sieveContext.getLog(); - if (log.isFatalEnabled()) - log.fatal(message); + new StringBuilder("Unsupported logging level: ").append(logLevel).toString()); } /** * Method logWarn. * * @param message not null - * @param context not null */ - protected void logWarn(String message, SieveContext context) { - org.apache.commons.logging.Log log = context.getLog(); - if (log.isWarnEnabled()) - log.warn(message); + protected void logWarn(String message) { + LOGGER.warn(message); } /** * Method logInfo. * * @param message not null - * @param context not null */ - protected void logInfo(String message, SieveContext context) { - org.apache.commons.logging.Log log = context.getLog(); - if (log.isInfoEnabled()) - log.info(message); + protected void logInfo(String message) { + LOGGER.info(message); } /** * Method logDebug. * * @param message not null - * @param context not null */ - protected void logDebug(String message, SieveContext context) { - org.apache.commons.logging.Log log = context.getLog(); - if (log.isDebugEnabled()) - log.debug(message); + protected void logDebug(String message) { + LOGGER.debug(message); } /** * Method logTrace. * * @param message not null - * @param context not null */ - protected void logTrace(String message, SieveContext context) { - org.apache.commons.logging.Log log = context.getLog(); - if (log.isTraceEnabled()) - log.trace(message); + protected void logTrace(String message) { + LOGGER.trace(message); } /** * Method logError. * * @param message not null - * @param context not null */ - protected void logError(String message, SieveContext context) { - org.apache.commons.logging.Log log = context.getLog(); - if (log.isErrorEnabled()) - log.error(message); + protected void logError(String message) { + LOGGER.error(message); } /** diff --git a/core/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java b/core/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java index 8579fdda8..3a8ba822f 100644 --- a/core/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java +++ b/core/src/main/java/org/apache/jsieve/commands/extensions/LogLevelTags.java @@ -28,8 +28,6 @@ public interface LogLevelTags { public static final String ERROR_TAG = ":error"; - public static final String FATAL_TAG = ":fatal"; - public static final String INFO_TAG = ":info"; public static final String TRACE_TAG = ":trace"; diff --git a/core/src/main/java/org/apache/jsieve/tests/AbstractTest.java b/core/src/main/java/org/apache/jsieve/tests/AbstractTest.java index 653a97c35..0c0599144 100644 --- a/core/src/main/java/org/apache/jsieve/tests/AbstractTest.java +++ b/core/src/main/java/org/apache/jsieve/tests/AbstractTest.java @@ -19,18 +19,20 @@ package org.apache.jsieve.tests; -import org.apache.commons.logging.Log; import org.apache.jsieve.Arguments; import org.apache.jsieve.SieveContext; import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.exception.SyntaxException; import org.apache.jsieve.mail.MailAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract class AbstractTest defines a framework of common behavior for Sieve * Tests. */ public abstract class AbstractTest implements ExecutableTest { + private static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest.class); /** * Constructor for AbstractTest. @@ -86,12 +88,9 @@ protected abstract boolean executeBasic(MailAdapter mail, protected void validateArguments(Arguments arguments, SieveContext context) throws SieveException { if (!arguments.getArgumentList().isEmpty()) { - final Log logger = context.getLog(); - if (logger.isWarnEnabled()) { - logger.warn("Unexpected arguments for " + getClass().getName()); - } - context.getCoordinate().logDiagnosticsInfo(logger); - logger.debug(arguments); + LOGGER.warn("Unexpected arguments for {}", getClass().getName()); + context.getCoordinate().logDiagnosticsInfo(); + LOGGER.debug(arguments.toString()); final String message = context.getCoordinate() .addStartLineAndColumn("Found unexpected arguments."); throw new SyntaxException(message); diff --git a/core/src/main/java/org/apache/jsieve/tests/Not.java b/core/src/main/java/org/apache/jsieve/tests/Not.java index 6c7881363..3c2aeae20 100644 --- a/core/src/main/java/org/apache/jsieve/tests/Not.java +++ b/core/src/main/java/org/apache/jsieve/tests/Not.java @@ -49,7 +49,7 @@ protected boolean executeBasic(MailAdapter mail, Arguments arguments, List tests = arguments.getTestList().getTests(); if (tests.size() != 1) throw context.getCoordinate().syntaxException( - new StringBuilder("Exactly 1 test permitted. Found ").append(tests.size())); + new StringBuilder("Exactly 1 test permitted. Found ").append(tests.size()).toString()); for (Test test: tests) { result = result && test.isTestPassed(mail, context); } diff --git a/core/src/main/java/org/apache/jsieve/tests/Size.java b/core/src/main/java/org/apache/jsieve/tests/Size.java index 1a65568c1..e11c99552 100644 --- a/core/src/main/java/org/apache/jsieve/tests/Size.java +++ b/core/src/main/java/org/apache/jsieve/tests/Size.java @@ -68,7 +68,7 @@ protected boolean executeBasic(MailAdapter mail, Arguments arguments, comparator = tag; else throw context.getCoordinate().syntaxException( - new StringBuilder("Found unexpected TagArgument: \"").append(tag).append("\"")); + new StringBuilder("Found unexpected TagArgument: \"").append(tag).append("\"").toString()); } } if (null == comparator) diff --git a/core/src/test/java/org/apache/jsieve/AddressParseTest.java b/core/src/test/java/org/apache/jsieve/AddressParseTest.java index 4d6e40515..97b56c5f2 100644 --- a/core/src/test/java/org/apache/jsieve/AddressParseTest.java +++ b/core/src/test/java/org/apache/jsieve/AddressParseTest.java @@ -19,11 +19,11 @@ package org.apache.jsieve; -import org.apache.commons.logging.LogFactory; -import org.apache.jsieve.utils.JUnitUtils; -import org.apache.jsieve.utils.SieveMailAdapter; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; + +import org.apache.jsieve.utils.JUnitUtils; +import org.apache.jsieve.utils.SieveMailAdapter; import org.junit.Before; import org.junit.Test; @@ -43,10 +43,9 @@ public class AddressParseTest { public void setUp() throws Exception { ConfigurationManager configurationManager = new ConfigurationManager(); context = new BaseSieveContext( - configurationManager.getCommandManager(), configurationManager - .getComparatorManager(), configurationManager - .getTestManager(), LogFactory - .getLog(AddressParseTest.class)); + configurationManager.getCommandManager(), + configurationManager.getComparatorManager(), + configurationManager.getTestManager()); mail = (SieveMailAdapter) JUnitUtils.createMail(); address = new OpenedAddress(); } diff --git a/core/src/test/java/org/apache/jsieve/LogTest.java b/core/src/test/java/org/apache/jsieve/LogTest.java index 31ee6d376..2db1bdca3 100644 --- a/core/src/test/java/org/apache/jsieve/LogTest.java +++ b/core/src/test/java/org/apache/jsieve/LogTest.java @@ -64,23 +64,6 @@ public void testLogError() { Assert.assertTrue(isTestPassed); } - /** - * Test for Command 'log'. - */ - @Test - public void testLogFatal() { - boolean isTestPassed = false; - String script = "log :fatal \"Log a fatal message.\";"; - - try { - JUnitUtils.interpret(JUnitUtils.createMail(), script); - isTestPassed = true; - } catch (ParseException e) { - } catch (SieveException e) { - } - Assert.assertTrue(isTestPassed); - } - /** * Test for Command 'log'. */ diff --git a/core/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java b/core/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java index 80c6f8e1e..a0016952d 100644 --- a/core/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java +++ b/core/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java @@ -19,7 +19,9 @@ package org.apache.jsieve; -import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; +import java.util.List; + import org.apache.jsieve.parser.generated.ASTstring; import org.apache.jsieve.parser.generated.Node; import org.apache.jsieve.utils.JUnitUtils; @@ -27,9 +29,6 @@ import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - public class SieveParserVisitorImplQuoteTest { @@ -42,11 +41,11 @@ public class SieveParserVisitorImplQuoteTest { @Before public void setUp() throws Exception { final ConfigurationManager configurationManager = new ConfigurationManager(); - visitor = new SieveParserVisitorImpl(new BaseSieveContext( - configurationManager.getCommandManager(), configurationManager - .getComparatorManager(), configurationManager - .getTestManager(), LogFactory - .getLog(SieveParserVisitorImplQuoteTest.class))); + visitor = new SieveParserVisitorImpl( + new BaseSieveContext( + configurationManager.getCommandManager(), + configurationManager.getComparatorManager(), + configurationManager.getTestManager())); data = new ArrayList(); } diff --git a/core/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java b/core/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java index 4d6947b4a..ae1861026 100644 --- a/core/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java +++ b/core/src/test/java/org/apache/jsieve/commands/optional/FileIntoTest.java @@ -18,7 +18,10 @@ ****************************************************************/ package org.apache.jsieve.commands.optional; -import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.apache.jsieve.Argument; import org.apache.jsieve.Arguments; import org.apache.jsieve.BaseSieveContext; @@ -33,10 +36,6 @@ import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class FileIntoTest { FileInto subject; @@ -55,10 +54,9 @@ public void setUp() throws Exception { dummyArguments = new Arguments(argumentList, new TestList(Collections.EMPTY_LIST)); ConfigurationManager configurationManager = new ConfigurationManager(); dummyContext = new BaseSieveContext( - configurationManager.getCommandManager(), configurationManager - .getComparatorManager(), configurationManager - .getTestManager(), LogFactory - .getLog(this.getClass())); + configurationManager.getCommandManager(), + configurationManager.getComparatorManager(), + configurationManager.getTestManager()); dummyContext.setCoordinate(new ScriptCoordinate(0, 0, 0, 0)); subject = new FileInto(); } diff --git a/core/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java b/core/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java index a8d80aca5..aeb324e4a 100644 --- a/core/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java +++ b/core/src/test/java/org/apache/jsieve/utils/SieveMailAdapter.java @@ -32,8 +32,6 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jsieve.SieveContext; import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.mail.Action; @@ -41,6 +39,8 @@ import org.apache.jsieve.mail.MailUtils; import org.apache.jsieve.mail.SieveMailException; import org.apache.jsieve.parser.address.SieveAddressBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -54,7 +54,7 @@ * to create an implementation of a MailAdapter. */ public class SieveMailAdapter implements MailAdapter { - private Log log = LogFactory.getLog(SieveMailAdapter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SieveMailAdapter.class); /** * The message being adapted. @@ -150,13 +150,10 @@ public void addAction(Action action) { * @see org.apache.jsieve.mail.MailAdapter#executeActions() */ public void executeActions() throws SieveException { - boolean isDebugEnabled = log.isDebugEnabled(); final List actions = getActions(); for (final Action action:actions) { - if (isDebugEnabled) - log.debug("Executing " + action.toString()); + LOGGER.debug("Executing {}", action.toString()); } - } /** diff --git a/pom.xml b/pom.xml index 7f90aa1ff..2b73049ac 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,7 @@ 1.7.1 25.1-jre 0.8.3 + 1.7.27 @@ -121,27 +122,9 @@ ${guava.version} - commons-logging - commons-logging - 1.2 - - - avalon-framework - avalon-framework - - - logkit - logkit - - - ch.qos.logback - logback-classic - - - javax.servlet - servlet-api - - + org.slf4j + slf4j-api + ${slf4j.version} junit diff --git a/util/pom.xml b/util/pom.xml index ac483e172..f56e94ddb 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -59,8 +59,8 @@ - commons-logging - commons-logging + org.slf4j + slf4j-api diff --git a/util/src/main/java/org/apache/jsieve/util/NodeToSieveAdapter.java b/util/src/main/java/org/apache/jsieve/util/NodeToSieveAdapter.java index 74fc42d48..4aab025e6 100644 --- a/util/src/main/java/org/apache/jsieve/util/NodeToSieveAdapter.java +++ b/util/src/main/java/org/apache/jsieve/util/NodeToSieveAdapter.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.jsieve.util; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jsieve.NumberArgument; import org.apache.jsieve.TagArgument; import org.apache.jsieve.parser.generated.ASTargument; @@ -33,14 +31,15 @@ import org.apache.jsieve.parser.generated.ASTtest; import org.apache.jsieve.parser.generated.ASTtest_list; import org.apache.jsieve.parser.generated.SimpleNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Adapters low level {@link NodeHandler} output into a * high level {@link SieveHandler}. */ public class NodeToSieveAdapter implements NodeHandler { - - private static final Log LOG = LogFactory.getLog(NodeToSieveAdapter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(NodeToSieveAdapter.class); private final SieveHandler handler; @@ -140,12 +139,12 @@ public void start(ASTarguments node) throws HaltTraversalException { public void start(ASTargument node) throws HaltTraversalException { final Object value = node.getValue(); if (value == null) { - LOG.debug("Ignoring null argument"); + LOGGER.debug("Ignoring null argument"); } else if (value instanceof NumberArgument) { final NumberArgument numberArgument = (NumberArgument) value; Integer integer = numberArgument.getInteger(); if (integer == null) { - LOG.debug("Ignoring null numeric argument"); + LOGGER.debug("Ignoring null numeric argument"); } else { handler.argument(integer); }