You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/06/19 20:59:41 UTC
svn commit: r1604007 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/builder/combined/ test/java/org/apache/commons/configuration/builder/combined/

Author: oheger
Date: Thu Jun 19 18:59:40 2014
New Revision: 1604007

URL: http://svn.apache.org/r1604007
Log:
ReloadingCombinedConfigurationBuilder now overrides the configure() method.

The return type is adapted to allow convenient method chaining.

Modified:
    commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilder.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java?rev=1604007&r1=1604006&r2=1604007&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java Thu Jun 19 18:59:40 2014
@@ -97,6 +97,16 @@ public class ReloadingCombinedConfigurat
     }
 
     /**
+     * {@inheritDoc} This method is overridden to adapt the return type.
+     */
+    @Override
+    public ReloadingCombinedConfigurationBuilder configure(BuilderParameters... params)
+    {
+        super.configure(params);
+        return this;
+    }
+
+    /**
      * {@inheritDoc} This implementation returns a
      * {@link CombinedReloadingController} which contains sub controllers for
      * all child configuration sources with reloading support. If the definition

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilder.java?rev=1604007&r1=1604006&r2=1604007&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilder.java Thu Jun 19 18:59:40 2014
@@ -84,8 +84,10 @@ public class TestReloadingCombinedConfig
         File testFile =
                 ConfigurationAssert
                         .getTestFile("testDigesterConfiguration.xml");
-        builder.configure(new FileBasedBuilderParametersImpl()
-                .setFile(testFile));
+        ReloadingCombinedConfigurationBuilder confBuilder =
+                builder.configure(new FileBasedBuilderParametersImpl()
+                        .setFile(testFile));
+        assertSame("Wrong configured builder instance", builder, confBuilder);
         builder.getConfiguration();
         CombinedReloadingController rc =
                 (CombinedReloadingController) builder.getReloadingController();