You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 22:24:26 UTC
svn commit: r1842194 [8/34] - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/beanutils/
main/java/org/apache/commons/configuration2/builder/
main/java/org/apache/comm...
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -97,7 +97,7 @@ public class CombinedBuilderParametersIm
* @throws NullPointerException if the map is <b>null</b>
*/
public static CombinedBuilderParametersImpl fromParameters(
- Map<String, ?> params)
+ final Map<String, ?> params)
{
return fromParameters(params, false);
}
@@ -116,7 +116,7 @@ public class CombinedBuilderParametersIm
* @throws NullPointerException if the map is <b>null</b>
*/
public static CombinedBuilderParametersImpl fromParameters(
- Map<String, ?> params, boolean createIfMissing)
+ final Map<String, ?> params, final boolean createIfMissing)
{
CombinedBuilderParametersImpl result =
(CombinedBuilderParametersImpl) params.get(PARAM_KEY);
@@ -132,11 +132,11 @@ public class CombinedBuilderParametersIm
* defined by this class.
*/
@Override
- public void inheritFrom(Map<String, ?> source)
+ public void inheritFrom(final Map<String, ?> source)
{
super.inheritFrom(source);
- CombinedBuilderParametersImpl srcParams = fromParameters(source);
+ final CombinedBuilderParametersImpl srcParams = fromParameters(source);
if (srcParams != null)
{
setChildDefaultParametersManager(
@@ -160,7 +160,7 @@ public class CombinedBuilderParametersIm
@Override
public CombinedBuilderParametersImpl setInheritSettings(
- boolean inheritSettings)
+ final boolean inheritSettings)
{
this.inheritSettings = inheritSettings;
return this;
@@ -187,7 +187,7 @@ public class CombinedBuilderParametersIm
*/
@Override
public CombinedBuilderParametersImpl setDefinitionBuilder(
- ConfigurationBuilder<? extends HierarchicalConfiguration<?>> builder)
+ final ConfigurationBuilder<? extends HierarchicalConfiguration<?>> builder)
{
definitionBuilder = builder;
return this;
@@ -206,8 +206,8 @@ public class CombinedBuilderParametersIm
* @throws IllegalArgumentException if a required parameter is missing
*/
@Override
- public CombinedBuilderParametersImpl registerProvider(String tagName,
- ConfigurationBuilderProvider provider)
+ public CombinedBuilderParametersImpl registerProvider(final String tagName,
+ final ConfigurationBuilderProvider provider)
{
if (tagName == null)
{
@@ -238,7 +238,7 @@ public class CombinedBuilderParametersIm
* or contains <b>null</b> entries
*/
public CombinedBuilderParametersImpl registerMissingProviders(
- Map<String, ConfigurationBuilderProvider> providers)
+ final Map<String, ConfigurationBuilderProvider> providers)
{
if (providers == null)
{
@@ -246,7 +246,7 @@ public class CombinedBuilderParametersIm
"Map with providers must not be null!");
}
- for (Map.Entry<String, ConfigurationBuilderProvider> e : providers
+ for (final Map.Entry<String, ConfigurationBuilderProvider> e : providers
.entrySet())
{
if (!this.providers.containsKey(e.getKey()))
@@ -270,7 +270,7 @@ public class CombinedBuilderParametersIm
* <b>null</b>
*/
public CombinedBuilderParametersImpl registerMissingProviders(
- CombinedBuilderParametersImpl params)
+ final CombinedBuilderParametersImpl params)
{
if (params == null)
{
@@ -300,7 +300,7 @@ public class CombinedBuilderParametersIm
* @param tagName the tag name
* @return the provider registered for this tag or <b>null</b>
*/
- public ConfigurationBuilderProvider providerForTag(String tagName)
+ public ConfigurationBuilderProvider providerForTag(final String tagName)
{
return providers.get(tagName);
}
@@ -328,7 +328,7 @@ public class CombinedBuilderParametersIm
* @return a reference to this object for method chaining
*/
@Override
- public CombinedBuilderParametersImpl setBasePath(String path)
+ public CombinedBuilderParametersImpl setBasePath(final String path)
{
basePath = path;
return this;
@@ -360,7 +360,7 @@ public class CombinedBuilderParametersIm
*/
@Override
public CombinedBuilderParametersImpl setDefinitionBuilderParameters(
- BuilderParameters params)
+ final BuilderParameters params)
{
definitionBuilderParameters = params;
return this;
@@ -406,7 +406,7 @@ public class CombinedBuilderParametersIm
*/
@Override
public CombinedBuilderParametersImpl setChildDefaultParametersManager(
- DefaultParametersManager manager)
+ final DefaultParametersManager manager)
{
childDefaultParametersManager = manager;
return this;
@@ -419,7 +419,7 @@ public class CombinedBuilderParametersIm
*/
@Override
public <D> CombinedBuilderParametersImpl registerChildDefaultsHandler(
- Class<D> paramClass, DefaultParametersHandler<? super D> handler)
+ final Class<D> paramClass, final DefaultParametersHandler<? super D> handler)
{
getChildDefaultParametersManager().registerDefaultsHandler(paramClass,
handler);
@@ -433,8 +433,8 @@ public class CombinedBuilderParametersIm
*/
@Override
public <D> CombinedBuilderParametersImpl registerChildDefaultsHandler(
- Class<D> paramClass, DefaultParametersHandler<? super D> handler,
- Class<?> startClass)
+ final Class<D> paramClass, final DefaultParametersHandler<? super D> handler,
+ final Class<?> startClass)
{
getChildDefaultParametersManager().registerDefaultsHandler(paramClass,
handler, startClass);
@@ -449,7 +449,7 @@ public class CombinedBuilderParametersIm
@Override
public Map<String, Object> getParameters()
{
- Map<String, Object> params = super.getParameters();
+ final Map<String, Object> params = super.getParameters();
params.put(PARAM_KEY, this);
return params;
}
@@ -461,7 +461,7 @@ public class CombinedBuilderParametersIm
@Override
public CombinedBuilderParametersImpl clone()
{
- CombinedBuilderParametersImpl copy =
+ final CombinedBuilderParametersImpl copy =
(CombinedBuilderParametersImpl) super.clone();
copy.setDefinitionBuilderParameters((BuilderParameters) ConfigurationUtils
.cloneIfPossible(getDefinitionBuilderParameters()));
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -514,7 +514,7 @@ public class CombinedConfigurationBuilde
* the specified initialization parameters.
* @param params a map with initialization parameters
*/
- public CombinedConfigurationBuilder(Map<String, Object> params)
+ public CombinedConfigurationBuilder(final Map<String, Object> params)
{
super(CombinedConfiguration.class, params);
}
@@ -526,7 +526,7 @@ public class CombinedConfigurationBuilde
* @param params a map with initialization parameters
* @param allowFailOnInit the <em>allowFailOnInit</em> flag
*/
- public CombinedConfigurationBuilder(Map<String, Object> params, boolean allowFailOnInit)
+ public CombinedConfigurationBuilder(final Map<String, Object> params, final boolean allowFailOnInit)
{
super(CombinedConfiguration.class, params, allowFailOnInit);
}
@@ -553,7 +553,7 @@ public class CombinedConfigurationBuilde
* {@inheritDoc} This method is overridden to adapt the return type.
*/
@Override
- public CombinedConfigurationBuilder configure(BuilderParameters... params)
+ public CombinedConfigurationBuilder configure(final BuilderParameters... params)
{
super.configure(params);
return this;
@@ -578,14 +578,14 @@ public class CombinedConfigurationBuilde
* yet available or no builder with this name exists
*/
public synchronized ConfigurationBuilder<? extends Configuration> getNamedBuilder(
- String name) throws ConfigurationException
+ final String name) throws ConfigurationException
{
if (sourceData == null)
{
throw new ConfigurationException("Information about child builders"
+ " has not been setup yet! Call getConfiguration() first.");
}
- ConfigurationBuilder<? extends Configuration> builder =
+ final ConfigurationBuilder<? extends Configuration> builder =
sourceData.getNamedBuilder(name);
if (builder == null)
{
@@ -659,13 +659,13 @@ public class CombinedConfigurationBuilde
* @throws ConfigurationException if an error occurs
*/
protected ConfigurationBuilder<? extends HierarchicalConfiguration<?>> setupDefinitionBuilder(
- Map<String, Object> params) throws ConfigurationException
+ final Map<String, Object> params) throws ConfigurationException
{
- CombinedBuilderParametersImpl cbParams =
+ final CombinedBuilderParametersImpl cbParams =
CombinedBuilderParametersImpl.fromParameters(params);
if (cbParams != null)
{
- ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
+ final ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
cbParams.getDefinitionBuilder();
if (defBuilder != null)
{
@@ -679,7 +679,7 @@ public class CombinedConfigurationBuilde
}
}
- BuilderParameters fileParams =
+ final BuilderParameters fileParams =
FileBasedBuilderParametersImpl.fromParameters(params);
if (fileParams != null)
{
@@ -702,7 +702,7 @@ public class CombinedConfigurationBuilde
* @return the standard builder for the definition configuration
*/
protected ConfigurationBuilder<? extends HierarchicalConfiguration<?>> createXMLDefinitionBuilder(
- BuilderParameters builderParams)
+ final BuilderParameters builderParams)
{
return new FileBasedConfigurationBuilder<>(
XMLConfiguration.class).configure(builderParams);
@@ -752,11 +752,11 @@ public class CombinedConfigurationBuilde
* properties defined as initialization parameters.
*/
@Override
- protected BeanDeclaration createResultDeclaration(Map<String, Object> params)
+ protected BeanDeclaration createResultDeclaration(final Map<String, Object> params)
throws ConfigurationException
{
- BeanDeclaration paramsDecl = super.createResultDeclaration(params);
- XMLBeanDeclaration resultDecl =
+ final BeanDeclaration paramsDecl = super.createResultDeclaration(params);
+ final XMLBeanDeclaration resultDecl =
new XMLBeanDeclaration(getDefinitionConfiguration(),
KEY_RESULT, true, CombinedConfiguration.class.getName());
return new CombinedBeanDeclaration(resultDecl, paramsDecl);
@@ -772,13 +772,13 @@ public class CombinedConfigurationBuilde
* </ul>
*/
@Override
- protected void initResultInstance(CombinedConfiguration result)
+ protected void initResultInstance(final CombinedConfiguration result)
throws ConfigurationException
{
super.initResultInstance(result);
currentConfiguration = result;
- HierarchicalConfiguration<?> config = getDefinitionConfiguration();
+ final HierarchicalConfiguration<?> config = getDefinitionConfiguration();
if (config.getMaxIndex(KEY_COMBINER) < 0)
{
// No combiner defined => set default
@@ -795,9 +795,9 @@ public class CombinedConfigurationBuilde
configureEntityResolver(config, currentXMLParameters);
setUpParentInterpolator(currentConfiguration, config);
- ConfigurationSourceData data = getSourceData();
- boolean createBuilders = data.getChildBuilders().isEmpty();
- List<ConfigurationBuilder<? extends Configuration>> overrideBuilders =
+ final ConfigurationSourceData data = getSourceData();
+ final boolean createBuilders = data.getChildBuilders().isEmpty();
+ final List<ConfigurationBuilder<? extends Configuration>> overrideBuilders =
data.createAndAddConfigurations(result,
data.getOverrideSources(), data.overrideBuilders);
if (createBuilders)
@@ -806,10 +806,10 @@ public class CombinedConfigurationBuilde
}
if (!data.getUnionSources().isEmpty())
{
- CombinedConfiguration addConfig = createAdditionalsConfiguration(result);
+ final CombinedConfiguration addConfig = createAdditionalsConfiguration(result);
result.addConfiguration(addConfig, ADDITIONAL_NAME);
initNodeCombinerListNodes(addConfig, config, KEY_ADDITIONAL_LIST);
- List<ConfigurationBuilder<? extends Configuration>> unionBuilders =
+ final List<ConfigurationBuilder<? extends Configuration>> unionBuilders =
data.createAndAddConfigurations(addConfig,
data.unionDeclarations, data.unionBuilders);
if (createBuilders)
@@ -836,9 +836,9 @@ public class CombinedConfigurationBuilde
* @since 1.7
*/
protected CombinedConfiguration createAdditionalsConfiguration(
- CombinedConfiguration resultConfig)
+ final CombinedConfiguration resultConfig)
{
- CombinedConfiguration addConfig =
+ final CombinedConfiguration addConfig =
new CombinedConfiguration(new UnionCombiner());
addConfig.setListDelimiterHandler(resultConfig.getListDelimiterHandler());
return addConfig;
@@ -856,24 +856,24 @@ public class CombinedConfigurationBuilde
* @throws ConfigurationException if an error occurs
*/
protected void registerConfiguredLookups(
- HierarchicalConfiguration<?> defConfig, Configuration resultConfig)
+ final HierarchicalConfiguration<?> defConfig, final Configuration resultConfig)
throws ConfigurationException
{
- Map<String, Lookup> lookups = new HashMap<>();
+ final Map<String, Lookup> lookups = new HashMap<>();
- List<? extends HierarchicalConfiguration<?>> nodes =
+ final List<? extends HierarchicalConfiguration<?>> nodes =
defConfig.configurationsAt(KEY_CONFIGURATION_LOOKUPS);
- for (HierarchicalConfiguration<?> config : nodes)
+ for (final HierarchicalConfiguration<?> config : nodes)
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
- String key = config.getString(KEY_LOOKUP_KEY);
- Lookup lookup = (Lookup) fetchBeanHelper().createBean(decl);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ final String key = config.getString(KEY_LOOKUP_KEY);
+ final Lookup lookup = (Lookup) fetchBeanHelper().createBean(decl);
lookups.put(key, lookup);
}
if (!lookups.isEmpty())
{
- ConfigurationInterpolator defCI = defConfig.getInterpolator();
+ final ConfigurationInterpolator defCI = defConfig.getInterpolator();
if (defCI != null)
{
defCI.registerLookups(lookups);
@@ -892,12 +892,12 @@ public class CombinedConfigurationBuilde
* @return the default {@code FileSystem} (may be <b>null</b>)
* @throws ConfigurationException if an error occurs
*/
- protected FileSystem initFileSystem(HierarchicalConfiguration<?> config)
+ protected FileSystem initFileSystem(final HierarchicalConfiguration<?> config)
throws ConfigurationException
{
if (config.getMaxIndex(FILE_SYSTEM) == 0)
{
- XMLBeanDeclaration decl =
+ final XMLBeanDeclaration decl =
new XMLBeanDeclaration(config, FILE_SYSTEM);
return (FileSystem) fetchBeanHelper().createBean(decl);
}
@@ -914,17 +914,17 @@ public class CombinedConfigurationBuilde
* <b>null</b>)
* @throws ConfigurationException if an error occurs.
*/
- protected void initSystemProperties(HierarchicalConfiguration<?> config,
- String basePath) throws ConfigurationException
+ protected void initSystemProperties(final HierarchicalConfiguration<?> config,
+ final String basePath) throws ConfigurationException
{
- String fileName = config.getString(KEY_SYSTEM_PROPS);
+ final String fileName = config.getString(KEY_SYSTEM_PROPS);
if (fileName != null)
{
try
{
SystemConfiguration.setSystemProperties(basePath, fileName);
}
- catch (Exception ex)
+ catch (final Exception ex)
{
throw new ConfigurationException(
"Error setting system properties from " + fileName, ex);
@@ -941,27 +941,27 @@ public class CombinedConfigurationBuilde
* parameters; here the new resolver is to be stored
* @throws ConfigurationException if an error occurs
*/
- protected void configureEntityResolver(HierarchicalConfiguration<?> config,
- XMLBuilderParametersImpl xmlParams) throws ConfigurationException
+ protected void configureEntityResolver(final HierarchicalConfiguration<?> config,
+ final XMLBuilderParametersImpl xmlParams) throws ConfigurationException
{
if (config.getMaxIndex(KEY_ENTITY_RESOLVER) == 0)
{
- XMLBeanDeclaration decl =
+ final XMLBeanDeclaration decl =
new XMLBeanDeclaration(config, KEY_ENTITY_RESOLVER, true);
- EntityResolver resolver =
+ final EntityResolver resolver =
(EntityResolver) fetchBeanHelper().createBean(decl,
CatalogResolver.class);
- FileSystem fileSystem = xmlParams.getFileHandler().getFileSystem();
+ final FileSystem fileSystem = xmlParams.getFileHandler().getFileSystem();
if (fileSystem != null)
{
BeanHelper.setProperty(resolver, "fileSystem", fileSystem);
}
- String basePath = xmlParams.getFileHandler().getBasePath();
+ final String basePath = xmlParams.getFileHandler().getBasePath();
if (basePath != null)
{
BeanHelper.setProperty(resolver, "baseDir", basePath);
}
- ConfigurationInterpolator ci = new ConfigurationInterpolator();
+ final ConfigurationInterpolator ci = new ConfigurationInterpolator();
ci.registerLookups(fetchPrefixLookups());
BeanHelper.setProperty(resolver, "interpolator", ci);
@@ -980,7 +980,7 @@ public class CombinedConfigurationBuilde
* @return the provider that was registered for this tag or <b>null</b> if
* there is none
*/
- protected ConfigurationBuilderProvider providerForTag(String tagName)
+ protected ConfigurationBuilderProvider providerForTag(final String tagName)
{
return currentParameters.providerForTag(tagName);
}
@@ -996,7 +996,7 @@ public class CombinedConfigurationBuilde
*
* @param params the parameters object to be initialized
*/
- protected void initChildBuilderParameters(BuilderParameters params)
+ protected void initChildBuilderParameters(final BuilderParameters params)
{
initDefaultChildParameters(params);
@@ -1026,7 +1026,7 @@ public class CombinedConfigurationBuilde
* @param dest the destination builder object which is to be initialized
*/
void initChildEventListeners(
- BasicConfigurationBuilder<? extends Configuration> dest)
+ final BasicConfigurationBuilder<? extends Configuration> dest)
{
copyEventListeners(dest);
}
@@ -1052,7 +1052,7 @@ public class CombinedConfigurationBuilde
* @param bean the bean to be initialized
* @param decl the {@code BeanDeclaration}
*/
- void initBean(Object bean, BeanDeclaration decl)
+ void initBean(final Object bean, final BeanDeclaration decl)
{
fetchBeanHelper().initBean(bean, decl);
}
@@ -1092,13 +1092,13 @@ public class CombinedConfigurationBuilde
* @param resultConfig the result configuration
* @param defConfig the definition configuration
*/
- private void setUpParentInterpolator(Configuration resultConfig,
- Configuration defConfig)
+ private void setUpParentInterpolator(final Configuration resultConfig,
+ final Configuration defConfig)
{
parentInterpolator = new ConfigurationInterpolator();
parentInterpolator.addDefaultLookup(new ConfigurationLookup(
resultConfig));
- ConfigurationInterpolator defInterpolator = defConfig.getInterpolator();
+ final ConfigurationInterpolator defInterpolator = defConfig.getInterpolator();
if (defInterpolator != null)
{
defInterpolator.setParentInterpolator(parentInterpolator);
@@ -1122,14 +1122,15 @@ public class CombinedConfigurationBuilde
}
else
{
- ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
+ final ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
getDefinitionBuilder();
if (defBuilder instanceof FileBasedConfigurationBuilder)
{
@SuppressWarnings("rawtypes")
+ final
FileBasedConfigurationBuilder fileBuilder =
(FileBasedConfigurationBuilder) defBuilder;
- URL url = fileBuilder.getFileHandler().getURL();
+ final URL url = fileBuilder.getFileHandler().getURL();
currentXMLParameters.setBasePath((url != null) ? url
.toExternalForm() : fileBuilder.getFileHandler()
.getBasePath());
@@ -1150,7 +1151,7 @@ public class CombinedConfigurationBuilde
* @throws org.apache.commons.configuration2.ex.ConfigurationRuntimeException if an error
* occurs when copying properties
*/
- private void initDefaultChildParameters(BuilderParameters params)
+ private void initDefaultChildParameters(final BuilderParameters params)
{
currentParameters.getChildDefaultParametersManager()
.initializeParameters(params);
@@ -1164,7 +1165,7 @@ public class CombinedConfigurationBuilde
*
* @param params the parameters object
*/
- private void initChildBasicParameters(BasicBuilderParameters params)
+ private void initChildBasicParameters(final BasicBuilderParameters params)
{
params.setPrefixLookups(fetchPrefixLookups());
params.setParentInterpolator(parentInterpolator);
@@ -1182,7 +1183,7 @@ public class CombinedConfigurationBuilde
* @param params the parameters object
*/
private void initChildFileBasedParameters(
- FileBasedBuilderProperties<?> params)
+ final FileBasedBuilderProperties<?> params)
{
params.setBasePath(getBasePath());
params.setFileSystem(currentXMLParameters.getFileHandler()
@@ -1195,7 +1196,7 @@ public class CombinedConfigurationBuilde
*
* @param params the parameters object
*/
- private void initChildXMLParameters(XMLBuilderProperties<?> params)
+ private void initChildXMLParameters(final XMLBuilderProperties<?> params)
{
params.setEntityResolver(currentXMLParameters.getEntityResolver());
}
@@ -1209,7 +1210,7 @@ public class CombinedConfigurationBuilde
* @param params the parameters object
*/
private void initChildCombinedParameters(
- CombinedBuilderParametersImpl params)
+ final CombinedBuilderParametersImpl params)
{
params.registerMissingProviders(currentParameters);
params.setBasePath(getBasePath());
@@ -1249,7 +1250,7 @@ public class CombinedConfigurationBuilde
private ConfigurationSourceData createSourceData()
throws ConfigurationException
{
- ConfigurationSourceData result = new ConfigurationSourceData();
+ final ConfigurationSourceData result = new ConfigurationSourceData();
result.initFromDefinitionConfiguration(getDefinitionConfiguration());
return result;
}
@@ -1271,15 +1272,15 @@ public class CombinedConfigurationBuilde
* @param defConfig the definition configuration
* @throws ConfigurationException if an error occurs
*/
- private void registerConfiguredProviders(HierarchicalConfiguration<?> defConfig)
+ private void registerConfiguredProviders(final HierarchicalConfiguration<?> defConfig)
throws ConfigurationException
{
- List<? extends HierarchicalConfiguration<?>> nodes =
+ final List<? extends HierarchicalConfiguration<?>> nodes =
defConfig.configurationsAt(KEY_CONFIGURATION_PROVIDERS);
- for (HierarchicalConfiguration<?> config : nodes)
+ for (final HierarchicalConfiguration<?> config : nodes)
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
- String key = config.getString(KEY_PROVIDER_KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ final String key = config.getString(KEY_PROVIDER_KEY);
currentParameters.registerProvider(key,
(ConfigurationBuilderProvider) fetchBeanHelper().createBean(decl));
}
@@ -1300,7 +1301,7 @@ public class CombinedConfigurationBuilde
new EventListener<ConfigurationBuilderEvent>()
{
@Override
- public void onEvent(ConfigurationBuilderEvent event)
+ public void onEvent(final ConfigurationBuilderEvent event)
{
synchronized (CombinedConfigurationBuilder.this)
{
@@ -1320,7 +1321,7 @@ public class CombinedConfigurationBuilde
*/
private Map<String, ? extends Lookup> fetchPrefixLookups()
{
- CombinedConfiguration cc = getConfigurationUnderConstruction();
+ final CombinedConfiguration cc = getConfigurationUnderConstruction();
return (cc != null) ? cc.getInterpolator().getLookups() : null;
}
@@ -1332,11 +1333,11 @@ public class CombinedConfigurationBuilde
* @return a collection with corresponding declarations
*/
private Collection<ConfigurationDeclaration> createDeclarations(
- Collection<? extends HierarchicalConfiguration<?>> configs)
+ final Collection<? extends HierarchicalConfiguration<?>> configs)
{
- Collection<ConfigurationDeclaration> declarations =
+ final Collection<ConfigurationDeclaration> declarations =
new ArrayList<>(configs.size());
- for (HierarchicalConfiguration<?> c : configs)
+ for (final HierarchicalConfiguration<?> c : configs)
{
declarations.add(new ConfigurationDeclaration(this, c));
}
@@ -1353,11 +1354,11 @@ public class CombinedConfigurationBuilde
* @param defConfig the definition configuration
* @param key the key for the list nodes
*/
- private static void initNodeCombinerListNodes(CombinedConfiguration cc,
- HierarchicalConfiguration<?> defConfig, String key)
+ private static void initNodeCombinerListNodes(final CombinedConfiguration cc,
+ final HierarchicalConfiguration<?> defConfig, final String key)
{
- List<Object> listNodes = defConfig.getList(key);
- for (Object listNode : listNodes)
+ final List<Object> listNodes = defConfig.getList(key);
+ for (final Object listNode : listNodes)
{
cc.getNodeCombiner().addListNode((String) listNode);
}
@@ -1370,7 +1371,7 @@ public class CombinedConfigurationBuilde
*/
private static Map<String, ConfigurationBuilderProvider> createDefaultProviders()
{
- Map<String, ConfigurationBuilderProvider> providers =
+ final Map<String, ConfigurationBuilderProvider> providers =
new HashMap<>();
for (int i = 0; i < DEFAULT_TAGS.length; i++)
{
@@ -1432,7 +1433,7 @@ public class CombinedConfigurationBuilde
* @throws ConfigurationException if an error occurs
*/
public void initFromDefinitionConfiguration(
- HierarchicalConfiguration<?> config) throws ConfigurationException
+ final HierarchicalConfiguration<?> config) throws ConfigurationException
{
overrideDeclarations.addAll(createDeclarations(fetchTopLevelOverrideConfigs(config)));
overrideDeclarations.addAll(createDeclarations(config.childConfigurationsAt(KEY_OVERRIDE)));
@@ -1451,12 +1452,12 @@ public class CombinedConfigurationBuilde
* @throws ConfigurationException if an error occurs
*/
public List<ConfigurationBuilder<? extends Configuration>> createAndAddConfigurations(
- CombinedConfiguration ccResult,
- List<ConfigurationDeclaration> srcDecl,
- List<ConfigurationBuilder<? extends Configuration>> builders)
+ final CombinedConfiguration ccResult,
+ final List<ConfigurationDeclaration> srcDecl,
+ final List<ConfigurationBuilder<? extends Configuration>> builders)
throws ConfigurationException
{
- boolean createBuilders = builders.isEmpty();
+ final boolean createBuilders = builders.isEmpty();
List<ConfigurationBuilder<? extends Configuration>> newBuilders;
if (createBuilders)
{
@@ -1491,7 +1492,7 @@ public class CombinedConfigurationBuilde
*/
public void cleanUp()
{
- for (ConfigurationBuilder<?> b : getChildBuilders())
+ for (final ConfigurationBuilder<?> b : getChildBuilders())
{
b.removeEventListener(ConfigurationBuilderEvent.RESET,
changeListener);
@@ -1541,7 +1542,7 @@ public class CombinedConfigurationBuilde
* @return the builder with this name or <b>null</b>
*/
public ConfigurationBuilder<? extends Configuration> getNamedBuilder(
- String name)
+ final String name)
{
return namedBuilders.get(name);
}
@@ -1565,9 +1566,9 @@ public class CombinedConfigurationBuilde
* @throws ConfigurationException if an error occurs
*/
private ConfigurationBuilder<? extends Configuration> createConfigurationBuilder(
- ConfigurationDeclaration decl) throws ConfigurationException
+ final ConfigurationDeclaration decl) throws ConfigurationException
{
- ConfigurationBuilderProvider provider =
+ final ConfigurationBuilderProvider provider =
providerForTag(decl.getConfiguration().getRootElementName());
if (provider == null)
{
@@ -1576,7 +1577,7 @@ public class CombinedConfigurationBuilde
+ decl.getConfiguration().getRootElementName());
}
- ConfigurationBuilder<? extends Configuration> builder =
+ final ConfigurationBuilder<? extends Configuration> builder =
provider.getConfigurationBuilder(decl);
if (decl.getName() != null)
{
@@ -1597,9 +1598,9 @@ public class CombinedConfigurationBuilde
* @param builder the configuration builder
* @throws ConfigurationException if an error occurs
*/
- private void addChildConfiguration(CombinedConfiguration ccResult,
- ConfigurationDeclaration decl,
- ConfigurationBuilder<? extends Configuration> builder)
+ private void addChildConfiguration(final CombinedConfiguration ccResult,
+ final ConfigurationDeclaration decl,
+ final ConfigurationBuilder<? extends Configuration> builder)
throws ConfigurationException
{
try
@@ -1608,7 +1609,7 @@ public class CombinedConfigurationBuilde
builder.getConfiguration(),
decl.getName(), decl.getAt());
}
- catch (ConfigurationException cex)
+ catch (final ConfigurationException cex)
{
// ignore exceptions for optional configurations
if (!decl.isOptional())
@@ -1627,7 +1628,7 @@ public class CombinedConfigurationBuilde
return new EventListener<ConfigurationBuilderEvent>()
{
@Override
- public void onEvent(ConfigurationBuilderEvent event)
+ public void onEvent(final ConfigurationBuilderEvent event)
{
resetResult();
}
@@ -1646,16 +1647,16 @@ public class CombinedConfigurationBuilde
* configurations
*/
private List<? extends HierarchicalConfiguration<?>> fetchTopLevelOverrideConfigs(
- HierarchicalConfiguration<?> config)
+ final HierarchicalConfiguration<?> config)
{
- List<? extends HierarchicalConfiguration<?>> configs =
+ final List<? extends HierarchicalConfiguration<?>> configs =
config.childConfigurationsAt(null);
- for (Iterator<? extends HierarchicalConfiguration<?>> it =
+ for (final Iterator<? extends HierarchicalConfiguration<?>> it =
configs.iterator(); it.hasNext();)
{
- String nodeName = it.next().getRootElementName();
- for (String element : CONFIG_SECTIONS)
+ final String nodeName = it.next().getRootElementName();
+ for (final String element : CONFIG_SECTIONS)
{
if (element.equals(nodeName))
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilderProvider.java Thu Sep 27 22:24:23 2018
@@ -81,7 +81,7 @@ public class CombinedConfigurationBuilde
*/
@Override
protected BasicConfigurationBuilder<? extends Configuration> createBuilder(
- ConfigurationDeclaration decl, Collection<BuilderParameters> params)
+ final ConfigurationDeclaration decl, final Collection<BuilderParameters> params)
throws Exception
{
CombinedConfigurationBuilder builder;
@@ -102,12 +102,12 @@ public class CombinedConfigurationBuilde
* basic properties of the parent builder's result configuration.
*/
@Override
- protected void initializeParameterObjects(ConfigurationDeclaration decl,
- Collection<BuilderParameters> params) throws Exception
+ protected void initializeParameterObjects(final ConfigurationDeclaration decl,
+ final Collection<BuilderParameters> params) throws Exception
{
// we know that the first object is the combined builder parameters
// object
- BasicBuilderParameters basicParams =
+ final BasicBuilderParameters basicParams =
(BasicBuilderParameters) params.iterator().next();
setUpBasicParameters(decl.getConfigurationBuilder()
.getConfigurationUnderConstruction(), basicParams);
@@ -123,8 +123,8 @@ public class CombinedConfigurationBuilde
* @param config the configuration whose properties are to be copied
* @param params the target parameters object
*/
- private static void setUpBasicParameters(CombinedConfiguration config,
- BasicBuilderParameters params)
+ private static void setUpBasicParameters(final CombinedConfiguration config,
+ final BasicBuilderParameters params)
{
params.setListDelimiterHandler(config.getListDelimiterHandler())
.setLogger(config.getLogger())
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java Thu Sep 27 22:24:23 2018
@@ -50,8 +50,8 @@ public class ConfigurationDeclaration ex
* @param builder the associated configuration builder
* @param config the configuration this declaration is based onto
*/
- public ConfigurationDeclaration(CombinedConfigurationBuilder builder,
- HierarchicalConfiguration<?> config)
+ public ConfigurationDeclaration(final CombinedConfigurationBuilder builder,
+ final HierarchicalConfiguration<?> config)
{
super(config);
configurationBuilder = builder;
@@ -74,7 +74,7 @@ public class ConfigurationDeclaration ex
*/
public String getAt()
{
- String result =
+ final String result =
this.getConfiguration().getString(
CombinedConfigurationBuilder.ATTR_AT_RES);
return (result == null) ? this.getConfiguration().getString(
@@ -178,14 +178,14 @@ public class ConfigurationDeclaration ex
* configuration files supported by earlier versions of this library.)
*/
@Override
- protected boolean isReservedAttributeName(String name)
+ protected boolean isReservedAttributeName(final String name)
{
if (super.isReservedAttributeName(name))
{
return true;
}
- Set<String> attributes = getAttributeNames();
+ final Set<String> attributes = getAttributeNames();
return (CombinedConfigurationBuilder.ATTR_ATNAME.equals(name) && !attributes
.contains(RESERVED_PREFIX
+ CombinedConfigurationBuilder.ATTR_ATNAME))
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java Thu Sep 27 22:24:23 2018
@@ -80,9 +80,9 @@ public class FileExtensionConfigurationB
* are needed
* @throws IllegalArgumentException if a required parameter is missing
*/
- public FileExtensionConfigurationBuilderProvider(String bldrCls,
- String reloadBldrCls, String matchingConfigCls,
- String defConfigClass, String ext, Collection<String> paramCls)
+ public FileExtensionConfigurationBuilderProvider(final String bldrCls,
+ final String reloadBldrCls, final String matchingConfigCls,
+ final String defConfigClass, final String ext, final Collection<String> paramCls)
{
super(bldrCls, reloadBldrCls, defConfigClass, paramCls);
if (matchingConfigCls == null)
@@ -129,10 +129,10 @@ public class FileExtensionConfigurationB
* configuration class is selected, otherwise the default one.
*/
@Override
- protected String determineConfigurationClass(ConfigurationDeclaration decl,
- Collection<BuilderParameters> params) throws ConfigurationException
+ protected String determineConfigurationClass(final ConfigurationDeclaration decl,
+ final Collection<BuilderParameters> params) throws ConfigurationException
{
- String currentExt = extractExtension(fetchCurrentFileName(params));
+ final String currentExt = extractExtension(fetchCurrentFileName(params));
return getExtension().equalsIgnoreCase(currentExt) ? getMatchingConfigurationClass()
: getConfigurationClass();
}
@@ -145,13 +145,13 @@ public class FileExtensionConfigurationB
* @return the file name or <b>null</b> if unspecified
*/
private static String fetchCurrentFileName(
- Collection<BuilderParameters> params)
+ final Collection<BuilderParameters> params)
{
- for (BuilderParameters p : params)
+ for (final BuilderParameters p : params)
{
if (p instanceof FileBasedBuilderParametersImpl)
{
- FileBasedBuilderParametersImpl fp = (FileBasedBuilderParametersImpl) p;
+ final FileBasedBuilderParametersImpl fp = (FileBasedBuilderParametersImpl) p;
return fp.getFileHandler().getFileName();
}
}
@@ -165,14 +165,14 @@ public class FileExtensionConfigurationB
* @param fileName the file name
* @return the extension (<b>null</b> if there is none)
*/
- private static String extractExtension(String fileName)
+ private static String extractExtension(final String fileName)
{
if (fileName == null)
{
return null;
}
- int pos = fileName.lastIndexOf(EXT_SEPARATOR);
+ final int pos = fileName.lastIndexOf(EXT_SEPARATOR);
return (pos < 0) ? null : fileName.substring(pos + 1);
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -77,7 +77,7 @@ public class MultiFileBuilderParametersI
* @throws NullPointerException if the map with parameters is <b>null</b>
*/
public static MultiFileBuilderParametersImpl fromParameters(
- Map<String, Object> params)
+ final Map<String, Object> params)
{
return fromParameters(params, false);
}
@@ -97,7 +97,7 @@ public class MultiFileBuilderParametersI
* @throws NullPointerException if the map with parameters is <b>null</b>
*/
public static MultiFileBuilderParametersImpl fromParameters(
- Map<String, Object> params, boolean createIfMissing)
+ final Map<String, Object> params, final boolean createIfMissing)
{
MultiFileBuilderParametersImpl instance =
(MultiFileBuilderParametersImpl) params.get(PARAM_KEY);
@@ -120,7 +120,7 @@ public class MultiFileBuilderParametersI
}
@Override
- public MultiFileBuilderParametersImpl setFilePattern(String p)
+ public MultiFileBuilderParametersImpl setFilePattern(final String p)
{
filePattern = p;
return this;
@@ -138,7 +138,7 @@ public class MultiFileBuilderParametersI
@Override
public MultiFileBuilderParametersImpl setManagedBuilderParameters(
- BuilderParameters p)
+ final BuilderParameters p)
{
managedBuilderParameters = p;
return this;
@@ -151,7 +151,7 @@ public class MultiFileBuilderParametersI
@Override
public Map<String, Object> getParameters()
{
- Map<String, Object> params = super.getParameters();
+ final Map<String, Object> params = super.getParameters();
params.put(PARAM_KEY, this);
return params;
}
@@ -163,7 +163,7 @@ public class MultiFileBuilderParametersI
@Override
public MultiFileBuilderParametersImpl clone()
{
- MultiFileBuilderParametersImpl copy =
+ final MultiFileBuilderParametersImpl copy =
(MultiFileBuilderParametersImpl) super.clone();
copy.setManagedBuilderParameters((BuilderParameters) ConfigurationUtils
.cloneIfPossible(getManagedBuilderParameters()));
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -114,7 +114,7 @@ public class MultiFileConfigurationBuild
new EventListener<ConfigurationBuilderEvent>()
{
@Override
- public void onEvent(ConfigurationBuilderEvent event)
+ public void onEvent(final ConfigurationBuilderEvent event)
{
handleManagedBuilderEvent(event);
}
@@ -131,8 +131,8 @@ public class MultiFileConfigurationBuild
* ignored
* @throws IllegalArgumentException if the result class is <b>null</b>
*/
- public MultiFileConfigurationBuilder(Class<? extends T> resCls,
- Map<String, Object> params, boolean allowFailOnInit)
+ public MultiFileConfigurationBuilder(final Class<? extends T> resCls,
+ final Map<String, Object> params, final boolean allowFailOnInit)
{
super(resCls, params, allowFailOnInit);
}
@@ -145,8 +145,8 @@ public class MultiFileConfigurationBuild
* @param params a map with initialization parameters
* @throws IllegalArgumentException if the result class is <b>null</b>
*/
- public MultiFileConfigurationBuilder(Class<? extends T> resCls,
- Map<String, Object> params)
+ public MultiFileConfigurationBuilder(final Class<? extends T> resCls,
+ final Map<String, Object> params)
{
super(resCls, params);
}
@@ -158,7 +158,7 @@ public class MultiFileConfigurationBuild
* @param resCls the result configuration class
* @throws IllegalArgumentException if the result class is <b>null</b>
*/
- public MultiFileConfigurationBuilder(Class<? extends T> resCls)
+ public MultiFileConfigurationBuilder(final Class<? extends T> resCls)
{
super(resCls);
}
@@ -167,7 +167,7 @@ public class MultiFileConfigurationBuild
* {@inheritDoc} This method is overridden to adapt the return type.
*/
@Override
- public MultiFileConfigurationBuilder<T> configure(BuilderParameters... params)
+ public MultiFileConfigurationBuilder<T> configure(final BuilderParameters... params)
{
super.configure(params);
return this;
@@ -200,14 +200,14 @@ public class MultiFileConfigurationBuild
public FileBasedConfigurationBuilder<T> getManagedBuilder()
throws ConfigurationException
{
- Map<String, Object> params = getParameters();
- MultiFileBuilderParametersImpl multiParams =
+ final Map<String, Object> params = getParameters();
+ final MultiFileBuilderParametersImpl multiParams =
MultiFileBuilderParametersImpl.fromParameters(params, true);
if (multiParams.getFilePattern() == null)
{
throw new ConfigurationException("No file name pattern is set!");
}
- String fileName = fetchFileName(multiParams);
+ final String fileName = fetchFileName(multiParams);
FileBasedConfigurationBuilder<T> builder =
getManagedBuilders().get(fileName);
@@ -216,7 +216,7 @@ public class MultiFileConfigurationBuild
builder =
createInitializedManagedBuilder(fileName,
createManagedBuilderParameters(params, multiParams));
- FileBasedConfigurationBuilder<T> newBuilder =
+ final FileBasedConfigurationBuilder<T> newBuilder =
ConcurrentUtils.putIfAbsent(getManagedBuilders(), fileName,
builder);
if (newBuilder == builder)
@@ -239,12 +239,12 @@ public class MultiFileConfigurationBuild
*/
@Override
public synchronized <E extends Event> void addEventListener(
- EventType<E> eventType, EventListener<? super E> l)
+ final EventType<E> eventType, final EventListener<? super E> l)
{
super.addEventListener(eventType, l);
if (isEventTypeForManagedBuilders(eventType))
{
- for (FileBasedConfigurationBuilder<T> b : getManagedBuilders()
+ for (final FileBasedConfigurationBuilder<T> b : getManagedBuilders()
.values())
{
b.addEventListener(eventType, l);
@@ -259,12 +259,12 @@ public class MultiFileConfigurationBuild
*/
@Override
public synchronized <E extends Event> boolean removeEventListener(
- EventType<E> eventType, EventListener<? super E> l)
+ final EventType<E> eventType, final EventListener<? super E> l)
{
- boolean result = super.removeEventListener(eventType, l);
+ final boolean result = super.removeEventListener(eventType, l);
if (isEventTypeForManagedBuilders(eventType))
{
- for (FileBasedConfigurationBuilder<T> b : getManagedBuilders()
+ for (final FileBasedConfigurationBuilder<T> b : getManagedBuilders()
.values())
{
b.removeEventListener(eventType, l);
@@ -281,7 +281,7 @@ public class MultiFileConfigurationBuild
@Override
public synchronized void resetParameters()
{
- for (FileBasedConfigurationBuilder<T> b : getManagedBuilders().values())
+ for (final FileBasedConfigurationBuilder<T> b : getManagedBuilders().values())
{
b.removeEventListener(ConfigurationBuilderEvent.ANY,
managedBuilderDelegationListener);
@@ -335,7 +335,7 @@ public class MultiFileConfigurationBuild
*/
protected ConfigurationInterpolator createInterpolator()
{
- InterpolatorSpecification spec =
+ final InterpolatorSpecification spec =
BasicBuilderParameters
.fetchInterpolatorSpecification(getParameters());
return ConfigurationInterpolator.fromSpecification(spec);
@@ -351,9 +351,9 @@ public class MultiFileConfigurationBuild
* @return the name of the configuration file to be loaded
*/
protected String constructFileName(
- MultiFileBuilderParametersImpl multiParams)
+ final MultiFileBuilderParametersImpl multiParams)
{
- ConfigurationInterpolator ci = getInterpolator();
+ final ConfigurationInterpolator ci = getInterpolator();
return String.valueOf(ci.interpolate(multiParams.getFilePattern()));
}
@@ -372,7 +372,7 @@ public class MultiFileConfigurationBuild
* @throws ConfigurationException if an error occurs
*/
protected FileBasedConfigurationBuilder<T> createManagedBuilder(
- String fileName, Map<String, Object> params)
+ final String fileName, final Map<String, Object> params)
throws ConfigurationException
{
return new FileBasedConfigurationBuilder<>(getResultClass(), params,
@@ -392,10 +392,10 @@ public class MultiFileConfigurationBuild
* @throws ConfigurationException if an error occurs
*/
protected FileBasedConfigurationBuilder<T> createInitializedManagedBuilder(
- String fileName, Map<String, Object> params)
+ final String fileName, final Map<String, Object> params)
throws ConfigurationException
{
- FileBasedConfigurationBuilder<T> managedBuilder =
+ final FileBasedConfigurationBuilder<T> managedBuilder =
createManagedBuilder(fileName, params);
managedBuilder.getFileHandler().setFileName(fileName);
return managedBuilder;
@@ -423,7 +423,7 @@ public class MultiFileConfigurationBuild
*
* @param newBuilder the builder to be initialized
*/
- private void initListeners(FileBasedConfigurationBuilder<T> newBuilder)
+ private void initListeners(final FileBasedConfigurationBuilder<T> newBuilder)
{
copyEventListeners(newBuilder, configurationListeners);
newBuilder.addEventListener(ConfigurationBuilderEvent.ANY,
@@ -440,10 +440,10 @@ public class MultiFileConfigurationBuild
* @param multiParams the current builder parameters
* @return the file name for a managed builder
*/
- private String fetchFileName(MultiFileBuilderParametersImpl multiParams)
+ private String fetchFileName(final MultiFileBuilderParametersImpl multiParams)
{
String fileName;
- Boolean reentrant = inInterpolation.get();
+ final Boolean reentrant = inInterpolation.get();
if (reentrant != null && reentrant.booleanValue())
{
fileName = multiParams.getFilePattern();
@@ -470,7 +470,7 @@ public class MultiFileConfigurationBuild
*
* @param event the event received from a managed builder
*/
- private void handleManagedBuilderEvent(ConfigurationBuilderEvent event)
+ private void handleManagedBuilderEvent(final ConfigurationBuilderEvent event)
{
if (ConfigurationBuilderEvent.RESET.equals(event.getEventType()))
{
@@ -493,7 +493,7 @@ public class MultiFileConfigurationBuild
* @return the event to be propagated
*/
private ConfigurationBuilderEvent createEventWithChangedSource(
- ConfigurationBuilderEvent event)
+ final ConfigurationBuilderEvent event)
{
if (ConfigurationBuilderResultCreatedEvent.RESULT_CREATED.equals(event
.getEventType()))
@@ -504,6 +504,7 @@ public class MultiFileConfigurationBuild
.getConfiguration());
}
@SuppressWarnings("unchecked")
+ final
// This is safe due to the constructor of ConfigurationBuilderEvent
EventType<? extends ConfigurationBuilderEvent> type =
(EventType<? extends ConfigurationBuilderEvent>) event
@@ -521,17 +522,17 @@ public class MultiFileConfigurationBuild
* @return the parameters for a new managed builder
*/
private static Map<String, Object> createManagedBuilderParameters(
- Map<String, Object> params,
- MultiFileBuilderParametersImpl multiParams)
+ final Map<String, Object> params,
+ final MultiFileBuilderParametersImpl multiParams)
{
- Map<String, Object> newParams = new HashMap<>(params);
+ final Map<String, Object> newParams = new HashMap<>(params);
newParams.remove(KEY_INTERPOLATOR);
- BuilderParameters managedBuilderParameters =
+ final BuilderParameters managedBuilderParameters =
multiParams.getManagedBuilderParameters();
if (managedBuilderParameters != null)
{
// clone parameters as they are applied to multiple builders
- BuilderParameters copy =
+ final BuilderParameters copy =
(BuilderParameters) ConfigurationUtils
.cloneIfPossible(managedBuilderParameters);
newParams.putAll(copy.getParameters());
@@ -549,7 +550,7 @@ public class MultiFileConfigurationBuild
* @return a flag whether this event type is of interest for managed
* builders
*/
- private static boolean isEventTypeForManagedBuilders(EventType<?> eventType)
+ private static boolean isEventTypeForManagedBuilders(final EventType<?> eventType)
{
return !EventType
.isInstanceOf(eventType, ConfigurationBuilderEvent.ANY);
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java Thu Sep 27 22:24:23 2018
@@ -78,8 +78,8 @@ public class MultiFileConfigurationBuild
* @param paramCls the name of the class of the parameters object to
* configure the managed configuration
*/
- public MultiFileConfigurationBuilderProvider(String configCls,
- String paramCls)
+ public MultiFileConfigurationBuilderProvider(final String configCls,
+ final String paramCls)
{
super(BUILDER_CLASS, RELOADING_BUILDER_CLASS, configCls, Arrays.asList(
paramCls, PARAM_CLASS));
@@ -91,11 +91,11 @@ public class MultiFileConfigurationBuild
*/
@Override
public ConfigurationBuilder<? extends Configuration> getConfigurationBuilder(
- ConfigurationDeclaration decl) throws ConfigurationException
+ final ConfigurationDeclaration decl) throws ConfigurationException
{
- ConfigurationBuilder<? extends Configuration> multiBuilder =
+ final ConfigurationBuilder<? extends Configuration> multiBuilder =
super.getConfigurationBuilder(decl);
- Configuration wrapConfig = createWrapperConfiguration(multiBuilder);
+ final Configuration wrapConfig = createWrapperConfiguration(multiBuilder);
return createWrapperBuilder(multiBuilder, wrapConfig);
}
@@ -111,11 +111,11 @@ public class MultiFileConfigurationBuild
"unchecked", "rawtypes"
})
private Configuration createWrapperConfiguration(
- ConfigurationBuilder builder)
+ final ConfigurationBuilder builder)
{
- Class<?> configClass =
+ final Class<?> configClass =
ConfigurationUtils.loadClassNoEx(getConfigurationClass());
- Class ifcClass =
+ final Class ifcClass =
HierarchicalConfiguration.class.isAssignableFrom(configClass) ? HierarchicalConfiguration.class
: Configuration.class;
return (Configuration) BuilderConfigurationWrapperFactory
@@ -136,8 +136,8 @@ public class MultiFileConfigurationBuild
* @return the wrapper builder
*/
private static ConfigurationBuilder<? extends Configuration> createWrapperBuilder(
- ConfigurationBuilder<? extends Configuration> multiBuilder,
- Configuration wrapConfig)
+ final ConfigurationBuilder<? extends Configuration> multiBuilder,
+ final Configuration wrapConfig)
{
if (multiBuilder instanceof ReloadingControllerSupport)
{
@@ -166,8 +166,8 @@ public class MultiFileConfigurationBuild
* @param conf the managed configuration
* @param bldr the underlying builder
*/
- public WrapperBuilder(Configuration conf,
- ConfigurationBuilder<? extends Configuration> bldr)
+ public WrapperBuilder(final Configuration conf,
+ final ConfigurationBuilder<? extends Configuration> bldr)
{
configuration = conf;
builder = bldr;
@@ -181,14 +181,14 @@ public class MultiFileConfigurationBuild
@Override
public <T extends Event> void addEventListener(
- EventType<T> eventType, EventListener<? super T> listener)
+ final EventType<T> eventType, final EventListener<? super T> listener)
{
builder.addEventListener(eventType, listener);
}
@Override
public <T extends Event> boolean removeEventListener(
- EventType<T> eventType, EventListener<? super T> listener)
+ final EventType<T> eventType, final EventListener<? super T> listener)
{
return builder.removeEventListener(eventType, listener);
}
@@ -213,8 +213,8 @@ public class MultiFileConfigurationBuild
* @param bldr the underlying builder (must implement
* {@code ReloadingControllerSupport})
*/
- public ReloadableWrapperBuilder(Configuration conf,
- ConfigurationBuilder<? extends Configuration> bldr)
+ public ReloadableWrapperBuilder(final Configuration conf,
+ final ConfigurationBuilder<? extends Configuration> bldr)
{
super(conf, bldr);
ctrlSupport = (ReloadingControllerSupport) bldr;
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaBean.java Thu Sep 27 22:24:23 2018
@@ -58,17 +58,17 @@ class MultiWrapDynaBean implements DynaB
*
* @param beans the wrapped beans
*/
- public MultiWrapDynaBean(Collection<?> beans)
+ public MultiWrapDynaBean(final Collection<?> beans)
{
propsToBeans = new HashMap<>();
- Collection<DynaClass> beanClasses =
+ final Collection<DynaClass> beanClasses =
new ArrayList<>(beans.size());
- for (Object bean : beans)
+ for (final Object bean : beans)
{
- DynaBean dynaBean = createDynaBean(bean);
- DynaClass beanClass = dynaBean.getDynaClass();
- for (DynaProperty prop : beanClass.getDynaProperties())
+ final DynaBean dynaBean = createDynaBean(bean);
+ final DynaClass beanClass = dynaBean.getDynaClass();
+ for (final DynaProperty prop : beanClass.getDynaProperties())
{
// ensure an order of properties
if (!propsToBeans.containsKey(prop.getName()))
@@ -88,26 +88,26 @@ class MultiWrapDynaBean implements DynaB
* thrown.
*/
@Override
- public boolean contains(String name, String key)
+ public boolean contains(final String name, final String key)
{
throw new UnsupportedOperationException(
"contains() operation not supported!");
}
@Override
- public Object get(String name)
+ public Object get(final String name)
{
return fetchBean(name).get(name);
}
@Override
- public Object get(String name, int index)
+ public Object get(final String name, final int index)
{
return fetchBean(name).get(name, index);
}
@Override
- public Object get(String name, String key)
+ public Object get(final String name, final String key)
{
return fetchBean(name).get(name, key);
}
@@ -128,26 +128,26 @@ class MultiWrapDynaBean implements DynaB
* thrown.
*/
@Override
- public void remove(String name, String key)
+ public void remove(final String name, final String key)
{
throw new UnsupportedOperationException(
"remove() operation not supported!");
}
@Override
- public void set(String name, Object value)
+ public void set(final String name, final Object value)
{
fetchBean(name).set(name, value);
}
@Override
- public void set(String name, int index, Object value)
+ public void set(final String name, final int index, final Object value)
{
fetchBean(name).set(name, index, value);
}
@Override
- public void set(String name, String key, Object value)
+ public void set(final String name, final String key, final Object value)
{
fetchBean(name).set(name, key, value);
}
@@ -160,7 +160,7 @@ class MultiWrapDynaBean implements DynaB
* @param property the property name
* @return the bean defining this property
*/
- private DynaBean fetchBean(String property)
+ private DynaBean fetchBean(final String property)
{
DynaBean dynaBean = propsToBeans.get(property);
if (dynaBean == null)
@@ -176,7 +176,7 @@ class MultiWrapDynaBean implements DynaB
* @param bean the bean
* @return the {@code DynaBean} for this bean
*/
- private static DynaBean createDynaBean(Object bean)
+ private static DynaBean createDynaBean(final Object bean)
{
if (bean instanceof DynaBean)
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiWrapDynaClass.java Thu Sep 27 22:24:23 2018
@@ -51,7 +51,7 @@ class MultiWrapDynaClass implements Dyna
*
* @param wrappedCls the collection with wrapped classes
*/
- public MultiWrapDynaClass(Collection<? extends DynaClass> wrappedCls)
+ public MultiWrapDynaClass(final Collection<? extends DynaClass> wrappedCls)
{
properties = new LinkedList<>();
namedProperties = new HashMap<>();
@@ -68,7 +68,7 @@ class MultiWrapDynaClass implements Dyna
}
@Override
- public DynaProperty getDynaProperty(String name)
+ public DynaProperty getDynaProperty(final String name)
{
return namedProperties.get(name);
}
@@ -96,12 +96,12 @@ class MultiWrapDynaClass implements Dyna
*
* @param wrappedCls the collection with the wrapped classes
*/
- private void initProperties(Collection<? extends DynaClass> wrappedCls)
+ private void initProperties(final Collection<? extends DynaClass> wrappedCls)
{
- for (DynaClass cls : wrappedCls)
+ for (final DynaClass cls : wrappedCls)
{
- DynaProperty[] props = cls.getDynaProperties();
- for (DynaProperty p : props)
+ final DynaProperty[] props = cls.getDynaProperties();
+ for (final DynaProperty p : props)
{
properties.add(p);
namedProperties.put(p.getName(), p);
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingCombinedConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -79,8 +79,8 @@ public class ReloadingCombinedConfigurat
* @param params a map with initialization parameters
* @param allowFailOnInit the <em>allowFailOnInit</em> flag
*/
- public ReloadingCombinedConfigurationBuilder(Map<String, Object> params,
- boolean allowFailOnInit)
+ public ReloadingCombinedConfigurationBuilder(final Map<String, Object> params,
+ final boolean allowFailOnInit)
{
super(params, allowFailOnInit);
}
@@ -91,7 +91,7 @@ public class ReloadingCombinedConfigurat
*
* @param params a map with initialization parameters
*/
- public ReloadingCombinedConfigurationBuilder(Map<String, Object> params)
+ public ReloadingCombinedConfigurationBuilder(final Map<String, Object> params)
{
super(params);
}
@@ -100,7 +100,7 @@ public class ReloadingCombinedConfigurat
* {@inheritDoc} This method is overridden to adapt the return type.
*/
@Override
- public ReloadingCombinedConfigurationBuilder configure(BuilderParameters... params)
+ public ReloadingCombinedConfigurationBuilder configure(final BuilderParameters... params)
{
super.configure(params);
return this;
@@ -132,7 +132,7 @@ public class ReloadingCombinedConfigurat
@Override
public CombinedConfiguration getConfiguration() throws ConfigurationException
{
- CombinedConfiguration result = super.getConfiguration();
+ final CombinedConfiguration result = super.getConfiguration();
reloadingController.resetReloadingState();
return result;
}
@@ -143,7 +143,7 @@ public class ReloadingCombinedConfigurat
*/
@Override
protected ConfigurationBuilder<? extends HierarchicalConfiguration<?>> createXMLDefinitionBuilder(
- BuilderParameters builderParams)
+ final BuilderParameters builderParams)
{
return new ReloadingFileBasedConfigurationBuilder<>(
XMLConfiguration.class).configure(builderParams);
@@ -156,7 +156,7 @@ public class ReloadingCombinedConfigurat
* with reloading support.
*/
@Override
- protected void initResultInstance(CombinedConfiguration result)
+ protected void initResultInstance(final CombinedConfiguration result)
throws ConfigurationException
{
super.initResultInstance(result);
@@ -178,18 +178,18 @@ public class ReloadingCombinedConfigurat
protected ReloadingController createReloadingController()
throws ConfigurationException
{
- Collection<ReloadingController> subControllers =
+ final Collection<ReloadingController> subControllers =
new LinkedList<>();
- ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
+ final ConfigurationBuilder<? extends HierarchicalConfiguration<?>> defBuilder =
getDefinitionBuilder();
obtainReloadingController(subControllers, defBuilder);
- for (ConfigurationBuilder<? extends Configuration> b : getChildBuilders())
+ for (final ConfigurationBuilder<? extends Configuration> b : getChildBuilders())
{
obtainReloadingController(subControllers, b);
}
- CombinedReloadingController ctrl =
+ final CombinedReloadingController ctrl =
new CombinedReloadingController(subControllers);
ctrl.resetInitialReloadingState();
return ctrl;
@@ -203,7 +203,7 @@ public class ReloadingCombinedConfigurat
* @param builder the builder object to be checked
*/
public static void obtainReloadingController(
- Collection<ReloadingController> subControllers, Object builder)
+ final Collection<ReloadingController> subControllers, final Object builder)
{
if (builder instanceof ReloadingControllerSupport)
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/ReloadingMultiFileConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -81,8 +81,8 @@ public class ReloadingMultiFileConfigura
* ignored
* @throws IllegalArgumentException if the result class is <b>null</b>
*/
- public ReloadingMultiFileConfigurationBuilder(Class<T> resCls,
- Map<String, Object> params, boolean allowFailOnInit)
+ public ReloadingMultiFileConfigurationBuilder(final Class<T> resCls,
+ final Map<String, Object> params, final boolean allowFailOnInit)
{
super(resCls, params, allowFailOnInit);
}
@@ -95,8 +95,8 @@ public class ReloadingMultiFileConfigura
* @param params a map with initialization parameters
* @throws IllegalArgumentException if the result class is <b>null</b>
*/
- public ReloadingMultiFileConfigurationBuilder(Class<T> resCls,
- Map<String, Object> params)
+ public ReloadingMultiFileConfigurationBuilder(final Class<T> resCls,
+ final Map<String, Object> params)
{
super(resCls, params);
}
@@ -108,7 +108,7 @@ public class ReloadingMultiFileConfigura
* @param resCls the result configuration class
* @throws IllegalArgumentException if the result class is <b>null</b>
*/
- public ReloadingMultiFileConfigurationBuilder(Class<T> resCls)
+ public ReloadingMultiFileConfigurationBuilder(final Class<T> resCls)
{
super(resCls);
}
@@ -130,7 +130,7 @@ public class ReloadingMultiFileConfigura
*/
@Override
protected FileBasedConfigurationBuilder<T> createManagedBuilder(
- String fileName, Map<String, Object> params)
+ final String fileName, final Map<String, Object> params)
throws ConfigurationException
{
return new ReloadingFileBasedConfigurationBuilder<>(getResultClass(),
@@ -146,17 +146,17 @@ public class ReloadingMultiFileConfigura
*/
private ReloadingController createReloadingController()
{
- Set<ReloadingController> empty = Collections.emptySet();
+ final Set<ReloadingController> empty = Collections.emptySet();
return new CombinedReloadingController(empty)
{
@Override
public Collection<ReloadingController> getSubControllers()
{
- Collection<FileBasedConfigurationBuilder<T>> builders =
+ final Collection<FileBasedConfigurationBuilder<T>> builders =
getManagedBuilders().values();
- Collection<ReloadingController> controllers =
+ final Collection<ReloadingController> controllers =
new ArrayList<>(builders.size());
- for (FileBasedConfigurationBuilder<T> b : builders)
+ for (final FileBasedConfigurationBuilder<T> b : builders)
{
controllers.add(((ReloadingControllerSupport) b)
.getReloadingController());