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 17:29:00 UTC
svn commit: r1842129 - 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/commons/con...
Author: ggregory
Date: Thu Sep 27 17:28:59 2018
New Revision: 1842129
URL: http://svn.apache.org/viewvc?rev=1842129&view=rev
Log:
Statement unnecessarily nested within else clause.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/MultiFileConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileUtils.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractYAMLBasedConfiguration.java Thu Sep 27 17:28:59 2018
@@ -210,10 +210,7 @@ public class AbstractYAMLBasedConfigurat
{
throw new ConfigurationException("Error parsing", e);
}
- else
- {
- throw new ConfigurationException("Unable to load the configuration",
- e);
- }
+ throw new ConfigurationException("Unable to load the configuration",
+ e);
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java Thu Sep 27 17:28:59 2018
@@ -155,11 +155,8 @@ public class BaseHierarchicalConfigurati
{
return new BaseHierarchicalConfiguration();
}
- else
- {
- result.setSynchronizer(getSynchronizer());
- return result;
- }
+ result.setSynchronizer(getSynchronizer());
+ return result;
}
finally
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java Thu Sep 27 17:28:59 2018
@@ -896,25 +896,21 @@ public class CombinedConfiguration exten
}
return EMPTY_ROOT;
}
-
- else
+ Iterator<ConfigData> it = configurations.iterator();
+ ImmutableNode node = it.next().getTransformedRoot();
+ while (it.hasNext())
{
- Iterator<ConfigData> it = configurations.iterator();
- ImmutableNode node = it.next().getTransformedRoot();
- while (it.hasNext())
- {
- node = nodeCombiner.combine(node,
- it.next().getTransformedRoot());
- }
- if (getLogger().isDebugEnabled())
- {
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- PrintStream stream = new PrintStream(os);
- TreeUtils.printTree(stream, node);
- getLogger().debug(os.toString());
- }
- return node;
+ node = nodeCombiner.combine(node,
+ it.next().getTransformedRoot());
+ }
+ if (getLogger().isDebugEnabled())
+ {
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ PrintStream stream = new PrintStream(os);
+ TreeUtils.printTree(stream, node);
+ getLogger().debug(os.toString());
}
+ return node;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/CompositeConfiguration.java Thu Sep 27 17:28:59 2018
@@ -359,10 +359,7 @@ implements Cloneable
{
return firstMatchingConfiguration.getProperty(key);
}
- else
- {
- return null;
- }
+ return null;
}
@Override
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationUtils.java Thu Sep 27 17:28:59 2018
@@ -330,19 +330,16 @@ public final class ConfigurationUtils
return hc;
}
- else
+ BaseHierarchicalConfiguration hc = new BaseHierarchicalConfiguration();
+ if (engine != null)
{
- BaseHierarchicalConfiguration hc = new BaseHierarchicalConfiguration();
- if (engine != null)
- {
- hc.setExpressionEngine(engine);
- }
-
- // Per default, a DisabledListDelimiterHandler is set.
- // So list delimiters in property values are not an issue.
- hc.copy(conf);
- return hc;
+ hc.setExpressionEngine(engine);
}
+
+ // Per default, a DisabledListDelimiterHandler is set.
+ // So list delimiters in property values are not an issue.
+ hc.copy(conf);
+ return hc;
}
/**
@@ -365,16 +362,13 @@ public final class ConfigurationUtils
{
return null;
}
- else
+ try
{
- try
- {
- return (Configuration) clone(config);
- }
- catch (CloneNotSupportedException cnex)
- {
- throw new ConfigurationRuntimeException(cnex);
- }
+ return (Configuration) clone(config);
+ }
+ catch (CloneNotSupportedException cnex)
+ {
+ throw new ConfigurationRuntimeException(cnex);
}
}
@@ -439,11 +433,8 @@ public final class ConfigurationUtils
throw new ConfigurationRuntimeException(itex);
}
}
- else
- {
- throw new CloneNotSupportedException(obj.getClass().getName()
- + " does not implement Cloneable");
- }
+ throw new CloneNotSupportedException(obj.getClass().getName()
+ + " does not implement Cloneable");
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java Thu Sep 27 17:28:59 2018
@@ -349,10 +349,7 @@ public class DatabaseConfiguration exten
return (results.size() > 1) ? results : results
.get(0);
}
- else
- {
- return null;
- }
+ return null;
}
};
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/INIConfiguration.java Thu Sep 27 17:28:59 2018
@@ -791,10 +791,7 @@ public class INIConfiguration extends Ba
{
return '"' + value.replaceAll("\"", "\\\\\\\"") + '"';
}
- else
- {
- return value;
- }
+ return value;
}
/**
@@ -902,21 +899,17 @@ public class INIConfiguration extends Ba
{
return getGlobalSection();
}
-
- else
+ try
{
- try
- {
- return (SubnodeConfiguration) configurationAt(name, true);
- }
- catch (ConfigurationRuntimeException iex)
- {
- // the passed in key does not map to exactly one node
- // obtain the node for the section, create it on demand
- InMemoryNodeModel parentModel = getSubConfigurationParentModel();
- NodeSelector selector = parentModel.trackChildNodeWithCreation(null, name, this);
- return createSubConfigurationForTrackedNode(selector, this);
- }
+ return (SubnodeConfiguration) configurationAt(name, true);
+ }
+ catch (ConfigurationRuntimeException iex)
+ {
+ // the passed in key does not map to exactly one node
+ // obtain the node for the section, create it on demand
+ InMemoryNodeModel parentModel = getSubConfigurationParentModel();
+ NodeSelector selector = parentModel.trackChildNodeWithCreation(null, name, this);
+ return createSubConfigurationForTrackedNode(selector, this);
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/MapConfiguration.java Thu Sep 27 17:28:59 2018
@@ -171,10 +171,7 @@ public class MapConfiguration extends Ab
Collection<String> list = getListDelimiterHandler().split((String) value, !isTrimmingDisabled());
return list.size() > 1 ? list : list.iterator().next();
}
- else
- {
- return value;
- }
+ return value;
}
@Override
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java Thu Sep 27 17:28:59 2018
@@ -720,35 +720,28 @@ public class PropertiesConfigurationLayo
{
return s;
}
-
- else
+ if (!comment)
{
- if (!comment)
+ int pos = 0;
+ // find first comment character
+ while (PropertiesConfiguration.COMMENT_CHARS.indexOf(s
+ .charAt(pos)) < 0)
{
- int pos = 0;
- // find first comment character
- while (PropertiesConfiguration.COMMENT_CHARS.indexOf(s
- .charAt(pos)) < 0)
- {
- pos++;
- }
-
- // Remove leading spaces
pos++;
- while (pos < s.length()
- && Character.isWhitespace(s.charAt(pos)))
- {
- pos++;
- }
-
- return (pos < s.length()) ? s.substring(pos)
- : StringUtils.EMPTY;
}
- else
+
+ // Remove leading spaces
+ pos++;
+ while (pos < s.length()
+ && Character.isWhitespace(s.charAt(pos)))
{
- return COMMENT_PREFIX + s;
+ pos++;
}
+
+ return (pos < s.length()) ? s.substring(pos)
+ : StringUtils.EMPTY;
}
+ return COMMENT_PREFIX + s;
}
/**
@@ -766,17 +759,13 @@ public class PropertiesConfigurationLayo
{
return null;
}
-
- else
+ StringBuilder buf = new StringBuilder(commentLines.get(from));
+ for (int i = from + 1; i <= to; i++)
{
- StringBuilder buf = new StringBuilder(commentLines.get(from));
- for (int i = from + 1; i <= to; i++)
- {
- buf.append(CR);
- buf.append(commentLines.get(i));
- }
- return buf.toString();
+ buf.append(CR);
+ buf.append(commentLines.get(i));
}
+ return buf.toString();
}
/**
@@ -807,10 +796,7 @@ public class PropertiesConfigurationLayo
}
return index + 1;
}
- else
- {
- return 0;
- }
+ return 0;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java Thu Sep 27 17:28:59 2018
@@ -207,10 +207,7 @@ public class SubnodeConfiguration extend
{
return ((SubnodeConfiguration) getParent()).getRootNodeModel();
}
- else
- {
- return getParent().getNodeModel();
- }
+ return getParent().getNodeModel();
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java Thu Sep 27 17:28:59 2018
@@ -90,10 +90,7 @@ public class SubsetConfiguration extends
{
return prefix;
}
- else
- {
- return delimiter == null ? prefix + key : prefix + delimiter + key;
- }
+ return delimiter == null ? prefix + key : prefix + delimiter + key;
}
/**
@@ -109,21 +106,18 @@ public class SubsetConfiguration extends
{
throw new IllegalArgumentException("The parent key '" + key + "' is not in the subset.");
}
+ String modifiedKey = null;
+ if (key.length() == prefix.length())
+ {
+ modifiedKey = "";
+ }
else
{
- String modifiedKey = null;
- if (key.length() == prefix.length())
- {
- modifiedKey = "";
- }
- else
- {
- int i = prefix.length() + (delimiter != null ? delimiter.length() : 0);
- modifiedKey = key.substring(i);
- }
-
- return modifiedKey;
+ int i = prefix.length() + (delimiter != null ? delimiter.length() : 0);
+ modifiedKey = key.substring(i);
}
+
+ return modifiedKey;
}
/**
@@ -234,10 +228,7 @@ public class SubsetConfiguration extends
{
return ((AbstractConfiguration) parent).isThrowExceptionOnMissing();
}
- else
- {
- return super.isThrowExceptionOnMissing();
- }
+ return super.isThrowExceptionOnMissing();
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java Thu Sep 27 17:28:59 2018
@@ -281,10 +281,7 @@ public class XMLConfiguration extends Ba
{
return (rootElementName == null) ? DEFAULT_ROOT_NAME : rootElementName;
}
- else
- {
- return doc.getDocumentElement().getNodeName();
- }
+ return doc.getDocumentElement().getNodeName();
}
/**
@@ -818,10 +815,7 @@ public class XMLConfiguration extends Ba
{
return currentTrim;
}
- else
- {
- return !VALUE_PRESERVE.equals(attr.getValue());
- }
+ return !VALUE_PRESERVE.equals(attr.getValue());
}
/**
@@ -844,37 +838,34 @@ public class XMLConfiguration extends Ba
{
return getDocumentBuilder();
}
- else
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
+ if (isValidating())
{
- DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- if (isValidating())
+ factory.setValidating(true);
+ if (isSchemaValidation())
{
- factory.setValidating(true);
- if (isSchemaValidation())
- {
- factory.setNamespaceAware(true);
- factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
- }
+ factory.setNamespaceAware(true);
+ factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
}
+ }
- DocumentBuilder result = factory.newDocumentBuilder();
- result.setEntityResolver(this.entityResolver);
+ DocumentBuilder result = factory.newDocumentBuilder();
+ result.setEntityResolver(this.entityResolver);
- if (isValidating())
+ if (isValidating())
+ {
+ // register an error handler which detects validation errors
+ result.setErrorHandler(new DefaultHandler()
{
- // register an error handler which detects validation errors
- result.setErrorHandler(new DefaultHandler()
+ @Override
+ public void error(SAXParseException ex) throws SAXException
{
- @Override
- public void error(SAXParseException ex) throws SAXException
- {
- throw ex;
- }
- });
- }
- return result;
+ throw ex;
+ }
+ });
}
+ return result;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java Thu Sep 27 17:28:59 2018
@@ -584,15 +584,9 @@ public final class BeanHelper
throw new ConfigurationRuntimeException(
"Unknown bean factory: " + factoryName);
}
- else
- {
- return factory;
- }
- }
- else
- {
- return getDefaultBeanFactory();
+ return factory;
}
+ return getDefaultBeanFactory();
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java Thu Sep 27 17:28:59 2018
@@ -78,45 +78,42 @@ public class ConfigurationDynaClass impl
{
return null;
}
- else
- {
- Class<?> type = value.getClass();
-
- if (type == Byte.class)
- {
- type = Byte.TYPE;
- }
- if (type == Character.class)
- {
- type = Character.TYPE;
- }
- else if (type == Boolean.class)
- {
- type = Boolean.TYPE;
- }
- else if (type == Double.class)
- {
- type = Double.TYPE;
- }
- else if (type == Float.class)
- {
- type = Float.TYPE;
- }
- else if (type == Integer.class)
- {
- type = Integer.TYPE;
- }
- else if (type == Long.class)
- {
- type = Long.TYPE;
- }
- else if (type == Short.class)
- {
- type = Short.TYPE;
- }
+ Class<?> type = value.getClass();
- return new DynaProperty(name, type);
+ if (type == Byte.class)
+ {
+ type = Byte.TYPE;
+ }
+ if (type == Character.class)
+ {
+ type = Character.TYPE;
+ }
+ else if (type == Boolean.class)
+ {
+ type = Boolean.TYPE;
+ }
+ else if (type == Double.class)
+ {
+ type = Double.TYPE;
}
+ else if (type == Float.class)
+ {
+ type = Float.TYPE;
+ }
+ else if (type == Integer.class)
+ {
+ type = Integer.TYPE;
+ }
+ else if (type == Long.class)
+ {
+ type = Long.TYPE;
+ }
+ else if (type == Short.class)
+ {
+ type = Short.TYPE;
+ }
+
+ return new DynaProperty(name, type);
}
@Override
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/beanutils/XMLBeanDeclaration.java Thu Sep 27 17:28:59 2018
@@ -555,11 +555,8 @@ public class XMLBeanDeclaration implemen
return ConstructorArg.forValue(
getAttribute(child, ATTR_CTOR_VALUE), type);
}
- else
- {
- return ConstructorArg.forBeanDeclaration(
- createBeanDeclaration(child), type);
- }
+ return ConstructorArg.forBeanDeclaration(
+ createBeanDeclaration(child), type);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java Thu Sep 27 17:28:59 2018
@@ -196,11 +196,8 @@ public class BasicBuilderParameters impl
properties.remove(PROP_PREFIX_LOOKUPS);
return this;
}
- else
- {
- return setProperty(PROP_PREFIX_LOOKUPS,
- new HashMap<>(lookups));
- }
+ return setProperty(PROP_PREFIX_LOOKUPS,
+ new HashMap<>(lookups));
}
/**
@@ -217,11 +214,8 @@ public class BasicBuilderParameters impl
properties.remove(PROP_DEFAULT_LOOKUPS);
return this;
}
- else
- {
- return setProperty(PROP_DEFAULT_LOOKUPS, new ArrayList<>(
- lookups));
- }
+ return setProperty(PROP_DEFAULT_LOOKUPS, new ArrayList<>(
+ lookups));
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java Thu Sep 27 17:28:59 2018
@@ -270,10 +270,7 @@ public class BuilderConfigurationWrapper
{
return handleEventSourceInvocation(method, args);
}
- else
- {
- return handleConfigurationInvocation(method, args);
- }
+ return handleConfigurationInvocation(method, args);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/combined/BaseConfigurationBuilderProvider.java Thu Sep 27 17:28:59 2018
@@ -391,10 +391,7 @@ public class BaseConfigurationBuilderPro
{
return Collections.emptySet();
}
- else
- {
- return Collections.unmodifiableCollection(new ArrayList<>(
- paramCls));
- }
+ return Collections.unmodifiableCollection(new ArrayList<>(
+ paramCls));
}
}
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=1842129&r1=1842128&r2=1842129&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 17:28:59 2018
@@ -619,10 +619,7 @@ public class CombinedConfigurationBuilde
{
return Collections.emptySet();
}
- else
- {
- return Collections.unmodifiableSet(sourceData.builderNames());
- }
+ return Collections.unmodifiableSet(sourceData.builderNames());
}
/**
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=1842129&r1=1842128&r2=1842129&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 17:28:59 2018
@@ -143,10 +143,7 @@ public class MultiFileConfigurationBuild
{
return new ReloadableWrapperBuilder(wrapConfig, multiBuilder);
}
- else
- {
- return new WrapperBuilder(wrapConfig, multiBuilder);
- }
+ return new WrapperBuilder(wrapConfig, multiBuilder);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/LegacyListDelimiterHandler.java Thu Sep 27 17:28:59 2018
@@ -126,10 +126,7 @@ public class LegacyListDelimiterHandler
}
return buf.toString();
}
- else
- {
- return null;
- }
+ return null;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java Thu Sep 27 17:28:59 2018
@@ -253,13 +253,10 @@ final class PropertyConverter
{
return Character.valueOf(strValue.charAt(0));
}
- else
- {
- throw new ConversionException(
- String.format(
- "The value '%s' cannot be converted to a Character object!",
- strValue));
- }
+ throw new ConversionException(
+ String.format(
+ "The value '%s' cannot be converted to a Character object!",
+ strValue));
}
/**
@@ -276,10 +273,7 @@ final class PropertyConverter
{
return (Byte) n;
}
- else
- {
- return n.byteValue();
- }
+ return n.byteValue();
}
/**
@@ -296,10 +290,7 @@ final class PropertyConverter
{
return (Short) n;
}
- else
- {
- return n.shortValue();
- }
+ return n.shortValue();
}
/**
@@ -316,10 +307,7 @@ final class PropertyConverter
{
return (Integer) n;
}
- else
- {
- return n.intValue();
- }
+ return n.intValue();
}
/**
@@ -336,10 +324,7 @@ final class PropertyConverter
{
return (Long) n;
}
- else
- {
- return n.longValue();
- }
+ return n.longValue();
}
/**
@@ -356,10 +341,7 @@ final class PropertyConverter
{
return (Float) n;
}
- else
- {
- return new Float(n.floatValue());
- }
+ return new Float(n.floatValue());
}
/**
@@ -376,10 +358,7 @@ final class PropertyConverter
{
return (Double) n;
}
- else
- {
- return new Double(n.doubleValue());
- }
+ return new Double(n.doubleValue());
}
/**
@@ -396,10 +375,7 @@ final class PropertyConverter
{
return (BigInteger) n;
}
- else
- {
- return BigInteger.valueOf(n.longValue());
- }
+ return BigInteger.valueOf(n.longValue());
}
/**
@@ -416,10 +392,7 @@ final class PropertyConverter
{
return (BigDecimal) n;
}
- else
- {
- return new BigDecimal(n.doubleValue());
- }
+ return new BigDecimal(n.doubleValue());
}
/**
@@ -440,56 +413,53 @@ final class PropertyConverter
{
return (Number) value;
}
- else
+ String str = value.toString();
+ if (str.startsWith(HEX_PREFIX))
{
- String str = value.toString();
- if (str.startsWith(HEX_PREFIX))
+ try
{
- try
- {
- return new BigInteger(str.substring(HEX_PREFIX.length()), HEX_RADIX);
- }
- catch (NumberFormatException nex)
- {
- throw new ConversionException("Could not convert " + str
- + " to " + targetClass.getName()
- + "! Invalid hex number.", nex);
- }
- }
-
- if (str.startsWith(BIN_PREFIX))
- {
- try
- {
- return new BigInteger(str.substring(BIN_PREFIX.length()), BIN_RADIX);
- }
- catch (NumberFormatException nex)
- {
- throw new ConversionException("Could not convert " + str
- + " to " + targetClass.getName()
- + "! Invalid binary number.", nex);
- }
+ return new BigInteger(str.substring(HEX_PREFIX.length()), HEX_RADIX);
}
+ catch (NumberFormatException nex)
+ {
+ throw new ConversionException("Could not convert " + str
+ + " to " + targetClass.getName()
+ + "! Invalid hex number.", nex);
+ }
+ }
+ if (str.startsWith(BIN_PREFIX))
+ {
try
{
- Constructor<?> constr = targetClass.getConstructor(CONSTR_ARGS);
- return (Number) constr.newInstance(str);
+ return new BigInteger(str.substring(BIN_PREFIX.length()), BIN_RADIX);
}
- catch (InvocationTargetException itex)
+ catch (NumberFormatException nex)
{
throw new ConversionException("Could not convert " + str
- + " to " + targetClass.getName(), itex
- .getTargetException());
- }
- catch (Exception ex)
- {
- // Treat all possible exceptions the same way
- throw new ConversionException(
- "Conversion error when trying to convert " + str
- + " to " + targetClass.getName(), ex);
+ + " to " + targetClass.getName()
+ + "! Invalid binary number.", nex);
}
}
+
+ try
+ {
+ Constructor<?> constr = targetClass.getConstructor(CONSTR_ARGS);
+ return (Number) constr.newInstance(str);
+ }
+ catch (InvocationTargetException itex)
+ {
+ throw new ConversionException("Could not convert " + str
+ + " to " + targetClass.getName(), itex
+ .getTargetException());
+ }
+ catch (Exception ex)
+ {
+ // Treat all possible exceptions the same way
+ throw new ConversionException(
+ "Conversion error when trying to convert " + str
+ + " to " + targetClass.getName(), ex);
+ }
}
/**
@@ -664,10 +634,7 @@ final class PropertyConverter
return new Locale(language, country, variant);
}
- else
- {
- throw new ConversionException("The value " + value + " can't be converted to a Locale");
- }
+ throw new ConversionException("The value " + value + " can't be converted to a Locale");
}
else
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/DefaultFileSystem.java Thu Sep 27 17:28:59 2018
@@ -67,35 +67,32 @@ public class DefaultFileSystem extends F
{
return getOutputStream(file);
}
- else
+ // for non file URLs save through an URLConnection
+ OutputStream out;
+ try
{
- // for non file URLs save through an URLConnection
- OutputStream out;
- try
- {
- URLConnection connection = url.openConnection();
- connection.setDoOutput(true);
+ URLConnection connection = url.openConnection();
+ connection.setDoOutput(true);
- // use the PUT method for http URLs
- if (connection instanceof HttpURLConnection)
- {
- HttpURLConnection conn = (HttpURLConnection) connection;
- conn.setRequestMethod("PUT");
- }
+ // use the PUT method for http URLs
+ if (connection instanceof HttpURLConnection)
+ {
+ HttpURLConnection conn = (HttpURLConnection) connection;
+ conn.setRequestMethod("PUT");
+ }
- out = connection.getOutputStream();
+ out = connection.getOutputStream();
- // check the response code for http URLs and throw an exception if an error occured
- if (connection instanceof HttpURLConnection)
- {
- out = new HttpOutputStream(out, (HttpURLConnection) connection);
- }
- return out;
- }
- catch (IOException e)
+ // check the response code for http URLs and throw an exception if an error occured
+ if (connection instanceof HttpURLConnection)
{
- throw new ConfigurationException("Could not save to URL " + url, e);
+ out = new HttpOutputStream(out, (HttpURLConnection) connection);
}
+ return out;
+ }
+ catch (IOException e)
+ {
+ throw new ConfigurationException("Could not save to URL " + url, e);
}
}
@@ -199,11 +196,8 @@ public class DefaultFileSystem extends F
{
return new URL(file);
}
- else
- {
- URL base = new URL(basePath);
- return new URL(base, file);
- }
+ URL base = new URL(basePath);
+ return new URL(base, file);
}
catch (MalformedURLException uex)
{
@@ -223,26 +217,23 @@ public class DefaultFileSystem extends F
return new URL(fileName);
//url = new URL(name);
}
- else
- {
- URL baseURL = new URL(basePath);
- url = new URL(baseURL, fileName);
+ URL baseURL = new URL(basePath);
+ url = new URL(baseURL, fileName);
- // check if the file exists
- InputStream in = null;
- try
- {
- in = url.openStream();
- }
- finally
+ // check if the file exists
+ InputStream in = null;
+ try
+ {
+ in = url.openStream();
+ }
+ finally
+ {
+ if (in != null)
{
- if (in != null)
- {
- in.close();
- }
+ in.close();
}
- return url;
}
+ return url;
}
catch (IOException e)
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java Thu Sep 27 17:28:59 2018
@@ -372,10 +372,7 @@ public final class FileLocatorUtils
{
return s;
}
- else
- {
- return s.substring(0, s.lastIndexOf("/") + 1);
- }
+ return s.substring(0, s.lastIndexOf("/") + 1);
}
/**
@@ -397,10 +394,7 @@ public final class FileLocatorUtils
{
return null;
}
- else
- {
- return path.substring(path.lastIndexOf("/") + 1);
- }
+ return path.substring(path.lastIndexOf("/") + 1);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileUtils.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileUtils.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileUtils.java Thu Sep 27 17:28:59 2018
@@ -54,11 +54,10 @@ class FileUtils {
public static File toFile(final URL url) {
if (url == null || !"file".equalsIgnoreCase(url.getProtocol())) {
return null;
- } else {
- String filename = url.getFile().replace('/', File.separatorChar);
- filename = decodeUrl(filename);
- return new File(filename);
}
+ String filename = url.getFile().replace('/', File.separatorChar);
+ filename = decodeUrl(filename);
+ return new File(filename);
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java Thu Sep 27 17:28:59 2018
@@ -152,10 +152,7 @@ public class HomeDirectoryLocationStrate
return FileLocatorUtils.appendPath(getHomeDirectory(),
locator.getBasePath());
}
- else
- {
- return getHomeDirectory();
- }
+ return getHomeDirectory();
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java Thu Sep 27 17:28:59 2018
@@ -502,10 +502,7 @@ public class XMLPropertyListConfiguratio
{
return stack.get(stack.size() - 1);
}
- else
- {
- return null;
- }
+ return null;
}
/**
@@ -534,10 +531,7 @@ public class XMLPropertyListConfiguratio
{
return stack.remove(stack.size() - 1);
}
- else
- {
- return null;
- }
+ return null;
}
/**
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java Thu Sep 27 17:28:59 2018
@@ -274,9 +274,6 @@ public class FileHandlerReloadingDetecto
return null;
}
}
- else
- {
- return FileLocatorUtils.fileFromURL(url);
- }
+ return FileLocatorUtils.fileFromURL(url);
}
}
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java Thu Sep 27 17:28:59 2018
@@ -511,11 +511,8 @@ public class CatalogResolver implements
{
break;
}
- else
- {
- // try again!
- continue;
- }
+ // try again!
+ continue;
}
finally
{
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/DefaultEntityResolver.java Thu Sep 27 17:28:59 2018
@@ -112,11 +112,8 @@ public class DefaultEntityResolver imple
throw new SAXException(e);
}
}
- else
- {
- // default processing behavior
- return null;
- }
+ // default processing behavior
+ return null;
}
/**
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesConfigurationLayout.java Thu Sep 27 17:28:59 2018
@@ -842,18 +842,12 @@ public class TestPropertiesConfiguration
{
return super.propertyLoaded(key, value);
}
- else
+ if (PropertiesConfiguration.getInclude().equals(key))
{
- if (PropertiesConfiguration.getInclude().equals(key))
- {
- getLayout().load(this, builder.getReader());
- return false;
- }
- else
- {
- return true;
- }
+ getLayout().load(this, builder.getReader());
+ return false;
}
+ return true;
}
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java?rev=1842129&r1=1842128&r2=1842129&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/web/TestAppletConfiguration.java Thu Sep 27 17:28:59 2018
@@ -118,10 +118,7 @@ public class TestAppletConfiguration ext
{
return new AppletConfiguration(new Applet());
}
- else
- {
- return new BaseConfiguration();
- }
+ return new BaseConfiguration();
}
@Override