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
The following commit(s) were added to refs/heads/master by this push:
new 1fc2c9c Remove unnecessary parens in ternary expression tests.
1fc2c9c is described below
commit 1fc2c9c33d73ce1cfc8d3cc4cb7cc5d121ade9a8
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Thu Sep 12 16:34:19 2019 -0400
Remove unnecessary parens in ternary expression tests.
---
.../commons/configuration2/PropertiesConfiguration.java | 4 ++--
.../configuration2/PropertiesConfigurationLayout.java | 6 +++---
.../org/apache/commons/configuration2/XMLConfiguration.java | 10 +++++-----
.../builder/FileBasedConfigurationBuilder.java | 4 ++--
.../builder/combined/ConfigurationDeclaration.java | 2 +-
.../org/apache/commons/configuration2/io/VFSFileSystem.java | 12 ++++++------
.../commons/configuration2/tree/DefaultConfigurationKey.java | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
index 4df6827..a7e984f 100644
---
a/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
+++
b/src/main/java/org/apache/commons/configuration2/PropertiesConfiguration.java
@@ -1182,7 +1182,7 @@ public class PropertiesConfiguration extends
BaseConfiguration
*/
public String getLineSeparator()
{
- return (lineSeparator != null) ? lineSeparator : LINE_SEPARATOR;
+ return lineSeparator != null ? lineSeparator : LINE_SEPARATOR;
}
/**
@@ -1357,7 +1357,7 @@ public class PropertiesConfiguration extends
BaseConfiguration
*/
protected String fetchSeparator(final String key, final Object value)
{
- return (getGlobalSeparator() != null) ? getGlobalSeparator()
+ return getGlobalSeparator() != null ? getGlobalSeparator()
: StringUtils.defaultString(getCurrentSeparator());
}
} // class PropertiesWriter
diff --git
a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
index 4da001f..005380a 100644
---
a/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
+++
b/src/main/java/org/apache/commons/configuration2/PropertiesConfigurationLayout.java
@@ -743,7 +743,7 @@ public class PropertiesConfigurationLayout implements
EventListener<Configuratio
pos++;
}
- return (pos < s.length()) ? s.substring(pos)
+ return pos < s.length() ? s.substring(pos)
: StringUtils.EMPTY;
}
return COMMENT_PREFIX + s;
@@ -852,7 +852,7 @@ public class PropertiesConfigurationLayout implements
EventListener<Configuratio
private static String constructCanonicalComment(final String comment,
final boolean commentChar)
{
- return (comment == null) ? null : trimComment(comment, commentChar);
+ return comment == null ? null : trimComment(comment, commentChar);
}
/**
@@ -968,7 +968,7 @@ public class PropertiesConfigurationLayout implements
EventListener<Configuratio
*/
public String getComment()
{
- return (comment == null) ? null : comment.toString();
+ return comment == null ? null : comment.toString();
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 831b6a0..34547c2 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -259,7 +259,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
{
super(c);
rootElementName =
- (c != null) ? c.getRootElementName() : null;
+ c != null ? c.getRootElementName() : null;
initLogger(new ConfigurationLogger(XMLConfiguration.class));
}
@@ -277,7 +277,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
final Document doc = getDocument();
if (doc == null)
{
- return (rootElementName == null) ? DEFAULT_ROOT_NAME :
rootElementName;
+ return rootElementName == null ? DEFAULT_ROOT_NAME :
rootElementName;
}
return doc.getDocumentElement().getNodeName();
}
@@ -514,7 +514,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
public Document getDocument()
{
final XMLDocumentHelper docHelper = getDocumentHelper();
- return (docHelper != null) ? docHelper.getDocument() : null;
+ return docHelper != null ? docHelper.getDocument() : null;
}
/**
@@ -911,7 +911,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
final XMLDocumentHelper docHelper =
(XMLDocumentHelper)
handler.getReference(handler.getRootNode());
final XMLDocumentHelper newHelper =
- (docHelper == null) ? XMLDocumentHelper
+ docHelper == null ? XMLDocumentHelper
.forNewDocument(getRootElementName()) : docHelper
.createCopy();
@@ -1310,7 +1310,7 @@ public class XMLConfiguration extends
BaseHierarchicalConfiguration implements
{
element = (Node) reference;
}
- return (element != null) ? (Element) elementMapping.get(element)
+ return element != null ? (Element) elementMapping.get(element)
: document.getDocumentElement();
}
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
b/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
index abcb418..50a5e9f 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/FileBasedConfigurationBuilder.java
@@ -207,7 +207,7 @@ public class FileBasedConfigurationBuilder<T extends
FileBasedConfiguration>
*/
public synchronized FileHandler getFileHandler()
{
- return (currentFileHandler != null) ? currentFileHandler
+ return currentFileHandler != null ? currentFileHandler
: fetchFileHandlerFromParameters();
}
@@ -279,7 +279,7 @@ public class FileBasedConfigurationBuilder<T extends
FileBasedConfiguration>
{
super.initResultInstance(obj);
final FileHandler srcHandler =
- (currentFileHandler != null && !resetParameters) ?
currentFileHandler
+ currentFileHandler != null && !resetParameters ?
currentFileHandler
: fetchFileHandlerFromParameters();
currentFileHandler = new FileHandler(obj, srcHandler);
diff --git
a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java
b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java
index 3e6e20a..97ef1a3 100644
---
a/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java
+++
b/src/main/java/org/apache/commons/configuration2/builder/combined/ConfigurationDeclaration.java
@@ -76,7 +76,7 @@ public class ConfigurationDeclaration extends
XMLBeanDeclaration
final String result =
this.getConfiguration().getString(
CombinedConfigurationBuilder.ATTR_AT_RES);
- return (result == null) ? this.getConfiguration().getString(
+ return result == null ? this.getConfiguration().getString(
CombinedConfigurationBuilder.ATTR_AT) : result;
}
diff --git
a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java
b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java
index 95c510a..cf58397 100644
--- a/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java
+++ b/src/main/java/org/apache/commons/configuration2/io/VFSFileSystem.java
@@ -62,7 +62,7 @@ public class VFSFileSystem extends DefaultFileSystem
try
{
final FileSystemOptions opts = getOptions(url.getProtocol());
- file = (opts == null) ?
VFS.getManager().resolveFile(url.toString())
+ file = opts == null ? VFS.getManager().resolveFile(url.toString())
: VFS.getManager().resolveFile(url.toString(), opts);
if (file.getType() != FileType.FILE)
{
@@ -90,7 +90,7 @@ public class VFSFileSystem extends DefaultFileSystem
{
final FileSystemOptions opts = getOptions(url.getProtocol());
final FileSystemManager fsManager = VFS.getManager();
- final FileObject file = (opts == null) ?
fsManager.resolveFile(url.toString())
+ final FileObject file = opts == null ?
fsManager.resolveFile(url.toString())
: fsManager.resolveFile(url.toString(), opts);
// throw an exception if the target URL is a directory
if (file == null || file.getType() == FileType.FOLDER)
@@ -245,8 +245,8 @@ public class VFSFileSystem extends DefaultFileSystem
if (basePath != null && fileScheme == null)
{
final String scheme = UriParser.extractScheme(basePath);
- final FileSystemOptions opts = (scheme != null) ?
getOptions(scheme) : null;
- FileObject base = (opts == null) ?
fsManager.resolveFile(basePath)
+ final FileSystemOptions opts = scheme != null ?
getOptions(scheme) : null;
+ FileObject base = opts == null ?
fsManager.resolveFile(basePath)
: fsManager.resolveFile(basePath, opts);
if (base.getType() == FileType.FILE)
{
@@ -257,8 +257,8 @@ public class VFSFileSystem extends DefaultFileSystem
}
else
{
- final FileSystemOptions opts = (fileScheme != null) ?
getOptions(fileScheme) : null;
- file = (opts == null) ? fsManager.resolveFile(fileName)
+ final FileSystemOptions opts = fileScheme != null ?
getOptions(fileScheme) : null;
+ file = opts == null ? fsManager.resolveFile(fileName)
: fsManager.resolveFile(fileName, opts);
}
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
index cf5ff79..1f7a086 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
@@ -498,7 +498,7 @@ public class DefaultConfigurationKey
*/
private String unescapeDelimiters(final String key)
{
- return (getSymbols().getEscapedDelimiter() == null) ? key
+ return getSymbols().getEscapedDelimiter() == null ? key
: StringUtils.replace(key, getSymbols()
.getEscapedDelimiter(), getSymbols()
.getPropertyDelimiter());
@@ -663,7 +663,7 @@ public class DefaultConfigurationKey
*/
public String currentKey(final boolean decorated)
{
- return (decorated && !isPropertyKey()) ?
constructAttributeKey(current)
+ return decorated && !isPropertyKey() ?
constructAttributeKey(current)
: current;
}
