Cleanup only

13 files changed, 85 insertions, 65 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
index 55001ae5915..ffd44bec935 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
@@ -5,12 +5,21 @@ import com.yahoo.language.Language;
 import com.yahoo.language.process.Segmenter;
 import com.yahoo.prelude.Index;
 import com.yahoo.prelude.IndexFacts;
-import com.yahoo.prelude.query.*;
+import com.yahoo.prelude.query.AndSegmentItem;
+import com.yahoo.prelude.query.CompositeItem;
+import com.yahoo.prelude.query.IndexedItem;
+import com.yahoo.prelude.query.Item;
+import com.yahoo.prelude.query.NullItem;
+import com.yahoo.prelude.query.PhraseItem;
+import com.yahoo.prelude.query.PhraseSegmentItem;
+import com.yahoo.prelude.query.WordItem;
 import com.yahoo.search.query.QueryTree;
 import com.yahoo.search.query.parser.Parsable;
 import com.yahoo.search.query.parser.ParserEnvironment;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
 
 /**
  * The Vespa query parser.
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java
index 3358075d670..22bdf145e90 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AdvancedParser.java
@@ -1,14 +1,25 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query.parser;
 
-import com.yahoo.prelude.query.*;
+import com.yahoo.prelude.query.AndItem;
+import com.yahoo.prelude.query.CompositeItem;
+import com.yahoo.prelude.query.EquivItem;
+import com.yahoo.prelude.query.Item;
+import com.yahoo.prelude.query.NearItem;
+import com.yahoo.prelude.query.NotItem;
+import com.yahoo.prelude.query.ONearItem;
+import com.yahoo.prelude.query.OrItem;
+import com.yahoo.prelude.query.RankItem;
+import com.yahoo.prelude.query.SegmentItem;
+import com.yahoo.prelude.query.WeakAndItem;
+import com.yahoo.prelude.query.WordItem;
 import com.yahoo.search.query.parser.ParserEnvironment;
 
 import static com.yahoo.prelude.query.parser.Token.Kind.LBRACE;
 import static com.yahoo.prelude.query.parser.Token.Kind.NUMBER;
 
 /**
- * Parser for queries of type advanced.
+ * Parser for queries of type 'advanced'.
  *
  * @author Steinar Knutsen
  * @deprecated YQL should be used for formal queries
@@ -80,8 +91,7 @@ public class AdvancedParser extends StructuredParser {
                             topLevelIsClosed = true;
                         }
                         expectingOperator = true;
-                    } else if (topLevelItem instanceof CompositeItem
-                               && !(topLevelItem instanceof SegmentItem)) {
+                    } else if (topLevelItem instanceof CompositeItem && !(topLevelItem instanceof SegmentItem)) {
                         ((CompositeItem) topLevelItem).addItem(item);
                         expectingOperator = true;
                     } else {
@@ -178,7 +188,7 @@ public class AdvancedParser extends StructuredParser {
             int distance = consumeNumericArgument();
             if (distance==0)
                 distance=NearItem.defaultDistance;
-            if (topLevelIsClosed || !(topLevelItem instanceof NearItem) || distance!=((NearItem)topLevelItem).getDistance()) {
+            if (topLevelIsClosed || !(topLevelItem instanceof NearItem) || distance != ((NearItem)topLevelItem).getDistance()) {
                 NearItem near = new NearItem(distance);
 
                 near.addItem(topLevelItem);
@@ -188,7 +198,7 @@ public class AdvancedParser extends StructuredParser {
         } else if (isTheWord("onear", item)) {
             int distance = consumeNumericArgument();
             if (distance==0)
-                distance=ONearItem.defaultDistance;
+                distance= ONearItem.defaultDistance;
             if (topLevelIsClosed || !(topLevelItem instanceof ONearItem) || distance!=((ONearItem)topLevelItem).getDistance()) {
                 ONearItem oNear = new ONearItem(distance);
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
index 09caa72ca59..09583f420cb 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AllParser.java
@@ -204,8 +204,7 @@ public class AllParser extends SimpleParser {
                 rank.addItem(topLevelItem);
             }
             return rank;
-        } else if ((item instanceof RankItem) && (((RankItem)item).getItem(0) instanceof OrItem)) {
-            RankItem itemAsRank = (RankItem) item;
+        } else if ((item instanceof RankItem itemAsRank) && (((RankItem)item).getItem(0) instanceof OrItem)) {
             OrItem or = (OrItem) itemAsRank.getItem(0);
 
             ((RankItem) topLevelItem).addItem(0, or);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java
index f4ff769ad05..603c3258ce2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java
@@ -14,9 +14,7 @@ import com.yahoo.prelude.query.RankItem;
 import com.yahoo.prelude.query.TermItem;
 import com.yahoo.search.query.parser.ParserEnvironment;
 
-import java.util.Collections;
 import java.util.Iterator;
-import java.util.Set;
 
 import static com.yahoo.prelude.query.parser.Token.Kind.*;
 
@@ -148,9 +146,7 @@ public class AnyParser extends SimpleParser {
 
     private Item filterItems(Item root) {
         while (tokens.hasNext()) {
-            Item item = null;
-
-            item = positiveItem();
+            Item item = positiveItem();
             root = addAndFilter(root, item);
             if (item == null) {
                 item = negativeItem();
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/CustomParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/CustomParser.java
index e867def5903..e3b2278475b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/CustomParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/CustomParser.java
@@ -7,7 +7,6 @@ import com.yahoo.prelude.query.Item;
 import com.yahoo.search.query.parser.Parser;
 
 import java.util.Collections;
-import java.util.Objects;
 import java.util.Set;
 
 /**
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java
index bef2ca9ffe9..82515c51c05 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/ParseException.java
@@ -1,13 +1,11 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query.parser;
 
-
 /**
  * Parser exceptions. JavaCC legacy, never thrown.
  *
- * @author  bratseth
+ * @author bratseth
  */
