Update error message from AmbiguousNotRule (#2959)

Update the error message returned by the AmbiguousNotRule to avoid users
assuming that the suggested syntax is overall correct and appropriate
for copy/pasting.

Closes #2939

Author: lbschanno

warehouse/query-core/src/main/java/datawave/query/rules/AmbiguousNotRule.java

@@ -1,10 +1,8 @@
 package datawave.query.rules;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.apache.log4j.Logger;
-import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.NotBooleanQueryNode;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 
@@ -61,26 +59,21 @@ private String formatMessage(NotBooleanQueryNode node) {
         StringBuilder sb = new StringBuilder();
         sb.append("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: ");
 
-        String precedingTerms = getPrecedingTerms(node);
+        String lastPrecedingTerm = getLastPrecedingTerm(node);
+
         // @formatter:off
-        return sb.append("\"")
-                        .append(precedingTerms)
-                        .append(" NOT\" should be \"(")
-                        .append(precedingTerms)
-                        .append(") NOT\".")
+        return sb.append("the NOT clause will only be applied to \"")
+                        .append(lastPrecedingTerm)
+                        .append("\".")
                         .toString();
         // @formatter:on
     }
 
-    // Return the terms preceding the NOT in the given node as a nicely formatted query string.
-    private String getPrecedingTerms(NotBooleanQueryNode node) {
+    // Return the last term preceding the NOT in the given, in query format.
+    private String getLastPrecedingTerm(NotBooleanQueryNode node) {
         QueryNode junctionNode = node.getChildren().get(0);
-        String junction = junctionNode instanceof AndQueryNode ? " AND " : " OR ";
-        // @formatter:off
-        return junctionNode.getChildren().stream()
-                        .map(LuceneQueryStringBuildingVisitor::build)
-                        .collect(Collectors.joining(junction));
-        // @formatter:on
+        List<QueryNode> children = junctionNode.getChildren();
+        QueryNode lastChild = children.get(children.size() - 1);
+        return LuceneQueryStringBuildingVisitor.build(lastChild);
     }
-
 }

warehouse/query-core/src/test/java/datawave/query/rules/AmbiguousNotRuleTest.java

@@ -66,8 +66,7 @@ void testNOTWithWrappedMultiplePrecedingTerms(String junction) throws Exception
     void testNOTWithUnwrappedMultiplePrecedingTerms(String junction) throws Exception {
         givenQuery("FIELD1:abc " + junction + " FIELD2:def NOT FIELD:ghi");
 
-        expectMessage("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: \"FIELD1:abc " + junction
-                        + " FIELD2:def NOT\" should be \"(FIELD1:abc " + junction + " FIELD2:def) NOT\".");
+        expectMessage("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: the NOT clause will only be applied to \"FIELD2:def\".");
 
         assertResult();
     }
@@ -79,8 +78,7 @@ void testNOTWithUnwrappedMultiplePrecedingTerms(String junction) throws Exceptio
     void testNOTWithUnwrappedAutomaticallyAndedPreceedingTerms() throws Exception {
         givenQuery("FIELD1:abc FIELD2:def NOT FIELD:ghi");
 
-        expectMessage("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: \"FIELD1:abc AND FIELD2:def NOT\" should be "
-                        + "\"(FIELD1:abc AND FIELD2:def) NOT\".");
+        expectMessage("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: the NOT clause will only be applied to \"FIELD2:def\".");
 
         assertResult();
     }
@@ -103,8 +101,7 @@ void testNOTWithWrappedAutomaticallyAndedPreceedingTerms() throws Exception {
     void testQueryWithTermThatIsNotPartOfNOT() throws Exception {
         givenQuery("FIELD1:abc OR (FIELD2:abc FIELD3:def NOT FIELD4:ghi)");
 
-        expectMessage("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: \"FIELD2:abc AND FIELD3:def NOT\" should be "
-                        + "\"(FIELD2:abc AND FIELD3:def) NOT\".");
+        expectMessage("Ambiguous usage of NOT detected with multiple unwrapped preceding terms: the NOT clause will only be applied to \"FIELD3:def\".");
 
         assertResult();
     }