Merge pull request #101 from jamezp/LOGMGR-144

[LOGMGR-144] Allow a # to be used as an alternate for expressions in …
jboss-logging · Feb 16, 2017 · 68be924 · 68be924
2 parents b74c12c + eaef367
commit 68be924
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 26 deletions.
diff --git a/src/main/java/org/jboss/logmanager/formatters/FormatStringParser.java b/src/main/java/org/jboss/logmanager/formatters/FormatStringParser.java
@@ -178,6 +178,7 @@ public static FormatStep[] getSteps(final String formatString, ColorMap colors)
                         timeZone = TimeZone.getTimeZone(argument);
                         break;
                     }
+                    case '#':
                     case '$': {
                         stepList.add(Formatters.systemPropertyFormatStep(argument, leftJustify, minimumWidth, truncateBeginning, maximumWidth));
                         break;

diff --git a/src/test/java/org/jboss/logmanager/formatters/PatternFormatterTests.java b/src/test/java/org/jboss/logmanager/formatters/PatternFormatterTests.java
@@ -130,32 +130,8 @@ public void threads() throws Exception {
 
     @Test
     public void systemProperties() throws Exception {
-        final ExtLogRecord record = createLogRecord("test");
-        PatternFormatter formatter = new PatternFormatter("%${org.jboss.logmanager.testProp}");
-        Assert.assertEquals("testValue", formatter.format(record));
-
-        formatter = new PatternFormatter("%${invalid:defaultValue}");
-        Assert.assertEquals("defaultValue", formatter.format(record));
-
-        formatter = new PatternFormatter("%${invalid}");
-        Assert.assertEquals("null", formatter.format(record));
-
-        // Test null arguments
-        try {
-            formatter = new PatternFormatter("%$");
-            formatter.format(record);
-            Assert.fail("Should not allow null arguments");
-        } catch (IllegalArgumentException ignore) {
-
-        }
-
-        try {
-            formatter = new PatternFormatter("%${}");
-            formatter.format(record);
-            Assert.fail("Should not allow null arguments");
-        } catch (IllegalArgumentException ignore) {
-
-        }
+        systemProperties("$");
+        systemProperties("#");
     }
 
     @Test
@@ -249,6 +225,36 @@ public void extendedThrowable() throws Exception {
         Assert.assertTrue(formatted.contains("CIRCULAR REFERENCE:java.lang.IllegalStateException: suppressedLevel1"));
     }
 
+
+    private void systemProperties(final String propertyPrefix) throws Exception {
+        final ExtLogRecord record = createLogRecord("test");
+        PatternFormatter formatter = new PatternFormatter("%" + propertyPrefix + "{org.jboss.logmanager.testProp}");
+        Assert.assertEquals("testValue", formatter.format(record));
+
+        formatter = new PatternFormatter("%" + propertyPrefix + "{invalid:defaultValue}");
+        Assert.assertEquals("defaultValue", formatter.format(record));
+
+        formatter = new PatternFormatter("%" + propertyPrefix + "{invalid}");
+        Assert.assertEquals("null", formatter.format(record));
+
+        // Test null arguments
+        try {
+            formatter = new PatternFormatter("%" + propertyPrefix);
+            formatter.format(record);
+            Assert.fail("Should not allow null arguments");
+        } catch (IllegalArgumentException ignore) {
+
+        }
+
+        try {
+            formatter = new PatternFormatter("%" + propertyPrefix + "{}");
+            formatter.format(record);
+            Assert.fail("Should not allow null arguments");
+        } catch (IllegalArgumentException ignore) {
+
+        }
+    }
+
     protected static ExtLogRecord createLogRecord(final String msg) {
         final ExtLogRecord result = new ExtLogRecord(org.jboss.logmanager.Level.INFO, msg, PatternFormatterTests.class.getName());
         result.setSourceClassName(PatternFormatterTests.class.getName());