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 2012/12/16 22:13:32 UTC
svn commit: r1422690 - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration/builder/
main/java/org/apache/commons/configuration/builder/combined/
test/java/org/apache/commons/configuration/builder/ test/resources/
Author: oheger
Date: Sun Dec 16 21:13:30 2012
New Revision: 1422690
URL: http://svn.apache.org/viewvc?rev=1422690&view=rev
Log:
The properties of the result configuration of CombinedConfigurationBuilder are now determined as a union of both the properties set in the definition configuration and the properties defined in builder parameters.
Added:
commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml (with props)
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java
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/TestBasicConfigurationBuilder.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java?rev=1422690&r1=1422689&r2=1422690&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java Sun Dec 16 21:13:30 2012
@@ -487,8 +487,9 @@ public class BasicConfigurationBuilder<T
*/
protected T createResultInstance() throws ConfigurationException
{
- return getResultClass().cast(
- BeanHelper.createBean(getResultDeclaration()));
+ Object bean = BeanHelper.createBean(getResultDeclaration());
+ checkResultInstance(bean);
+ return getResultClass().cast(bean);
}
/**
@@ -524,7 +525,6 @@ public class BasicConfigurationBuilder<T
if (resultDeclaration == null)
{
resultDeclaration = createResultDeclaration(getFilteredParameters());
- checkResultClass(resultDeclaration);
}
return resultDeclaration;
}
@@ -668,20 +668,20 @@ public class BasicConfigurationBuilder<T
}
/**
- * Checks whether the bean class of the given {@code BeanDeclaration} equals
+ * Checks whether the class of the result configuration is compatible with
* this builder's result class. This is done to ensure that only objects of
* the expected result class are created.
*
- * @param decl the declaration to be checked
- * @throws ConfigurationRuntimeException if an invalid bean class is
+ * @param inst the result instance to be checked
+ * @throws ConfigurationRuntimeException if an invalid result class is
* detected
*/
- private void checkResultClass(BeanDeclaration decl)
+ private void checkResultInstance(Object inst)
{
- if (!getResultClass().getName().equals(decl.getBeanClassName()))
+ if (!getResultClass().isInstance(inst))
{
- throw new ConfigurationRuntimeException("Unexpected bean class: "
- + decl.getBeanClassName());
+ throw new ConfigurationRuntimeException(
+ "Incompatible result object: " + inst);
}
}
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=1422690&r1=1422689&r2=1422690&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 Sun Dec 16 21:13:30 2012
@@ -37,6 +37,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.beanutils.BeanDeclaration;
import org.apache.commons.configuration.beanutils.BeanHelper;
+import org.apache.commons.configuration.beanutils.CombinedBeanDeclaration;
import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
import org.apache.commons.configuration.builder.BasicConfigurationBuilder;
import org.apache.commons.configuration.builder.BuilderListener;
@@ -708,17 +709,20 @@ public class CombinedConfigurationBuilde
}
/**
- * {@inheritDoc} This implementation creates a bean declaration from the
- * {@code result} property of the definition configuration. This might be
- * undefined. In this case, an empty declaration with only the result class
- * name is returned.
+ * {@inheritDoc} This implementation evaluates the {@code result} property
+ * of the definition configuration. It creates a combined bean declaration
+ * with both the properties specified in the definition file and the
+ * properties defined as initialization parameters.
*/
@Override
protected BeanDeclaration createResultDeclaration(Map<String, Object> params)
throws ConfigurationException
{
- return new XMLBeanDeclaration(getDefinitionConfiguration(), KEY_RESULT,
- true, CombinedConfiguration.class.getName());
+ BeanDeclaration paramsDecl = super.createResultDeclaration(params);
+ XMLBeanDeclaration resultDecl =
+ new XMLBeanDeclaration(getDefinitionConfiguration(),
+ KEY_RESULT, true, CombinedConfiguration.class.getName());
+ return new CombinedBeanDeclaration(resultDecl, paramsDecl);
}
/**
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java?rev=1422690&r1=1422689&r2=1422690&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java Sun Dec 16 21:13:30 2012
@@ -30,12 +30,14 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.commons.configuration.BaseHierarchicalConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.ConfigurationRuntimeException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.beanutils.BeanDeclaration;
+import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
import org.easymock.EasyMock;
@@ -304,12 +306,9 @@ public class TestBasicConfigurationBuild
protected BeanDeclaration createResultDeclaration(
Map<String, Object> params)
{
- BeanDeclaration decl =
- EasyMock.createMock(BeanDeclaration.class);
- EasyMock.expect(decl.getBeanClassName())
- .andReturn(Object.class.getName()).anyTimes();
- EasyMock.replay(decl);
- return decl;
+ return new XMLBeanDeclaration(
+ new BaseHierarchicalConfiguration(), "bean",
+ true, Object.class.getName());
}
};
builder.getConfiguration();
Added: commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml?rev=1422690&view=auto
==============================================================================
--- commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml (added)
+++ commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml Sun Dec 16 21:13:30 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Test configuration definition file that explicitly defines the result
+ configuration object.
+ $Id$
+-->
+
+<configuration>
+ <header>
+ <result throwExceptionOnMissing="true"
+ config-class="org.apache.commons.configuration.builder.combined.TestCombinedConfigurationBuilder$CombinedConfigurationTestImpl">
+ <nodeCombiner config-class="org.apache.commons.configuration.tree.OverrideCombiner"/>
+ </result>
+ </header>
+ <xml fileName="test.xml" config-name="xml"/>
+</configuration>
Propchange: commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: commons/proper/configuration/trunk/src/test/resources/testCCResultClass.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml