You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/06/01 14:53:20 UTC

(commons-jexl) 19/39: Remove redundant keyword; use final

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

commit 37c8694509fa1cda251e846208d73c9e57ada661
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 1 10:21:06 2024 -0400

    Remove redundant keyword; use final
---
 .../java/org/apache/commons/jexl3/parser/JexlParser.java     | 12 ++++++------
 src/test/java/org/apache/commons/jexl3/JexlTestCase.java     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
index b955fb0a..50d7b972 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
@@ -328,7 +328,7 @@ public abstract class JexlParser extends StringParser {
         blocks.clear();
         block = null;
         blockScopes.clear();
-        this.setFeatures(features);
+        setFeatures(features);
     }
 
     /**
@@ -422,7 +422,7 @@ public abstract class JexlParser extends StringParser {
         }
         // declaring a namespace or module
         final String[] nsprefixes = { PRAGMA_JEXLNS, PRAGMA_MODULE };
-        for(String nsprefix : nsprefixes) {
+        for(final String nsprefix : nsprefixes) {
             if (key.startsWith(nsprefix)) {
                 if (!features.supportsNamespacePragma()) {
                     throwFeatureException(JexlFeatures.NS_PRAGMA, getToken(0));
@@ -592,7 +592,7 @@ public abstract class JexlParser extends StringParser {
      * @param name the namespace name
      * @return true if declared, false otherwise
      */
-    private boolean isNamespace(String name) {
+    private boolean isNamespace(final String name) {
         // templates
         if ("jexl".equals(name) || "$jexl".equals(name)) {
             return true;
@@ -632,7 +632,7 @@ public abstract class JexlParser extends StringParser {
         final String name = ns.image;
         if (isVariable(name)) {
             // the namespace sticks to the colon as in 'ns:fun()' (vs 'ns : fun()')
-            return colon.beginColumn - 1 == ns.endColumn && ((colon.endColumn == fun.beginColumn - 1) || isNamespace(name));
+            return colon.beginColumn - 1 == ns.endColumn && (colon.endColumn == fun.beginColumn - 1 || isNamespace(name));
         }
         return true;
     }
@@ -819,7 +819,7 @@ public abstract class JexlParser extends StringParser {
     protected void throwFeatureException(final int feature, final Token trigger) {
         Token token = trigger;
         if (token == null) {
-            token = this.getToken(0);
+            token = getToken(0);
             if (token == null) {
                 throw new JexlException.Parsing(null, JexlFeatures.stringify(feature)).clean();
             }
@@ -838,7 +838,7 @@ public abstract class JexlParser extends StringParser {
         String msg = "unrecoverable state";
         Token token = parsed;
         if (token == null) {
-            token = this.getToken(0);
+            token = getToken(0);
         }
         if (token != null) {
             xinfo = info.at(token.beginLine, token.beginColumn);
diff --git a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
index 4ad4e035..e7e2e637 100644
--- a/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
+++ b/src/test/java/org/apache/commons/jexl3/JexlTestCase.java
@@ -220,10 +220,10 @@ public class JexlTestCase {
             return;
         }
         try {
-            this.setUp();
+            setUp();
             method.invoke(this);
         } finally {
-            this.tearDown();
+            tearDown();
         }
     }