3402 (#3403)

Co-authored-by: hgklohr <hgklohr@gmail.com>

Author: FineAndDandy

warehouse/query-core/src/main/java/datawave/query/transformer/annotation/TermExtractor.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.jexl3.parser.ASTEQNode;
 import org.apache.commons.jexl3.parser.ASTERNode;
@@ -19,10 +20,14 @@
 import datawave.query.parser.JavaRegexAnalyzer;
 
 public class TermExtractor implements Serializable {
-    private Set<String> fields;
+    final private Set<String> fields;
 
     public TermExtractor(Set<String> fields) {
-        this.fields = fields;
+        if (fields == null) {
+            this.fields = null;
+        } else {
+            this.fields = fields.stream().map(String::toUpperCase).collect(Collectors.toSet());
+        }
     }
 
     @Override
@@ -61,7 +66,7 @@ private boolean acceptNode(JexlNode node) {
             return false;
         }
 
-        return fields == null || fields.contains(identifier);
+        return fields == null || fields.contains(identifier.toUpperCase());
     }
 
     /**

warehouse/query-core/src/test/java/datawave/query/transformer/annotation/TermExtractorTest.java

@@ -102,6 +102,25 @@ public void extractTargetFieldsTest(String query, String terms) throws ParseExce
         test(query, terms);
     }
 
+    // test term extraction with case-sensitive limited fields
+    // @formatter:off
+    @CsvSource({
+        "a=='abc',abc",
+        "b=='abc',abc",
+        "c=='abc',abc",
+        "A=='abc',abc",
+        "B=='abc',abc",
+        "C=='abc',abc",
+    })
+    // @formatter:on
+    @ParameterizedTest(name = "extract {0}")
+    public void extractTargetCaseSensitiveFieldsTest(String query, String terms) throws ParseException, JavaRegexAnalyzer.JavaRegexParseException {
+        termExtractor = new TermExtractor(Set.of("A", "B", "C"));
+        test(query, terms);
+        termExtractor = new TermExtractor(Set.of("a", "b", "c"));
+        test(query, terms);
+    }
+
     // test normalization is applied
     // @formatter:on
     @CsvSource({"UUID=='AbC',abc", "UUID=='ABC' || UUID=='dEf',abc;def", "UUID='A',", "UUID=='A' || UUID=='B' && UUID=='C',a;b;c;", "UUID=~'.*ABC.*',.*abc.*"})