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 05:47:18 UTC
[1/2] git commit: Add validation for JmsAppender.
Repository: logging-log4j2
Updated Branches:
refs/heads/master cb63a15ea -> 82d43d09b
Add validation for JmsAppender.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/91088516
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/91088516
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/91088516
Branch: refs/heads/master
Commit: 91088516c90679fd5be5f62ff6936d443d96af34
Parents: cb63a15
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 14 22:40:00 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 14 22:40:00 2014 -0500
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/mom/JmsAppender.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/91088516/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
index 79ef122..c53a970 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java
@@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginAliases;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.RequiresNonNull;
import org.apache.logging.log4j.core.layout.SerializedLayout;
import org.apache.logging.log4j.core.net.JndiManager;
@@ -74,6 +75,7 @@ public class JmsAppender extends AbstractAppender {
public static class Builder implements org.apache.logging.log4j.core.util.Builder<JmsAppender> {
@PluginBuilderAttribute
+ @RequiresNonNull(message = "A name for the JmsAppender must be specified")
private String name;
@PluginBuilderAttribute
@@ -92,10 +94,12 @@ public class JmsAppender extends AbstractAppender {
private String securityCredentials;
@PluginBuilderAttribute
+ @RequiresNonNull(message = "A javax.jms.ConnectionFactory JNDI name must be specified")
private String factoryBindingName;
@PluginBuilderAttribute
@PluginAliases({"queueBindingName", "topicBindingName"})
+ @RequiresNonNull(message = "A javax.jms.Destination JNDI name must be specified")
private String destinationBindingName;
@PluginBuilderAttribute
[2/2] git commit: Fix yet another generics compilation error.
Posted by ma...@apache.org.
Fix yet another generics compilation error.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/82d43d09
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/82d43d09
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/82d43d09
Branch: refs/heads/master
Commit: 82d43d09b1183caf04b726e834a7aef514b5ce0f
Parents: 9108851
Author: Matt Sicker <ma...@apache.org>
Authored: Sun Sep 14 22:47:12 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sun Sep 14 22:47:12 2014 -0500
----------------------------------------------------------------------
.../core/config/plugins/convert/TypeConverterRegistry.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/82d43d09/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
index 47319e7..c8171f3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverterRegistry.java
@@ -82,7 +82,7 @@ public class TypeConverterRegistry {
}
// dynamic enum support
if (type instanceof Class<?> && ((Class<?>) type).isEnum()) {
- return registerEnumType(type);
+ return registerEnumType(((Class<?>) type).asSubclass(Enum.class));
}
// look for compatible converters
for (final Map.Entry<Type, TypeConverter<?>> entry : registry.entrySet()) {
@@ -149,9 +149,8 @@ public class TypeConverterRegistry {
registry.putIfAbsent(aliasType, registry.get(knownType));
}
- private <E extends Enum<E>> TypeConverter<? extends E> registerEnumType(final Type type) {
- @SuppressWarnings("unchecked")
- final TypeConverter<E> converter = new EnumConverter<E>((Class<E>) type);
+ private <E extends Enum<E>> TypeConverter<? extends E> registerEnumType(final Class<E> type) {
+ final TypeConverter<E> converter = new EnumConverter<E>(type);
registry.putIfAbsent(type, converter);
return converter;
}