[commons-ognl] branch master updated: Use isEmpty().

[ggregory]

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-ognl.git


The following commit(s) were added to refs/heads/master by this push:
     new b93cdf4  Use isEmpty().
b93cdf4 is described below

commit b93cdf42778a86114512c23f21b271261a38cbe5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jan 17 10:31:59 2021 -0500

    Use isEmpty().
    
    Match Animal Sniffer pluigin Java version to POM compiler Java version.
---
 pom.xml                                                             | 2 +-
 src/main/java/org/apache/commons/ognl/ASTSequence.java              | 6 +++---
 src/main/java/org/apache/commons/ognl/ExpressionNode.java           | 2 +-
 .../java/org/apache/commons/ognl/test/objects/PropertyHolder.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc15c2a..4d1a139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@ limitations under the License.
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 
-    <animal-sniffer.signature>java15</animal-sniffer.signature>
+    <animal-sniffer.signature>java18</animal-sniffer.signature>
 
     <commons.releaseManagerKey>63AFBB1F</commons.releaseManagerKey>
   </properties>
diff --git a/src/main/java/org/apache/commons/ognl/ASTSequence.java 
b/src/main/java/org/apache/commons/ognl/ASTSequence.java
index daf2520..b2bd571 100644
--- a/src/main/java/org/apache/commons/ognl/ASTSequence.java
+++ b/src/main/java/org/apache/commons/ognl/ASTSequence.java
@@ -115,7 +115,7 @@ public class ASTSequence
             }
 
             if ( i > 0 && ASTProperty.class.isInstance( children[i] ) && 
seqValue != null
-                && seqValue.trim().length() > 0 )
+                && !seqValue.trim().isEmpty() )
             {
                 String pre = (String) context.get( "_currentChain" );
                 if ( pre == null )
@@ -134,11 +134,11 @@ public class ASTSequence
                 lastExpression = seqValue;
             }
 
-            if ( seqValue != null && seqValue.trim().length() > 0 && ( i + 1 ) 
< children.length )
+            if ( seqValue != null && !seqValue.trim().isEmpty() && ( i + 1 ) < 
children.length )
             {
                 result += seqValue + ";";
             }
-            else if ( seqValue != null && seqValue.trim().length() > 0 )
+            else if ( seqValue != null && !seqValue.trim().isEmpty() )
             {
                 result += seqValue;
             }
diff --git a/src/main/java/org/apache/commons/ognl/ExpressionNode.java 
b/src/main/java/org/apache/commons/ognl/ExpressionNode.java
index 9cea4f4..76e4a7b 100644
--- a/src/main/java/org/apache/commons/ognl/ExpressionNode.java
+++ b/src/main/java/org/apache/commons/ognl/ExpressionNode.java
@@ -96,7 +96,7 @@ public abstract class ExpressionNode
 
                 if ( ( ASTProperty.class.isInstance( children[i] ) || 
ASTMethod.class.isInstance( children[i] )
                     || ASTSequence.class.isInstance( children[i] ) || 
ASTChain.class.isInstance( children[i] ) )
-                    && value != null && value.trim().length() > 0 )
+                    && value != null && !value.trim().isEmpty() )
                 {
 
                     String pre = null;
diff --git 
a/src/test/java/org/apache/commons/ognl/test/objects/PropertyHolder.java 
b/src/test/java/org/apache/commons/ognl/test/objects/PropertyHolder.java
index d59d2da..df56e5c 100644
--- a/src/test/java/org/apache/commons/ognl/test/objects/PropertyHolder.java
+++ b/src/test/java/org/apache/commons/ognl/test/objects/PropertyHolder.java
@@ -41,7 +41,7 @@ public class PropertyHolder
 
     public boolean hasValue()
     {
-        return _value != null && _value.length() > 0;
+        return _value != null && !_value.isEmpty();
     }
 
     public void setSearch( String value )