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 a7fea9c  Use isEmpty().
a7fea9c is described below

commit a7fea9cc0dfe78498cb9703fca1e4930aeafc685
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jan 17 09:51:30 2021 -0500

    Use isEmpty().
---
 src/main/java/org/apache/commons/configuration2/XMLConfiguration.java  | 2 +-
 .../apache/commons/configuration2/tree/DefaultConfigurationKey.java    | 2 +-
 .../commons/configuration2/tree/xpath/XPathExpressionEngine.java       | 2 +-
 .../org/apache/commons/configuration2/MockInitialContextFactory.java   | 3 +--
 .../java/org/apache/commons/configuration2/io/TestFileHandler.java     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java 
b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
index 5c169a5..f0f3d19 100644
--- a/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
@@ -636,7 +636,7 @@ public class XMLConfiguration extends 
BaseHierarchicalConfiguration implements
             childrenFlag = hasChildren || attributes.size() > 1;
         }
         final String text = determineValue(buffer.toString(), childrenFlag, 
trimFlag);
-        if (text.length() > 0 || (!childrenFlag && level != 0))
+        if (!text.isEmpty() || (!childrenFlag && level != 0))
         {
             refValue.setValue(text);
         }
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 1f7a086..dac601b 100644
--- 
a/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
+++ 
b/src/main/java/org/apache/commons/configuration2/tree/DefaultConfigurationKey.java
@@ -130,7 +130,7 @@ public class DefaultConfigurationKey
         key = trim(key);
 
         if (keyBuffer.length() > 0 && !isAttributeKey(property)
-                && key.length() > 0)
+                && !key.isEmpty())
         {
             keyBuffer.append(getSymbols().getPropertyDelimiter());
         }
diff --git 
a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
 
b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
index 37f9403..7d7fdbf 100644
--- 
a/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
+++ 
b/src/main/java/org/apache/commons/configuration2/tree/xpath/XPathExpressionEngine.java
@@ -237,7 +237,7 @@ public class XPathExpressionEngine implements 
ExpressionEngine
                     new StringBuilder(parentKey.length()
                             + handler.nodeName(node).length()
                             + PATH_DELIMITER.length());
-            if (parentKey.length() > 0)
+            if (!parentKey.isEmpty())
             {
                 buf.append(parentKey);
                 buf.append(PATH_DELIMITER);
diff --git 
a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
 
b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
index eda0941..c69645e 100644
--- 
a/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
+++ 
b/src/test/java/org/apache/commons/configuration2/MockInitialContextFactory.java
@@ -133,8 +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
-                    + PROP_NAMES[i];
+            final String errProp = prefix.isEmpty() ?  PREFIX + PROP_NAMES[i] 
: PROP_NAMES[i];
             bindError(mockCtx, errProp);
         }
         for (final String element : MISSING_NAMES) {
diff --git 
a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java 
b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
index fcda843..c9a2769 100644
--- a/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
+++ b/src/test/java/org/apache/commons/configuration2/io/TestFileHandler.java
@@ -552,7 +552,7 @@ public class TestFileHandler
         final FileHandler config1 = new FileHandler(content);
         config1.setFileName("config/deep/deeptest.properties");
         config1.load();
-        assertTrue("No data loaded", content.getContent().length() > 0);
+        assertFalse("No data loaded", content.getContent().isEmpty());
     }
 
     /**

Reply via email to