Java 9: Replace 'new Integer' with 'Integer.valueOf'

32 files changed, 105 insertions, 105 deletions

diff --git a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java
index 7af863a37c3..d8fb0d7f584 100644
--- a/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java
+++ b/chain/src/main/java/com/yahoo/component/chain/dependencies/ordering/OrderedReadyNodes.java
@@ -15,11 +15,11 @@ class OrderedReadyNodes {
     private class PriorityComparator implements Comparator<Node> {
         @Override
         public int compare(Node lhs, Node rhs) {
-            int result = new Integer(lhs.classPriority()).compareTo(rhs.classPriority());
+            int result = Integer.valueOf(lhs.classPriority()).compareTo(rhs.classPriority());
 
             return result != 0 ?
                     result :
-                    new Integer(lhs.priority).compareTo(rhs.priority);
+                    Integer.valueOf(lhs.priority).compareTo(rhs.priority);
         }
     }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
index b0287c3fcb3..77ca7e12711 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
@@ -131,7 +131,7 @@ public class ZooKeeperDatabase extends Database {
         createNode(zooKeeperRoot, "indexes", new byte[0]);
         createNode(zooKeeperRoot, "wantedstates", new byte[0]);
         createNode(zooKeeperRoot, "starttimestamps", new byte[0]);
-        createNode(zooKeeperRoot, "latestversion", new Integer(0).toString().getBytes(utf8));
+        createNode(zooKeeperRoot, "latestversion", Integer.valueOf(0).toString().getBytes(utf8));
         createNode(zooKeeperRoot, "published_state_bundle", new byte[0]); // TODO dedupe string constants
         byte val[] = String.valueOf(nodeIndex).getBytes(utf8);
         deleteNodeIfExists(getMyIndexPath());
diff --git a/component/src/main/java/com/yahoo/component/VersionSpecification.java b/component/src/main/java/com/yahoo/component/VersionSpecification.java
index 223e6b05b6a..c926df4a80b 100644
--- a/component/src/main/java/com/yahoo/component/VersionSpecification.java
+++ b/component/src/main/java/com/yahoo/component/VersionSpecification.java
@@ -121,19 +121,19 @@ public final class VersionSpecification implements Comparable<VersionSpecificati
             if (components.length > 0) {
                 String s = components[0];
                 if (! s.equals("*")) {
-                    major = new Integer(s);
+                    major = Integer.valueOf(s);
                 }
             }
             if (components.length > 1) {
                 String s = components[1];
                 if (! s.equals("*")) {
-                    minor = new Integer(s);
+                    minor = Integer.valueOf(s);
                 }
             }
             if (components.length > 2) {
                 String s = components[2];
                 if (! s.equals("*")) {
-                    micro = new Integer(s);
+                    micro = Integer.valueOf(s);
                 }
             }
             if (components.length > 3) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java
index d3d62f83e2c..d9b3bb87002 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java
@@ -266,10 +266,10 @@ public class DomV20ClientsBuilder {
                         abortondocumenterror = Boolean.valueOf(childval);
                         break;
                     case "maxpendingdocs":
-                        maxpendingdocs = new Integer(childval);
+                        maxpendingdocs = Integer.valueOf(childval);
                         break;
                     case "maxpendingbytes":
-                        maxpendingbytes = new Integer(childval);
+                        maxpendingbytes = Integer.valueOf(childval);
                         break;
                     case "retryenabled":
                         retryenabled = Boolean.valueOf(childval);
@@ -284,10 +284,10 @@ public class DomV20ClientsBuilder {
                         route = childval;
                         break;
                     case "tracelevel":
-                        tracelevel = new Integer(childval);
+                        tracelevel = Integer.valueOf(childval);
                         break;
                     case "mbusport":
-                        mbusport = new Integer(childval);
+                        mbusport = Integer.valueOf(childval);
                         break;
                     case "docprocchain":
                         docprocChain = childval;
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java
index b7faee5b062..460558866fe 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java
@@ -112,7 +112,7 @@ public class ConfigDefinitionBuilder {
 
     static void addNode(ConfigDefinition def, LeafCNode.IntegerLeaf leaf) {
         if (leaf.getDefaultValue() != null) {
-            def.addIntDef(leaf.getName(), new Integer(leaf.getDefaultValue().getValue()));
+            def.addIntDef(leaf.getName(), Integer.valueOf(leaf.getDefaultValue().getValue()));
         } else {
             def.addIntDef(leaf.getName());
         }
diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java b/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java
index 556ab6bb78f..81192be035a 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java
@@ -261,7 +261,7 @@ public class Backend implements ConnectionFactory {
      *         set of active channels.
      */
     public FS4Channel getChannel (int id) {
-        return getChannel(new Integer(id));
+        return getChannel(Integer.valueOf(id));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
index 7cab3d59f66..b0fce14e73f 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
@@ -52,7 +52,7 @@ public class FS4Channel
     }
 
     static public FS4Channel createPingChannel(Backend backend) {
-        FS4Channel pingChannel = new FS4Channel(backend, new Integer(0));
+        FS4Channel pingChannel = new FS4Channel(backend, Integer.valueOf(0));
         pingChannel.isPingChannel = true;
         return pingChannel;
     }
diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java
index 2c1bb623ee0..11e7d4e3d35 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java
@@ -236,7 +236,7 @@ public class FS4Connection implements Connection
                         receiver = backend.getPingChannel();
                 }
                 else {
-                    receiver = backend.getChannel(new Integer(queryId));
+                    receiver = backend.getChannel(Integer.valueOf(queryId));
                 }
                 packet = PacketDecoder.extractPacket(readBuffer);
 
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 0b86b05deb4..d5f72a3387e 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
@@ -25,10 +25,10 @@ class UnicodePropertyDump {
         boolean debug = false;
 
         if (arg.length > 0) {
-            start = new Integer(arg[0]).intValue();
+            start = Integer.valueOf(arg[0]).intValue();
         }
         if (arg.length > 1) {
-            end = new Integer(arg[1]).intValue();
+            end = Integer.valueOf(arg[1]).intValue();
         }
         if (arg.length > 2) {
             debug = new Boolean(arg[2]).booleanValue();
diff --git a/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java
index 7f391a6520b..71e54c810c2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/searcher/FieldCollapsingSearcher.java
@@ -179,10 +179,10 @@ public class FieldCollapsingSearcher extends Searcher {
                 if (numHitsThisField < collapseSize) {
                     result.hits().add(hit);
                     ++numHitsThisField;
-                    knownCollapses.put(collapseId, new Integer(numHitsThisField));
+                    knownCollapses.put(collapseId, Integer.valueOf(numHitsThisField));
                 }
             } else {
-                knownCollapses.put(collapseId, new Integer(1));
+                knownCollapses.put(collapseId, Integer.valueOf(1));
                 result.hits().add(hit);
             }
         }
diff --git a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
index 270c1acdae4..a42c1000617 100644
--- a/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
+++ b/container-search/src/main/java/com/yahoo/prelude/semantics/engine/Evaluation.java
@@ -102,9 +102,9 @@ public class Evaluation {
     /** Returns whether stemmed matches are allowed. True by default */
     public boolean getStemming() { return stemming; }
 
-    void addMatchDigest(int digest) { matchDigests.add(new Integer(digest)); }
+    void addMatchDigest(int digest) { matchDigests.add(Integer.valueOf(digest)); }
 
-    boolean hasMatchDigest(int matchDigest) { return matchDigests.contains(new Integer(matchDigest)); }
+    boolean hasMatchDigest(int matchDigest) { return matchDigests.contains(Integer.valueOf(matchDigest)); }
 
     int getPreviousQuerySize() { return previousQuerySize; }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java b/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java
index 6ba2360eb00..31e133d22d5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java
+++ b/container-search/src/main/java/com/yahoo/prelude/templates/SearchRendererAdaptor.java
@@ -164,7 +164,7 @@ public final class SearchRendererAdaptor extends Renderer {
 
         HitContext hitContext = new HitContext(hit, context);
         hitContext.put("hit", hit);
-        hitContext.put("hitno", new Integer(hitno));
+        hitContext.put("hitno", Integer.valueOf(hitno));
         hitContext.put("relevancy",hit.getRelevance());
         templates.hit(hitContext, writer);
 
@@ -173,7 +173,7 @@ public final class SearchRendererAdaptor extends Renderer {
 
         // Put these back - may have been changed by nested rendering
         hitContext.put("hit", hit);
-        hitContext.put("hitno", new Integer(hitno));
+        hitContext.put("hitno", Integer.valueOf(hitno));
         templates.hitFooter(hitContext, writer);
 
 
diff --git a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java
index 1bd10234e55..b7dc080b52a 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/ProgramParser.java
@@ -1037,7 +1037,7 @@ final class ProgramParser {
 		case yqlplusParser.RULE_fixed_or_parameter: {
 			ParseTree firstChild = parseTree.getChild(0);
 			if (getParseTreeIndex(firstChild) == yqlplusParser.INT) {
-				return OperatorNode.create(toLocation(scope, firstChild), ExpressionOperator.LITERAL, new Integer(firstChild.getText()));
+				return OperatorNode.create(toLocation(scope, firstChild), ExpressionOperator.LITERAL, Integer.valueOf(firstChild.getText()));
 			} else {
 				return convertExpr(firstChild, scope);
 			}
@@ -1369,7 +1369,7 @@ final class ProgramParser {
         String text = literal.getChild(0).getText();
         switch(parseTreeIndex) {
             case yqlplusParser.INT:
-                return new Integer(text);
+                return Integer.valueOf(text);
             case yqlplusParser.FLOAT:
                 return new Double(text);
             case yqlplusParser.STRING:
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java
index 4671ada6545..69ca646dbd5 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java
@@ -24,7 +24,7 @@ public class RankFeaturesTestCase {
     public void requireThatRankPropertiesTakesBothStringAndObject() {
         RankProperties p = new RankProperties();
         p.put("string", "b");
-        p.put("object", new Integer(7));
+        p.put("object", Integer.valueOf(7));
         assertEquals("7", p.get("object").get(0));
         assertEquals("b", p.get("string").get(0));
     }
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java
index 5806a08bb24..38911ef83c5 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java
@@ -388,7 +388,7 @@ public class ItemsCommonStuffTestCase {
     @Test
     public final void testTermTypeBasic() {
         assertFalse(TermType.AND.equals(TermType.DEFAULT));
-        assertFalse(TermType.AND.equals(new Integer(10)));
+        assertFalse(TermType.AND.equals(Integer.valueOf(10)));
         assertTrue(TermType.AND.equals(TermType.AND));
         assertSame(AndItem.class, TermType.DEFAULT.createItemClass().getClass());
         assertSame(CompositeItem.class, TermType.DEFAULT.getItemClass());
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java
index 3d31bc67df1..0aff28c746d 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java
@@ -24,28 +24,28 @@ public class WeightedSetItemTestCase {
         assertNull(ws.getTokenWeight("bogus"));
 
         // insert tokens
-        assertEquals(new Integer(1), ws.addToken("foo"));
-        assertEquals(new Integer(2), ws.addToken("bar", 2));
-        assertEquals(new Integer(3), ws.addToken("baz", 3));
+        assertEquals(Integer.valueOf(1), ws.addToken("foo"));
+        assertEquals(Integer.valueOf(2), ws.addToken("bar", 2));
+        assertEquals(Integer.valueOf(3), ws.addToken("baz", 3));
 
         // check state
         assertEquals(3, ws.getNumTokens());
-        assertEquals(new Integer(1), ws.getTokenWeight("foo"));
-        assertEquals(new Integer(2), ws.getTokenWeight("bar"));
-        assertEquals(new Integer(3), ws.getTokenWeight("baz"));
+        assertEquals(Integer.valueOf(1), ws.getTokenWeight("foo"));
+        assertEquals(Integer.valueOf(2), ws.getTokenWeight("bar"));
+        assertEquals(Integer.valueOf(3), ws.getTokenWeight("baz"));
 
         // add duplicate tokens
-        assertEquals(new Integer(2), ws.addToken("foo", 2));
-        assertEquals(new Integer(3), ws.addToken("baz", 2));
+        assertEquals(Integer.valueOf(2), ws.addToken("foo", 2));
+        assertEquals(Integer.valueOf(3), ws.addToken("baz", 2));
 
         // check state
         assertEquals(3, ws.getNumTokens());
-        assertEquals(new Integer(2), ws.getTokenWeight("foo"));
-        assertEquals(new Integer(2), ws.getTokenWeight("bar"));
-        assertEquals(new Integer(3), ws.getTokenWeight("baz"));
+        assertEquals(Integer.valueOf(2), ws.getTokenWeight("foo"));
+        assertEquals(Integer.valueOf(2), ws.getTokenWeight("bar"));
+        assertEquals(Integer.valueOf(3), ws.getTokenWeight("baz"));
 
         // remove token
-        assertEquals(new Integer(2), ws.removeToken("bar"));
+        assertEquals(Integer.valueOf(2), ws.removeToken("bar"));
         assertEquals(2, ws.getNumTokens());
         assertNull(ws.getTokenWeight("bar"));
 
@@ -57,9 +57,9 @@ public class WeightedSetItemTestCase {
     @Test
     public void testNegativeWeight() {
         WeightedSetItem ws = new WeightedSetItem("index");
-        assertEquals(new Integer(-10), ws.addToken("bad", -10));
+        assertEquals(Integer.valueOf(-10), ws.addToken("bad", -10));
         assertEquals(1, ws.getNumTokens());
-        assertEquals(new Integer(-10), ws.getTokenWeight("bad"));        
+        assertEquals(Integer.valueOf(-10), ws.getTokenWeight("bad"));        
     }
 
     static class FakeWSItem extends CompositeIndexedItem {
diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java
index 6c4253bff2d..ee735104caa 100644
--- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java
@@ -114,12 +114,12 @@ public class QuotingSearcherTestCase {
         Hit hit = new FastHit();
         hit.setId("http://abc.html");
         hit.setRelevance(new Relevance(1));
-        hit.setField("title", new Integer(42));
+        hit.setField("title", Integer.valueOf(42));
         r.hits().add(hit);
         docsource.addResultSet(q, r);
         Result check = doSearch(s, q, 0, 10, chained);
         // should not quote non-string properties
-        assertEquals(new Integer(42), check.hits().get(0).getField("title"));
+        assertEquals(Integer.valueOf(42), check.hits().get(0).getField("title"));
     }
 
     private Result doSearch(Searcher searcher, Query query, int offset, int hits, Map<Searcher, Searcher> chained) {
diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java
index be6256c1711..93955da383e 100644
--- a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java
@@ -197,9 +197,9 @@ public class WandSearcherTestCase {
 
     private void assertWeightedSetItem(WeightedSetItem item) {
         assertEquals(3, item.getNumTokens());
-        assertEquals(new Integer(1), item.getTokenWeight("a"));
-        assertEquals(new Integer(2), item.getTokenWeight("b"));
-        assertEquals(new Integer(3), item.getTokenWeight("c"));
+        assertEquals(Integer.valueOf(1), item.getTokenWeight("a"));
+        assertEquals(Integer.valueOf(2), item.getTokenWeight("b"));
+        assertEquals(Integer.valueOf(3), item.getTokenWeight("c"));
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
index e497845248e..ee70c427aee 100644
--- a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java
@@ -90,7 +90,7 @@ public class DataTypeTestCase {
             Map<String, Integer> wsetMap = new LinkedHashMap<>();
             wsetMap.put("foo", 1);
             WeightedSet<StringFieldValue> ws = (WeightedSet<StringFieldValue>) DataType.getWeightedSet(DataType.STRING).createFieldValue(wsetMap);
-            assertEquals(ws.get(new StringFieldValue("foo")), new Integer(1));
+            assertEquals(ws.get(new StringFieldValue("foo")), Integer.valueOf(1));
         }
         {
             List<String> arrayArray = new ArrayList<>();
diff --git a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java
index a14640a2f86..a0c891a3f30 100755
--- a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java
@@ -131,7 +131,7 @@ public class DocumentPathUpdateTestCase {
         docUp.applyTo(doc);
         assertEquals(1, ((WeightedSet) doc.getFieldValue("strwset")).size());
         WeightedSet docWset = (WeightedSet) doc.getFieldValue("strwset");
-        assertEquals(new Integer(10), docWset.get(new StringFieldValue("hello hello")));
+        assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("hello hello")));
     }
 
     @Test
@@ -240,8 +240,8 @@ public class DocumentPathUpdateTestCase {
         docUp.applyTo(doc);
         assertEquals(2, ((WeightedSet) doc.getFieldValue("strwset")).size());
         WeightedSet docWset = (WeightedSet) doc.getFieldValue("strwset");
-        assertEquals(new Integer(5), docWset.get(new StringFieldValue("assigned val 0")));
-        assertEquals(new Integer(10), docWset.get(new StringFieldValue("assigned val 1")));
+        assertEquals(Integer.valueOf(5), docWset.get(new StringFieldValue("assigned val 0")));
+        assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("assigned val 1")));
     }
 
     @Test
@@ -260,7 +260,7 @@ public class DocumentPathUpdateTestCase {
         docUp.applyTo(doc);
         WeightedSet docWset = (WeightedSet) doc.getFieldValue(doc.getField("strwset"));
         assertEquals(1, docWset.size());
-        assertEquals(new Integer(243), docWset.get(new StringFieldValue("blahdi blahdi")));
+        assertEquals(Integer.valueOf(243), docWset.get(new StringFieldValue("blahdi blahdi")));
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index 44c82042d5c..c503e0bdf67 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -553,7 +553,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
 
             FieldValue fv = doc.getRecursiveValue("l1s1.ss.iarray");
 
-            assertFalse(((Array)fv).contains(new Integer(12)));
+            assertFalse(((Array)fv).contains(Integer.valueOf(12)));
             assertEquals(3, ((Array)fv).size());
         }
 
@@ -690,8 +690,8 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         assertEquals(new FloatFieldValue(2.0f), array.get(1));
 
         WeightedSet<StringFieldValue> wset = (WeightedSet<StringFieldValue>)doc.getFieldValue("wsfield");
-        assertEquals(new Integer(50), wset.get(new StringFieldValue("Weighted 0")));
-        assertEquals(new Integer(199), wset.get(new StringFieldValue("Weighted 1")));
+        assertEquals(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0")));
+        assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1")));
     }
 
     @Test
@@ -722,8 +722,8 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         assertEquals(new DocumentId("doc:docindoc:http://embedded"), docindoc.getId());
 
         WeightedSet wset = (WeightedSet)doc.getFieldValue("wsfield");
-        assertEquals(new Integer(50), wset.get(new StringFieldValue("Weighted 0")));
-        assertEquals(new Integer(199), wset.get(new StringFieldValue("Weighted 1")));
+        assertEquals(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0")));
+        assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1")));
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
index 13474efc282..4392ea932b2 100644
--- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
@@ -163,7 +163,7 @@ public class DocumentUpdateTestCase {
         docUp.applyTo(doc);
         assertEquals(1, ((WeightedSet)doc.getFieldValue("strwset")).size());
         WeightedSet docWset = (WeightedSet)doc.getFieldValue("strwset");
-        assertEquals(new Integer(10), docWset.get(new StringFieldValue("hello hello")));
+        assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("hello hello")));
     }
 
     @Test
@@ -205,8 +205,8 @@ public class DocumentUpdateTestCase {
         docUp.applyTo(doc);
         assertEquals(2, ((WeightedSet)doc.getFieldValue("strwset")).size());
         WeightedSet docWset = (WeightedSet)doc.getFieldValue("strwset");
-        assertEquals(new Integer(5), docWset.get(new StringFieldValue("assigned val 0")));
-        assertEquals(new Integer(10), docWset.get(new StringFieldValue("assigned val 1")));
+        assertEquals(Integer.valueOf(5), docWset.get(new StringFieldValue("assigned val 0")));
+        assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("assigned val 1")));
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java
index 19d5b4b3a7e..3436c73feae 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/WeightedSetTestCase.java
@@ -33,7 +33,7 @@ public class WeightedSetTestCase {
         assertEquals(5, ok);
 
         assertEquals(1, wset.size());
-        assertEquals(wset.get(new StringFieldValue("this is a test")), new Integer(10));
+        assertEquals(wset.get(new StringFieldValue("this is a test")), Integer.valueOf(10));
 
         //REMOVE:
 
@@ -75,8 +75,8 @@ public class WeightedSetTestCase {
         set.put(new StringFieldValue("hello"), 5);
         set.put(new StringFieldValue("aba"), 10);
         assertEquals(2, set.size());
-        assertEquals(new Integer(5), set.get(new StringFieldValue("hello")));
-        assertEquals(new Integer(10), set.get(new StringFieldValue("aba")));
+        assertEquals(Integer.valueOf(5), set.get(new StringFieldValue("hello")));
+        assertEquals(Integer.valueOf(10), set.get(new StringFieldValue("aba")));
 
         DataType type2 = DataType.getWeightedSet(DataType.STRING, true, true);
         WeightedSet<StringFieldValue> set2 = new WeightedSet<>(type2);
@@ -84,9 +84,9 @@ public class WeightedSetTestCase {
         set2.put(new StringFieldValue("bye"), 13);
         set2.put(new StringFieldValue("see you"), 15);
         assertEquals(3, set2.size());
-        assertEquals(new Integer(6), set2.get(new StringFieldValue("hi")));
-        assertEquals(new Integer(13), set2.get(new StringFieldValue("bye")));
-        assertEquals(new Integer(15), set2.get(new StringFieldValue("see you")));
+        assertEquals(Integer.valueOf(6), set2.get(new StringFieldValue("hi")));
+        assertEquals(Integer.valueOf(13), set2.get(new StringFieldValue("bye")));
+        assertEquals(Integer.valueOf(15), set2.get(new StringFieldValue("see you")));
 
         try {
             set.assign(set2);
@@ -96,8 +96,8 @@ public class WeightedSetTestCase {
         }
 
         assertEquals(2, set.size());
-        assertEquals(new Integer(5), set.get(new StringFieldValue("hello")));
-        assertEquals(new Integer(10), set.get(new StringFieldValue("aba")));
+        assertEquals(Integer.valueOf(5), set.get(new StringFieldValue("hello")));
+        assertEquals(Integer.valueOf(10), set.get(new StringFieldValue("aba")));
     }
 
     @Test
@@ -154,7 +154,7 @@ public class WeightedSetTestCase {
         assertEquals(3, ws.size());
         assertEquals(3, map.size());
 
-        assertEquals(new Integer(1), ws.get(new StringFieldValue("sitronbrus")));
+        assertEquals(Integer.valueOf(1), ws.get(new StringFieldValue("sitronbrus")));
     }
 
     @Test
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index 29ba244a9f1..07f0a172caf 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -477,8 +477,8 @@ public class JsonReaderTestCase {
         assertSame(WeightedSet.class, f.getClass());
         WeightedSet<?> w = (WeightedSet<?>) f;
         assertEquals(2, w.size());
-        assertEquals(new Integer(2), w.get(new StringFieldValue("nalle")));
-        assertEquals(new Integer(7), w.get(new StringFieldValue("tralle")));
+        assertEquals(Integer.valueOf(2), w.get(new StringFieldValue("nalle")));
+        assertEquals(Integer.valueOf(7), w.get(new StringFieldValue("tralle")));
     }
 
     @Test
@@ -700,8 +700,8 @@ public class JsonReaderTestCase {
         AssignValueUpdate assign = (AssignValueUpdate) x.getValueUpdate(0);
         WeightedSet<?> w = (WeightedSet<?>) assign.getValue();
         assertEquals(2, w.size());
-        assertEquals(new Integer(37), w.get(new StringFieldValue("person")));
-        assertEquals(new Integer(41), w.get(new StringFieldValue("another person")));
+        assertEquals(Integer.valueOf(37), w.get(new StringFieldValue("person")));
+        assertEquals(Integer.valueOf(41), w.get(new StringFieldValue("another person")));
     }
 
 
diff --git a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
index b5f74c8973e..4c64f7c35cb 100755
--- a/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/vespaxmlparser/VespaXMLReaderTestCase.java
@@ -96,12 +96,12 @@ public class VespaXMLReaderTestCase {
         assertEquals(new FloatFieldValue(10.0f), floatArr.get(1));
 
         WeightedSet intWset = (WeightedSet)doc.getFieldValue("weightedsetint");
-        assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11)));
-        assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12)));
+        assertEquals(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11)));
+        assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12)));
 
         WeightedSet strWset = (WeightedSet)doc.getFieldValue("weightedsetstring");
-        assertEquals(new Integer(13), strWset.get(new StringFieldValue("string13")));
-        assertEquals(new Integer(14), strWset.get(new StringFieldValue("string14")));
+        assertEquals(Integer.valueOf(13), strWset.get(new StringFieldValue("string13")));
+        assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14")));
 
         MapFieldValue strMap = (MapFieldValue)doc.getFieldValue("stringmap");
         assertEquals(new StringFieldValue("slovakia"), strMap.get(new StringFieldValue("italia")));
@@ -196,14 +196,14 @@ public class VespaXMLReaderTestCase {
         //weightedsetint
         WeightedSet weightedsetint =
                 (WeightedSet)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue();
-        assertEquals(new Integer(11), weightedsetint.get(new IntegerFieldValue(11)));
-        assertEquals(new Integer(12), weightedsetint.get(new IntegerFieldValue(12)));
+        assertEquals(Integer.valueOf(11), weightedsetint.get(new IntegerFieldValue(11)));
+        assertEquals(Integer.valueOf(12), weightedsetint.get(new IntegerFieldValue(12)));
 
         //weightedsetstring
         WeightedSet weightedsetstring =
                 (WeightedSet)docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue();
-        assertEquals(new Integer(13), weightedsetstring.get(new StringFieldValue("assign13")));
-        assertEquals(new Integer(14), weightedsetstring.get(new StringFieldValue("assign14")));
+        assertEquals(Integer.valueOf(13), weightedsetstring.get(new StringFieldValue("assign13")));
+        assertEquals(Integer.valueOf(14), weightedsetstring.get(new StringFieldValue("assign14")));
 
     }
 
@@ -255,8 +255,8 @@ public class VespaXMLReaderTestCase {
         //weightedsetint
         WeightedSet weightedsetint =
                 (WeightedSet)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue();
-        assertEquals(new Integer(11), weightedsetint.get(new IntegerFieldValue(11)));
-        assertEquals(new Integer(12), weightedsetint.get(new IntegerFieldValue(12)));
+        assertEquals(Integer.valueOf(11), weightedsetint.get(new IntegerFieldValue(11)));
+        assertEquals(Integer.valueOf(12), weightedsetint.get(new IntegerFieldValue(12)));
 
         //weightedsetstring
         assertNull(docUpdate.getFieldUpdate("weightedsetstring"));
@@ -309,17 +309,17 @@ public class VespaXMLReaderTestCase {
 
         //weightedsetint
         assertEquals(new IntegerFieldValue(11), docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue());
-        assertEquals(new Integer(11),
+        assertEquals(Integer.valueOf(11),
                      (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0))
                              .getWeight());
         assertEquals(new IntegerFieldValue(12), docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(1).getValue());
-        assertEquals(new Integer(12),
+        assertEquals(Integer.valueOf(12),
                      (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(1))
                              .getWeight());
 
         //weightedsetstring
         assertEquals(new StringFieldValue("add13"), docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue());
-        assertEquals(new Integer(1),
+        assertEquals(Integer.valueOf(1),
                      (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0))
                              .getWeight());
     }
@@ -575,12 +575,12 @@ public class VespaXMLReaderTestCase {
             assertEquals(new FloatFieldValue(10.0f), floatArr.get(1));
 
             WeightedSet intWset = (WeightedSet)doc.getFieldValue("weightedsetint");
-            assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11)));
-            assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12)));
+            assertEquals(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11)));
+            assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12)));
 
             WeightedSet strWset = (WeightedSet)doc.getFieldValue("weightedsetstring");
-            assertEquals(new Integer(13), strWset.get(new StringFieldValue("string13")));
-            assertEquals(new Integer(14), strWset.get(new StringFieldValue("string14")));
+            assertEquals(Integer.valueOf(13), strWset.get(new StringFieldValue("string13")));
+            assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14")));
         }
         {
             VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
@@ -613,16 +613,16 @@ public class VespaXMLReaderTestCase {
             assertNull(upd.getFieldUpdate("floatarr"));
 
             assertEquals(new IntegerFieldValue(11), upd.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue());
-            assertEquals(new Integer(11),
+            assertEquals(Integer.valueOf(11),
                          (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetint").getValueUpdate(0))
                                  .getWeight());
             assertEquals(new IntegerFieldValue(12), upd.getFieldUpdate("weightedsetint").getValueUpdate(1).getValue());
-            assertEquals(new Integer(12),
+            assertEquals(Integer.valueOf(12),
                          (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetint").getValueUpdate(1))
                                  .getWeight());
 
             assertEquals(new StringFieldValue("add13"), upd.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue());
-            assertEquals(new Integer(1),
+            assertEquals(Integer.valueOf(1),
                          (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetstring").getValueUpdate(0))
                                  .getWeight());
         }
@@ -653,8 +653,8 @@ public class VespaXMLReaderTestCase {
             assertNull(upd.getFieldUpdate("floatarr"));
 
             WeightedSet intWset = (WeightedSet)upd.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue();
-            assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11)));
-            assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12)));
+            assertEquals(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11)));
+            assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12)));
 
             assertNull(upd.getFieldUpdate("weightedsetstring"));
         }
