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:57:01 UTC

svn commit: r1604001 - 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:57:01 2014
New Revision: 1604001

URL: http://svn.apache.org/r1604001
Log:
CombinedConfigurationBuilder 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/CombinedConfigurationBuilder.java
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java

Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java?rev=1604001&r1=1604000&r2=1604001&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java Thu Jun 19 18:57:01 2014
@@ -564,6 +564,16 @@ public class CombinedConfigurationBuilde
     }
 
     /**
+     * {@inheritDoc} This method is overridden to adapt the return type.
+     */
+    @Override
+    public CombinedConfigurationBuilder configure(BuilderParameters... params)
+    {
+        super.configure(params);
+        return this;
+    }
+
+    /**
      * <p>
      * Returns the configuration builder with the given name. With this method a
      * builder of a child configuration which was given a name in the

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java?rev=1604001&r1=1604000&r2=1604001&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java Thu Jun 19 18:57:01 2014
@@ -229,6 +229,17 @@ public class TestCombinedConfigurationBu
     }
 
     /**
+     * Tests that the return value of configure() is overloaded.
+     */
+    @Test
+    public void testConfigureResult()
+    {
+        CombinedConfigurationBuilder configuredBuilder =
+                builder.configure(createParameters().setFile(TEST_FILE));
+        assertSame("Wrong instance returned", builder, configuredBuilder);
+    }
+
+    /**
      * Tests loading a simple configuration definition file.
      */
     @Test