You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/15 01:27:04 UTC
[15/21] git commit: Add @Plugin to all concrete type converters.
Add @Plugin to all concrete type converters.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4c5ca4a1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4c5ca4a1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4c5ca4a1
Branch: refs/heads/master
Commit: 4c5ca4a13615ff46f73521afa4e8a2be15969b7e
Parents: 0dcb0f0
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 14 15:25:03 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 14 15:25:03 2014 -0500
----------------------------------------------------------------------
.../config/plugins/convert/TypeConverters.java | 29 ++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4c5ca4a1/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
index c693fa2..7e9f573 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
@@ -36,6 +36,7 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.layout.GelfLayout;
import org.apache.logging.log4j.core.layout.HtmlLayout;
import org.apache.logging.log4j.core.net.Facility;
@@ -51,11 +52,15 @@ import org.apache.logging.log4j.util.EnglishEnums;
*/
public final class TypeConverters {
- // TODO: this could probably be combined with the usual plugin architecture instead
+ /**
+ * The {@link Plugin} category to use for {@link TypeConverter} plugins.
+ */
+ public static final String CATEGORY = "TypeConverter";
/**
* Parses a {@link String} into a {@link BigDecimal}.
*/
+ @Plugin(name = "BigDecimal", category = CATEGORY)
public static class BigDecimalConverter implements TypeConverter<BigDecimal> {
@Override
public BigDecimal convert(final String s) {
@@ -66,6 +71,7 @@ public final class TypeConverters {
/**
* Parses a {@link String} into a {@link BigInteger}.
*/
+ @Plugin(name = "BigInteger", category = CATEGORY)
public static class BigIntegerConverter implements TypeConverter<BigInteger> {
@Override
public BigInteger convert(final String s) {
@@ -76,6 +82,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Boolean}.
*/
+ @Plugin(name = "Boolean", category = CATEGORY)
public static class BooleanConverter implements TypeConverter<Boolean> {
@Override
public Boolean convert(final String s) {
@@ -93,6 +100,7 @@ public final class TypeConverters {
* <li>String</li>
* </ul>
*/
+ @Plugin(name = "ByteArray", category = CATEGORY)
public static class ByteArrayConverter implements TypeConverter<byte[]> {
private static final String PREFIX_0x = "0x";
@@ -119,6 +127,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Byte}.
*/
+ @Plugin(name = "Byte", category = CATEGORY)
public static class ByteConverter implements TypeConverter<Byte> {
@Override
public Byte convert(final String s) {
@@ -129,6 +138,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Character}.
*/
+ @Plugin(name = "Character", category = CATEGORY)
public static class CharacterConverter implements TypeConverter<Character> {
@Override
public Character convert(final String s) {
@@ -142,6 +152,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@code char[]}.
*/
+ @Plugin(name = "CharacterArray", category = CATEGORY)
public static class CharArrayConverter implements TypeConverter<char[]> {
@Override
public char[] convert(final String s) {
@@ -152,6 +163,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Charset}.
*/
+ @Plugin(name = "Charset", category = CATEGORY)
public static class CharsetConverter implements TypeConverter<Charset> {
@Override
public Charset convert(final String s) {
@@ -162,6 +174,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Class}.
*/
+ @Plugin(name = "Class", category = CATEGORY)
public static class ClassConverter implements TypeConverter<Class<?>> {
@Override
public Class<?> convert(final String s) throws ClassNotFoundException {
@@ -172,6 +185,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Double}.
*/
+ @Plugin(name = "Double", category = CATEGORY)
public static class DoubleConverter implements TypeConverter<Double> {
@Override
public Double convert(final String s) {
@@ -201,6 +215,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link File}.
*/
+ @Plugin(name = "File", category = CATEGORY)
public static class FileConverter implements TypeConverter<File> {
@Override
public File convert(final String s) {
@@ -211,6 +226,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Float}.
*/
+ @Plugin(name = "Float", category = CATEGORY)
public static class FloatConverter implements TypeConverter<Float> {
@Override
public Float convert(final String s) {
@@ -225,6 +241,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Integer}.
*/
+ @Plugin(name = "Integer", category = CATEGORY)
public static class IntegerConverter implements TypeConverter<Integer> {
@Override
public Integer convert(final String s) {
@@ -235,6 +252,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a Log4j {@link Level}. Returns {@code null} for invalid level names.
*/
+ @Plugin(name = "Level", category = CATEGORY)
public static class LevelConverter implements TypeConverter<Level> {
@Override
public Level convert(final String s) {
@@ -245,6 +263,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Long}.
*/
+ @Plugin(name = "Long", category = CATEGORY)
public static class LongConverter implements TypeConverter<Long> {
@Override
public Long convert(final String s) {
@@ -255,6 +274,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Pattern}.
*/
+ @Plugin(name = "Pattern", category = CATEGORY)
public static class PatternConverter implements TypeConverter<Pattern> {
@Override
public Pattern convert(final String s) {
@@ -263,8 +283,9 @@ public final class TypeConverters {
}
/**
- * Converts a {@link String} into a {@link Pattern}.
+ * Converts a {@link String} into a {@link Provider}.
*/
+ @Plugin(name = "SecurityProvider", category = CATEGORY)
public static class SecurityProviderConverter implements TypeConverter<Provider> {
@Override
public Provider convert(final String s) {
@@ -275,6 +296,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link Short}.
*/
+ @Plugin(name = "Short", category = CATEGORY)
public static class ShortConverter implements TypeConverter<Short> {
@Override
public Short convert(final String s) {
@@ -285,6 +307,7 @@ public final class TypeConverters {
/**
* Returns the given {@link String}, no conversion takes place.
*/
+ @Plugin(name = "String", category = CATEGORY)
public static class StringConverter implements TypeConverter<String> {
@Override
public String convert(final String s) {
@@ -295,6 +318,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link URI}.
*/
+ @Plugin(name = "URI", category = CATEGORY)
public static class UriConverter implements TypeConverter<URI> {
@Override
public URI convert(final String s) throws URISyntaxException {
@@ -305,6 +329,7 @@ public final class TypeConverters {
/**
* Converts a {@link String} into a {@link URL}.
*/
+ @Plugin(name = "URL", category = CATEGORY)
public static class UrlConverter implements TypeConverter<URL> {
@Override
public URL convert(final String s) throws MalformedURLException {