-@SuppressWarnings("serial")
 public class ParseException extends RuntimeException {
 
     public ParseException(String message) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/ProgrammaticParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/ProgrammaticParser.java
index 6a005bc0ec9..209753a596c 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/ProgrammaticParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/ProgrammaticParser.java
@@ -9,8 +9,6 @@ import com.yahoo.search.query.QueryTree;
 import com.yahoo.search.query.parser.Parsable;
 import com.yahoo.search.query.textserialize.TextSerialize;
 
-import java.util.Set;
-
 /**
  * @author Simon Thoresen Hult
  */
@@ -32,4 +30,5 @@ public final class ProgrammaticParser implements CustomParser {
         if (queryToParse == null)  return null;
         return TextSerialize.parse(queryToParse);
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java
index fafbf55a522..0f94e4ce21d 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java
@@ -1,7 +1,16 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query.parser;
 
-import com.yahoo.prelude.query.*;
+import com.yahoo.prelude.query.AndItem;
+import com.yahoo.prelude.query.BlockItem;
+import com.yahoo.prelude.query.CompositeItem;
+import com.yahoo.prelude.query.Item;
+import com.yahoo.prelude.query.NotItem;
+import com.yahoo.prelude.query.OrItem;
+import com.yahoo.prelude.query.PhraseItem;
+import com.yahoo.prelude.query.RankItem;
+import com.yahoo.prelude.query.TermItem;
+import com.yahoo.prelude.query.TrueItem;
 import com.yahoo.search.query.parser.ParserEnvironment;
 
 import java.util.Iterator;
@@ -54,7 +63,7 @@ abstract class SimpleParser extends StructuredParser {
     private Item anyItemsBody(boolean topLevel, String defaultIndexName) {
         Item topLevelItem = null;
         NotItem not = null;
-        Item item = null;
+        Item item;
         do {
             item = positiveItem();
             if (item != null) {
@@ -177,9 +186,7 @@ abstract class SimpleParser extends StructuredParser {
                 return null;
             }
 
-            if (item == null) {
-                item = indexableItem();
-            }
+            item = indexableItem();
 
             if (item == null) {
                 item = compositeItem();
@@ -200,12 +207,10 @@ abstract class SimpleParser extends StructuredParser {
      * (+ items) are not found, but negatives are.
      */
     private Item getItemAsPositiveItem(Item item, NotItem not) {
-        if (!(item instanceof RankItem)) {
+        if (!(item instanceof RankItem rank)) {
             return item;
         }
 
-        RankItem rank = (RankItem) item;
-
         // Remove the not from the rank item, the rank should generally
         // be the first, but this is not always the case
         int limit = rank.getItemCount();
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
index c668cf66447..0d6a06961d1 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java
@@ -2,7 +2,24 @@
 package com.yahoo.prelude.query.parser;
 
 import com.yahoo.prelude.IndexFacts;
-import com.yahoo.prelude.query.*;
+import com.yahoo.prelude.query.AndItem;
+import com.yahoo.prelude.query.AndSegmentItem;
+import com.yahoo.prelude.query.BlockItem;
+import com.yahoo.prelude.query.CompositeItem;
+import com.yahoo.prelude.query.IntItem;
+import com.yahoo.prelude.query.Item;
+import com.yahoo.prelude.query.MarkerWordItem;
+import com.yahoo.prelude.query.PhraseItem;
+import com.yahoo.prelude.query.PhraseSegmentItem;
+import com.yahoo.prelude.query.PrefixItem;
+import com.yahoo.prelude.query.SegmentItem;
+import com.yahoo.prelude.query.Substring;
+import com.yahoo.prelude.query.SubstringItem;
+import com.yahoo.prelude.query.SuffixItem;
+import com.yahoo.prelude.query.TaggableItem;
+import com.yahoo.prelude.query.TermItem;
+import com.yahoo.prelude.query.UriItem;
+import com.yahoo.prelude.query.WordItem;
 import com.yahoo.search.query.parser.ParserEnvironment;
 
 import java.util.ArrayList;
@@ -592,7 +609,7 @@ abstract class StructuredParser extends AbstractParser {
                 if (firstWord instanceof IntItem) {
                     IntItem asInt = (IntItem) firstWord;
                     firstWord = new WordItem(asInt.stringValue(), asInt.getIndexName(),
-                            true, asInt.getOrigin());
+                                             true, asInt.getOrigin());
                 }
                 composite.addItem(firstWord);
                 composite.addItem(word);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java
index b668df9208c..3bf4d9dcf01 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Token.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query.parser;
 
-
 import com.yahoo.prelude.query.Substring;
 
 /**
@@ -11,7 +10,7 @@ import com.yahoo.prelude.query.Substring;
  */
 public class Token {
 
-    public static enum Kind {
+    public enum Kind {
         EOF("<EOF>"),
         NUMBER("<NUMBER>"),
         WORD("<WORD>"),
@@ -77,31 +76,6 @@ public class Token {
     /** Returns whether this is a <i>special token</i> */
     public boolean isSpecial() { return special; }
 
-    public String toString() { return image; }
-
-    public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object == null) {
-            return false;
-        }
-        if (object.getClass() != this.getClass()) {
-            return false;
-        }
-
-        Token other = (Token) object;
-
-        if (this.kind != other.kind) {
-            return false;
-        }
-        if (!(this.image.equals(other.image))) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Returns the substring containing the image ins original form (including casing),
      * as well as all the text surrounding the token
@@ -110,6 +84,22 @@ public class Token {
      */
     public Substring getSubstring() { return substring; }
 
+    @Override
+    public String toString() { return image; }
+
+    @Override
+    public boolean equals(Object object) {
+        if (this == object) return true;
+        if (object == null) return false;
+        if (object.getClass() != this.getClass()) return false;
+
+        Token other = (Token) object;
+        if (this.kind != other.kind) return false;
+        if (!(this.image.equals(other.image))) return false;
+        return true;
+    }
+
+    @Override
     public int hashCode() {
         return image.hashCode() ^ kind.hashCode();
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java
index 9c60abab637..5ead962e430 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/TokenPosition.java
@@ -37,9 +37,7 @@ final class TokenPosition {
      * Returns null (no exception) if there are no more tokens.
      */
     public Token current() {
-        Token token = current(0);
-
-        return token;
+        return current(0);
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java
index 93b8cf1ed83..c1d415b8e27 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/Tokenizer.java
@@ -84,7 +84,6 @@ public final class Tokenizer {
      * @param indexFacts information about the indexes we will search
      * @return a read-only list of tokens. This list can only be used by this thread
      */
-    @SuppressWarnings({"deprecation"})
     // To avoid this we need to pass an IndexFacts.session down instead - easily done but not without breaking API's
     public List<Token> tokenize(String string, String defaultIndexName, IndexFacts.Session indexFacts) {
         this.source = string;
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java
index b01b1295f45..8d2adfe0d78 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/UnicodePropertyDump.java
@@ -26,13 +26,13 @@ class UnicodePropertyDump {
         boolean debug = false;
 
         if (arg.length > 0) {
-            start = Integer.valueOf(arg[0]).intValue();
+            start = Integer.parseInt(arg[0]);
         }
         if (arg.length > 1) {
-            end = Integer.valueOf(arg[1]).intValue();
+            end = Integer.parseInt(arg[1]);
         }
         if (arg.length > 2) {
-            debug = Boolean.valueOf(arg[2]).booleanValue();
+            debug = Boolean.parseBoolean(arg[2]);
         }
         dumpProperties(start, end, debug, System.out);
     }
@@ -109,4 +109,5 @@ class UnicodePropertyDump {
             out.println();
         }
     }
+
 }