Remove use of Nullable and NotNull annotations

Different implementations and using OSGi makes it really
hard to use these annotations and the value of using them
is IMHO not very high.

15 files changed, 16 insertions, 114 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
index 0c8ebd70b5e..6d3ae440152 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
@@ -23,7 +23,6 @@ import com.yahoo.search.grouping.request.GroupingOperation;
 import com.yahoo.search.query.Ranking;
 import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.searchchain.Execution;
-import edu.umd.cs.findbugs.annotations.NonNull;
 
 import java.io.IOException;
 import java.util.Optional;
@@ -262,7 +261,7 @@ public class FastSearcher extends VespaBackEndSearcher {
         return Optional.of(local);
     }
 
-    private static @NonNull Optional<String> quotedSummaryClass(String summaryClass) {
+    private static Optional<String> quotedSummaryClass(String summaryClass) {
         return Optional.of(summaryClass == null ? "[null]" : quote(summaryClass));
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java b/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java
index 91378eeca21..bac227ac3e3 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java
@@ -3,8 +3,6 @@ package com.yahoo.prelude.query;
 
 import java.util.Iterator;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * An immutable and'ing of a collection of sub-expressions. It does not extend
  * AndItem to avoid code using instanceof handling it as an AndItem.
@@ -41,7 +39,6 @@ public class AndSegmentItem extends SegmentItem implements BlockItem {
         return "SAND";
     }
 
-    @NonNull
     public String getIndexName() {
         if (getItemCount() == 0) {
             return "";
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/CompositeIndexedItem.java b/container-search/src/main/java/com/yahoo/prelude/query/CompositeIndexedItem.java
index 3e53fc64a13..d3a9bb28519 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/CompositeIndexedItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/CompositeIndexedItem.java
@@ -3,8 +3,6 @@ package com.yahoo.prelude.query;
 
 import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 import java.nio.ByteBuffer;
 
 /**
@@ -22,13 +20,11 @@ import java.nio.ByteBuffer;
  */
 public abstract class CompositeIndexedItem extends CompositeTaggableItem implements IndexedItem {
 
-    @NonNull
     private String index = "";
 
     /**
      * The name of the index this belongs to, or "" (never null) if not specified
      **/
-    @NonNull
     public String getIndexName() {
         return index;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java b/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java
index 8a91587daa2..6641dee9780 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java
@@ -1,21 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.query;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
-
 /**
  * An interface for items where it is useful to access an associated
  * index name.
  *
- * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author  Steinar Knutsen
  */
 public interface HasIndexItem {
 
-    @NonNull
-    public String getIndexName();
+    String getIndexName();
 
     /** @return how many phrase words does this item contain */
-    public int getNumWords();
+    int getNumWords();
 
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java
index b459f0aa902..a06009e642a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/IndexedSegmentItem.java
@@ -3,8 +3,6 @@ package com.yahoo.prelude.query;
 
 import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 import java.nio.ByteBuffer;
 
 /**
@@ -22,7 +20,6 @@ import java.nio.ByteBuffer;
  */
 public abstract class IndexedSegmentItem extends TaggableSegmentItem implements IndexedItem {
 
-    @NonNull
     private String index = "";
 
     protected IndexedSegmentItem(String rawWord, String current, boolean isFromQuery, boolean stemmed, Substring origin) {
@@ -32,7 +29,6 @@ public abstract class IndexedSegmentItem extends TaggableSegmentItem implements
     /**
      * The name of the index this belongs to, or "" (never null) if not specified
      **/
-    @NonNull
     public String getIndexName() {
         return index;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java
index a8dc9db1928..5d5976e2383 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java
@@ -3,8 +3,6 @@ package com.yahoo.prelude.query;
 
 import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 import java.nio.ByteBuffer;
 
 /**
@@ -22,11 +20,9 @@ import java.nio.ByteBuffer;
  */
 public abstract class SimpleIndexedItem extends SimpleTaggableItem implements IndexedItem {
 
-    @NonNull
     private String index = "";
 
     /** The name of the index this belongs to, or "" (never null) if not specified */
-    @NonNull
     public String getIndexName() {
         return index;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java
index 902fefae9be..033986dc90f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WeakAndItem.java
@@ -4,8 +4,6 @@ package com.yahoo.prelude.query;
 import com.yahoo.compress.IntegerCompressor;
 import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 import java.nio.ByteBuffer;
 
 /**
@@ -21,7 +19,6 @@ import java.nio.ByteBuffer;
 public final class WeakAndItem extends NonReducibleCompositeItem {
 
     private int N;
-    @NonNull
     private String index;
     private int scoreThreshold = 0;
 
@@ -56,7 +53,6 @@ public final class WeakAndItem extends NonReducibleCompositeItem {
         this.index = toSet;
     }
 
-    @NonNull
     public String getIndexName() {
         return index;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java
index b87de5f019a..0e74099174f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java
@@ -5,8 +5,6 @@ import com.yahoo.collections.CopyOnWriteHashMap;
 import com.yahoo.compress.IntegerCompressor;
 import com.yahoo.prelude.query.textualrepresentation.Discloser;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.Map;
@@ -27,7 +25,6 @@ import java.util.Map;
  */
 public class WeightedSetItem extends SimpleTaggableItem {
 
-    @NonNull
     private String indexName = "";
 
     private CopyOnWriteHashMap<Object,Integer> set = new CopyOnWriteHashMap<>(1000);
@@ -99,7 +96,6 @@ public class WeightedSetItem extends SimpleTaggableItem {
         }
     }
 
-    @NonNull
     public String getIndexName() {
         return indexName;
     }
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 84db07d20da..eef4cb72e9b 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -35,7 +35,6 @@ import com.yahoo.search.Query;
 import com.yahoo.search.Result;
 import com.yahoo.search.Searcher;
 import com.yahoo.search.config.IndexInfoConfig;
-import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfile;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileConfigurer;
@@ -50,7 +49,7 @@ import com.yahoo.statistics.Handle;
 import com.yahoo.statistics.Statistics;
 import com.yahoo.statistics.Value;
 import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
-import edu.umd.cs.findbugs.annotations.NonNull;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -308,7 +307,6 @@ public class SearchHandler extends LoggingRequestHandler {
         return result.hits().getErrorHit() == null ? 0 : 1;
     }
 
-    @NonNull
     private Renderer<Result> toRendererCopy(ComponentSpecification format) {
         Renderer<Result> renderer = executionFactory.rendererRegistry().getRenderer(format);
         renderer = perRenderingCopy(renderer);
@@ -374,7 +372,6 @@ public class SearchHandler extends LoggingRequestHandler {
         return perRenderingCopy(renderer);
     }
 
-    @NonNull
     private Renderer<Result> perRenderingCopy(Renderer<Result> renderer) {
         Renderer<Result> copy = renderer.clone();
         copy.init();
diff --git a/container-search/src/main/java/com/yahoo/search/query/Presentation.java b/container-search/src/main/java/com/yahoo/search/query/Presentation.java
index 6edef386d49..13196488e98 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Presentation.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Presentation.java
@@ -10,14 +10,11 @@ import com.yahoo.search.Query;
 import com.yahoo.search.query.profile.types.FieldDescription;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.rendering.RendererRegistry;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-
 /**
  * Parameters deciding how the result of a query should be presented
  *
@@ -69,7 +66,6 @@ public class Presentation implements Cloneable {
     private boolean timing = false;
 
     /** Set of explicitly requested summary fields, instead of summary classes */
-    @NonNull
     private Set<String> summaryFields = LazySet.newHashSet();
 
     private static final Splitter COMMA_SPLITTER = Splitter.on(',').omitEmptyStrings().trimResults();
@@ -95,24 +91,22 @@ public class Presentation implements Cloneable {
     public void setBolding(boolean bolding) { this.bolding = bolding; }
 
     /** Get the name of the format desired for result rendering. */
-    @NonNull
     public ComponentSpecification getRenderer() { return format; }
 
     /** Set the desired format for result rendering. If null, use the default renderer. */
-    public void setRenderer(@Nullable ComponentSpecification format) {
+    public void setRenderer(ComponentSpecification format) {
         this.format = (format != null) ? format : RendererRegistry.defaultRendererId.toSpecification();
     }
 
     /**
      * Get the name of the format desired for result rendering.
      */
-    @NonNull
     public String getFormat() { return format.getName(); }
 
     /**
      * Set the desired format for result rendering. If null, use the default renderer.
      */
-    public void setFormat(@Nullable String format) {
+    public void setFormat(String format) {
         setRenderer(ComponentSpecification.fromString(format));
     }
 
@@ -168,7 +162,6 @@ public class Presentation implements Cloneable {
      *
      * @return the set of names of requested fields, never null
      */
-    @NonNull
     public Set<String> getSummaryFields() {
         return summaryFields;
     }
diff --git a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
index ae1d82ef0fb..7540f06266c 100644
--- a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
+++ b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java
@@ -46,7 +46,6 @@ import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Inspector;
 import com.yahoo.slime.ObjectTraverser;
 import com.yahoo.vespa.config.SlimeUtils;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -225,7 +224,6 @@ public class SelectParser implements Parser {
         return operations;
     }
 
-    @NonNull
     private Item buildFunctionCall(String key, Inspector value) {
         switch (key) {
             case WAND:
@@ -358,7 +356,6 @@ public class SelectParser implements Parser {
         return annotations.get(annotationName);
     }
 
-    @NonNull
     private CompositeItem buildAnd(String key, Inspector value) {
         AndItem andItem = new AndItem();
         addItemsFromInspector(andItem, value);
@@ -366,7 +363,6 @@ public class SelectParser implements Parser {
         return andItem;
     }
 
-    @NonNull
     private CompositeItem buildNotAnd(String key, Inspector value) {
         NotItem notItem = new NotItem();
         addItemsFromInspector(notItem, value);
@@ -374,14 +370,12 @@ public class SelectParser implements Parser {
         return notItem;
     }
 
-    @NonNull
     private CompositeItem buildOr(String key, Inspector value) {
         OrItem orItem = new OrItem();
         addItemsFromInspector(orItem, value);
         return orItem;
     }
 
-    @NonNull
     private CompositeItem buildWeakAnd(String key, Inspector value) {
         WeakAndItem weakAnd = new WeakAndItem();
         addItemsFromInspector(weakAnd, value);
@@ -401,8 +395,7 @@ public class SelectParser implements Parser {
         return weakAnd;
     }
 
-    @NonNull
-    private <T extends TaggableItem> T leafStyleSettings(Inspector annotations, @NonNull T out) {
+    private <T extends TaggableItem> T leafStyleSettings(Inspector annotations, T out) {
         {
             if (annotations != null) {
                 Inspector  itemConnectivity= getAnnotationAsInspectorOrNull(CONNECTIVITY, getAnnotationMapFromAnnotationInspector(annotations));
@@ -597,29 +590,23 @@ public class SelectParser implements Parser {
         return leafStyleSettings(annotations, range);
     }
 
-    @NonNull
     private IntItem buildGreaterThanOrEquals(String field, String bound) {
         return new IntItem("[" + bound + ";]", field);
 
     }
 
-    @NonNull
     private IntItem buildLessThanOrEquals(String field, String bound) {
         return new IntItem("[;" + bound + "]", field);
     }
 
-    @NonNull
     private IntItem buildGreaterThan(String field, String bound) {
         return new IntItem(">" + bound, field);
-
     }
 
-    @NonNull
     private IntItem buildLessThan(String field, String bound) {
         return new IntItem("<" + bound, field);
     }
 
-    @NonNull
     private IntItem instantiateRangeItem(Number lowerBound, Number upperBound, String field, boolean bounds_left_open, boolean bounds_right_open) {
         Preconditions.checkArgument(lowerBound != null && upperBound != null && field != null,
                 "Expected 3 NonNull-arguments");
@@ -665,7 +652,7 @@ public class SelectParser implements Parser {
         return fillWeightedSet(value, children, out);
     }
 
-    private WeightedSetItem fillWeightedSet(Inspector value, HashMap<Integer, Inspector> children, @NonNull WeightedSetItem out) {
+    private WeightedSetItem fillWeightedSet(Inspector value, HashMap<Integer, Inspector> children, WeightedSetItem out) {
         addItems(children, out);
 
         return leafStyleSettings(getAnnotations(value), out);
@@ -707,7 +694,6 @@ public class SelectParser implements Parser {
         });
     }
 
-    @NonNull
     private Item buildRegExpSearch(String key, Inspector value) {
         assertHasOperator(key, MATCHES);
         HashMap<Integer, Inspector> children = childMap(value);
@@ -717,7 +703,6 @@ public class SelectParser implements Parser {
         return leafStyleSettings(getAnnotations(value), regExp);
     }
 
-    @NonNull
     private Item buildWeightedSet(String key, Inspector value) {
         HashMap<Integer, Inspector> children = childMap(value);
         String field = children.get(0).asString();
@@ -725,7 +710,6 @@ public class SelectParser implements Parser {
         return fillWeightedSet(value, children, new WeightedSetItem(field));
     }
 
-    @NonNull
     private Item buildDotProduct(String key, Inspector value) {
         HashMap<Integer, Inspector> children = childMap(value);
         String field = children.get(0).asString();
@@ -733,7 +717,6 @@ public class SelectParser implements Parser {
         return fillWeightedSet(value, children, new DotProductItem(field));
     }
 
-    @NonNull
     private Item buildPredicate(String key, Inspector value) {
         HashMap<Integer, Inspector> children = childMap(value);
         String field = children.get(0).asString();
@@ -762,14 +745,12 @@ public class SelectParser implements Parser {
         return leafStyleSettings(getAnnotations(value), item);
     }
 
-    @NonNull
     private CompositeItem buildRank(String key, Inspector value) {
         RankItem rankItem = new RankItem();
         addItemsFromInspector(rankItem, value);
         return rankItem;
     }
 
-    @NonNull
     private Item buildTermSearch(String key, Inspector value) {
         HashMap<Integer, Inspector> children = childMap(value);
         String field = children.get(0).asString();
@@ -788,7 +769,6 @@ public class SelectParser implements Parser {
         return actualKey[0];
     }
 
-    @NonNull
     private Item instantiateLeafItem(String field, String key, Inspector value) {
         List<Inspector> possibleLeafFunction = valueListFromInspector(value);
         String possibleLeafFunctionName = (possibleLeafFunction.size() > 1) ? getInspectorKey(possibleLeafFunction.get(1)) : "";
@@ -801,7 +781,6 @@ public class SelectParser implements Parser {
         }
     }
 
-    @NonNull
     private Item instantiateCompositeLeaf(String field, String key, Inspector value) {
         switch (key) {
             case SAME_ELEMENT:
@@ -821,7 +800,6 @@ public class SelectParser implements Parser {
         }
     }
 
-    @NonNull
     private Item instantiateWordItem(String field, String key, Inspector value) {
         var children = childMap(value);
         if (children.size() < 2)
@@ -831,7 +809,6 @@ public class SelectParser implements Parser {
         return instantiateWordItem(field, wordData, key, value, false, decideParsingLanguage(value, wordData));
     }
 
-    @NonNull
     private Item instantiateWordItem(String field, String rawWord, String key, Inspector value, boolean exactMatch, Language language) {
         String wordData = rawWord;
         HashMap<String, Inspector> annotations = getAnnotationMap(value);
@@ -849,7 +826,6 @@ public class SelectParser implements Parser {
         Preconditions.checkArgument((prefixMatch ? 1 : 0)
                         + (substrMatch ? 1 : 0) + (suffixMatch ? 1 : 0) < 2,
                 "Only one of prefix, substring and suffix can be set.");
-        @NonNull
         final TaggableItem wordItem;
 
         if (exactMatch) {
@@ -956,8 +932,6 @@ public class SelectParser implements Parser {
         return null;
     }
 
-
-    @NonNull
     private Item instantiateSameElementItem(String field, String key, Inspector value) {
         assertHasOperator(key, SAME_ELEMENT);
 
@@ -970,7 +944,6 @@ public class SelectParser implements Parser {
         return sameElement;
     }
 
-    @NonNull
     private Item instantiatePhraseItem(String field, String key, Inspector value) {
         assertHasOperator(key, PHRASE);
 
@@ -988,7 +961,6 @@ public class SelectParser implements Parser {
         return leafStyleSettings(getAnnotations(value), phrase);
     }
 
-    @NonNull
     private Item instantiateNearItem(String field, String key, Inspector value) {
         assertHasOperator(key, NEAR);
 
@@ -1009,7 +981,6 @@ public class SelectParser implements Parser {
         return near;
     }
 
-    @NonNull
     private Item instantiateONearItem(String field, String key, Inspector value) {
         assertHasOperator(key, ONEAR);
 
@@ -1028,8 +999,6 @@ public class SelectParser implements Parser {
         return onear;
     }
 
-
-    @NonNull
     private Item instantiateEquivItem(String field, String key, Inspector value) {
 
         HashMap<Integer, Inspector> children = childMap(value);
@@ -1067,7 +1036,6 @@ public class SelectParser implements Parser {
     }
 
     //  Not in use yet
-    @NonNull
     private String getIndex(String field) {
         Preconditions.checkArgument(indexFactsSession.isIndex(field), "Field '%s' does not exist.", field);
         //return indexFactsSession.getCanonicName(field);
diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
index 45d74da53eb..df9f2af0cce 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java
@@ -19,8 +19,6 @@ import com.yahoo.search.Searcher;
 import com.yahoo.search.query.Presentation;
 import com.yahoo.search.searchchain.Execution;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Ensure the fields specified in {@link Presentation#getSummaryFields()} are
  * available after filling phase.
@@ -48,7 +46,6 @@ public class FieldFiller extends Searcher {
             docType.put(summary.name(), fields);
         }
 
-        @NonNull
         private Map<String, Set<String>> getOrCreateDocType(String dbName) {
             Map<String, Set<String>> docType = db.get(dbName);
             if (docType == null) {
diff --git a/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java b/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
index 6c43955bead..431f159db01 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/OperatorNode.java
@@ -7,7 +7,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -166,9 +165,8 @@ final class OperatorNode<T extends Operator> {
 
     // we are aware only of types used in our logical operator trees -- OperatorNode, List, and constant values
     private static final Function<Object, Object> COPY = new Function<Object, Object>() {
-        @Nullable
         @Override
-        public Object apply(@Nullable Object input) {
+        public Object apply(Object input) {
             if (input instanceof List) {
                 List<Object> newList = Lists.newArrayListWithExpectedSize(((List) input).size());
                 for (Object val : (List) input) {
diff --git a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
index f706310221c..f326903bff5 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java
@@ -102,8 +102,6 @@ import com.yahoo.search.Query;
 import com.yahoo.search.grouping.Continuation;
 import com.yahoo.search.grouping.GroupingRequest;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Serialize Vespa query trees to YQL+ strings.
  *
@@ -1391,7 +1389,7 @@ public class VespaSerializer {
                 .append("\": ").append(length).append("}");
     }
 
-    private static String normalizeIndexName(@NonNull String indexName) {
+    private static String normalizeIndexName(String indexName) {
         if (indexName.length() == 0) {
             return "default";
         } else {
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
index 9850deabcb9..b660d90072b 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
@@ -77,8 +77,6 @@ import com.yahoo.search.query.parser.Parser;
 import com.yahoo.search.query.parser.ParserEnvironment;
 import com.yahoo.search.query.parser.ParserFactory;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * The YQL query language.
  *
@@ -234,7 +232,6 @@ public class YqlParser implements Parser {
         this.environment = environment;
     }
 
-    @NonNull
     @Override
     public QueryTree parse(Parsable query) {
         indexFactsSession = indexFacts.newSession(query.getSources(), query.getRestrict());
@@ -267,7 +264,6 @@ public class YqlParser implements Parser {
         docTypes = new HashSet<>(indexFactsSession.documentTypes());
     }
 
-    @NonNull
     private QueryTree buildTree(OperatorNode<?> filterPart) {
         Preconditions.checkArgument(filterPart.getArguments().length == 2,
                                     "Expected 2 arguments to filter, got %s.",
@@ -395,7 +391,6 @@ public class YqlParser implements Parser {
         return item;
     }
 
-    @NonNull
     private Item buildWeightedSet(OperatorNode<ExpressionOperator> ast) {
         List<OperatorNode<ExpressionOperator>> args = ast.getArgument(1);
         Preconditions.checkArgument(args.size() == 2, "Expected 2 arguments, got %s.", args.size());
@@ -403,7 +398,6 @@ public class YqlParser implements Parser {
         return fillWeightedSet(ast, args.get(1), new WeightedSetItem(getIndex(args.get(0))));
     }
 
-    @NonNull
     private Item buildDotProduct(OperatorNode<ExpressionOperator> ast) {
         List<OperatorNode<ExpressionOperator>> args = ast.getArgument(1);
         Preconditions.checkArgument(args.size() == 2, "Expected 2 arguments, got %s.", args.size());
@@ -411,7 +405,6 @@ public class YqlParser implements Parser {
         return fillWeightedSet(ast, args.get(1), new DotProductItem(getIndex(args.get(0))));
     }
 
-    @NonNull
     private Item buildPredicate(OperatorNode<ExpressionOperator> ast) {
         List<OperatorNode<ExpressionOperator>> args = ast.getArgument(1);
         Preconditions.checkArgument(args.size() == 3, "Expected 3 arguments, got %s.", args.size());
@@ -474,7 +467,6 @@ public class YqlParser implements Parser {
         }
     }
 
-    @NonNull
     private Item buildWand(OperatorNode<ExpressionOperator> ast) {
         List<OperatorNode<ExpressionOperator>> args = ast.getArgument(1);
         Preconditions.checkArgument(args.size() == 2, "Expected 2 arguments, got %s.", args.size());
@@ -496,10 +488,9 @@ public class YqlParser implements Parser {
         return fillWeightedSet(ast, args.get(1), out);
     }
 
-    @NonNull
     private WeightedSetItem fillWeightedSet(OperatorNode<ExpressionOperator> ast,
                                             OperatorNode<ExpressionOperator> arg,
-                                            @NonNull WeightedSetItem out) {
+                                            WeightedSetItem out) {
         addItems(arg, out);
         return leafStyleSettings(ast, out);
     }
@@ -515,7 +506,7 @@ public class YqlParser implements Parser {
             return prefix + leaf;
         }
     }
-    @NonNull
+
     private Item instantiateSameElementItem(String field, OperatorNode<ExpressionOperator> ast) {
         assertHasFunctionName(ast, SAME_ELEMENT);
 
@@ -529,7 +520,6 @@ public class YqlParser implements Parser {
         return sameElement;
     }
 
-    @NonNull
     private Item instantiatePhraseItem(String field, OperatorNode<ExpressionOperator> ast) {
         assertHasFunctionName(ast, PHRASE);
 
@@ -564,7 +554,6 @@ public class YqlParser implements Parser {
         return leafStyleSettings(ast, phrase);
     }
 
-    @NonNull
     private Item instantiatePhraseSegmentItem(String field, OperatorNode<ExpressionOperator> ast, boolean forcePhrase) {
         Substring origin = getOrigin(ast);
         Boolean stem = getAnnotation(ast, STEM, Boolean.class, Boolean.TRUE, STEM_DESCRIPTION);
@@ -600,7 +589,6 @@ public class YqlParser implements Parser {
         return phrase;
     }
 
-    @NonNull
     private Item instantiateNearItem(String field, OperatorNode<ExpressionOperator> ast) {
         assertHasFunctionName(ast, NEAR);
 
@@ -616,7 +604,6 @@ public class YqlParser implements Parser {
         return near;
     }
 
-    @NonNull
     private Item instantiateONearItem(String field, OperatorNode<ExpressionOperator> ast) {
         assertHasFunctionName(ast, ONEAR);
 
@@ -632,7 +619,6 @@ public class YqlParser implements Parser {
         return onear;
     }
 
-    @NonNull
     private Item fetchUserQuery() {
         Preconditions.checkState(!queryParser, "Tried inserting user query into itself.");
         Preconditions.checkState(userQuery != null,
@@ -641,7 +627,6 @@ public class YqlParser implements Parser {
         return userQuery.getModel().getQueryTree().getRoot();
     }
 
-    @NonNull
     private Item buildUserInput(OperatorNode<ExpressionOperator> ast) {
         // TODO add support for default arguments if property results in nothing
         List<OperatorNode<ExpressionOperator>> args = ast.getArgument(1);
@@ -702,7 +687,6 @@ public class YqlParser implements Parser {
         ToolBox.visit(new AnnotationPropagator(ast), item);
     }
 
-    @NonNull
     private Item parseUserInput(String grammar, String defaultIndex, String wordData,
                                 Language language, boolean allowNullItem) {
         Query.Type parseAs = Query.Type.getType(grammar);
@@ -721,7 +705,6 @@ public class YqlParser implements Parser {
         return item;
     }
 
-    @NonNull
     private OperatorNode<?> parseYqlProgram() {
         OperatorNode<?> ast;
         try {
@@ -766,7 +749,6 @@ public class YqlParser implements Parser {
         return ast;
     }
 
-    @NonNull
     private OperatorNode<?> fetchSorting(OperatorNode<?> ast) {
         if (ast.getOperator() != SequenceOperator.SORT) return ast;
 
@@ -840,7 +822,6 @@ public class YqlParser implements Parser {
         return ast.getArgument(0);
     }
 
-    @NonNull
     private OperatorNode<?> fetchOffsetAndHits(OperatorNode<?> ast) {
         if (ast.getOperator() == SequenceOperator.OFFSET) {
             offset = ast.<OperatorNode<?>> getArgument(1).<Integer> getArgument(0);
@@ -860,7 +841,6 @@ public class YqlParser implements Parser {
         return ast;
     }
 
-    @NonNull
     private OperatorNode<?> fetchSummaryFields(OperatorNode<?> ast) {
         if (ast.getOperator() != SequenceOperator.PROJECT) return ast;
 
@@ -1032,7 +1012,7 @@ public class YqlParser implements Parser {
         return convertVarArgs(spec, 1, new RankItem());
     }
 
-    private CompositeItem convertVarArgs(OperatorNode<ExpressionOperator> ast, int argIdx, @NonNull CompositeItem out) {
+    private CompositeItem convertVarArgs(OperatorNode<ExpressionOperator> ast, int argIdx, CompositeItem out) {
         Iterable<OperatorNode<ExpressionOperator>> args = ast.getArgument(argIdx);
         for (OperatorNode<ExpressionOperator> arg : args) {
             assertHasOperator(arg, ExpressionOperator.class);
@@ -1277,7 +1257,6 @@ public class YqlParser implements Parser {
      */
     // TODO: Clean up such that there is one way to look up an Index instance
     //       which always expands first, but not using getIndex, which performs checks that doesn't always work
-    @NonNull
     private Item instantiateWordItem(String field,
                                      String rawWord,
                                      OperatorNode<ExpressionOperator> ast, Class<?> parent,
@@ -1389,7 +1368,7 @@ public class YqlParser implements Parser {
         wordStyleSettings(ast, wordItem);
     }
 
-    private <T extends TaggableItem> T leafStyleSettings(OperatorNode<?> ast, @NonNull T out) {
+    private <T extends TaggableItem> T leafStyleSettings(OperatorNode<?> ast, T out) {
         {
             Map<?, ?> connectivity = getAnnotation(ast, CONNECTIVITY, Map.class, null, "connectivity settings");
             if (connectivity != null) {
@@ -1473,7 +1452,7 @@ public class YqlParser implements Parser {
     public void setQueryParser(boolean queryParser) { this.queryParser = queryParser; }
 
     @Beta
-    public void setUserQuery(@NonNull Query userQuery) { this.userQuery = userQuery; }
+    public void setUserQuery(Query userQuery) { this.userQuery = userQuery; }
 
     @Beta
     public Set<String> getYqlSummaryFields() { return yqlSummaryFields; }