[logback-dev] [GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.25-47-gc1ba67d
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Tue Dec 21 18:00:14 CET 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Logback: the generic, reliable, fast and flexible logging framework.".
The branch, master has been updated
via c1ba67d938b0cfb24275fae4f7829d97ee7c96cd (commit)
from 4556c00a26f4aaee2d44d9d3fdff642297c32ffa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=c1ba67d938b0cfb24275fae4f7829d97ee7c96cd
http://github.com/ceki/logback/commit/c1ba67d938b0cfb24275fae4f7829d97ee7c96cd
commit c1ba67d938b0cfb24275fae4f7829d97ee7c96cd
Author: Ceki Gulcu <ceki at qos.ch>
Date: Tue Dec 21 17:58:24 2010 +0100
- merged OptionTokenizer into TokenStream in order to lift the
requirement of escaping '}' in options. You can't have multiple
tokenizers within the same DSL.
diff --git a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java
index 43590ed..d702bd5 100644
--- a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java
+++ b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java
@@ -43,6 +43,7 @@ import ch.qos.logback.access.pattern.ServerNameConverter;
import ch.qos.logback.access.pattern.StatusCodeConverter;
import ch.qos.logback.access.spi.AccessEvent;
import ch.qos.logback.core.pattern.PatternLayoutBase;
+import ch.qos.logback.core.pattern.parser.Parser;
/**
* <p>
@@ -70,6 +71,7 @@ public class PatternLayout extends PatternLayoutBase<AccessEvent> {
public static String COMBINED_PATTERN_NAME = "combined";
static {
+ defaultConverterMap.putAll(Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
defaultConverterMap.put("a", RemoteIPAddressConverter.class.getName());
defaultConverterMap.put("remoteIP", RemoteIPAddressConverter.class
diff --git a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy
index c1dfacb..8feb3cd 100644
--- a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy
+++ b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/ConfigurationDelegate.groovy
@@ -137,7 +137,6 @@ public class ConfigurationDelegate extends ContextAwareBase {
appenderDelegate.metaClass."${newName}" = appender.&"$oldName"
}
}
-
}
void turboFilter(Class clazz, Closure closure = null) {
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java b/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java
index 3a6442d..35a8b86 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/PatternLayout.java
@@ -40,6 +40,7 @@ import ch.qos.logback.classic.pattern.ThrowableProxyConverter;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.CoreConstants;
import ch.qos.logback.core.pattern.PatternLayoutBase;
+import ch.qos.logback.core.pattern.parser.Parser;
/**
* <p>
@@ -58,6 +59,7 @@ public class PatternLayout extends PatternLayoutBase<ILoggingEvent> {
public static final Map<String, String> defaultConverterMap = new HashMap<String, String>();
static {
+ defaultConverterMap.putAll(Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
defaultConverterMap.put("d", DateConverter.class.getName());
defaultConverterMap.put("date", DateConverter.class.getName());
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java
index fad905e..34b2ce6 100644
--- a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java
+++ b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java
@@ -25,6 +25,7 @@ import java.util.List;
import ch.qos.logback.core.status.Status;
import ch.qos.logback.core.util.StatusPrinter;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -147,23 +148,6 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest<ILoggingEve
assertTrue(val.matches(regex));
}
- @Test
- public void replace() {
-// {
-// pl.setPattern("%replace(a){'a', 'b'}");
-// pl.start();
-// String val = pl.doLayout(getEventObject());
-// assertEquals("b", val);
-// }
- {
- pl.setPattern("%replace(a1234b){'\\d{4\\}', 'XXXX'}");
- pl.start();
- StatusPrinter.print(lc);
- String val = pl.doLayout(getEventObject());
- assertEquals("aXXXXb", val);
- }
-
- }
@Test
public void contextNameTest() {
@@ -197,5 +181,27 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest<ILoggingEve
assertEquals(SampleConverter.SAMPLE_STR + " - " + msg, sla.strList.get(0));
}
+ @Test
+ public void somekeReplace() {
+ pl.setPattern("%replace(a1234b){'\\d{4}', 'XXXX'}");
+ pl.start();
+ StatusPrinter.print(lc);
+ String val = pl.doLayout(getEventObject());
+ assertEquals("aXXXXb", val);
+ }
+
+ @Test
+ public void replaceWithJoran() throws JoranException {
+ configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "pattern/replace0.xml");
+ StatusPrinter.print(lc);
+ root.getAppender("LIST");
+ String msg = "And the number is 4111111111110000, expiring on 12/2010";
+ logger.debug(msg);
+ StringListAppender<ILoggingEvent> sla = (StringListAppender<ILoggingEvent>) root.getAppender("LIST");
+ assertNotNull(sla);
+ assertEquals(1, sla.strList.size());
+ assertEquals("And the number is XXXX, expiring on 12/2010", sla.strList.get(0));
+ }
+
}
diff --git a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java
index d654f9b..181da69 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java
@@ -74,6 +74,14 @@ public class CoreConstants {
public static final char LEFT_PARENTHESIS_CHAR = '(';
public static final char RIGHT_PARENTHESIS_CHAR = ')';
+ public static final char ESCAPE_CHAR = '\\';
+ public static final char CURLY_LEFT = '{';
+ public static final char CURLY_RIGHT = '}';
+ public static final char COMMA_CHAR = ',';
+ public static final char DOUBLE_QUOTE_CHAR = '"';
+ public static final char SINGLE_QUOTE_CHAR = '\'';
+
+
/**
* Number of rows before in an HTML table before,
* we close the table and create a new one
diff --git a/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java b/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java
index af16edf..5ee84d0 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/html/HTMLLayoutBase.java
@@ -83,7 +83,7 @@ public abstract class HTMLLayoutBase<E> extends LayoutBase<E> {
Parser<E> p = new Parser<E>(pattern);
p.setContext(getContext());
Node t = p.parse();
- this.head = p.compile(t, getEffectiveConverterMap(), Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
+ this.head = p.compile(t, getEffectiveConverterMap());
ConverterUtil.startConverters(this.head);
} catch (ScanException ex) {
addError("Incorrect pattern found", ex);
diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java
index e60ee6f..d507887 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/PatternLayoutBase.java
@@ -81,7 +81,7 @@ abstract public class PatternLayoutBase<E> extends LayoutBase<E> {
p.setContext(getContext());
}
Node t = p.parse();
- this.head = p.compile(t, getEffectiveConverterMap(), Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
+ this.head = p.compile(t, getEffectiveConverterMap());
if (postCompileProcessor != null) {
postCompileProcessor.process(head);
}
diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java
index 9bcb1a6..2f807f7 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java
@@ -26,12 +26,10 @@ class Compiler<E> extends ContextAwareBase {
Converter<E> tail;
final Node top;
final Map converterMap;
- final Map compositeConverterMap;
- Compiler(final Node top, final Map converterMap, Map compositeConverterMap) {
+ Compiler(final Node top, final Map converterMap) {
this.top = top;
this.converterMap = converterMap;
- this.compositeConverterMap = compositeConverterMap;
}
Converter<E> compile() {
@@ -47,7 +45,7 @@ class Compiler<E> extends ContextAwareBase {
compositeConverter.setFormattingInfo(cn.getFormatInfo());
compositeConverter.setOptionList(cn.getOptions());
Compiler<E> childCompiler = new Compiler<E>(cn.getChildNode(),
- converterMap, compositeConverterMap);
+ converterMap);
childCompiler.setContext(context);
Converter<E> childConverter = childCompiler.compile();
compositeConverter.setChildConverter(childConverter);
@@ -122,7 +120,7 @@ class Compiler<E> extends ContextAwareBase {
@SuppressWarnings("unchecked")
CompositeConverter<E> createCompiteConverter(CompositeNode cn) {
String keyword = (String) cn.getValue();
- String converterClassStr = (String) compositeConverterMap.get(keyword);
+ String converterClassStr = (String) converterMap.get(keyword);
if (converterClassStr != null) {
try {
diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java
index 369a67f..63f53bf 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java
@@ -20,111 +20,130 @@ import ch.qos.logback.core.pattern.util.AsIsEscapeUtil;
import ch.qos.logback.core.pattern.util.IEscapeUtil;
import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
+import static ch.qos.logback.core.CoreConstants.CURLY_RIGHT;
+
+
+import static ch.qos.logback.core.CoreConstants.ESCAPE_CHAR;
+import static ch.qos.logback.core.CoreConstants.COMMA_CHAR;
+import static ch.qos.logback.core.CoreConstants.SINGLE_QUOTE_CHAR;
+import static ch.qos.logback.core.CoreConstants.DOUBLE_QUOTE_CHAR;
+
+
+import ch.qos.logback.core.pattern.parser.TokenStream.TokenizerState;
+
public class OptionTokenizer {
private final static int EXPECTING_STATE = 0;
- private final static int COLLECTING_STATE = 1;
+ private final static int RAW_COLLECTING_STATE = 1;
private final static int QUOTED_COLLECTING_STATE = 2;
- private static final char ESCAPE_CHAR = '\\';
- private static final char COMMA_CHAR = ',';
- private static final char DOUBLE_QUOTE_CHAR = '"';
- private static final char SINGLE_QUOTE_CHAR = '\'';
+ final IEscapeUtil escapeUtil;
+ final TokenStream tokenStream;
final String pattern;
final int patternLength;
- final IEscapeUtil escapeUtil;
-
+
char quoteChar;
- int pointer = 0;
int state = EXPECTING_STATE;
- /**
- * This variant is used in tests
- * @param pattern
- */
- OptionTokenizer(String pattern) {
- this(pattern, new AsIsEscapeUtil());
+ OptionTokenizer(TokenStream tokenStream) {
+ this(tokenStream, new AsIsEscapeUtil());
}
-
- OptionTokenizer(String pattern, IEscapeUtil escapeUtil) {
- this.pattern = pattern;
- patternLength = pattern.length();
+
+ OptionTokenizer(TokenStream tokenStream, IEscapeUtil escapeUtil) {
+ this.tokenStream = tokenStream;
+ this.pattern = tokenStream.pattern;
+ this.patternLength = tokenStream.patternLength;
this.escapeUtil = escapeUtil;
}
- List<String> tokenize() throws ScanException {
- List<String> tokenList = new ArrayList<String>();
+ void tokenize(char firstChar, List<Token> tokenList) throws ScanException {
StringBuffer buf = new StringBuffer();
+ List<String> optionList = new ArrayList<String>();
+ char c = firstChar;
- while (pointer < patternLength) {
- char c = pattern.charAt(pointer);
- pointer++;
-
+ while (tokenStream.pointer < patternLength) {
switch (state) {
- case EXPECTING_STATE:
- switch (c) {
- case ' ':
- case '\t':
- case '\r':
- case '\n':
+ case EXPECTING_STATE:
+ switch (c) {
+ case ' ':
+ case '\t':
+ case '\r':
+ case '\n':
+ break;
+ case COMMA_CHAR:
+ break;
+ case SINGLE_QUOTE_CHAR:
+ case DOUBLE_QUOTE_CHAR:
+ state = QUOTED_COLLECTING_STATE;
+ quoteChar = c;
+ break;
+ case CURLY_RIGHT:
+ emitOptionToken(tokenList, optionList);
+ return;
+ default:
+ buf.append(c);
+ state = RAW_COLLECTING_STATE;
+ }
break;
- case COMMA_CHAR:
+ case RAW_COLLECTING_STATE:
+ switch (c) {
+ case COMMA_CHAR:
+ optionList.add(buf.toString().trim());
+ buf.setLength(0);
+ state = EXPECTING_STATE;
+ break;
+ case CURLY_RIGHT:
+ optionList.add(buf.toString().trim());
+ emitOptionToken(tokenList, optionList);
+ return;
+ default:
+ buf.append(c);
+ }
break;
- case SINGLE_QUOTE_CHAR:
- case DOUBLE_QUOTE_CHAR:
- state = QUOTED_COLLECTING_STATE;
- quoteChar = c;
- break;
- default:
- buf.append(c);
- state = COLLECTING_STATE;
- }
- break;
- case COLLECTING_STATE:
- switch (c) {
- case COMMA_CHAR:
- tokenList.add(buf.toString().trim());
- buf.setLength(0);
- state = EXPECTING_STATE;
+ case QUOTED_COLLECTING_STATE:
+ if (c == quoteChar) {
+ optionList.add(buf.toString());
+ buf.setLength(0);
+ state = EXPECTING_STATE;
+ } else if (c == ESCAPE_CHAR) {
+ escape(String.valueOf(quoteChar), buf);
+ } else {
+ buf.append(c);
+ }
+
break;
- default:
- buf.append(c);
- }
- break;
- case QUOTED_COLLECTING_STATE:
- if (c == quoteChar) {
- tokenList.add(buf.toString());
- buf.setLength(0);
- state = EXPECTING_STATE;
- } else if (c == ESCAPE_CHAR) {
- escape(String.valueOf(quoteChar), buf);
- } else {
- buf.append(c);
- }
-
- break;
}
+
+ c = pattern.charAt(tokenStream.pointer);
+ tokenStream.pointer++;
}
+
// EOS
- switch (state) {
- case EXPECTING_STATE:
- break;
- case COLLECTING_STATE:
- tokenList.add(buf.toString().trim());
- break;
- default:
- throw new ScanException("Unexpected end of pattern string");
+ if (c == CURLY_RIGHT) {
+ if(state == EXPECTING_STATE) {
+ emitOptionToken(tokenList, optionList);
+ } else if(state == RAW_COLLECTING_STATE){
+ optionList.add(buf.toString().trim());
+ emitOptionToken(tokenList, optionList);
+ } else {
+ throw new ScanException("Unexpected end of pattern string in OptionTokenizer");
+ }
+ } else {
+ throw new ScanException("Unexpected end of pattern string in OptionTokenizer");
}
+ }
- return tokenList;
+ void emitOptionToken( List<Token> tokenList, List<String> optionList) {
+ tokenList.add(new Token(Token.OPTION, optionList));
+ tokenStream.state = TokenizerState.LITERAL_STATE;
}
void escape(String escapeChars, StringBuffer buf) {
- if ((pointer < patternLength)) {
- char next = pattern.charAt(pointer++);
- escapeUtil.escape(escapeChars, buf, next, pointer);
+ if ((tokenStream.pointer < patternLength)) {
+ char next = pattern.charAt(tokenStream.pointer++);
+ escapeUtil.escape(escapeChars, buf, next, tokenStream.pointer);
}
}
}
\ No newline at end of file
diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java
index dff1bf8..0d30413 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Parser.java
@@ -44,13 +44,12 @@ import ch.qos.logback.core.spi.ContextAwareBase;
public class Parser<E> extends ContextAwareBase {
public final static Map<String, String> DEFAULT_COMPOSITE_CONVERTER_MAP = new HashMap<String, String>();
- public final static String REPLACER_CONVERTER_WORD = "replace";
+ public final static String REPLACE_CONVERTER_WORD = "replace";
static {
DEFAULT_COMPOSITE_CONVERTER_MAP.put(Token.BARE_COMPOSITE_KEYWORD_TOKEN.getValue().toString(),
IdentityCompositeConverter.class.getName());
- DEFAULT_COMPOSITE_CONVERTER_MAP.put(REPLACER_CONVERTER_WORD,
+ DEFAULT_COMPOSITE_CONVERTER_MAP.put(REPLACE_CONVERTER_WORD,
ReplacingCompositeConverter.class.getName());
-
}
final List tokenList;
@@ -82,8 +81,8 @@ public class Parser<E> extends ContextAwareBase {
* @return
* @throws ScanException
*/
- public Converter<E> compile(final Node top, Map converterMap, Map compositeConverterMap) {
- Compiler<E> compiler = new Compiler<E>(top, converterMap, compositeConverterMap);
+ public Converter<E> compile(final Node top, Map converterMap) {
+ Compiler<E> compiler = new Compiler<E>(top, converterMap);
compiler.setContext(context);
//compiler.setStatusManager(statusManager);
return compiler.compile();
@@ -176,7 +175,7 @@ public class Parser<E> extends ContextAwareBase {
Token ot = getCurentToken();
if (ot != null && ot.getType() == Token.OPTION) {
- List<String> optionList = new OptionTokenizer((String) ot.getValue()).tokenize();
+ List<String> optionList = (List<String>) ot.getValue();
keywordNode.setOptions(optionList);
advanceTokenPointer();
}
@@ -202,7 +201,7 @@ public class Parser<E> extends ContextAwareBase {
}
Token ot = getCurentToken();
if (ot != null && ot.getType() == Token.OPTION) {
- List<String> optionList = new OptionTokenizer((String) ot.getValue()).tokenize();
+ List<String> optionList = (List<String>) ot.getValue();
compositeNode.setOptions(optionList);
advanceTokenPointer();
}
diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Token.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Token.java
index 1e8a385..63ece70 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Token.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Token.java
@@ -15,6 +15,7 @@ package ch.qos.logback.core.pattern.parser;
class Token {
+
static final int PERCENT = 37;
//static final int LEFT_PARENTHESIS = 40;
static final int RIGHT_PARENTHESIS = 41;
@@ -22,6 +23,7 @@ class Token {
static final int DOT = 46;
static final int CURLY_LEFT = 123;
static final int CURLY_RIGHT = 125;
+
static final int LITERAL = 1000;
static final int FORMAT_MODIFIER = 1002;
static final int SIMPLE_KEYWORD = 1004;
diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java
index 085947a..c3b3ad5 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java
@@ -17,6 +17,9 @@ import java.util.List;
import java.util.ArrayList;
import ch.qos.logback.core.CoreConstants;
+import static ch.qos.logback.core.CoreConstants.CURLY_LEFT;
+import static ch.qos.logback.core.CoreConstants.ESCAPE_CHAR;
+
import ch.qos.logback.core.pattern.util.IEscapeUtil;
import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
import ch.qos.logback.core.pattern.util.RestrictedEscapeUtil;
@@ -42,15 +45,7 @@ import ch.qos.logback.core.pattern.util.RestrictedEscapeUtil;
*/
class TokenStream {
- private static final char ESCAPE_CHAR = '\\';
- private static final char CURLY_LEFT = '{';
- private static final char CURLY_RIGHT = '}';
-
- private static final int LITERAL_STATE = 0;
- private static final int FORMAT_MODIFIER_STATE = 1;
- private static final int KEYWORD_STATE = 2;
- private static final int OPTION_STATE = 3;
- private static final int RIGHT_PARENTHESIS_STATE = 4;
+ enum TokenizerState { LITERAL_STATE, FORMAT_MODIFIER_STATE, KEYWORD_STATE, OPTION_STATE, RIGHT_PARENTHESIS_STATE}
final String pattern;
final int patternLength;
@@ -58,7 +53,7 @@ class TokenStream {
final IEscapeUtil optionEscapeUtil = new RestrictedEscapeUtil();
- int state = LITERAL_STATE;
+ TokenizerState state = TokenizerState.LITERAL_STATE;
int pointer = 0;
// this variant should be used for testing purposes only
@@ -92,7 +87,7 @@ class TokenStream {
handleFormatModifierState(c, tokenList, buf);
break;
case OPTION_STATE:
- handleOptionState(c, tokenList, buf);
+ processOption(c, tokenList, buf);
break;
case KEYWORD_STATE:
handleKeywordState(c, tokenList, buf);
@@ -131,40 +126,31 @@ class TokenStream {
case CoreConstants.RIGHT_PARENTHESIS_CHAR:
break;
case CURLY_LEFT:
- state = OPTION_STATE;
+ state = TokenizerState.OPTION_STATE;
break;
case ESCAPE_CHAR:
escape("%{}", buf);
- state = LITERAL_STATE;
+ state = TokenizerState.LITERAL_STATE;
break;
default:
buf.append(c);
- state = LITERAL_STATE;
+ state = TokenizerState.LITERAL_STATE;
}
}
- private void handleOptionState(char c, List<Token> tokenList, StringBuffer buf) {
- switch (c) {
- case CURLY_RIGHT:
- addValuedToken(Token.OPTION, buf, tokenList);
- state = LITERAL_STATE;
- break;
- case ESCAPE_CHAR:
- optionEscape("}", buf);
- break;
- default:
- buf.append(c);
- }
+ private void processOption(char c, List<Token> tokenList, StringBuffer buf) throws ScanException {
+ OptionTokenizer ot = new OptionTokenizer(this);
+ ot.tokenize(c, tokenList);
}
private void handleFormatModifierState(char c, List<Token> tokenList, StringBuffer buf) {
if (c == CoreConstants.LEFT_PARENTHESIS_CHAR) {
addValuedToken(Token.FORMAT_MODIFIER, buf, tokenList);
tokenList.add(Token.BARE_COMPOSITE_KEYWORD_TOKEN);
- state = LITERAL_STATE;
+ state = TokenizerState.LITERAL_STATE;
} else if (Character.isJavaIdentifierStart(c)) {
addValuedToken(Token.FORMAT_MODIFIER, buf, tokenList);
- state = KEYWORD_STATE;
+ state = TokenizerState.KEYWORD_STATE;
buf.append(c);
} else {
buf.append(c);
@@ -180,12 +166,12 @@ class TokenStream {
case CoreConstants.PERCENT_CHAR:
addValuedToken(Token.LITERAL, buf, tokenList);
tokenList.add(Token.PERCENT_TOKEN);
- state = FORMAT_MODIFIER_STATE;
+ state = TokenizerState.FORMAT_MODIFIER_STATE;
break;
case CoreConstants.RIGHT_PARENTHESIS_CHAR:
addValuedToken(Token.LITERAL, buf, tokenList);
- state = RIGHT_PARENTHESIS_STATE;
+ state = TokenizerState.RIGHT_PARENTHESIS_STATE;
break;
default:
@@ -199,17 +185,17 @@ class TokenStream {
buf.append(c);
} else if (c == CURLY_LEFT) {
addValuedToken(Token.SIMPLE_KEYWORD, buf, tokenList);
- state = OPTION_STATE;
+ state = TokenizerState.OPTION_STATE;
} else if (c == CoreConstants.LEFT_PARENTHESIS_CHAR) {
addValuedToken(Token.COMPOSITE_KEYWORD, buf, tokenList);
- state = LITERAL_STATE;
+ state = TokenizerState.LITERAL_STATE;
} else if (c == CoreConstants.PERCENT_CHAR) {
addValuedToken(Token.SIMPLE_KEYWORD, buf, tokenList);
tokenList.add(Token.PERCENT_TOKEN);
- state = FORMAT_MODIFIER_STATE;
+ state = TokenizerState.FORMAT_MODIFIER_STATE;
} else if (c == CoreConstants.RIGHT_PARENTHESIS_CHAR) {
addValuedToken(Token.SIMPLE_KEYWORD, buf, tokenList);
- state = RIGHT_PARENTHESIS_STATE;
+ state = TokenizerState.RIGHT_PARENTHESIS_STATE;
} else {
addValuedToken(Token.SIMPLE_KEYWORD, buf, tokenList);
if (c == ESCAPE_CHAR) {
@@ -220,7 +206,7 @@ class TokenStream {
} else {
buf.append(c);
}
- state = LITERAL_STATE;
+ state = TokenizerState.LITERAL_STATE;
}
}
diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
index be3c8b5..88adfe6 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
+++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java
@@ -66,7 +66,7 @@ public class FileNamePattern extends ContextAwareBase {
Parser<Object> p = new Parser<Object>(patternForParsing, new AlmostAsIsEscapeUtil());
p.setContext(context);
Node t = p.parse();
- this.headTokenConverter = p.compile(t, CONVERTER_MAP, Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
+ this.headTokenConverter = p.compile(t, CONVERTER_MAP);
} catch (ScanException sce) {
addError("Failed to parse pattern \"" + pattern + "\".", sce);
diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java
index 39bb596..a548a6f 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java
@@ -39,6 +39,7 @@ public class CompilerTest {
@Before public void setUp() {
converterMap.put("OTT", Converter123.class.getName());
converterMap.put("hello", ConverterHello.class.getName());
+ converterMap.putAll(Parser.DEFAULT_COMPOSITE_CONVERTER_MAP);
}
@@ -56,7 +57,7 @@ public class CompilerTest {
public void testLiteral() throws Exception {
Parser<Object> p = new Parser<Object>("hello");
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("hello", result);
}
@@ -67,7 +68,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc Hello", result);
}
@@ -75,7 +76,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %hello %OTT");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc Hello 123", result);
}
@@ -87,7 +88,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %7hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc Hello", result);
}
@@ -96,7 +97,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %-7hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc Hello ", result);
}
@@ -105,7 +106,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %.3hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc llo", result);
}
@@ -114,7 +115,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %.-3hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc Hel", result);
}
@@ -123,7 +124,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %4.5OTT");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc 123", result);
}
@@ -131,7 +132,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %-4.5OTT");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc 123 ", result);
}
@@ -139,7 +140,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %3.4hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc ello", result);
}
@@ -147,7 +148,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("abc %-3.-4hello");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("abc Hell", result);
}
@@ -168,7 +169,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("%(ABC %hello)");
p.setContext(c);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
StatusPrinter.print(c);
assertEquals("ABC Hello", result);
@@ -177,7 +178,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("%(ABC %hello)");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap,DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("ABC Hello", result);
}
@@ -189,7 +190,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("xyz %4.10(ABC)");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("xyz ABC", result);
}
@@ -198,7 +199,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("xyz %-4.10(ABC)");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("xyz ABC ", result);
}
@@ -207,7 +208,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("xyz %.2(ABC %hello)");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("xyz lo", result);
}
@@ -216,7 +217,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("xyz %.-2(ABC)");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("xyz AB", result);
}
@@ -225,7 +226,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("xyz %30.30(ABC %20hello)");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("xyz ABC Hello", result);
}
@@ -236,7 +237,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("%unknown");
p.setContext(context);
Node t = p.parse();
- p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ p.compile(t, converterMap);
StatusChecker chercker = new StatusChecker(context.getStatusManager());
assertTrue(chercker
.containsMatch("\\[unknown] is not a valid conversion word"));
@@ -248,7 +249,7 @@ public class CompilerTest {
Parser<Object> p = new Parser<Object>("xyz %hello\\_world");
p.setContext(context);
Node t = p.parse();
- Converter<Object> head = p.compile(t, converterMap, DEFAULT_COMPOSITE_CONVERTER_MAP);
+ Converter<Object> head = p.compile(t, converterMap);
String result = write(head, new Object());
assertEquals("xyz Helloworld", result);
}
diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java
index bd23c5a..e8b7e2f 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java
@@ -23,117 +23,123 @@ import org.junit.Test;
public class OptionTokenizerTest {
@Test
- public void testEmpty() throws ScanException {
- {
- List ol = new OptionTokenizer("").tokenize();
- List witness = new ArrayList();
- assertEquals(witness, ol);
- }
+ public void testEmpty() {
- {
- List ol = new OptionTokenizer(" ").tokenize();
- List witness = new ArrayList();
- assertEquals(witness, ol);
- }
- }
-
- @Test
- public void testSimple() throws ScanException {
- {
- List ol = new OptionTokenizer("abc").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add("abc");
- assertEquals(witness, ol);
- }
- }
-
- @Test
- public void testSingleQuote() throws ScanException {
- {
- List ol = new OptionTokenizer("' '").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" ");
- assertEquals(witness, ol);
- }
-
- {
- List ol = new OptionTokenizer("' x\t'").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" x\t");
- assertEquals(witness, ol);
- }
-
- {
- List ol = new OptionTokenizer("' x\\t'").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" x\\t");
- assertEquals(witness, ol);
- }
-
- {
- List ol = new OptionTokenizer("' x\\''").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" x\\'");
- assertEquals(witness, ol);
- }
- }
-
-
-
- @Test
- public void testDoubleQuote() throws ScanException {
- {
- List ol = new OptionTokenizer("\" \"").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" ");
- assertEquals(witness, ol);
- }
-
- {
- List ol = new OptionTokenizer("\" x\t\"").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" x\t");
- assertEquals(witness, ol);
- }
-
- {
- List ol = new OptionTokenizer("\" x\\t\"").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" x\\t");
- assertEquals(witness, ol);
- }
-
- {
- List ol = new OptionTokenizer("\" x\\\"\"").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add(" x\\\"");
- assertEquals(witness, ol);
- }
- }
-
- @Test
- public void testMultiple() throws ScanException {
- {
- List ol = new OptionTokenizer("a, b").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add("a");
- witness.add("b");
- assertEquals(witness, ol);
- }
- {
- List ol = new OptionTokenizer("'a', b").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add("a");
- witness.add("b");
- assertEquals(witness, ol);
- }
- {
- List ol = new OptionTokenizer("'', b").tokenize();
- List<String> witness = new ArrayList<String>();
- witness.add("");
- witness.add("b");
- assertEquals(witness, ol);
- }
}
+//
+// @Test
+// public void testEmpty() throws ScanException {
+// {
+// List ol = new OptionTokenizer("").tokenize();
+// List witness = new ArrayList();
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer(" ").tokenize();
+// List witness = new ArrayList();
+// assertEquals(witness, ol);
+// }
+// }
+//
+// @Test
+// public void testSimple() throws ScanException {
+// {
+// List ol = new OptionTokenizer("abc").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add("abc");
+// assertEquals(witness, ol);
+// }
+// }
+//
+// @Test
+// public void testSingleQuote() throws ScanException {
+// {
+// List ol = new OptionTokenizer("' '").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" ");
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer("' x\t'").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" x\t");
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer("' x\\t'").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" x\\t");
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer("' x\\''").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" x\\'");
+// assertEquals(witness, ol);
+// }
+// }
+//
+//
+//
+// @Test
+// public void testDoubleQuote() throws ScanException {
+// {
+// List ol = new OptionTokenizer("\" \"").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" ");
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer("\" x\t\"").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" x\t");
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer("\" x\\t\"").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" x\\t");
+// assertEquals(witness, ol);
+// }
+//
+// {
+// List ol = new OptionTokenizer("\" x\\\"\"").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add(" x\\\"");
+// assertEquals(witness, ol);
+// }
+// }
+//
+// @Test
+// public void testMultiple() throws ScanException {
+// {
+// List ol = new OptionTokenizer("a, b").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add("a");
+// witness.add("b");
+// assertEquals(witness, ol);
+// }
+// {
+// List ol = new OptionTokenizer("'a', b").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add("a");
+// witness.add("b");
+// assertEquals(witness, ol);
+// }
+// {
+// List ol = new OptionTokenizer("'', b").tokenize();
+// List<String> witness = new ArrayList<String>();
+// witness.add("");
+// witness.add("b");
+// assertEquals(witness, ol);
+// }
+// }
+//
}
\ No newline at end of file
diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java
index e220964..58f7f52 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java
@@ -138,7 +138,7 @@ public class ParserTest {
}
}
-
+
@Test
public void testNested() throws Exception {
{
@@ -203,41 +203,39 @@ public class ParserTest {
}
@Test
- public void testOptions() throws Exception {
- {
- Parser p = new Parser("%45x{'test '}");
- Node t = p.parse();
- SimpleKeywordNode witness = new SimpleKeywordNode("x");
- witness.setFormatInfo(new FormatInfo(45, Integer.MAX_VALUE));
- List<String> ol = new ArrayList<String>();
- ol.add("test ");
- witness.setOptions(ol);
- assertEquals(witness, t);
- }
+ public void testOptions0() throws Exception {
+ Parser p = new Parser("%45x{'test '}");
+ Node t = p.parse();
+ SimpleKeywordNode witness = new SimpleKeywordNode("x");
+ witness.setFormatInfo(new FormatInfo(45, Integer.MAX_VALUE));
+ List<String> ol = new ArrayList<String>();
+ ol.add("test ");
+ witness.setOptions(ol);
+ assertEquals(witness, t);
+ }
- {
- Parser p = new Parser("%45x{a, b}");
- Node t = p.parse();
- SimpleKeywordNode witness = new SimpleKeywordNode("x");
- witness.setFormatInfo(new FormatInfo(45, Integer.MAX_VALUE));
- List<String> ol = new ArrayList<String>();
- ol.add("a");
- ol.add("b");
- witness.setOptions(ol);
- assertEquals(witness, t);
- }
+ @Test
+ public void testOptions1() throws Exception {
+ Parser p = new Parser("%45x{a, b}");
+ Node t = p.parse();
+ SimpleKeywordNode witness = new SimpleKeywordNode("x");
+ witness.setFormatInfo(new FormatInfo(45, Integer.MAX_VALUE));
+ List<String> ol = new ArrayList<String>();
+ ol.add("a");
+ ol.add("b");
+ witness.setOptions(ol);
+ assertEquals(witness, t);
}
// see http://jira.qos.ch/browse/LBCORE-180
@Test
public void keywordGluedToLitteral() throws Exception {
- {
- Parser p = new Parser("%x{}a");
- Node t = p.parse();
- SimpleKeywordNode witness = new SimpleKeywordNode("x");
- witness.next = new Node(Node.LITERAL, "a");
- assertEquals(witness, t);
- }
+ Parser p = new Parser("%x{}a");
+ Node t = p.parse();
+ SimpleKeywordNode witness = new SimpleKeywordNode("x");
+ witness.setOptions(new ArrayList<String>());
+ witness.next = new Node(Node.LITERAL, "a");
+ assertEquals(witness, t);
}
@Test
@@ -257,15 +255,15 @@ public class ParserTest {
assertEquals(witness, t);
}
}
-
+
@Test
public void empty() {
try {
- Parser p = new Parser("");
- p.parse();
+ Parser p = new Parser("");
+ p.parse();
fail("");
- } catch(ScanException e) {
-
+ } catch (ScanException e) {
+
}
}
}
\ No newline at end of file
diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java
index 751f515..f695205 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java
@@ -108,7 +108,9 @@ public class TokenStreamTest {
List<Token> witness = new ArrayList<Token>();
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "d"));
- witness.add(new Token(Token.OPTION, "1234"));
+ List ol = new ArrayList<String>();
+ ol.add("1234");
+ witness.add(new Token(Token.OPTION, ol));
witness.add(new Token(Token.LITERAL, " ["));
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.FORMAT_MODIFIER, "34.-67"));
@@ -198,7 +200,9 @@ public class TokenStreamTest {
List<Token> witness = new ArrayList<Token>();
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "x"));
- witness.add(new Token(Token.OPTION, "t"));
+ List ol = new ArrayList<String>();
+ ol.add("t");
+ witness.add(new Token(Token.OPTION, ol));
assertEquals(witness, tl);
}
@@ -207,7 +211,10 @@ public class TokenStreamTest {
List<Token> witness = new ArrayList<Token>();
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "x"));
- witness.add(new Token(Token.OPTION, "t,y"));
+ List ol = new ArrayList<String>();
+ ol.add("t");
+ ol.add("y");
+ witness.add(new Token(Token.OPTION, ol));
assertEquals(witness, tl);
}
@@ -216,16 +223,21 @@ public class TokenStreamTest {
List<Token> witness = new ArrayList<Token>();
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "x"));
- witness.add(new Token(Token.OPTION, "\"hello world.\", \"12y \""));
+ List ol = new ArrayList<String>();
+ ol.add("hello world.");
+ ol.add("12y ");
+ witness.add(new Token(Token.OPTION, ol));
assertEquals(witness, tl);
}
{
- List tl = new TokenStream("%x{opt\\}}").tokenize();
+ List tl = new TokenStream("%x{'opt}'}").tokenize();
List<Token> witness = new ArrayList<Token>();
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "x"));
- witness.add(new Token(Token.OPTION, "opt}"));
+ List ol = new ArrayList<String>();
+ ol.add("opt}");
+ witness.add(new Token(Token.OPTION, ol));
assertEquals(witness, tl);
}
}
@@ -239,7 +251,9 @@ public class TokenStreamTest {
witness.add(new Token(Token.LITERAL, "hello "));
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "class"));
- witness.add(new Token(Token.OPTION, ".4?"));
+ List ol = new ArrayList<String>();
+ ol.add(".4?");
+ witness.add(new Token(Token.OPTION, ol));
witness.add(Token.RIGHT_PARENTHESIS_TOKEN);
assertEquals(witness, tl);
}
@@ -258,7 +272,9 @@ public class TokenStreamTest {
witness.add(new Token(Token.LITERAL, "hello "));
witness.add(Token.PERCENT_TOKEN);
witness.add(new Token(Token.SIMPLE_KEYWORD, "class"));
- witness.add(new Token(Token.OPTION, ".4?"));
+ List ol = new ArrayList<String>();
+ ol.add(".4?");
+ witness.add(new Token(Token.OPTION, ol));
witness.add(Token.RIGHT_PARENTHESIS_TOKEN);
assertEquals(witness, tl);
}
@@ -366,6 +382,7 @@ public class TokenStreamTest {
assertEquals(witness, tl);
}
}
+
@Test
public void compositedKeywordFollowedByOptions() throws ScanException {
{
@@ -376,7 +393,9 @@ public class TokenStreamTest {
witness.add(new Token(Token.COMPOSITE_KEYWORD, "d"));
witness.add(new Token(Token.LITERAL, "A"));
witness.add(Token.RIGHT_PARENTHESIS_TOKEN);
- witness.add(new Token(Token.OPTION, "o"));
+ List ol = new ArrayList<String>();
+ ol.add("o");
+ witness.add(new Token(Token.OPTION, ol));
assertEquals(witness, tl);
}
diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
index 02bc719..759a2fa 100644
--- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
+++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java
@@ -213,7 +213,7 @@ public class TimeBasedRollingWithArchiveRemovalTest {
void waitForCompression(TimeBasedRollingPolicy<Object> tbrp)
throws InterruptedException, ExecutionException, TimeoutException {
if (tbrp.future != null && !tbrp.future.isDone()) {
- tbrp.future.get(200, TimeUnit.MILLISECONDS);
+ tbrp.future.get(800, TimeUnit.MILLISECONDS);
}
}
diff --git a/logback-site/src/site/pages/manual/appenders.html b/logback-site/src/site/pages/manual/appenders.html
index 6e87946..c527c4f 100644
--- a/logback-site/src/site/pages/manual/appenders.html
+++ b/logback-site/src/site/pages/manual/appenders.html
@@ -1693,10 +1693,12 @@ public interface TriggeringPolicy<E> extends LifeCycle {
</tr>
<tr>
- <td><b><span class="option">to</span></b></td>
+ <td><a name="smtpTo" href="#smtpTo"><b><span class="option">to</span></b></a></td>
<td><code>String</code></td>
- <td>The email address of the recipient. Multiple recipients
- can be specified by using several <To> elements.</td>
+ <td>The email address of the recipient as a pattern. The
+ pattern is evaluated anew with the triggering event as input
+ for each outgoing email. Multiple recipients can be specified
+ by using several <code><to></code> elements.</td>
</tr>
<tr class="alt">
<td><b><span class="option">from</span></b></td>
diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html
index 3cb8333..6399a4b 100644
--- a/logback-site/src/site/pages/manual/layouts.html
+++ b/logback-site/src/site/pages/manual/layouts.html
@@ -999,8 +999,28 @@ Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</pre>
omitted, the returned value will be "Property_HAS_NO_KEY",
expliciting the error condition.</p>
- <p>
+ </td>
+ </tr>
+
+ <tr class="alt">
+ <td align="center">
+ <a name="replace" href="#replace"><b>replace(<em>p</em>){r, t}</b></a>
+ </td>
+
+ <td>
+ <p>Replaces occurrences of 'r', a regex, with its
+ replacement 't' in the string produces by the sub-pattern
+ 'p'. For example, "%replace(%msg){'\s', ''}" will remove all
+ spaces contained in the event message.
</p>
+
+ <p>The pattern 'p' can be arbitrarily complex and in
+ particular can contain multiple conversion keywords. For
+ instance, "%replace(%logger %msg){'\.', '/'}" will replace
+ all dots in the logger or the message of the event with a
+ forward slash.
+ </p>
+
</td>
</tr>
@@ -1208,12 +1228,10 @@ Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</pre>
<h2><a name="cwOptions" href="#cwOptions">Conversion word
options</a></h2>
- <p>
- A conversion specifier can be followed by options. The are
- always declared between braces. We have already seen some of the
- possibilities offered by options, for instance in conjunction
- with the MDC conversion specifier, as in:
- <em>%mdc{someKey}</em>.
+ <p>A conversion specifier can be followed by options. The are
+ always declared between braces. We have already seen some of the
+ possibilities offered by options, for instance in conjunction with
+ the MDC conversion specifier, as in: <em>%mdc{someKey}</em>.
</p>
<p>A conversion specifier might have more than one option. For
@@ -1221,14 +1239,24 @@ Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</pre>
which will be covered soon, may add evaluator names to the option
list, as shown below:</p>
- <pre class="prettyprint source">
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <param name="Pattern" value="%-4relative [%thread] %-5level - %msg%n \
- <b>%caller{2, DISP_CALLER_EVAL, OTHER_EVAL_NAME, THIRD_EVAL_NAME}</b>" />
- </layout>
- </appender></pre>
+ <pre class="prettyprint source"><pattern>%-4relative [%thread] %-5level - %msg%n \
+ <b>%caller{2, DISP_CALLER_EVAL, OTHER_EVAL_NAME, THIRD_EVAL_NAME}</b></pattern></pre>
+ <p>If the option includes special characters such as a braces, spaces or
+ commas, you can enclose it between single or double quotes. For
+ example, consider the next pattern.</p>
+
+ <pre class="prettyprint source"><pattern>%-5level - %replace(%msg)<b>{'\d{14,16}', 'XXXX'}</b>%n</pattern></pre>
+
+
+ <p>We pass the options <code>\d{16}</code> and <code>XXXX</code>
+ to the <code>replace</code> conversion word. It replaces any
+ sequence of 14, 15 or 16 digits contained in the message with XXXX
+ effectively obfuscating credit card numbers. Note that "\d" which
+ is a shorthand for a single digit in regular expressions. The
+ "{14,16\}" is interpreted as "{14, 16}", that is, repeat the
+ previous item at least 14 but at most 16 times.
+ </p>
<h2><a name="Parentheses" href="#Parentheses">Parentheses are
special</a></h2>
diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html
index dadd9f7..55138ef 100644
--- a/logback-site/src/site/pages/news.html
+++ b/logback-site/src/site/pages/news.html
@@ -30,6 +30,13 @@
<h3>xxx, 2010 - Release of version 0.9.27</h3>
+ <p><code>PatternLayout</code> now supports compound conversion
+ words of which <a href="manual/layouts.html#replace">"%replace"</a> is one example.
+ </p>
+
+ <p>The <a href="manual/appenders.html#smtpTo"><span
+ class="option">to</span></a> option of SMTPAppender now admits a
+ pattern and is evaluated dynamically.</p>
<p><code>TeeServletInputStream</code> no longer chokes on input
over 8K in size. This fixes <a
-----------------------------------------------------------------------
Summary of changes:
.../java/ch/qos/logback/access/PatternLayout.java | 2 +
.../classic/gaffer/ConfigurationDelegate.groovy | 1 -
.../java/ch/qos/logback/classic/PatternLayout.java | 2 +
.../ch/qos/logback/classic/PatternLayoutTest.java | 40 ++--
.../java/ch/qos/logback/core/CoreConstants.java | 8 +
.../ch/qos/logback/core/html/HTMLLayoutBase.java | 2 +-
.../logback/core/pattern/PatternLayoutBase.java | 2 +-
.../qos/logback/core/pattern/parser/Compiler.java | 8 +-
.../core/pattern/parser/OptionTokenizer.java | 169 ++++++++-------
.../ch/qos/logback/core/pattern/parser/Parser.java | 13 +-
.../ch/qos/logback/core/pattern/parser/Token.java | 2 +
.../logback/core/pattern/parser/TokenStream.java | 56 ++---
.../core/rolling/helper/FileNamePattern.java | 2 +-
.../logback/core/pattern/parser/CompilerTest.java | 41 ++--
.../core/pattern/parser/OptionTokenizerTest.java | 226 ++++++++++----------
.../logback/core/pattern/parser/ParserTest.java | 68 +++---
.../core/pattern/parser/TokenStreamTest.java | 37 +++-
.../TimeBasedRollingWithArchiveRemovalTest.java | 2 +-
logback-site/src/site/pages/manual/appenders.html | 8 +-
logback-site/src/site/pages/manual/layouts.html | 56 ++++--
logback-site/src/site/pages/news.html | 7 +
21 files changed, 417 insertions(+), 335 deletions(-)
hooks/post-receive
--
Logback: the generic, reliable, fast and flexible logging framework.
More information about the logback-dev
mailing list