commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1588688 - in /commons/proper/configuration/branches/immutableNodes/src: main/java/org/apache/commons/configuration/builder/combined/ test/java/org/apache/commons/configuration/builder/combined/
Date Sat, 19 Apr 2014 18:04:53 GMT
Author: oheger
Date: Sat Apr 19 18:04:53 2014
New Revision: 1588688

URL: http://svn.apache.org/r1588688
Log:
Adapted ReloadingCombinedConfigurationBuilder to changes in its base class.

Modified:
    commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
    commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java

Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java?rev=1588688&r1=1588687&r2=1588688&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
(original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
Sat Apr 19 18:04:53 2014
@@ -117,7 +117,7 @@ public class ReloadingCombinedConfigurat
      * configurations with reloading support.
      */
     @Override
-    protected ConfigurationBuilder<? extends HierarchicalConfiguration> createXMLDefinitionBuilder(
+    protected ConfigurationBuilder<? extends HierarchicalConfiguration<?>> createXMLDefinitionBuilder(
             BuilderParameters builderParams)
     {
         return new ReloadingFileBasedConfigurationBuilder<XMLConfiguration>(
@@ -152,7 +152,7 @@ public class ReloadingCombinedConfigurat
     {
         Collection<ReloadingController> subControllers =
                 new LinkedList<ReloadingController>();
-        ConfigurationBuilder<? extends HierarchicalConfiguration> defBuilder =
+        ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder
=
                 getDefinitionBuilder();
         obtainReloadingController(subControllers, defBuilder);
 

Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java?rev=1588688&r1=1588687&r2=1588688&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
(original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
Sat Apr 19 18:04:53 2014
@@ -28,7 +28,6 @@ import java.text.MessageFormat;
 import org.apache.commons.configuration.BaseHierarchicalConfiguration;
 import org.apache.commons.configuration.CombinedConfiguration;
 import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.configuration.builder.BasicBuilderParameters;
 import org.apache.commons.configuration.builder.BasicBuilderProperties;
@@ -155,9 +154,7 @@ public class TestReloadingCombinedConfig
             throws IOException
     {
         return writeReloadFile(f,
-                MessageFormat.format(RELOAD_CONTENT, new Object[] {
-                        value, tagIdx
-                }));
+                MessageFormat.format(RELOAD_CONTENT, value, tagIdx));
     }
 
     /**
@@ -191,7 +188,7 @@ public class TestReloadingCombinedConfig
                         return new AlwaysReloadingDetector();
                     }
                 };
-        HierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
+        BaseHierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
         addReloadSource(defConf, xmlConf1.getAbsolutePath());
         addReloadSource(defConf, xmlConf2.getAbsolutePath());
         builder.configure(parameters
@@ -245,7 +242,7 @@ public class TestReloadingCombinedConfig
                         return new RandomReloadingDetector();
                     }
                 };
-        HierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
+        BaseHierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
         defConf.addProperty("header.result.nodeCombiner[@config-class]",
                 MergeCombiner.class.getName());
         defConf.addProperty("header.result.expressionEngine[@config-class]",
@@ -375,18 +372,18 @@ public class TestReloadingCombinedConfig
      * A test builder class which always returns the same configuration.
      */
     private static class ConstantConfigurationBuilder extends
-            BasicConfigurationBuilder<HierarchicalConfiguration>
+            BasicConfigurationBuilder<BaseHierarchicalConfiguration>
     {
-        private final HierarchicalConfiguration configuration;
+        private final BaseHierarchicalConfiguration configuration;
 
-        public ConstantConfigurationBuilder(HierarchicalConfiguration conf)
+        public ConstantConfigurationBuilder(BaseHierarchicalConfiguration conf)
         {
-            super(HierarchicalConfiguration.class);
+            super(BaseHierarchicalConfiguration.class);
             configuration = conf;
         }
 
         @Override
-        public HierarchicalConfiguration getConfiguration()
+        public BaseHierarchicalConfiguration getConfiguration()
                 throws ConfigurationException
         {
             return configuration;



Mime
View raw message