Author: ggregory
Date: Wed May 28 04:05:53 2014
New Revision: 1597924
URL: http://svn.apache.org/r1597924
Log:
Add a File converter.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/TypeConvertersTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java?rev=1597924&r1=1597923&r2=1597924&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/TypeConverters.java
Wed May 28 04:05:53 2014
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config.plugins.util;
+import java.io.File;
import java.nio.charset.Charset;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -73,6 +74,7 @@ public final class TypeConverters {
registry.put(Facility.class, new
EnumConverter<Facility>(Facility.class));
registry.put(Protocol.class, new
EnumConverter<Protocol>(Protocol.class));
registry.put(HtmlLayout.FontSize.class, new
EnumConverter<HtmlLayout.FontSize>(HtmlLayout.FontSize.class));
+ registry.put(File.class, new FileConverter());
}
/**
@@ -157,6 +159,16 @@ public final class TypeConverters {
}
/**
+ * Parses Strings into Files
+ */
+ private static class FileConverter implements TypeConverter<File> {
+ @Override
+ public File convert(final String s) {
+ return new File(s);
+ }
+ }
+
+ /**
* Parses Strings into char[]s.
*/
private static class CharArrayConverter implements TypeConverter<char[]> {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/TypeConvertersTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/TypeConvertersTest.java?rev=1597924&r1=1597923&r2=1597924&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/TypeConvertersTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/TypeConvertersTest.java
Wed May 28 04:05:53 2014
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config.plugins.util;
+import java.io.File;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Collection;
@@ -116,6 +117,7 @@ public class TypeConvertersTest {
// arrays
{ "123", "123".toCharArray(), null, char[].class },
{ "123", "123".getBytes(Charset.defaultCharset()), null,
byte[].class },
+ { "c:/temp", new File("c:/temp"), null, File.class },
}
);
}
