Updated to use custom configured JexlFeatures everywhere

NationalSecurityAgency · Mar 8, 2024 · 3b71beb · 3b71beb
1 parent f53107c
commit 3b71beb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/jexl/JexlASTHelper.java b/warehouse/query-core/src/main/java/datawave/query/jexl/JexlASTHelper.java
@@ -135,7 +135,7 @@ public static ASTJexlScript parseAndFlattenJexlQuery(String query) throws ParseE
         return TreeFlatteningRebuildingVisitor.flatten(script);
     }
 
-    protected static JexlFeatures jexlFeatures() {
+    public static JexlFeatures jexlFeatures() {
         // @formatter:off
         return new JexlFeatures()
                 // mostly used internally by Jexl
@@ -243,7 +243,7 @@ private static ASTJexlScript parseQueryWithBackslashes(String query, Parser pars
         // Parse the query with the placeholders
         ASTJexlScript jexlScript;
         try {
-            jexlScript = parser.parse(null, new JexlFeatures(), query, null);
+            jexlScript = parser.parse(null, jexlFeatures(), query, null);
         } catch (TokenMgrException e) {
             throw new ParseException(e.getMessage());
         }

diff --git a/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PrintingVisitor.java b/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PrintingVisitor.java
@@ -1,5 +1,7 @@
 package datawave.query.jexl.visitors;
 
+import static datawave.query.jexl.JexlASTHelper.jexlFeatures;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Collections;
@@ -193,7 +195,7 @@ public static void printQuery(String query) throws ParseException {
 
         // Parse the query
         try {
-            printQuery(parser.parse(null, new JexlFeatures(), query, null));
+            printQuery(parser.parse(null, jexlFeatures(), query, null));
         } catch (TokenMgrException e) {
             throw new ParseException(e.getMessage());
         }
@@ -254,7 +256,7 @@ public static String formattedQueryString(String query, int maxChildNodes) throw
 
         // Parse the query
         try {
-            return formattedQueryString(parser.parse(null, new JexlFeatures(), query, null), maxChildNodes);
+            return formattedQueryString(parser.parse(null, jexlFeatures(), query, null), maxChildNodes);
         } catch (TokenMgrException e) {
             throw new ParseException(e.getMessage());
         }

diff --git a/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/VariableNameVisitor.java b/warehouse/query-core/src/main/java/datawave/query/jexl/visitors/VariableNameVisitor.java
@@ -1,5 +1,6 @@
 package datawave.query.jexl.visitors;
 
+import static datawave.query.jexl.JexlASTHelper.jexlFeatures;
 import static datawave.query.jexl.nodes.QueryPropertyMarker.MarkerType.EXCEEDED_OR;
 
 import java.util.Set;
@@ -42,7 +43,7 @@ public static Set<String> parseQuery(String query) throws ParseException {
 
         // Parse the query
         try {
-            return parseQuery(parser.parse(null, new JexlFeatures(), query, null));
+            return parseQuery(parser.parse(null, jexlFeatures(), query, null));
         } catch (TokenMgrException e) {
             throw new ParseException(e.getMessage());
         }

diff --git a/warehouse/query-core/src/main/java/datawave/query/tables/edge/EdgeQueryLogic.java b/warehouse/query-core/src/main/java/datawave/query/tables/edge/EdgeQueryLogic.java
@@ -1,5 +1,7 @@
 package datawave.query.tables.edge;
 
+import static datawave.query.jexl.JexlASTHelper.jexlFeatures;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -348,7 +350,7 @@ protected QueryData configureRanges(String queryString) throws ParseException {
         Parser parser = new Parser(new StringProvider(";"));
         ASTJexlScript script;
         try {
-            script = parser.parse(null, new JexlFeatures(), queryString, null);
+            script = parser.parse(null, jexlFeatures(), queryString, null);
         } catch (Exception e) {
             throw new IllegalArgumentException("Invalid jexl supplied. " + e.getMessage());
         }

diff --git a/...ry-core/src/test/java/datawave/query/jexl/visitors/EdgeTableRangeBuildingVisitorTest.java b/...ry-core/src/test/java/datawave/query/jexl/visitors/EdgeTableRangeBuildingVisitorTest.java
@@ -2,6 +2,7 @@
 
 import static java.util.Collections.emptyList;
 
+import static datawave.query.jexl.JexlASTHelper.jexlFeatures;
 import static org.junit.Assert.assertThrows;
 
 import org.apache.commons.jexl3.JexlFeatures;
@@ -35,6 +36,6 @@ public void shouldEnforceTermLimit() {
     }
 
     private ASTJexlScript parseQuery(String query) {
-        return parser.parse(null, new JexlFeatures(), EdgeQueryLogic.fixQueryString(query), null);
+        return parser.parse(null, jexlFeatures(), EdgeQueryLogic.fixQueryString(query), null);
     }
 }
diff --git a/...-core/src/test/java/datawave/query/jexl/visitors/TreeFlatteningRebuildingVisitorTest.java b/...-core/src/test/java/datawave/query/jexl/visitors/TreeFlatteningRebuildingVisitorTest.java
@@ -1,5 +1,6 @@
 package datawave.query.jexl.visitors;
 
+import static datawave.query.jexl.JexlASTHelper.jexlFeatures;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -164,8 +165,8 @@ public void depthNoStackTraceOrTest() throws Exception {
         for (int i = 2; i <= numTerms; i++) {
             sb.append(" OR ").append(i);
         }
-        assertNotNull(TreeFlatteningRebuildingVisitor.flattenAll(new Parser(new StringProvider(";")).parse(null, new JexlFeatures(),
-                        new LuceneToJexlQueryParser().parse(sb.toString()).toString(), null)));
+        assertNotNull(TreeFlatteningRebuildingVisitor.flattenAll(
+                        new Parser(new StringProvider(";")).parse(null, jexlFeatures(), new LuceneToJexlQueryParser().parse(sb.toString()).toString(), null)));
     }
 
     @Test