This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit 63386c88f07ffdbb237b84777c97916ca1746839
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Sep 12 16:20:15 2019 -0400
Remove unnecessary parens in ternary expression tests.
Also in a select few other spots.
---
.../configuration2/AbstractConfiguration.java | 18 +++++++++---------
.../AbstractHierarchicalConfiguration.java | 4 ++--
.../BaseHierarchicalConfiguration.java | 6 +++---
.../configuration2/CombinedConfiguration.java | 4 ++--
.../configuration2/ConfigurationXMLReader.java | 2 +-
.../commons/configuration2/DataConfiguration.java | 4 ++--
.../configuration2/DatabaseConfiguration.java | 4 ++--
.../HierarchicalConfigurationXMLReader.java | 2 +-
.../commons/configuration2/SubnodeConfiguration.java | 2 +-
.../commons/configuration2/SubsetConfiguration.java | 2 +-
.../configuration2/XMLPropertiesConfiguration.java | 2 +-
.../commons/configuration2/beanutils/BeanHelper.java | 2 +-
.../beanutils/ConfigurationDynaBean.java | 2 +-
.../configuration2/beanutils/DefaultBeanFactory.java | 2 +-
.../builder/BasicConfigurationBuilder.java | 2 +-
.../builder/BuilderConfigurationWrapperFactory.java | 2 +-
.../builder/DefaultReloadingDetectorFactory.java | 2 +-
.../builder/FileBasedBuilderParametersImpl.java | 2 +-
.../ReloadingFileBasedConfigurationBuilder.java | 4 ++--
.../combined/CombinedConfigurationBuilder.java | 4 ++--
.../FileExtensionConfigurationBuilderProvider.java | 2 +-
.../builder/fluent/Configurations.java | 2 +-
.../configuration2/builder/fluent/Parameters.java | 2 +-
.../convert/AbstractListDelimiterHandler.java | 2 +-
.../configuration2/convert/PropertyConverter.java | 6 +++---
.../interpol/ConfigurationInterpolator.java | 2 +-
.../commons/configuration2/interpol/ExprLookup.java | 2 +-
.../commons/configuration2/io/FileHandler.java | 4 ++--
.../commons/configuration2/io/FileLocator.java | 2 +-
.../commons/configuration2/io/FileLocatorUtils.java | 8 ++++----
.../apache/commons/configuration2/io/FileSystem.java | 2 +-
.../io/HomeDirectoryLocationStrategy.java | 2 +-
.../plist/PropertyListConfiguration.java | 2 +-
.../reloading/FileHandlerReloadingDetector.java | 2 +-
.../reloading/PeriodicReloadingTrigger.java | 2 +-
.../spring/ConfigurationPropertiesFactoryBean.java | 4 ++--
.../configuration2/sync/ReadWriteSynchronizer.java | 2 +-
.../configuration2/tree/DefaultExpressionEngine.java | 2 +-
.../configuration2/tree/InMemoryNodeModel.java | 8 ++++----
.../configuration2/tree/ModelTransaction.java | 20 ++++++++++----------
.../commons/configuration2/tree/NodeSelector.java | 2 +-
.../commons/configuration2/tree/NodeTracker.java | 6 +++---
.../configuration2/tree/OverrideCombiner.java | 2 +-
.../configuration2/tree/ReferenceTracker.java | 2 +-
.../xpath/ConfigurationNodeIteratorAttribute.java | 2 +-
.../tree/xpath/ConfigurationNodeIteratorBase.java | 2 +-
.../DatabaseConfigurationTestHelper.java | 2 +-
.../configuration2/MockInitialContextFactory.java | 2 +-
.../TestAbstractHierarchicalConfiguration.java | 2 +-
.../commons/configuration2/TestXMLConfiguration.java | 2 +-
.../combined/TestConfigurationDeclaration.java | 2 +-
...loadingCombinedConfigurationBuilderFileBased.java | 2 +-
.../plist/TestPropertyListConfiguration.java | 2 +-
.../tree/TestInMemoryNodeModelTrackedNodes.java | 2 +-
.../configuration2/tree/xpath/AbstractXPathTest.java | 4 ++--
55 files changed, 93 insertions(+), 93 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index 4886ceb..44fb31a 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -316,7 +316,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
// instance may be changed by another thread
final ConfigurationInterpolator ciOld = getInterpolator();
final ConfigurationInterpolator ciNew =
- (ciOld != null) ? ciOld : new ConfigurationInterpolator();
+ ciOld != null ? ciOld : new ConfigurationInterpolator();
ciNew.registerLookups(lookups);
success = interpolator.compareAndSet(ciOld, ciNew);
} while (!success);
@@ -346,7 +346,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
{
final ConfigurationInterpolator ciOld = getInterpolator();
final ConfigurationInterpolator ciNew =
- (ciOld != null) ? ciOld : new ConfigurationInterpolator();
+ ciOld != null ? ciOld : new ConfigurationInterpolator();
Lookup confLookup = findConfigurationLookup(ciNew);
if (confLookup == null)
{
@@ -380,7 +380,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
{
final ConfigurationInterpolator ciOld = getInterpolator();
final ConfigurationInterpolator ciNew =
- (ciOld != null) ? ciOld : new ConfigurationInterpolator();
+ ciOld != null ? ciOld : new ConfigurationInterpolator();
ciNew.setParentInterpolator(parent);
success = interpolator.compareAndSet(ciOld, ciNew);
} while (!success);
@@ -557,7 +557,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
public final Synchronizer getSynchronizer()
{
final Synchronizer sync = synchronizer;
- return (sync != null) ? sync : NoOpSynchronizer.INSTANCE;
+ return sync != null ? sync : NoOpSynchronizer.INSTANCE;
}
/**
@@ -1355,7 +1355,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
public String getString(final String key, final String defaultValue)
{
final String result = convert(String.class, key, null, false);
- return (result != null) ? result : interpolate(defaultValue);
+ return result != null ? result : interpolate(defaultValue);
}
/**
@@ -1375,7 +1375,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
}
final String value = getString(key);
- return (value != null) ? decoder.decode(value) : null;
+ return value != null ? decoder.decode(value) : null;
}
/**
@@ -1419,7 +1419,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
public String[] getStringArray(final String key)
{
final String[] result = (String[]) getArray(String.class, key);
- return (result == null) ? new String[0] : result;
+ return result == null ? new String[0] : result;
}
/**
@@ -1561,7 +1561,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
}
final Collection<T> targetCol =
- (target != null) ? target : new ArrayList<>();
+ target != null ? target : new ArrayList<>();
getConversionHandler().toCollection(src, cls, getInterpolator(),
targetCol);
return targetCol;
@@ -1701,7 +1701,7 @@ public abstract class AbstractConfiguration extends
BaseEventSource implements C
*/
protected final void initLogger(final ConfigurationLogger log)
{
- this.log = (log != null) ? log : ConfigurationLogger.newDummyLogger();
+ this.log = log != null ? log : ConfigurationLogger.newDummyLogger();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
index ac2014c..252512d 100644
---
a/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/AbstractHierarchicalConfiguration.java
@@ -253,7 +253,7 @@ public abstract class AbstractHierarchicalConfiguration<T>
extends AbstractConfi
@Override
public ExpressionEngine getExpressionEngine()
{
- return (expressionEngine != null) ? expressionEngine
+ return expressionEngine != null ? expressionEngine
: DefaultExpressionEngine.INSTANCE;
}
@@ -303,7 +303,7 @@ public abstract class AbstractHierarchicalConfiguration<T>
extends AbstractConfi
{
return null;
}
- return (list.size() == 1) ? list.get(0) : list;
+ return list.size() == 1 ? list.get(0) : list;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
b/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
index 298eee2..dc3c60e 100644
---
a/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/BaseHierarchicalConfiguration.java
@@ -696,7 +696,7 @@ public class BaseHierarchicalConfiguration extends
AbstractHierarchicalConfigura
private static NodeModel<ImmutableNode> createNodeModel(
final HierarchicalConfiguration<ImmutableNode> c)
{
- final ImmutableNode root = (c != null) ? obtainRootNode(c) : null;
+ final ImmutableNode root = c != null ? obtainRootNode(c) : null;
return new InMemoryNodeModel(root);
}
@@ -836,7 +836,7 @@ public class BaseHierarchicalConfiguration extends
AbstractHierarchicalConfigura
// Insert all new nodes
final ImmutableNode sibling2 =
- (refHandler.getReference(nd) == null) ? null : nd;
+ refHandler.getReference(nd) == null ? null : nd;
for (final ImmutableNode insertNode : newNodes)
{
if (refHandler.getReference(insertNode) == null)
@@ -977,7 +977,7 @@ public class BaseHierarchicalConfiguration extends
AbstractHierarchicalConfigura
final boolean attributeChanged =
interpolateAttributes(node, handler,
interpolatedAttributes);
final ImmutableNode newNode =
- (valueChanged(value, handler.getValue(node)) ||
attributeChanged) ? new ImmutableNode.Builder()
+ valueChanged(value, handler.getValue(node)) ||
attributeChanged ? new ImmutableNode.Builder()
.name(handler.nodeName(node)).value(value)
.addAttributes(interpolatedAttributes).create()
: node;
diff --git
a/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
b/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
index a46f29c..1c8c60f 100644
--- a/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/CombinedConfiguration.java
@@ -230,7 +230,7 @@ public class CombinedConfiguration extends
BaseHierarchicalConfiguration impleme
*/
public CombinedConfiguration(final NodeCombiner comb)
{
- nodeCombiner = (comb != null) ? comb : DEFAULT_COMBINER;
+ nodeCombiner = comb != null ? comb : DEFAULT_COMBINER;
initChildCollections();
}
@@ -1084,7 +1084,7 @@ public class CombinedConfiguration extends
BaseHierarchicalConfiguration impleme
public ImmutableNode getTransformedRoot()
{
final ImmutableNode configRoot = getRootNodeOfConfiguration();
- return (atPath == null) ? configRoot : prependAtPath(configRoot);
+ return atPath == null ? configRoot : prependAtPath(configRoot);
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java
b/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java
index 88015df..9ae0364 100644
---
a/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java
+++
b/src/main/java/org/apache/commons/configuration2/ConfigurationXMLReader.java
@@ -264,7 +264,7 @@ public abstract class ConfigurationXMLReader implements
XMLReader
{
try
{
- final Attributes at = (attribs == null) ? EMPTY_ATTRS :
attribs;
+ final Attributes at = attribs == null ? EMPTY_ATTRS : attribs;
getContentHandler().startElement(NS_URI, name, name, at);
}
catch (final SAXException ex)
diff --git
a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
index 7caa17e..673d430 100644
--- a/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DataConfiguration.java
@@ -1688,7 +1688,7 @@ public class DataConfiguration extends
AbstractConfiguration
private DefaultConversionHandler getOriginalConversionHandler()
{
final ConversionHandler handler = super.getConversionHandler();
- return (DefaultConversionHandler) ((handler instanceof
DefaultConversionHandler) ? handler
+ return (DefaultConversionHandler) (handler instanceof
DefaultConversionHandler ? handler
: null);
}
@@ -1726,7 +1726,7 @@ public class DataConfiguration extends
AbstractConfiguration
final DefaultConversionHandler orgHandler =
getOriginalConversionHandler();
- return (orgHandler != null) ? orgHandler.getDateFormat() : null;
+ return orgHandler != null ? orgHandler.getDateFormat() : null;
}
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
index b82865e..2d8554a 100644
--- a/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
@@ -344,7 +344,7 @@ public class DatabaseConfiguration extends
AbstractConfiguration
}
if (!results.isEmpty())
{
- return (results.size() > 1) ? results : results
+ return results.size() > 1 ? results : results
.get(0);
}
return null;
@@ -673,7 +673,7 @@ public class DatabaseConfiguration extends
AbstractConfiguration
private static Object convertClob(final Clob clob) throws SQLException
{
final int len = (int) clob.length();
- return (len > 0) ? clob.getSubString(1, len) : StringUtils.EMPTY;
+ return len > 0 ? clob.getSubString(1, len) : StringUtils.EMPTY;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
index 4037b25..e8dd560 100644
---
a/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
+++
b/src/main/java/org/apache/commons/configuration2/HierarchicalConfigurationXMLReader.java
@@ -201,7 +201,7 @@ public class HierarchicalConfigurationXMLReader<T> extends
private String nodeName(final T node, final NodeHandler<T> handler)
{
final String nodeName = handler.nodeName(node);
- return (nodeName == null) ? getRootName() : nodeName;
+ return nodeName == null ? getRootName() : nodeName;
}
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
b/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
index 9626d71..caa6602 100644
--- a/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/SubnodeConfiguration.java
@@ -170,7 +170,7 @@ public class SubnodeConfiguration extends
BaseHierarchicalConfiguration
*/
public void close()
{
- (getTrackedModel()).close();
+ getTrackedModel().close();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
index 4edc774..925f865 100644
--- a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
@@ -237,7 +237,7 @@ public class SubsetConfiguration extends
AbstractConfiguration
@Override
public ListDelimiterHandler getListDelimiterHandler()
{
- return (parent instanceof AbstractConfiguration) ?
((AbstractConfiguration) parent)
+ return parent instanceof AbstractConfiguration ?
((AbstractConfiguration) parent)
.getListDelimiterHandler() : super.getListDelimiterHandler();
}
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
index 624b243..85152a0 100644
---
a/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/XMLPropertiesConfiguration.java
@@ -206,7 +206,7 @@ public class XMLPropertiesConfiguration extends
BaseConfiguration implements
{
final PrintWriter writer = new PrintWriter(out);
- String encoding = (locator != null) ? locator.getEncoding() : null;
+ String encoding = locator != null ? locator.getEncoding() : null;
if (encoding == null)
{
encoding = DEFAULT_ENCODING;
diff --git
a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
index 7b03664..9675c10 100644
--- a/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
+++ b/src/main/java/org/apache/commons/configuration2/beanutils/BeanHelper.java
@@ -116,7 +116,7 @@ public final class BeanHelper
public BeanHelper(final BeanFactory defFactory)
{
defaultBeanFactory =
- (defFactory != null) ? defFactory :
DefaultBeanFactory.INSTANCE;
+ defFactory != null ? defFactory : DefaultBeanFactory.INSTANCE;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java
b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java
index d15724e..6a8075b 100644
---
a/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java
+++
b/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaBean.java
@@ -247,6 +247,6 @@ public class ConfigurationDynaBean extends ConfigurationMap
implements DynaBean
+ "' does not exist.");
}
- return (property instanceof List) || property.getClass().isArray();
+ return property instanceof List || property.getClass().isArray();
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
b/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
index 6d61259..54cc1b2 100644
---
a/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
+++
b/src/main/java/org/apache/commons/configuration2/beanutils/DefaultBeanFactory.java
@@ -82,7 +82,7 @@ public class DefaultBeanFactory implements BeanFactory
public DefaultBeanFactory(final ConversionHandler convHandler)
{
conversionHandler =
- (convHandler != null) ? convHandler
+ convHandler != null ? convHandler
: DefaultConversionHandler.INSTANCE;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
index 6f6a2f6..19e2b48 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/BasicConfigurationBuilder.java
@@ -515,7 +515,7 @@ public class BasicConfigurationBuilder<T extends
ImmutableConfiguration> impleme
{
final BeanHelper helper =
BasicBuilderParameters.fetchBeanHelper(getParameters());
- return (helper != null) ? helper : BeanHelper.INSTANCE;
+ return helper != null ? helper : BeanHelper.INSTANCE;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
b/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
index 74d9ac9..61c611e 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/BuilderConfigurationWrapperFactory.java
@@ -301,7 +301,7 @@ public class BuilderConfigurationWrapperFactory
throws Exception
{
final Object target =
- (EventSourceSupport.DUMMY == eventSourceSupport) ?
ConfigurationUtils
+ EventSourceSupport.DUMMY == eventSourceSupport ?
ConfigurationUtils
.asEventSource(this, true) : builder;
return method.invoke(target, args);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java
b/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java
index eef4dfc..d749921 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/DefaultReloadingDetectorFactory.java
@@ -43,7 +43,7 @@ public class DefaultReloadingDetectorFactory implements
final Long refreshDelay = params.getReloadingRefreshDelay();
final FileHandlerReloadingDetector fileHandlerReloadingDetector =
- (refreshDelay != null) ? new FileHandlerReloadingDetector(
+ refreshDelay != null ? new FileHandlerReloadingDetector(
handler, refreshDelay) : new FileHandlerReloadingDetector(
handler);
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java
b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java
index c2e84d6..9b6c0a5 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/FileBasedBuilderParametersImpl.java
@@ -88,7 +88,7 @@ public class FileBasedBuilderParametersImpl extends
BasicBuilderParameters
*/
public FileBasedBuilderParametersImpl(final FileHandler handler)
{
- fileHandler = (handler != null) ? handler : new FileHandler();
+ fileHandler = handler != null ? handler : new FileHandler();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java
b/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java
index 0901be6..de65358 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/ReloadingFileBasedConfigurationBuilder.java
@@ -233,7 +233,7 @@ public class ReloadingFileBasedConfigurationBuilder<T
extends FileBasedConfigura
public boolean isReloadingRequired()
{
final ReloadingDetector detector = resultReloadingDetector;
- return (detector != null) && detector.isReloadingRequired();
+ return detector != null && detector.isReloadingRequired();
}
};
}
@@ -249,6 +249,6 @@ public class ReloadingFileBasedConfigurationBuilder<T
extends FileBasedConfigura
final FileBasedBuilderParametersImpl params)
{
final ReloadingDetectorFactory factory =
params.getReloadingDetectorFactory();
- return (factory != null) ? factory : DEFAULT_DETECTOR_FACTORY;
+ return factory != null ? factory : DEFAULT_DETECTOR_FACTORY;
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
index 5dad820..f13d459 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/combined/CombinedConfigurationBuilder.java
@@ -1127,7 +1127,7 @@ public class CombinedConfigurationBuilder extends
BasicConfigurationBuilder<Comb
FileBasedConfigurationBuilder fileBuilder =
(FileBasedConfigurationBuilder) defBuilder;
final URL url = fileBuilder.getFileHandler().getURL();
- currentXMLParameters.setBasePath((url != null) ? url
+ currentXMLParameters.setBasePath(url != null ? url
.toExternalForm() : fileBuilder.getFileHandler()
.getBasePath());
}
@@ -1318,7 +1318,7 @@ public class CombinedConfigurationBuilder extends
BasicConfigurationBuilder<Comb
private Map<String, ? extends Lookup> fetchPrefixLookups()
{
final CombinedConfiguration cc = getConfigurationUnderConstruction();
- return (cc != null) ? cc.getInterpolator().getLookups() : null;
+ return cc != null ? cc.getInterpolator().getLookups() : null;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java
b/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java
index 9cf1d37..8208d2c 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/combined/FileExtensionConfigurationBuilderProvider.java
@@ -172,6 +172,6 @@ public class FileExtensionConfigurationBuilderProvider
extends
}
final int pos = fileName.lastIndexOf(EXT_SEPARATOR);
- return (pos < 0) ? null : fileName.substring(pos + 1);
+ return pos < 0 ? null : fileName.substring(pos + 1);
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
b/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
index 5c07d71..418a367 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/fluent/Configurations.java
@@ -103,7 +103,7 @@ public class Configurations
*/
public Configurations(final Parameters params)
{
- parameters = (params != null) ? params : new Parameters();
+ parameters = params != null ? params : new Parameters();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java
b/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java
index f34814f..cf6ee0a 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/fluent/Parameters.java
@@ -109,7 +109,7 @@ public final class Parameters
public Parameters(final DefaultParametersManager manager)
{
defaultParametersManager =
- (manager != null) ? manager : new DefaultParametersManager();
+ manager != null ? manager : new DefaultParametersManager();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
index 1f304c0..89e6618 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/AbstractListDelimiterHandler.java
@@ -88,7 +88,7 @@ public abstract class AbstractListDelimiterHandler implements
public Object escape(final Object value, final ValueTransformer
transformer)
{
final Object escValue =
- (value instanceof String) ? escapeString((String) value)
+ value instanceof String ? escapeString((String) value)
: value;
return transformer.transformValue(escValue);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
index 8df939f..efd2a11 100644
---
a/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
+++
b/src/main/java/org/apache/commons/configuration2/convert/PropertyConverter.java
@@ -624,11 +624,11 @@ final class PropertyConverter
final String[] elements = ((String) value).split("_");
final int size = elements.length;
- if (size >= 1 && ((elements[0]).length() == 2 ||
(elements[0]).length() == 0))
+ if (size >= 1 && (elements[0].length() == 2 ||
elements[0].length() == 0))
{
final String language = elements[0];
- final String country = (size >= 2) ? elements[1] : "";
- final String variant = (size >= 3) ? elements[2] : "";
+ final String country = size >= 2 ? elements[1] : "";
+ final String variant = size >= 3 ? elements[2] : "";
return new Locale(language, country, variant);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
index 6bda7df..33d91c6 100644
---
a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
+++
b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
@@ -194,7 +194,7 @@ public class ConfigurationInterpolator
throw new IllegalArgumentException(
"InterpolatorSpecification must not be null!");
}
- return (spec.getInterpolator() != null) ? spec.getInterpolator()
+ return spec.getInterpolator() != null ? spec.getInterpolator()
: createInterpolator(spec);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
index 9d16a7b..bca2a5e 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
@@ -229,7 +229,7 @@ public class ExprLookup implements Lookup
{
final Expression exp = engine.createExpression(result);
final Object exprResult = exp.evaluate(createContext());
- result = (exprResult != null) ? String.valueOf(exprResult) : null;
+ result = exprResult != null ? String.valueOf(exprResult) : null;
}
catch (final Exception e)
{
diff --git
a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
index 1e177e2..9aee68e 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileHandler.java
@@ -393,7 +393,7 @@ public class FileHandler
{
final String fileName = file.getName();
final String basePath =
- (file.getParentFile() != null) ? file.getParentFile()
+ file.getParentFile() != null ? file.getParentFile()
.getAbsolutePath() : null;
new Updater()
{
@@ -448,7 +448,7 @@ public class FileHandler
public URL getURL()
{
final FileLocator locator = getFileLocator();
- return (locator.getSourceURL() != null) ? locator.getSourceURL()
+ return locator.getSourceURL() != null ? locator.getSourceURL()
: FileLocatorUtils.locate(locator);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
b/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
index 87e3077..f0d02f7 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocator.java
@@ -227,7 +227,7 @@ public final class FileLocator
*/
private String sourceURLAsString()
{
- return (sourceURL != null) ? sourceURL.toExternalForm()
+ return sourceURL != null ? sourceURL.toExternalForm()
: StringUtils.EMPTY;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
index ed4fc9f..9ef8311 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileLocatorUtils.java
@@ -234,7 +234,7 @@ public final class FileLocatorUtils
*/
public static boolean isLocationDefined(final FileLocator locator)
{
- return (locator != null)
+ return locator != null
&& (locator.getFileName() != null || locator.getSourceURL() !=
null);
}
@@ -296,7 +296,7 @@ public final class FileLocatorUtils
}
final URL url = locate(locator);
- return (url != null) ? createFullyInitializedLocatorFromURL(locator,
+ return url != null ? createFullyInitializedLocatorFromURL(locator,
url) : null;
}
@@ -610,7 +610,7 @@ public final class FileLocatorUtils
*/
static FileSystem obtainFileSystem(final FileLocator locator)
{
- return (locator != null) ? ObjectUtils.defaultIfNull(
+ return locator != null ? ObjectUtils.defaultIfNull(
locator.getFileSystem(), DEFAULT_FILE_SYSTEM)
: DEFAULT_FILE_SYSTEM;
}
@@ -627,7 +627,7 @@ public final class FileLocatorUtils
*/
static FileLocationStrategy obtainLocationStrategy(final FileLocator
locator)
{
- return (locator != null) ? ObjectUtils.defaultIfNull(
+ return locator != null ? ObjectUtils.defaultIfNull(
locator.getLocationStrategy(), DEFAULT_LOCATION_STRATEGY)
: DEFAULT_LOCATION_STRATEGY;
}
diff --git a/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
b/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
index a696120..8aa998b 100644
--- a/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
@@ -47,7 +47,7 @@ public abstract class FileSystem
public ConfigurationLogger getLogger()
{
final ConfigurationLogger result = log;
- return (result != null) ? result : DEFAULT_LOG;
+ return result != null ? result : DEFAULT_LOG;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java
b/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java
index 27607b4..866502a 100644
---
a/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java
+++
b/src/main/java/org/apache/commons/configuration2/io/HomeDirectoryLocationStrategy.java
@@ -164,6 +164,6 @@ public class HomeDirectoryLocationStrategy implements
FileLocationStrategy
*/
private static String fetchHomeDirectory(final String homeDir)
{
- return (homeDir != null) ? homeDir : System.getProperty(PROP_HOME);
+ return homeDir != null ? homeDir : System.getProperty(PROP_HOME);
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
index bbe9456..d8633a8 100644
---
a/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/plist/PropertyListConfiguration.java
@@ -523,7 +523,7 @@ public class PropertyListConfiguration extends
BaseHierarchicalConfiguration
protected void checkLength(final String s, final int index, final int
length)
throws ParseException
{
- final int len = (s == null) ? 0 : s.length();
+ final int len = s == null ? 0 : s.length();
if (index + length > len)
{
throw new ParseException("Input string too short: " + s
diff --git
a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
index 44c9cb3..c424823 100644
---
a/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
+++
b/src/main/java/org/apache/commons/configuration2/reloading/FileHandlerReloadingDetector.java
@@ -85,7 +85,7 @@ public class FileHandlerReloadingDetector implements
ReloadingDetector
*/
public FileHandlerReloadingDetector(final FileHandler handler, final long
refreshDelay)
{
- fileHandler = (handler != null) ? handler : new FileHandler();
+ fileHandler = handler != null ? handler : new FileHandler();
this.refreshDelay = refreshDelay;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
b/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
index 624c80d..aa918d1 100644
---
a/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
+++
b/src/main/java/org/apache/commons/configuration2/reloading/PeriodicReloadingTrigger.java
@@ -100,7 +100,7 @@ public class PeriodicReloadingTrigger
period = triggerPeriod;
timeUnit = unit;
executorService =
- (exec != null) ? exec : createDefaultExecutorService();
+ exec != null ? exec : createDefaultExecutorService();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
b/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
index 50d55fe..d478e6a 100644
---
a/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
+++
b/src/main/java/org/apache/commons/configuration2/spring/ConfigurationPropertiesFactoryBean.java
@@ -75,7 +75,7 @@ public class ConfigurationPropertiesFactoryBean implements
InitializingBean, Fac
@Override
public Properties getObject() throws Exception
{
- return (compositeConfiguration != null) ?
ConfigurationConverter.getProperties(compositeConfiguration) : null;
+ return compositeConfiguration != null ?
ConfigurationConverter.getProperties(compositeConfiguration) : null;
}
/**
@@ -196,6 +196,6 @@ public class ConfigurationPropertiesFactoryBean implements
InitializingBean, Fac
*/
private static <T> T[] defensiveCopy(final T[] src)
{
- return (src != null) ? src.clone() : null;
+ return src != null ? src.clone() : null;
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java
b/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java
index 81db5d7..0fca645 100644
---
a/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java
+++
b/src/main/java/org/apache/commons/configuration2/sync/ReadWriteSynchronizer.java
@@ -53,7 +53,7 @@ public class ReadWriteSynchronizer implements Synchronizer
*/
public ReadWriteSynchronizer(final ReadWriteLock l)
{
- lock = (l != null) ? l : createDefaultLock();
+ lock = l != null ? l : createDefaultLock();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
index 48dd784..67c15e0 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/DefaultExpressionEngine.java
@@ -158,7 +158,7 @@ public class DefaultExpressionEngine implements
ExpressionEngine
symbols = syms;
nameMatcher =
- (nodeNameMatcher != null) ? nodeNameMatcher
+ nodeNameMatcher != null ? nodeNameMatcher
: NodeNameMatchers.EQUALS;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
index 29a0072..db28a01 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/InMemoryNodeModel.java
@@ -725,7 +725,7 @@ public class InMemoryNodeModel implements
NodeModel<ImmutableNode>
final TreeData currentData = structure.get();
final InMemoryNodeModel detachedNodeModel =
currentData.getNodeTracker().getDetachedNodeModel(selector);
- return (detachedNodeModel != null) ? detachedNodeModel.getNodeHandler()
+ return detachedNodeModel != null ? detachedNodeModel.getNodeHandler()
: new TrackedNodeHandler(currentData.getNodeTracker()
.getTrackedNode(selector), currentData);
}
@@ -873,7 +873,7 @@ public class InMemoryNodeModel implements
NodeModel<ImmutableNode>
private TreeData createTreeData(final ImmutableNode root, final TreeData
current)
{
final NodeTracker newTracker =
- (current != null) ? current.getNodeTracker()
+ current != null ? current.getNodeTracker()
.detachAllTrackedNodes() : new NodeTracker();
return createTreeDataForRootAndTracker(root, newTracker);
}
@@ -959,7 +959,7 @@ public class InMemoryNodeModel implements
NodeModel<ImmutableNode>
.addAttribute(addData.getNewNodeName(),
values.iterator().next()).create();
final ImmutableNode newChild =
- (pathNodeCount > 1) ? createNodeOnPath(addData
+ pathNodeCount > 1 ? createNodeOnPath(addData
.getPathNodes().subList(0, pathNodeCount - 1)
.iterator(),
Collections.singleton(childWithAttribute))
@@ -1096,7 +1096,7 @@ public class InMemoryNodeModel implements
NodeModel<ImmutableNode>
*/
private static ImmutableNode initialRootNode(final ImmutableNode
providedRoot)
{
- return (providedRoot != null) ? providedRoot
+ return providedRoot != null ? providedRoot
: new ImmutableNode.Builder().create();
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
index ccb2cec..d5120bd 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ModelTransaction.java
@@ -358,7 +358,7 @@ class ModelTransaction
Operations fetchOperations(final ImmutableNode target, final int level)
{
final Integer nodeLevel =
- Integer.valueOf((level == LEVEL_UNKNOWN) ? level(target)
+ Integer.valueOf(level == LEVEL_UNKNOWN ? level(target)
: level);
Map<ImmutableNode, Operations> levelOperations =
operations.get(nodeLevel);
@@ -387,7 +387,7 @@ class ModelTransaction
*/
private ImmutableNode initQueryRoot(final TreeData treeData, final
NodeSelector selector)
{
- return (selector == null) ? treeData.getRootNode() : treeData
+ return selector == null ? treeData.getRootNode() : treeData
.getNodeTracker().getTrackedNode(selector);
}
@@ -566,7 +566,7 @@ class ModelTransaction
}
final Collection<E> result =
- (col1 != null) ? col1 : new ArrayList<>(col2.size());
+ col1 != null ? col1 : new ArrayList<>(col2.size());
result.addAll(col2);
return result;
}
@@ -586,7 +586,7 @@ class ModelTransaction
return set1;
}
- final Set<E> result = (set1 != null) ? set1 : new HashSet<>();
+ final Set<E> result = set1 != null ? set1 : new HashSet<>();
result.addAll(set2);
return result;
}
@@ -608,7 +608,7 @@ class ModelTransaction
return map1;
}
- final Map<K, V> result = (map1 != null) ? map1 : new HashMap<>();
+ final Map<K, V> result = map1 != null ? map1 : new HashMap<>();
result.putAll(map2);
return result;
}
@@ -624,7 +624,7 @@ class ModelTransaction
*/
private static <E> Collection<E> append(final Collection<E> col, final E
node)
{
- final Collection<E> result = (col != null) ? col : new LinkedList<>();
+ final Collection<E> result = col != null ? col : new LinkedList<>();
result.add(node);
return result;
}
@@ -640,7 +640,7 @@ class ModelTransaction
*/
private static <E> Set<E> append(final Set<E> col, final E elem)
{
- final Set<E> result = (col != null) ? col : new HashSet<>();
+ final Set<E> result = col != null ? col : new HashSet<>();
result.add(elem);
return result;
}
@@ -658,7 +658,7 @@ class ModelTransaction
*/
private static <K, V> Map<K, V> append(final Map<K, V> map, final K key,
final V value)
{
- final Map<K, V> result = (map != null) ? map : new HashMap<>();
+ final Map<K, V> result = map != null ? map : new HashMap<>();
result.put(key, value);
return result;
}
@@ -810,7 +810,7 @@ class ModelTransaction
*/
private Map<ImmutableNode, ImmutableNode> fetchReplacementMap()
{
- return (nodesToReplace != null) ? nodesToReplace : Collections
+ return nodesToReplace != null ? nodesToReplace : Collections
.<ImmutableNode, ImmutableNode> emptyMap();
}
@@ -822,7 +822,7 @@ class ModelTransaction
*/
private Set<ImmutableNode> fetchRemovalSet()
{
- return (nodesToRemove != null) ? nodesToRemove : Collections
+ return nodesToRemove != null ? nodesToRemove : Collections
.<ImmutableNode> emptySet();
}
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java
b/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java
index 9cfc89e..e4eb6bd 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/NodeSelector.java
@@ -104,7 +104,7 @@ public class NodeSelector
nodes = currentResults;
}
- return (nodes.size() == 1) ? nodes.get(0) : null;
+ return nodes.size() == 1 ? nodes.get(0) : null;
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
b/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
index c6f0c17..afbffef 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/NodeTracker.java
@@ -486,7 +486,7 @@ class NodeTracker
*/
public ImmutableNode getNode()
{
- return (getDetachedModel() != null) ? getDetachedModel()
+ return getDetachedModel() != null ? getDetachedModel()
.getRootNode() : node;
}
@@ -532,7 +532,7 @@ class NodeTracker
*/
public TrackedNodeData observerRemoved()
{
- return (observerCount <= 1) ? null : new TrackedNodeData(node,
+ return observerCount <= 1 ? null : new TrackedNodeData(node,
observerCount - 1, getDetachedModel());
}
@@ -562,7 +562,7 @@ class NodeTracker
public TrackedNodeData detach(final ImmutableNode newNode)
{
final ImmutableNode newTrackedNode =
- (newNode != null) ? newNode : getNode();
+ newNode != null ? newNode : getNode();
return new TrackedNodeData(newTrackedNode, observerCount,
new InMemoryNodeModel(newTrackedNode));
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java
b/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java
index 81076e9..61f7261 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/OverrideCombiner.java
@@ -91,7 +91,7 @@ public class OverrideCombiner extends NodeCombiner
// Handle attributes and value
addAttributes(result, node1, node2);
- result.value((node1.getValue() != null) ? node1.getValue() : node2
+ result.value(node1.getValue() != null ? node1.getValue() : node2
.getValue());
return result.create();
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java
b/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java
index b8c2faf..ddc5dab 100644
--- a/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java
+++ b/src/main/java/org/apache/commons/configuration2/tree/ReferenceTracker.java
@@ -135,7 +135,7 @@ class ReferenceTracker
}
List<Object> newRemovedRefs =
- (newRefs != null) ? new LinkedList<>(
+ newRefs != null ? new LinkedList<>(
removedReferences) : null;
for (final ImmutableNode node : removedNodes)
{
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
index 5fd08f4..e900e20 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
@@ -101,7 +101,7 @@ class ConfigurationNodeIteratorAttribute<T> extends
new LinkedHashSet<>(parent.getNodeHandler()
.getAttributes(parent.getConfigurationNode()));
final String prefix =
- (name.getPrefix() != null) ? prefixName(name.getPrefix(),
+ name.getPrefix() != null ? prefixName(name.getPrefix(),
null) : null;
for (final String n : names)
{
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
index 6f5116b..53cfea4 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorBase.java
@@ -221,7 +221,7 @@ abstract class ConfigurationNodeIteratorBase<T> implements
NodeIterator
*/
protected static String qualifiedName(final QName name)
{
- return (name.getPrefix() == null) ? name.getName() : prefixName(
+ return name.getPrefix() == null ? name.getName() : prefixName(
name.getPrefix(), name.getName());
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
b/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
index 0787e6b..ed4d62b 100644
---
a/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
+++
b/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
@@ -162,7 +162,7 @@ public class DatabaseConfigurationTestHelper
.setTable(TABLE_MULTI)
.setConfigurationNameColumn(COL_NAME)
.setConfigurationName(
- (configName != null) ? configName : CONFIG_NAME);
+ configName != null ? configName : CONFIG_NAME);
}
/**
diff --git
a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
index 7613c16..eda0941 100644
---
a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
+++
b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
@@ -133,7 +133,7 @@ public class MockInitialContextFactory implements
InitialContextFactory
for (int i = 0; i < PROP_NAMES.length; i++)
{
bind(mockCtx, prefix + PROP_NAMES[i], PROP_VALUES[i]);
- final String errProp = (prefix.length() > 0) ? PROP_NAMES[i] :
PREFIX
+ final String errProp = prefix.length() > 0 ? PROP_NAMES[i] : PREFIX
+ PROP_NAMES[i];
bindError(mockCtx, errProp);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
index 74efb5e..cd3a55f 100644
---
a/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
@@ -972,7 +972,7 @@ public class TestAbstractHierarchicalConfiguration
{
final Set<String> values = new HashSet<>();
for (final String anExpected : expected) {
- values.add((anExpected.startsWith(prefix)) ? anExpected : prefix +
"." + anExpected);
+ values.add(anExpected.startsWith(prefix) ? anExpected : prefix +
"." + anExpected);
}
final Iterator<String> itKeys = config.getKeys(prefix);
diff --git
a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
index c8967ae..16681e4 100644
--- a/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestXMLConfiguration.java
@@ -1158,7 +1158,7 @@ public class TestXMLConfiguration
{
assertEquals("Wrong value of element " + (i + 1), i,
conf.getInt("attrList.a(" + i + ")"));
- assertEquals("Wrong name attribute for element " + (i), "y",
+ assertEquals("Wrong name attribute for element " + i, "y",
conf.getString("attrList.a(" + i + ")[@name]"));
}
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java
index 86ff5e5..e753eca 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java
@@ -43,7 +43,7 @@ public class TestConfigurationDeclaration
final HierarchicalConfiguration<?> conf)
{
final HierarchicalConfiguration<?> config =
- (conf != null) ? conf : new BaseHierarchicalConfiguration();
+ conf != null ? conf : new BaseHierarchicalConfiguration();
return new ConfigurationDeclaration(null, config);
}
diff --git
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
index 4c96073..1f4c46a 100644
---
a/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
+++
b/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
@@ -135,7 +135,7 @@ public class
TestReloadingCombinedConfigurationBuilderFileBased
*/
private File writeReloadFile(final File f, final String content) throws
IOException
{
- final File file = (f != null) ? f : folder.newFile();
+ final File file = f != null ? f : folder.newFile();
writeFile(file, content);
return file;
}
diff --git
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
index d2a33df..b5a1185 100644
---
a/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/plist/TestPropertyListConfiguration.java
@@ -214,7 +214,7 @@ public class TestPropertyListConfiguration
@Test
public void testData()
{
- ObjectAssert.assertInstanceOf("data", (new byte[0]).getClass(),
config.getProperty("data"));
+ ObjectAssert.assertInstanceOf("data", new byte[0].getClass(),
config.getProperty("data"));
ArrayAssert.assertEquals("data", "foo bar".getBytes(), (byte[])
config.getProperty("data"));
}
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
index 11b370a..3316452 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/TestInMemoryNodeModelTrackedNodes.java
@@ -586,7 +586,7 @@ public class TestInMemoryNodeModelTrackedNodes
for (final ImmutableNode field : nodeFields.getChildren())
{
final String expName =
- (childIndex == idx) ? NEW_FIELD : NodeStructureHelper
+ childIndex == idx ? NEW_FIELD : NodeStructureHelper
.field(1, childIndex);
checkFieldNode(field, expName);
childIndex++;
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
b/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
index 306d1f2..394551b 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
@@ -146,12 +146,12 @@ public abstract class AbstractXPathTest
{
if (level >= 0)
{
- final String prefix = (value == null) ? "" : value + ".";
+ final String prefix = value == null ? "" : value + ".";
for (int i = 1; i <= CHILD_COUNT; i++)
{
final ImmutableNode.Builder childBuilder =
new ImmutableNode.Builder();
- childBuilder.name((i % 2 == 0) ? CHILD_NAME1 : CHILD_NAME2);
+ childBuilder.name(i % 2 == 0 ? CHILD_NAME1 : CHILD_NAME2);
final String currentValue = prefix + i;
childBuilder.value(currentValue);
createLevel(childBuilder, currentValue, level - 1);
