Author: sseifert
Date: Fri Dec 9 08:58:55 2016
New Revision: 1773341
URL: http://svn.apache.org/viewvc?rev=1773341&view=rev
Log:
trace logging: include string values in tick marks
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/MapUtil.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/MapUtilTest.java
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/MapUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/MapUtil.java?rev=1773341&r1=1773340&r2=1773341&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/MapUtil.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/util/MapUtil.java
Fri Dec 9 08:58:55 2016
@@ -67,6 +67,9 @@ public final class MapUtil {
}
sb.append("]");
}
+ else if (value instanceof String) {
+ sb.append("'").append(value.toString()).append("'");
+ }
else {
sb.append(value.toString());
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/MapUtilTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/MapUtilTest.java?rev=1773341&r1=1773340&r2=1773341&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/MapUtilTest.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/caconfig/resource/impl/util/MapUtilTest.java
Fri Dec 9 08:58:55 2016
@@ -31,13 +31,13 @@ public class MapUtilTest {
public void testTraceOutput() {
assertEquals("{}", traceOutput(ImmutableMap.<String,Object>of()));
- assertEquals("{prop1: aa, prop2: 5, prop3: true}",
traceOutput(ImmutableMap.<String,Object>of(
+ assertEquals("{prop1: 'aa', prop2: 5, prop3: true}",
traceOutput(ImmutableMap.<String,Object>of(
"prop1", "aa",
"prop2", 5,
"prop3", true
)));
- assertEquals("{prop1: [aa,bb], prop2: [5,10], prop3: true}",
traceOutput(ImmutableMap.<String,Object>of(
+ assertEquals("{prop1: ['aa','bb'], prop2: [5,10], prop3: true}",
traceOutput(ImmutableMap.<String,Object>of(
"prop1", new String[] { "aa", "bb" },
"prop2", new Integer[] { 5, 10 },
"prop3", true
