You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/09/08 02:40:50 UTC

[07/50] logging-log4j2 git commit: More Generics clean ups.

More Generics clean ups.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8eac2e3d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8eac2e3d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8eac2e3d

Branch: refs/heads/master
Commit: 8eac2e3d90787dd1856aa52a1cd7dc61bd3a73a3
Parents: be2344f
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 19:20:35 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 19:20:35 2015 -0700

----------------------------------------------------------------------
 .../config/builder/impl/DefaultConfigurationBuilder.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8eac2e3d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 6bf558f..ed6fc6e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -46,7 +46,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
     private Component filters;
     private Component properties;
     private Component customLevels;
-    private final Class<? extends BuiltConfiguration> clazz;
+    private final Class<T> clazz;
     private ConfigurationSource source;
     private int monitorInterval = 0;
     private Level level = null;
@@ -73,7 +73,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
         if (clazz == null) {
             throw new IllegalArgumentException("A Configuration class must be provided");
         }
-        this.clazz = clazz;
+        this.clazz = (Class<T>) clazz;
         List<Component> components = root.getComponents();
         properties = new Component("Properties");
         components.add(properties);
@@ -283,12 +283,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
     @Override
     @SuppressWarnings({"unchecked"})
     public T build() {
-        BuiltConfiguration configuration;
+        T configuration;
         try {
             if (source == null) {
                 source = ConfigurationSource.NULL_SOURCE;
             }
-            Constructor<? extends BuiltConfiguration> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
+            Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
             configuration = constructor.newInstance(source, root);
             configuration.setMonitorInterval(monitorInterval);
             if (name != null) {
@@ -311,6 +311,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
         }
         configuration.getStatusConfiguration().initialize();
         configuration.initialize();
-        return (T) configuration;
+        return configuration;
     }
 }