Merge pull request #2210 from yahoo/arnej/silence-warnings-2

Arnej/silence warnings 2

50 files changed, 147 insertions, 71 deletions

diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index 1f90c195065..7671d50bb96 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java
@@ -27,7 +27,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -49,6 +48,7 @@ import static com.yahoo.application.container.JDiscTest.getListenPort;
 /**
  * @author bratseth
  */
+@SuppressWarnings("deprecation")
 public class ApplicationTest {
 
     @Test
@@ -331,7 +331,7 @@ public class ApplicationTest {
     public void http_interface_is_off_when_networking_is_disabled() throws Exception {
         int httpPort = getFreePort();
         try (Application application = Application.fromServicesXml(servicesXmlWithServer(httpPort), Networking.disable)) {
-            HttpClient client = new DefaultHttpClient();
+            HttpClient client = new org.apache.http.impl.client.DefaultHttpClient();
             int statusCode = client.execute(new HttpGet("http://localhost:" + httpPort)).getStatusLine().getStatusCode();
             fail("Networking.disable is specified, but the network interface is enabled! Got status code: " + statusCode);
         }
@@ -341,7 +341,7 @@ public class ApplicationTest {
     public void http_interface_is_on_when_networking_is_enabled() throws Exception {
         int httpPort = getFreePort();
         try (Application application = Application.fromServicesXml(servicesXmlWithServer(httpPort), Networking.enable)) {
-            HttpClient client = new DefaultHttpClient();
+            HttpClient client = new org.apache.http.impl.client.DefaultHttpClient();
             HttpResponse response = client.execute(new HttpGet("http://localhost:" + httpPort));
             assertEquals(200, response.getStatusLine().getStatusCode());
             BufferedReader r = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
diff --git a/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java b/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java
index 95765e69d33..3cd1de85475 100644
--- a/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java
+++ b/application/src/test/java/com/yahoo/application/container/processors/Rot13Processor.java
@@ -14,6 +14,7 @@ import static com.yahoo.application.container.docprocs.Rot13DocumentProcessor.ro
  */
 public class Rot13Processor extends Processor {
 
+    @SuppressWarnings("unchecked")
     @Override
     public Response process(Request request, Execution execution) {
         Object fooObj = request.properties().get("title");
diff --git a/chain/src/main/java/com/yahoo/component/chain/Chain.java b/chain/src/main/java/com/yahoo/component/chain/Chain.java
index 4e003c3b41f..b1365948d34 100644
--- a/chain/src/main/java/com/yahoo/component/chain/Chain.java
+++ b/chain/src/main/java/com/yahoo/component/chain/Chain.java
@@ -50,6 +50,7 @@ public class Chain<COMPONENT extends ChainedComponent> {
 
     /** Create a chain directly. This will NOT order the chain by the ordering constraints. */
     @SafeVarargs
+    @SuppressWarnings("varargs")
     public Chain(ComponentId id, COMPONENT... components) {
         this(id, Arrays.<COMPONENT>asList(components));
     }
@@ -115,7 +116,7 @@ public class Chain<COMPONENT extends ChainedComponent> {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        Chain chain = (Chain) o;
+        Chain<?> chain = (Chain<?>) o;
 
         if (!componentList.equals(chain.componentList)) return false;
         if (!id.equals(chain.id)) return false;
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
index 684a3abe2b2..3eadd381508 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SummaryField.java
@@ -131,6 +131,7 @@ public class SummaryField extends Field implements Cloneable, TypedKey {
     public void setImplicit(boolean implicit) { this.implicit=implicit; }
 
     @Override // override to make public
+    @Deprecated
     public void setDataType(DataType type) {
         super.setDataType(type);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
index 29846ded00f..bf80ff5f0bd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerModel.java
@@ -41,6 +41,7 @@ public class ContainerModel extends ConfigModel {
     }
 
     @Override
+    @Deprecated
     public void initialize(ConfigModelRepo configModelRepo) {
         List<AbstractSearchCluster> searchClusters = Content.getSearchClusters(configModelRepo);
 
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 0f56934c5bc..c88b3967e1c 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -19,7 +19,6 @@ import com.yahoo.container.di.osgi.OsgiUtil;
 import com.yahoo.container.handler.observability.OverviewHandler;
 import com.yahoo.container.logging.AccessLog;
 import com.yahoo.container.logging.AccessLogInterface;
-import com.yahoo.container.protect.FreezeDetector;
 import com.yahoo.jdisc.application.OsgiFramework;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.service.ClientProvider;
@@ -166,7 +165,9 @@ public class HandlersConfigurerDi {
                 bind(com.yahoo.container.Container.class).toInstance(vespaContainer);
                 bind(com.yahoo.statistics.Statistics.class).toInstance(Statistics.nullImplementation);
                 bind(Linguistics.class).toInstance(new SimpleLinguistics());
-                bind(FreezeDetector.class).toInstance(new FreezeDetector(new DiagnosticsConfig(new DiagnosticsConfig.Builder().disabled(true))));
+                bind(com.yahoo.container.protect.FreezeDetector.class).toInstance(
+                        new com.yahoo.container.protect.FreezeDetector(
+                                new DiagnosticsConfig(new DiagnosticsConfig.Builder().disabled(true))));
                 bind(AccessLog.class).toInstance(new AccessLog(new ComponentRegistry<>()));
                 bind(Executor.class).toInstance(Executors.newCachedThreadPool(ThreadFactoryFactory.getThreadFactory("HandlersConfigurerDI")));
 
diff --git a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java
index cc6ba83711d..11649a06cc6 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/AccessLogRequestHandler.java
@@ -35,7 +35,7 @@ public class AccessLogRequestHandler extends ThreadedHttpRequestHandler {
             @Override
             public void render(OutputStream outputStream) throws IOException {
 
-                JsonGenerator generator = jsonFactory.createJsonGenerator(outputStream);
+                JsonGenerator generator = jsonFactory.createGenerator(outputStream);
                 generator.writeStartObject();
                 generator.writeArrayFieldStart("entries");
                 for (String uri : uris) {
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
index 7f656c61db4..89ecf204821 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingTestDriver.java
@@ -37,10 +37,12 @@ public class ProcessingTestDriver extends RequestHandlerTestDriver {
         this(chains, new ComponentRegistry<Renderer>());
     }
     @SafeVarargs
+    @SuppressWarnings("varargs")
     public ProcessingTestDriver(Chain<Processor> ... chains) {
         this(Arrays.asList(chains), new ComponentRegistry<Renderer>());
     }
     @SafeVarargs
+    @SuppressWarnings("varargs")
     public ProcessingTestDriver(String binding, Chain<Processor> ... chains) {
         this(binding, Arrays.asList(chains), new ComponentRegistry<Renderer>());
     }
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
index 592240db07a..4fbe89e570e 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
@@ -179,6 +179,8 @@ public class FilterBindingsProviderTest {
         }
     }
 
+    @SafeVarargs
+    @SuppressWarnings("varargs")
     private static <T> Matcher<? super BindingRepository<T>> containsFilters(
             final T... requiredInstances) {
         return new TypeSafeMatcher<BindingRepository<T>>() {
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java
index a5cb1730089..2397d285166 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/MetricProviderTest.java
@@ -13,7 +13,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
index e56303e60f8..84ca89694a5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
@@ -188,6 +188,7 @@ public class IndexCombinatorSearcher extends Searcher {
                 break;
             case FLAT:
                 c = flatTransform(c, session);
+                break;
             default:
                 break;
             }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
index 554424c267f..c3662102b85 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
@@ -66,6 +66,7 @@ public class QueryMarshaller {
             break;
         case WEAK_AND:
             marshalWeakAnd((WeakAndItem)root, s);
+            break;
         default:
             break;
         }
diff --git a/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java b/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java
index 79b8d55bb07..5fe604dca15 100644
--- a/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java
+++ b/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java
@@ -50,6 +50,7 @@ public class DefaultErrorHit extends Hit implements ErrorHit, Cloneable {
      * @deprecated since 5.18, use {@link #errors()}
      */
     @Override
+    @Deprecated
     public ErrorMessage getMainError() {
         return errors.get(0);
     }
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
index a888ad9b59e..c9176b208a4 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
@@ -221,6 +221,14 @@ public class Execution extends com.yahoo.processing.execution.Execution {
         }
 
         @Override
+        public int hashCode() {
+            return java.util.Objects.hash(indexFacts,
+                                          rendererRegistry, tokenRegistry, searchChainRegistry,
+                                          detailedDiagnostics, breakdown,
+                                          linguistics);
+        }
+
+        @Override
         public boolean equals(Object other) {
             if (other == null) {
                 return false;
diff --git a/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java
index 16a207171cb..1a524ddcefc 100644
--- a/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/SimpleDocumentProcessor.java
@@ -32,6 +32,7 @@ public class SimpleDocumentProcessor extends DocumentProcessor {
      *
      * @param document the Document to process.
      */
+    @Deprecated
     public void process(Document document) {
         if (log.isLoggable(LogLevel.DEBUG)) {
             log.log(LogLevel.DEBUG, "Ignored " + document);
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java
index f934d64736f..c7e0cd2cdf2 100644
--- a/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/util/JoinerDocumentProcessor.java
@@ -47,10 +47,13 @@ public class JoinerDocumentProcessor extends DocumentProcessor {
 
         DocumentPut outerDoc = (DocumentPut)processing.getVariable(contextFieldName);
 
+        @SuppressWarnings("unchecked")
         Array<Document> innerDocuments = (Array<Document>) outerDoc.getDocument().getFieldValue(arrayFieldName);
 
         if (innerDocuments == null) {
-            innerDocuments = (Array<Document>) outerDoc.getDocument().getDataType().getField(arrayFieldName).getDataType().createFieldValue();
+            @SuppressWarnings("unchecked")
+            Array<Document> empty = (Array<Document>) outerDoc.getDocument().getDataType().getField(arrayFieldName).getDataType().createFieldValue();
+            innerDocuments = empty;
         }
 
         for (DocumentOperation op : processing.getDocumentOperations()) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
index ed45435d6ef..9377412d1ae 100644
--- a/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/util/SplitterDocumentProcessor.java
@@ -53,6 +53,7 @@ public class SplitterDocumentProcessor extends DocumentProcessor {
 
         Document outerDoc = ((DocumentPut)processing.getDocumentOperations().get(0)).getDocument();;
 
+        @SuppressWarnings("unchecked")
         Array<Document> innerDocuments = (Array<Document>) outerDoc.getFieldValue(arrayFieldName);
         if (innerDocuments == null) {
             //the document does not have the field, return
diff --git a/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java
index 42906f062fd..0ed626d5e99 100644
--- a/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/CallStackTestCase.java
@@ -8,6 +8,7 @@ import java.util.Iterator;
  *
  * @author bratseth
  */
+@SuppressWarnings({"unchecked","rawtypes"})
 public class CallStackTestCase extends junit.framework.TestCase {
 
     private CallStack callStack, insertStack;
diff --git a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
index e5d3a4dc137..d66276428ca 100644
--- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
+++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
@@ -34,6 +34,7 @@ import com.yahoo.document.datatypes.Struct;
 import com.yahoo.document.datatypes.StructuredFieldValue;
 import com.yahoo.document.update.FieldUpdate;
 
+@SuppressWarnings("unchecked")
 public class SchemaMappingAndAccessesTest extends junit.framework.TestCase {
 
     private Document getDoc() {
diff --git a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java
index 2d5a61fa005..89b6f2451b9 100644
--- a/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/util/SplitterJoinerTestCase.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  */
+@SuppressWarnings({"unchecked","rawtypes"})
 public class SplitterJoinerTestCase {
 
     @Test
diff --git a/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java b/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java
index c8d007037f3..47c7b5b4d94 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/FieldPathIteratorHandler.java
@@ -47,17 +47,27 @@ public abstract class FieldPathIteratorHandler {
         }
 
         @Override
-        public boolean equals(Object o) {
-            IndexValue other = (IndexValue)o;
-
+        public int hashCode() {
+            int hc = index;
             if (key != null) {
-                if (other.key != null && key.equals(other.key)) {
-                    return true;
-                }
-                return false;
+                hc = key.hashCode();
             }
+            return hc;
+        }
 
-            return index == other.index;
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof IndexValue)) {
+                return false;
+            }
+            IndexValue other = (IndexValue)o;
+            if (key != null && other.key != null) {
+                return key.equals(other.key);
+            }
+            if (key == null && other.key == null) {
+                return index == other.index;
+            }
+            return false;
         }
     };
 
diff --git a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java
index 3f5a7a58733..3388c6db23d 100644
--- a/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java
+++ b/document/src/main/java/com/yahoo/document/select/OrderingSpecification.java
@@ -5,10 +5,10 @@ public class OrderingSpecification {
     public static int ASCENDING = 0;
     public static int DESCENDING = 1;
 
-    public int order;
-    public long orderingStart;
-    public short widthBits;
-    public short divisionBits;
+    public final int order;
+    public final long orderingStart;
+    public final short widthBits;
+    public final short divisionBits;
 
     public OrderingSpecification() {
         this(ASCENDING, (long)0, (short)0, (short)0);
@@ -30,6 +30,7 @@ public class OrderingSpecification {
     public short getWidthBits() { return widthBits; }
     public short getDivisionBits() { return divisionBits; }
 
+    @Override
     public boolean equals(Object other) {
         OrderingSpecification o = (OrderingSpecification)other;
         if (o == null) return false;
@@ -37,6 +38,11 @@ public class OrderingSpecification {
         return (order == o.order && orderingStart == o.orderingStart && widthBits == o.widthBits && divisionBits == o.divisionBits);
     }
 
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(order, orderingStart, widthBits, divisionBits);
+    }
+
     public String toString() {
         return "O: " + order + " S:" + orderingStart + " W:" + widthBits + " D:" + divisionBits;
     }
diff --git a/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java b/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java
index 1ad2941c80c..bae921a7ab7 100644
--- a/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/AddValueUpdate.java
@@ -56,10 +56,10 @@ public class AddValueUpdate extends ValueUpdate {
     public FieldValue applyTo(FieldValue val) {
         if (val instanceof WeightedSet) {
             WeightedSet wset = (WeightedSet) val;
-            wset.put((FieldValue) value, weight);
+            wset.put(value, weight);
         } else if (val instanceof CollectionFieldValue) {
             CollectionFieldValue fval = (CollectionFieldValue) val;
-            fval.add((FieldValue) value);
+            fval.add(value);
         } else {
             throw new IllegalStateException("Cannot add "+value+" to field of type " + val.getClass().getName());
         }
diff --git a/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java b/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java
index edb40c6959b..de2fe1987a9 100644
--- a/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/MapValueUpdate.java
@@ -70,7 +70,7 @@ public class MapValueUpdate extends ValueUpdate {
                 }
             }
             weight = (Integer) update.applyTo(new IntegerFieldValue(weight)).getWrappedValue();
-            wset.put((FieldValue) value, weight);
+            wset.put(value, weight);
             if (wtype.removeIfZero() && update instanceof ArithmeticValueUpdate && weight == 0) {
                 wset.remove(value);
             }
diff --git a/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java b/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java
index e511e4cf378..7df271035f7 100644
--- a/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java
+++ b/document/src/test/java/com/yahoo/document/BucketIdFactoryTestCase.java
@@ -31,9 +31,12 @@ public class BucketIdFactoryTestCase extends junit.framework.TestCase {
             value = val;
         }
 
+        @Override
         public boolean equals(Object o) {
             return (o instanceof Hex && value == ((Hex) o).value);
         }
+        @Override
+        public int hashCode() { return (int)value; }
 
         public String toString() {
             return Long.toHexString(value);
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
index f3721ff0173..4ca50aae215 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  *
  * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
  */
+@SuppressWarnings("deprecation")
 public class PolicyTestFrame extends junit.framework.Assert {
 
     private final AtomicBoolean destroyed = new AtomicBoolean(false);
diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
index 4a29114628c..7e9365a0e6b 100644
--- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
+++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
  * Testcases for vespa-documentgen-plugin
  * @author vegardh
  */
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "rawtypes"})
 public class DocumentGenPluginTest {
 
     private static final int NUM_BOOKS = 10000;
diff --git a/fileacquirer/src/test/java/MockFileAcquirerTest.java b/fileacquirer/src/test/java/MockFileAcquirerTest.java
index 04a4c202b24..4438e169c3b 100644
--- a/fileacquirer/src/test/java/MockFileAcquirerTest.java
+++ b/fileacquirer/src/test/java/MockFileAcquirerTest.java
@@ -63,10 +63,10 @@ public class MockFileAcquirerTest {
     }
 
     private FileReference createFileReference(String value) {
-        Constructor constructors = FileReference.class.getDeclaredConstructors()[0];
-        constructors.setAccessible(true);
         try {
-            return (FileReference)constructors.newInstance(value);
+            Constructor<FileReference> constructors = FileReference.class.getDeclaredConstructor(String.class);
+            constructors.setAccessible(true);
+            return constructors.newInstance(value);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/fsa/src/main/java/com/yahoo/fsa/FSA.java b/fsa/src/main/java/com/yahoo/fsa/FSA.java
index 6e352f3ddca..da013cc4dce 100644
--- a/fsa/src/main/java/com/yahoo/fsa/FSA.java
+++ b/fsa/src/main/java/com/yahoo/fsa/FSA.java
@@ -377,9 +377,6 @@ public class FSA {
         catch (FileNotFoundException e) {
             throw new IllegalArgumentException("Could not find FSA file '" + filename + "'",e);
         }
-        catch (IOException e) {
-            throw new IllegalArgumentException("Could not read FSA file '" + filename + "'",e);
-        }
     }
 
     private void init(FileInputStream file, String charsetname) {
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
index 02c752ceae9..313be743dd9 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
@@ -12,6 +12,8 @@ import com.yahoo.jdisc.References;
 import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>This class provides a convenient way of safely dispatching a {@link Request}. Using this class you do not have to
@@ -116,7 +118,10 @@ public abstract class RequestDispatch implements ListenableFuture<Response>, Res
 
     @Override
     public void addListener(Runnable listener, Executor executor) {
-        Futures.allAsList(completions, futureResponse).addListener(listener, executor);
+        List<ListenableFuture<?>> combined = new ArrayList<>(2);
+        combined.add(completions);
+        combined.add(futureResponse);
+        Futures.allAsList(combined).addListener(listener, executor);
     }
 
     @Override
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingRepositoryTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingRepositoryTestCase.java
index aa9bc783b74..41807513991 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingRepositoryTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingRepositoryTestCase.java
@@ -87,7 +87,7 @@ public class BindingRepositoryTestCase {
         bindings.bind(pattern, originallyBoundHandler);
         bindings.bind(pattern, new PatternStealingRequestHandler());
 
-        BindingSet bindingSet = bindings.activate();
+        BindingSet<?> bindingSet = bindings.activate();
         assertEquals(originallyBoundHandler, bindingSet.resolve(URI.create(pattern)));
     }
 
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java
index 811f8fa901b..3591d6dc165 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/ContainerBuilderTestCase.java
@@ -74,7 +74,7 @@ public class ContainerBuilderTestCase {
     public void requireThatBindingSetsAreCreatedOnDemand() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();
-        BindingRepository repo = builder.serverBindings("foo");
+        BindingRepository<?> repo = builder.serverBindings("foo");
         assertNotNull(repo);
         assertSame(repo, builder.serverBindings("foo"));
         assertNotNull(repo = builder.serverBindings("bar"));
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java
index 77af705cfac..bf3e285e3aa 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ApplicationEnvironmentModuleTestCase.java
@@ -25,7 +25,7 @@ public class ApplicationEnvironmentModuleTestCase {
 
     @Test
     public void requireThatBindingsExist() {
-        List<Class> expected = new LinkedList<>();
+        List<Class<?>> expected = new LinkedList<>();
         expected.add(ContainerActivator.class);
         expected.add(ContainerBuilder.class);
         expected.add(CurrentContainer.class);
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogFormatterTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogFormatterTestCase.java
index 901817dbd26..7871694c12d 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogFormatterTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogFormatterTestCase.java
@@ -211,7 +211,7 @@ public class ConsoleLogFormatterTestCase {
         final int level;
         final long time;
         Bundle bundle = null;
-        ServiceReference serviceReference = null;
+        ServiceReference<?> serviceReference = null;
         Throwable exception;
 
         MyEntry(long time, int level, String message) {
@@ -263,7 +263,7 @@ public class ConsoleLogFormatterTestCase {
         }
 
         @Override
-        public ServiceReference getServiceReference() {
+        public ServiceReference<?> getServiceReference() {
             return serviceReference;
         }
     }
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogListenerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogListenerTestCase.java
index 3ac30f0456e..502b3857024 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogListenerTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ConsoleLogListenerTestCase.java
@@ -108,7 +108,7 @@ public class ConsoleLogListenerTestCase {
         }
 
         @Override
-        public ServiceReference getServiceReference() {
+        public ServiceReference<?> getServiceReference() {
             return null;
         }
     }
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java
index eb18e6f8e49..1904c05d135 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogHandlerTestCase.java
@@ -90,7 +90,7 @@ public class OsgiLogHandlerTestCase {
         record.setThrown(thrown);
         log.log(record);
 
-        ServiceReference ref = logService.lastServiceReference;
+        ServiceReference<?> ref = logService.lastServiceReference;
         assertNotNull(ref);
         assertTrue(Arrays.equals(new String[] { "LEVEL",
                                                 "LOGGER_NAME",
@@ -146,9 +146,10 @@ public class OsgiLogHandlerTestCase {
         }
     }
 
+    @SuppressWarnings("rawtypes")
     private static class MyLogService implements LogService {
 
-        ServiceReference lastServiceReference;
+        ServiceReference<?> lastServiceReference;
         int lastLevel;
         String lastMessage;
         Throwable lastThrowable;
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogManagerTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogManagerTestCase.java
index 32e4b37aca8..ba31a5da118 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogManagerTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogManagerTestCase.java
@@ -41,11 +41,11 @@ public class OsgiLogManagerTestCase {
         manager.log(4, "b", t1);
         assertLast(service, null, 4, "b", t1);
 
-        ServiceReference ref1 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref1 = Mockito.mock(ServiceReference.class);
         manager.log(ref1, 8, "c");
         assertLast(service, ref1, 8, "c", null);
 
-        ServiceReference ref2 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref2 = Mockito.mock(ServiceReference.class);
         Throwable t2 = new Throwable();
         manager.log(ref2, 16, "d", t2);
         assertLast(service, ref2, 16, "d", t2);
@@ -66,7 +66,7 @@ public class OsgiLogManagerTestCase {
         OsgiLogManager manager = new OsgiLogManager(true);
         manager.install(ctx);
 
-        ServiceReference ref1 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref1 = Mockito.mock(ServiceReference.class);
         Throwable t1 = new Throwable();
         manager.log(ref1, 2, "a", t1);
         assertLast(foo, ref1, 2, "a", t1);
@@ -74,7 +74,7 @@ public class OsgiLogManagerTestCase {
         MyLogService bar = new MyLogService();
         ServiceRegistration<LogService> barReg = ctx.registerService(LogService.class, bar, null);
 
-        ServiceReference ref2 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref2 = Mockito.mock(ServiceReference.class);
         Throwable t2 = new Throwable();
         manager.log(ref2, 4, "b", t2);
         assertLast(foo, ref2, 4, "b", t2);
@@ -83,7 +83,7 @@ public class OsgiLogManagerTestCase {
         MyLogService baz = new MyLogService();
         ServiceRegistration<LogService> bazReg = ctx.registerService(LogService.class, baz, null);
 
-        ServiceReference ref3 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref3 = Mockito.mock(ServiceReference.class);
         Throwable t3 = new Throwable();
         manager.log(ref3, 8, "c", t3);
         assertLast(foo, ref3, 8, "c", t3);
@@ -92,7 +92,7 @@ public class OsgiLogManagerTestCase {
 
         fooReg.unregister();
 
-        ServiceReference ref4 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref4 = Mockito.mock(ServiceReference.class);
         Throwable t4 = new Throwable();
         manager.log(ref4, 16, "d", t4);
         assertLast(foo, ref3, 8, "c", t3);
@@ -101,7 +101,7 @@ public class OsgiLogManagerTestCase {
 
         barReg.unregister();
 
-        ServiceReference ref5 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref5 = Mockito.mock(ServiceReference.class);
         Throwable t5 = new Throwable();
         manager.log(ref5, 32, "e", t5);
         assertLast(foo, ref3, 8, "c", t3);
@@ -110,7 +110,7 @@ public class OsgiLogManagerTestCase {
 
         bazReg.unregister();
 
-        ServiceReference ref6 = Mockito.mock(ServiceReference.class);
+        ServiceReference<?> ref6 = Mockito.mock(ServiceReference.class);
         Throwable t6 = new Throwable();
         manager.log(ref6, 64, "f", t6);
         assertLast(foo, ref3, 8, "c", t3);
@@ -144,13 +144,14 @@ public class OsgiLogManagerTestCase {
         assertEquals(Level.ALL, logger.getLevel());
     }
 
-    private static void assertLast(MyLogService service, ServiceReference ref, int level, String message, Throwable t) {
+    private static void assertLast(MyLogService service, ServiceReference<?> ref, int level, String message, Throwable t) {
         assertSame(ref, service.lastServiceReference);
         assertEquals(level, service.lastLevel);
         assertEquals(message, service.lastMessage);
         assertSame(t, service.lastThrowable);
     }
 
+    @SuppressWarnings("rawtypes")
     private static class MyLogService implements LogService {
 
         ServiceReference lastServiceReference;
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java
index fbd6f5a3f88..ad2d7826c43 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/OsgiLogServiceTestCase.java
@@ -24,8 +24,8 @@ public class OsgiLogServiceTestCase {
         OsgiFramework osgi = TestDriver.newOsgiFramework();
         osgi.start();
 
-        ServiceTracker logs = newTracker(osgi, LogService.class);
-        ServiceTracker logReaders = newTracker(osgi, LogReaderService.class);
+        ServiceTracker<?,?> logs = newTracker(osgi, LogService.class);
+        ServiceTracker<?,?> logReaders = newTracker(osgi, LogReaderService.class);
         assertEquals(1, logs.getTrackingCount());
         assertEquals(1, logReaders.getTrackingCount());
 
@@ -97,8 +97,8 @@ public class OsgiLogServiceTestCase {
     }
 
     @SuppressWarnings("unchecked")
-    private static ServiceTracker newTracker(OsgiFramework osgi, Class trackedClass) {
-        ServiceTracker tracker = new ServiceTracker(osgi.bundleContext(), trackedClass, null);
+    private static ServiceTracker<?,?> newTracker(OsgiFramework osgi, Class<?> trackedClass) {
+        ServiceTracker<?,?> tracker = new ServiceTracker<>(osgi.bundleContext(), trackedClass, null);
         tracker.open();
         return tracker;
     }
diff --git a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java
index 29ce713f606..13828aed324 100644
--- a/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java
+++ b/jdisc_core_test/test_bundles/app-g-act/src/main/java/com/yahoo/jdisc/bundle/MyBundleActivator.java
@@ -13,11 +13,11 @@ import org.osgi.framework.ServiceRegistration;
 public class MyBundleActivator implements BundleActivator {
 
     private MyService service;
-    private ServiceRegistration registration;
+    private ServiceRegistration<?> registration;
 
     @Override
     public void start(BundleContext ctx) throws Exception {
-        ServiceReference containerRef = ctx.getServiceReference(CurrentContainer.class.getName());
+        ServiceReference<?> containerRef = ctx.getServiceReference(CurrentContainer.class.getName());
         service = new MyService((CurrentContainer)ctx.getService(containerRef));
         registration = ctx.registerService(MyService.class.getName(), service, null);
     }
diff --git a/processing/src/main/java/com/yahoo/processing/Response.java b/processing/src/main/java/com/yahoo/processing/Response.java
index 44fbc7678fd..dc6a210142f 100644
--- a/processing/src/main/java/com/yahoo/processing/Response.java
+++ b/processing/src/main/java/com/yahoo/processing/Response.java
@@ -106,7 +106,7 @@ public class Response extends ListenableFreezableClass {
 
         @SuppressWarnings("unchecked")
     private static <D extends Data> void collectCompletionFutures(DataList<D> dataList, List<ListenableFuture<DataList<D>>> futures) {
-        futures.add((ListenableFuture<DataList<D>>) dataList.complete());
+        futures.add(dataList.complete());
         for (D data : dataList.asList()) {
             if (data instanceof DataList)
                 collectCompletionFutures((DataList<D>) data, futures);
diff --git a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java b/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
index ea6f451b41b..ed0a47c0571 100644
--- a/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
+++ b/processing/src/main/java/com/yahoo/processing/test/ProcessorLibrary.java
@@ -156,6 +156,7 @@ public class ProcessorLibrary {
          *                to render the datalist from each federated source in the order it completes.
          */
         @SafeVarargs
+        @SuppressWarnings("varargs")
         public Federator(boolean ordered, Chain<? extends Processor>... chains) {
             this.chains = Arrays.asList(chains);
             this.ordered = ordered;
@@ -205,6 +206,7 @@ public class ProcessorLibrary {
          *                to render the datalist from each federated source in the order it completes.
          */
         @SafeVarargs
+        @SuppressWarnings("varargs")
         public EagerReturnFederator(boolean ordered, Chain<? extends Processor>... chains) {
             this.chains = Arrays.asList(chains);
             this.ordered = ordered;
diff --git a/processing/src/test/java/com/yahoo/processing/test/documentation/Federator.java b/processing/src/test/java/com/yahoo/processing/test/documentation/Federator.java
index c69bdf0c85c..841b76d2a6b 100644
--- a/processing/src/test/java/com/yahoo/processing/test/documentation/Federator.java
+++ b/processing/src/test/java/com/yahoo/processing/test/documentation/Federator.java
@@ -21,8 +21,9 @@ public class Federator extends Processor {
     private final List<Chain<? extends Processor>> chains;
 
     @SafeVarargs
+    @SuppressWarnings("varargs")
     public Federator(Chain<? extends Processor> ... chains) {
-        this.chains= Arrays.asList(chains);
+        this.chains = Arrays.asList(chains);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java b/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
index 5e51c3b4754..698fc8a587d 100644
--- a/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
@@ -21,7 +21,7 @@ public class CounterGroupTestCase extends junit.framework.TestCase {
         // This is for testing CounterProxy
         @Override
         public void publish(LogRecord record) {
-            com.yahoo.log.event.CountGroup msg = (com.yahoo.log.event.CountGroup) ((Object[]) record.getParameters())[0];
+            com.yahoo.log.event.CountGroup msg = (com.yahoo.log.event.CountGroup) record.getParameters()[0];
             assertEquals("test", msg.getValue("name"));
             String values = msg.getValue("values");
             assertFalse("Unexpected value for a.", values.indexOf("a=500") == -1);
diff --git a/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java b/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
index 1491575626f..fa2b56a6d38 100644
--- a/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
@@ -21,7 +21,7 @@ public class ValueGroupTestCase extends junit.framework.TestCase {
 
         @Override
         public void publish(LogRecord record) {
-            com.yahoo.log.event.ValueGroup msg = (com.yahoo.log.event.ValueGroup) ((Object[]) record.getParameters())[0];
+            com.yahoo.log.event.ValueGroup msg = (com.yahoo.log.event.ValueGroup) record.getParameters()[0];
             assertEquals("test", msg.getValue("name"));
             String values = msg.getValue("values");
             assertFalse("Unexpected value for a.", values.indexOf("a=-50.0") == -1);
diff --git a/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java b/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
index b837b775040..88c65b5b283 100644
--- a/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
@@ -132,7 +132,7 @@ public class ValueTestCase extends junit.framework.TestCase {
             if (!(record.getParameters()[0] instanceof com.yahoo.log.event.Histogram)) {
                 return;
             }
-            com.yahoo.log.event.Histogram msg = (com.yahoo.log.event.Histogram) ((Object[]) record.getParameters())[0];
+            com.yahoo.log.event.Histogram msg = (com.yahoo.log.event.Histogram) record.getParameters()[0];
             assertEquals(NALLE, msg.getValue("name"));
             assertEquals(histogram, msg.getValue("counts"));
             assertEquals(representation, msg.getValue("representation"));
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
index a54f1971d21..0b8a7457e51 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/ClusterState.java
@@ -66,6 +66,7 @@ public class ClusterState implements Cloneable {
         }
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof ClusterState)) { return false; }
         ClusterState other = (ClusterState) o;
@@ -80,6 +81,11 @@ public class ClusterState implements Cloneable {
         return true;
     }
 
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(version, state, distributionBits, nodeCount, nodeStates);
+    }
+
     @FunctionalInterface
     private interface NodeStateCmp {
         boolean similar(NodeType nodeType, NodeState lhs, NodeState rhs);
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java
index fb91af14f90..e0d9ad533f4 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/state/DiskState.java
@@ -115,6 +115,7 @@ public class DiskState implements Cloneable {
         return sb.toString();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof DiskState)) { return false; }
         DiskState other = (DiskState) o;
@@ -125,4 +126,10 @@ public class DiskState implements Cloneable {
         }
         return false;
     }
+
+    @Override
+    public int hashCode() {
+        // NOTE: capacity cannot be part of the hashCode
+        return state.hashCode();
+    }
 }
diff --git a/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java b/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java
index abd6ef70d35..804480569d6 100644
--- a/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java
+++ b/vdslib/src/test/java/com/yahoo/vdslib/distribution/DistributionTestFactory.java
@@ -43,6 +43,7 @@ public class DistributionTestFactory extends CrossPlatformTestFactory {
             failure = Failure.NONE;
         }
 
+        @Override
         public boolean equals(Object other) {
             if (!(other instanceof Test)) return false;
             Test t = (Test) other;
@@ -51,6 +52,11 @@ public class DistributionTestFactory extends CrossPlatformTestFactory {
                     && failure.equals(t.failure));
         }
 
+        @Override
+        public int hashCode() {
+            return java.util.Objects.hash(bucket, nodes, disks);
+        }
+
         public String toString() {
             StringBuilder sb = new StringBuilder().append(bucket.toString());
             if (failure == Failure.NONE) {
diff --git a/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java b/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java
index 892240ce253..5468ba915fc 100644
--- a/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java
+++ b/vespajlib/src/main/java/com/yahoo/javacc/FastCharStream.java
@@ -27,12 +27,12 @@ public class FastCharStream {
         return inputArr[readPos++];
     }
 
-    @SuppressWarnings("deprecation")
+    @Deprecated
     public int getColumn() {
         return getEndColumn();
     }
 
-    @SuppressWarnings("deprecation")
+    @Deprecated
     public int getLine() {
         return getEndLine();
     }
@@ -128,4 +128,4 @@ public class FastCharStream {
 
         return Integer.valueOf(str.substring(from, to));
     }
-}
\ No newline at end of file
+}
diff --git a/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java b/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java
index a73fffc6c5c..ab444b29486 100644
--- a/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/javacc/FastCharStreamTestCase.java
@@ -30,25 +30,27 @@ public class FastCharStreamTestCase {
     @Test
     public void requireThatColumnIsTracked() throws IOException {
         FastCharStream input = new FastCharStream("foo");
-        assertEquals(1, input.getColumn());
+        assertEquals(1, input.getEndColumn());
         input.readChar();
-        assertEquals(2, input.getColumn());
+        assertEquals(2, input.getEndColumn());
         input.readChar();
-        assertEquals(3, input.getColumn());
+        assertEquals(3, input.getEndColumn());
         input.readChar();
-        assertEquals(4, input.getColumn());
+        assertEquals(4, input.getEndColumn());
     }
 
     @Test
     public void requireThatLineIsNotTracked() throws IOException {
         FastCharStream input = new FastCharStream("f\no");
-        assertEquals(-1, input.getLine());
+        assertEquals(-1, input.getEndLine());
+        assertEquals(-1, input.getBeginLine());
         input.readChar();
-        assertEquals(-1, input.getLine());
+        assertEquals(-1, input.getBeginLine());
         input.readChar();
-        assertEquals(-1, input.getLine());
+        assertEquals(-1, input.getBeginLine());
         input.readChar();
-        assertEquals(-1, input.getLine());
+        assertEquals(-1, input.getBeginLine());
+        assertEquals(-1, input.getEndLine());
     }