Clean up query node classes (#14737)

Author: stefanvodita

lucene/CHANGES.txt

@@ -33,6 +33,8 @@ Improvements
 
 * GITHUB#14443: Support adaptive refresh in Searcher Managers (Vigya Sharma)
 
+* GITHUB#14737: Clean up redundant code and comments in query node classes. (Stefan Vodita)
+
 Optimizations
 ---------------------
 * GITHUB#14418: Quick exit on filter query matching no docs when rewriting knn query. (Pan Guixin)

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java

@@ -59,6 +59,6 @@ public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
     // in case is root or the parent is a group node avoid parenthesis
     if ((getParent() != null && getParent() instanceof GroupQueryNode) || isRoot())
       return sb.toString();
-    else return "( " + sb.toString() + " )";
+    else return "( " + sb + " )";
   }
 }

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java

@@ -47,18 +47,14 @@ public int getMinimumMatchingElements() {
   }
 
   /**
-   * returns null if the field was not specified
-   *
-   * @return the field
+   * @return the field or null if the field is unspecified
    */
   public CharSequence getField() {
     return this.field;
   }
 
   /**
-   * returns - null if the field was not specified
-   *
-   * @return the field as a String
+   * @return the field as a String or null if the field is unspecified
    */
   public String getFieldAsString() {
     if (this.field == null) return null;

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java

@@ -37,7 +37,7 @@ public BooleanQueryNode(List<QueryNode> clauses) {
 
   @Override
   public String toString() {
-    if (getChildren() == null || getChildren().size() == 0) return "<boolean operation='default'/>";
+    if (getChildren() == null || getChildren().isEmpty()) return "<boolean operation='default'/>";
     StringBuilder sb = new StringBuilder();
     sb.append("<boolean operation='default'>");
     for (QueryNode child : getChildren()) {
@@ -50,7 +50,7 @@ public String toString() {
 
   @Override
   public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
-    if (getChildren() == null || getChildren().size() == 0) return "";
+    if (getChildren() == null || getChildren().isEmpty()) return "";
 
     StringBuilder sb = new StringBuilder();
     String filler = "";
@@ -62,15 +62,11 @@ public CharSequence toQueryString(EscapeQuerySyntax escapeSyntaxParser) {
     // in case is root or the parent is a group node avoid parenthesis
     if ((getParent() != null && getParent() instanceof GroupQueryNode) || isRoot())
       return sb.toString();
-    else return "( " + sb.toString() + " )";
+    else return "( " + sb + " )";
   }
 
   @Override
   public QueryNode cloneTree() throws CloneNotSupportedException {
-    BooleanQueryNode clone = (BooleanQueryNode) super.cloneTree();
-
-    // nothing to do here
-
-    return clone;
+    return super.cloneTree();
   }
 }

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java

@@ -51,14 +51,12 @@ public BoostQueryNode(QueryNode query, float value) {
   }
 
   /**
-   * Returns the single child which this node boosts.
-   *
    * @return the single child which this node boosts
    */
   public QueryNode getChild() {
     List<QueryNode> children = getChildren();
 
-    if (children == null || children.size() == 0) {
+    if (children == null || children.isEmpty()) {
       return null;
     }
 

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java

@@ -41,8 +41,6 @@ public String toString() {
 
   @Override
   public QueryNode cloneTree() throws CloneNotSupportedException {
-    DeletedQueryNode clone = (DeletedQueryNode) super.cloneTree();
-
-    return clone;
+    return super.cloneTree();
   }
 }

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java

@@ -135,8 +135,6 @@ public void setPositionIncrement(int pi) {
   }
 
   /**
-   * Returns the term.
-   *
    * @return The "original" form of the term.
    */
   @Override

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java

@@ -23,5 +23,4 @@
  * @see FieldableNode
  * @see ValueQueryNode
  */
-public interface FieldValuePairQueryNode<T extends Object>
-    extends FieldableNode, ValueQueryNode<T> {}
+public interface FieldValuePairQueryNode<T> extends FieldableNode, ValueQueryNode<T> {}

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java

@@ -26,9 +26,7 @@
 public interface FieldableNode extends QueryNode {
 
   /**
-   * Returns the field associated to the node and every node under it.
-   *
-   * @return the field name
+   * @return name of the filed associated to the node and every node under it
    */
   CharSequence getField();
 

lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java

@@ -25,10 +25,6 @@ public class FuzzyQueryNode extends FieldQueryNode {
 
   private int prefixLength;
 
-  /**
-   * @param field Name of the field query will use.
-   * @param termStr Term token to use for building term for the query
-   */
   /**
    * @param field - Field name
    * @param term - Value