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

commit 48f38890712b5b9998c7e88b5f35922ddfaabf20
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jan 17 10:35:56 2021 -0500

    Use isEmpty().
---
 src/main/java/org/apache/commons/ognl/ASTAdd.java                     | 2 +-
 src/main/java/org/apache/commons/ognl/ASTChain.java                   | 4 ++--
 src/main/java/org/apache/commons/ognl/ASTList.java                    | 2 +-
 src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/ognl/ASTAdd.java 
b/src/main/java/org/apache/commons/ognl/ASTAdd.java
index 5d746ea..12fe65a 100644
--- a/src/main/java/org/apache/commons/ognl/ASTAdd.java
+++ b/src/main/java/org/apache/commons/ognl/ASTAdd.java
@@ -190,7 +190,7 @@ class ASTAdd
 
                     if ( ( expr != null && "null".equals( expr ) )
                         || ( !ASTConst.class.isInstance( children[i] )
-                        && ( expr == null || expr.trim().length() <= 0 ) ) )
+                        && ( expr == null || expr.trim().isEmpty() ) ) )
                     {
                         expr = "null";
                     }
diff --git a/src/main/java/org/apache/commons/ognl/ASTChain.java 
b/src/main/java/org/apache/commons/ognl/ASTChain.java
index 0ec8839..e0cc8ac 100644
--- a/src/main/java/org/apache/commons/ognl/ASTChain.java
+++ b/src/main/java/org/apache/commons/ognl/ASTChain.java
@@ -333,7 +333,7 @@ public class ASTChain
                         ordered = true;
                         OrderedReturn or = (OrderedReturn) child;
 
-                        if ( or.getCoreExpression() == null || 
or.getCoreExpression().trim().length() <= 0 )
+                        if ( or.getCoreExpression() == null || 
or.getCoreExpression().trim().isEmpty() )
                         {
                             result = "";
                         }
@@ -424,7 +424,7 @@ public class ASTChain
                     }
 
                     String value = children[i].toSetSourceString( context, 
context.getCurrentObject() );
-                    // if (value == null || value.trim().length() <= 0)
+                    // if (value == null || value.trim().isEmpty())
                     // return "";
 
                     // System.out.println("astchain setter child returned >>  
" + value + "  <<");
diff --git a/src/main/java/org/apache/commons/ognl/ASTList.java 
b/src/main/java/org/apache/commons/ognl/ASTList.java
index 545e5ea..66f0707 100644
--- a/src/main/java/org/apache/commons/ognl/ASTList.java
+++ b/src/main/java/org/apache/commons/ognl/ASTList.java
@@ -190,7 +190,7 @@ public class ASTList
                     value = " ($w) (" + value + ")";
                 }
 
-                if ( objValue == null || value.length() <= 0 )
+                if ( objValue == null || value.isEmpty() )
                 {
                     value = "null";
                 }
diff --git 
a/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java 
b/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
index 2cca4bc..1e1d7f2 100644
--- a/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
+++ b/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
@@ -593,7 +593,7 @@ public class ExpressionCompiler
 
         String getterCode = expression.toGetSourceString( context, root );
 
-        if ( getterCode == null || getterCode.trim().length() <= 0
+        if ( getterCode == null || getterCode.trim().isEmpty()
             && !ASTVarRef.class.isAssignableFrom( expression.getClass() ) )
         {
             getterCode = "null";