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/03/17 17:43:18 UTC
svn commit: r1301959 - in
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration:
./ beanutils/
Author: oheger
Date: Sat Mar 17 16:43:18 2012
New Revision: 1301959
URL: http://svn.apache.org/viewvc?rev=1301959&view=rev
Log:
[CONFIGURATION-485] Made some member fields final; thanks to Sebb AT apache org for the patches.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationMap.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationMap.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationMap.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationMap.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/ConfigurationMap.java Sat Mar 17 16:43:18 2012
@@ -40,7 +40,7 @@ public class ConfigurationMap extends Ab
/**
* The {@code Configuration} wrapped by this class.
*/
- private Configuration configuration;
+ private final Configuration configuration;
/**
* Creates a new instance of a {@code ConfigurationMap}
@@ -115,7 +115,7 @@ public class ConfigurationMap extends Ab
static class ConfigurationSet extends AbstractSet<Map.Entry<Object, Object>>
{
/** The configuration mapped to this entry set. */
- private Configuration configuration;
+ private final Configuration configuration;
/**
* A Map entry in the ConfigurationMap.
@@ -154,7 +154,7 @@ public class ConfigurationMap extends Ab
private final class ConfigurationSetIterator implements Iterator<Map.Entry<Object, Object>>
{
/** An iterator over the keys in the configuration. */
- private Iterator<String> keys;
+ private final Iterator<String> keys;
private ConfigurationSetIterator()
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DatabaseConfiguration.java Sat Mar 17 16:43:18 2012
@@ -88,22 +88,22 @@ import org.apache.commons.logging.LogFac
public class DatabaseConfiguration extends AbstractConfiguration
{
/** The datasource to connect to the database. */
- private DataSource datasource;
+ private final DataSource datasource;
/** The name of the table containing the configurations. */
- private String table;
+ private final String table;
/** The column containing the name of the configuration. */
- private String nameColumn;
+ private final String nameColumn;
/** The column containing the keys. */
- private String keyColumn;
+ private final String keyColumn;
/** The column containing the values. */
- private String valueColumn;
+ private final String valueColumn;
/** The name of the configuration. */
- private String name;
+ private final String name;
/** A flag whether commits should be performed by this configuration. */
private final boolean doCommits;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java Sat Mar 17 16:43:18 2012
@@ -439,7 +439,7 @@ public class DefaultConfigurationBuilder
private CombinedConfiguration constructedConfiguration;
/** Stores a map with the registered configuration providers. */
- private Map<String, ConfigurationProvider> providers;
+ private final Map<String, ConfigurationProvider> providers;
/** Stores the base path to the configuration sources to load. */
private String configurationBasePath;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java Sat Mar 17 16:43:18 2012
@@ -60,7 +60,7 @@ import org.apache.commons.lang.ClassUtil
public final class BeanHelper
{
/** Stores a map with the registered bean factories. */
- private static Map<String, BeanFactory> beanFactories = Collections
+ private static final Map<String, BeanFactory> beanFactories = Collections
.synchronizedMap(new HashMap<String, BeanFactory>());
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java Sat Mar 17 16:43:18 2012
@@ -59,7 +59,7 @@ public class ConfigurationDynaBean exten
private static final String PROPERTY_DELIMITER = ".";
/** The logger.*/
- private static Log log = LogFactory.getLog(ConfigurationDynaBean.class);
+ private static final Log log = LogFactory.getLog(ConfigurationDynaBean.class);
/**
* Creates a new instance of {@code ConfigurationDynaBean} and sets
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java Sat Mar 17 16:43:18 2012
@@ -40,10 +40,10 @@ import org.apache.commons.logging.LogFac
public class ConfigurationDynaClass implements DynaClass
{
/** The logger.*/
- private static Log log = LogFactory.getLog(ConfigurationDynaClass.class);
+ private static final Log log = LogFactory.getLog(ConfigurationDynaClass.class);
/** Stores the associated configuration.*/
- private Configuration configuration;
+ private final Configuration configuration;
/**
* Construct an instance of a {@code ConfigurationDynaClass}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java?rev=1301959&r1=1301958&r2=1301959&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java Sat Mar 17 16:43:18 2012
@@ -125,10 +125,10 @@ public class XMLBeanDeclaration implemen
+ "factoryParam]";
/** Stores the associated configuration. */
- private SubnodeConfiguration configuration;
+ private final SubnodeConfiguration configuration;
/** Stores the configuration node that contains the bean declaration. */
- private ConfigurationNode node;
+ private final ConfigurationNode node;
/**
* Creates a new instance of {@code XMLBeanDeclaration} and
@@ -170,10 +170,12 @@ public class XMLBeanDeclaration implemen
"Configuration must not be null!");
}
+ SubnodeConfiguration tmpconfiguration = null;
+ ConfigurationNode tmpnode = null;
try
{
- configuration = config.configurationAt(key);
- node = configuration.getRootNode();
+ tmpconfiguration = config.configurationAt(key);
+ tmpnode = tmpconfiguration.getRootNode();
}
catch (IllegalArgumentException iex)
{
@@ -182,9 +184,11 @@ public class XMLBeanDeclaration implemen
{
throw iex;
}
- configuration = config.configurationAt(null);
- node = new DefaultConfigurationNode();
+ tmpconfiguration = config.configurationAt(null);
+ tmpnode = new DefaultConfigurationNode();
}
+ this.node = tmpnode;
+ this.configuration = tmpconfiguration;
initSubnodeConfiguration(getConfiguration());
}