@@ -738,15 +738,15 @@ public class VespaXMLReaderTestCase {
             AssignFieldPathUpdate ass = (AssignFieldPathUpdate)docUpdate.getFieldPathUpdates().get(10);
             assertEquals("weightedsetint", ass.getOriginalFieldPath());
             WeightedSet set = (WeightedSet)ass.getNewValue();
-            assertEquals(new Integer(11), set.get(new IntegerFieldValue(11)));
-            assertEquals(new Integer(12), set.get(new IntegerFieldValue(12)));
+            assertEquals(Integer.valueOf(11), set.get(new IntegerFieldValue(11)));
+            assertEquals(Integer.valueOf(12), set.get(new IntegerFieldValue(12)));
         }
         {
             AssignFieldPathUpdate ass = (AssignFieldPathUpdate)docUpdate.getFieldPathUpdates().get(11);
             assertEquals("weightedsetstring", ass.getOriginalFieldPath());
             WeightedSet set = (WeightedSet)ass.getNewValue();
-            assertEquals(new Integer(13), set.get(new StringFieldValue("assign13")));
-            assertEquals(new Integer(14), set.get(new StringFieldValue("assign14")));
+            assertEquals(Integer.valueOf(13), set.get(new StringFieldValue("assign13")));
+            assertEquals(Integer.valueOf(14), set.get(new StringFieldValue("assign14")));
         }
         {
             AddFieldPathUpdate ass = (AddFieldPathUpdate)docUpdate.getFieldPathUpdates().get(12);
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java
index 950e1842ea2..c98620c573f 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java
@@ -158,8 +158,8 @@ public class ForEachTestCase {
 
         WeightedSet after = (WeightedSet)val;
         assertEquals(2, after.size());
-        assertEquals(new Integer(9), after.get(new IntegerFieldValue(6)));
-        assertEquals(new Integer(6), after.get(new IntegerFieldValue(9)));
+        assertEquals(Integer.valueOf(9), after.get(new IntegerFieldValue(6)));
+        assertEquals(Integer.valueOf(6), after.get(new IntegerFieldValue(9)));
     }
 
     @Test
diff --git a/processing/src/main/java/com/yahoo/processing/request/Properties.java b/processing/src/main/java/com/yahoo/processing/request/Properties.java
index 524c65463e4..fae0407815b 100644
--- a/processing/src/main/java/com/yahoo/processing/request/Properties.java
+++ b/processing/src/main/java/com/yahoo/processing/request/Properties.java
@@ -418,7 +418,7 @@ public class Properties implements Cloneable {
             if (stringValue.isEmpty())
                 return defaultValue;
 
-            return new Integer(stringValue);
+            return Integer.valueOf(stringValue);
         } catch (IllegalArgumentException e) {
             throw new NumberFormatException("Not a valid integer");
         }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
index 0c7410a39ca..a2103ca0cdd 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int16ResultNode.java
@@ -122,7 +122,7 @@ public class Int16ResultNode extends NumericResultNode {
 
     @Override
     public Object getNumber() {
-        return new Integer(value);
+        return Integer.valueOf(value);
     }
 
     @Override
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java
index 7edcbca5168..ccb54e42d1c 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int32ResultNode.java
@@ -122,7 +122,7 @@ public class Int32ResultNode extends NumericResultNode {
 
     @Override
     public Object getNumber() {
-        return new Integer(value);
+        return Integer.valueOf(value);
     }
 
     @Override
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
index 421f09ea96c..a36ce210dbe 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/Int8ResultNode.java
@@ -122,7 +122,7 @@ public class Int8ResultNode extends NumericResultNode {
 
     @Override
     public Object getNumber() {
-        return new Integer(value);
+        return Integer.valueOf(value);
     }
 
     @Override
diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java
index a553cfa9e71..e3caaeb455c 100644
--- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java
+++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Group.java
@@ -57,7 +57,7 @@ public class Group implements Comparable<Group> {
 
     @Override
     public int compareTo(Group o) {
-        return new Integer(index).compareTo(o.getIndex());
+        return Integer.valueOf(index).compareTo(o.getIndex());
     }
 
     @Override
diff --git a/vespajlib/src/main/java/com/yahoo/text/HTML.java b/vespajlib/src/main/java/com/yahoo/text/HTML.java
index 594935acaac..0ae69287ff8 100644
--- a/vespajlib/src/main/java/com/yahoo/text/HTML.java
+++ b/vespajlib/src/main/java/com/yahoo/text/HTML.java
@@ -13,7 +13,7 @@ import java.util.HashMap;
  */
 public class HTML {
     static Object[][] entities = {
-        // {"#39", new Integer(39)},     // ' - apostrophe
+        // {"#39", Integer.valueOf(39)},     // ' - apostrophe
         {"quot", 34},    // " - double-quote
         {"amp", 38},     // & - ampersand
         {"lt", 60},      // < - less-than