Author: deki
Date: Thu May 12 15:09:38 2016
New Revision: 1743514
URL: http://svn.apache.org/viewvc?rev=1743514&view=rev
Log:
[CONFIGURATION-624] better names
Added:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
- copied, changed from r1743513,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigFactoryBean.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java
- copied, changed from r1743513,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigPropertySource.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java
- copied, changed from r1743513,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigFactoryBean.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertySource.java
- copied, changed from r1743513,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigPropertySource.java
Removed:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigFactoryBean.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigPropertySource.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigFactoryBean.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigPropertySource.java
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
(from r1743513,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigFactoryBean.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigFactoryBean.java&r1=1743513&r2=1743514&rev=1743514&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigFactoryBean.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
Thu May 12 15:09:38 2016
@@ -43,7 +43,7 @@ import java.util.Properties;
* @see org.springframework.core.io.support.PropertiesLoaderSupport
*
*/
-public class ConfigFactoryBean implements InitializingBean,
FactoryBean<Properties>
+public class ConfigurationPropertiesFactoryBean implements InitializingBean,
FactoryBean<Properties>
{
/** internal CompositeConfiguration containing the merged configuration
objects **/
@@ -58,11 +58,11 @@ public class ConfigFactoryBean implement
/** @see
org.apache.commons.configuration2.AbstractConfiguration#throwExceptionOnMissing
**/
private boolean throwExceptionOnMissing = true;
- public ConfigFactoryBean()
+ public ConfigurationPropertiesFactoryBean()
{
}
- public ConfigFactoryBean(Configuration configuration)
+ public ConfigurationPropertiesFactoryBean(Configuration configuration)
{
Assert.notNull(configuration);
this.compositeConfiguration = new
CompositeConfiguration(configuration);
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java
(from r1743513,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigPropertySource.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigPropertySource.java&r1=1743513&r2=1743514&rev=1743514&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigPropertySource.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertySource.java
Thu May 12 15:09:38 2016
@@ -27,15 +27,15 @@ import org.springframework.core.env.Enum
/**
* Allow use of Apache Commons Configuration Objects as Spring PropertySources
*/
-public class ConfigPropertySource extends
EnumerablePropertySource<Configuration>
+public class ConfigurationPropertySource extends
EnumerablePropertySource<Configuration>
{
- public ConfigPropertySource(String name, Configuration source)
+ public ConfigurationPropertySource(String name, Configuration source)
{
super(name, source);
}
- protected ConfigPropertySource(String name)
+ protected ConfigurationPropertySource(String name)
{
super(name);
}
Copied:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java
(from r1743513,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigFactoryBean.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigFactoryBean.java&r1=1743513&r2=1743514&rev=1743514&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigFactoryBean.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertiesFactoryBean.java
Thu May 12 15:09:38 2016
@@ -17,13 +17,13 @@ import java.util.Properties;
* Spring FactoryBean test.
*
*/
-public class TestConfigFactoryBean {
+public class TestConfigurationPropertiesFactoryBean {
- private ConfigFactoryBean configurationFactory;
+ private ConfigurationPropertiesFactoryBean configurationFactory;
@Before
public void setUp() {
- configurationFactory = new ConfigFactoryBean();
+ configurationFactory = new ConfigurationPropertiesFactoryBean();
}
@Test(expected = IllegalArgumentException.class)
@@ -68,7 +68,7 @@ public class TestConfigFactoryBean {
@Test
public void testInitialConfiguration() throws Exception {
- configurationFactory = new ConfigFactoryBean(new BaseConfiguration());
+ configurationFactory = new ConfigurationPropertiesFactoryBean(new
BaseConfiguration());
configurationFactory.afterPropertiesSet();
Assert.assertNotNull(configurationFactory.getConfiguration());
}
Copied:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertySource.java
(from r1743513,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigPropertySource.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertySource.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertySource.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigPropertySource.java&r1=1743513&r2=1743514&rev=1743514&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigPropertySource.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/spring/TestConfigurationPropertySource.java
Thu May 12 15:09:38 2016
@@ -32,11 +32,11 @@ import org.springframework.test.context.
/**
- * test for ConfigPropertySource
+ * test for ConfigurationPropertySource
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
-public class TestConfigPropertySource {
+public class TestConfigurationPropertySource {
private static final String TEST_PROPERTY = "test.property";
private static final String TEST_VALUE = "testVALUE";
@@ -64,10 +64,10 @@ public class TestConfigPropertySource {
}
}
- private static ConfigPropertySource createConfigPropertySource() {
+ private static ConfigurationPropertySource createConfigPropertySource() {
PropertiesConfiguration propertiesConfiguration = new
PropertiesConfiguration();
propertiesConfiguration.addProperty(TEST_PROPERTY, TEST_VALUE);
- return new ConfigPropertySource("test configuration",
propertiesConfiguration);
+ return new ConfigurationPropertySource("test configuration",
propertiesConfiguration);
}
}
