Revert "Gjoranv/java9 prep 05"

15 files changed, 39 insertions, 39 deletions

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 81192be035a..556ab6bb78f 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(Integer.valueOf(id));
+        return getChannel(new Integer(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 b0fce14e73f..7cab3d59f66 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, Integer.valueOf(0));
+        FS4Channel pingChannel = new FS4Channel(backend, new Integer(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 11e7d4e3d35..2c1bb623ee0 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(Integer.valueOf(queryId));
+                    receiver = backend.getChannel(new Integer(queryId));
                 }
                 packet = PacketDecoder.extractPacket(readBuffer);
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java
index 2e24937856c..1f99bb50725 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java
@@ -152,12 +152,12 @@ public class IntItem extends TermItem {
 
     private Number asNumber(String numberString) {
         try {
-            if (!numberString.contains(".")) return Long.valueOf(numberString);
+            if (!numberString.contains(".")) return new Long(numberString);
         }
         catch (NumberFormatException e) {
             return new BigInteger(numberString);
         }
-        return Double.valueOf(numberString);
+        return new Double(numberString);
     }
 
     /** Sets the number expression of this - a number or range */
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 d5f72a3387e..0b86b05deb4 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 = Integer.valueOf(arg[0]).intValue();
+            start = new Integer(arg[0]).intValue();
         }
         if (arg.length > 1) {
-            end = Integer.valueOf(arg[1]).intValue();
+            end = new Integer(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 71e54c810c2..7f391a6520b 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, Integer.valueOf(numHitsThisField));
+                    knownCollapses.put(collapseId, new Integer(numHitsThisField));
                 }
             } else {
-                knownCollapses.put(collapseId, Integer.valueOf(1));
+                knownCollapses.put(collapseId, new Integer(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 a42c1000617..270c1acdae4 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(Integer.valueOf(digest)); }
+    void addMatchDigest(int digest) { matchDigests.add(new Integer(digest)); }
 
-    boolean hasMatchDigest(int matchDigest) { return matchDigests.contains(Integer.valueOf(matchDigest)); }
+    boolean hasMatchDigest(int matchDigest) { return matchDigests.contains(new Integer(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 31e133d22d5..6ba2360eb00 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", Integer.valueOf(hitno));
+        hitContext.put("hitno", new Integer(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", Integer.valueOf(hitno));
+        hitContext.put("hitno", new Integer(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 ea4a07508b6..1bd10234e55 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, Integer.valueOf(firstChild.getText()));
+				return OperatorNode.create(toLocation(scope, firstChild), ExpressionOperator.LITERAL, new Integer(firstChild.getText()));
 			} else {
 				return convertExpr(firstChild, scope);
 			}
@@ -1369,9 +1369,9 @@ final class ProgramParser {
         String text = literal.getChild(0).getText();
         switch(parseTreeIndex) {
             case yqlplusParser.INT:
-                return Integer.valueOf(text);
+                return new Integer(text);
             case yqlplusParser.FLOAT:
-                return Double.valueOf(text);
+                return new Double(text);
             case yqlplusParser.STRING:
                 return StringUnescaper.unquote(text);
             case yqlplusParser.TRUE:
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 69ca646dbd5..4671ada6545 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", Integer.valueOf(7));
+        p.put("object", new Integer(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/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
index 116bab43645..07ffe7ac706 100644
--- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java
@@ -580,7 +580,7 @@ public class ClusterSearcherTestCase {
 
     @Test
     public void testThatQueryTimeoutIsCappedWithSpecifiedMax() {
-        QueryTimeoutFixture f = new QueryTimeoutFixture(Double.valueOf(70), null);
+        QueryTimeoutFixture f = new QueryTimeoutFixture(new Double(70), null);
         f.query.setTimeout(70001);
         f.search();
         assertEquals(70000, f.query.getTimeout());
@@ -606,7 +606,7 @@ public class ClusterSearcherTestCase {
 
     @Test
     public void testThatQueryCacheIsDisabledIfTimeoutIsLargerThanConfiguredMax() {
-        QueryTimeoutFixture f = new QueryTimeoutFixture(null, Double.valueOf(5));
+        QueryTimeoutFixture f = new QueryTimeoutFixture(null, new Double(5));
         f.query.setTimeout(5001);
         f.query.getRanking().setQueryCache(true);
         f.search();
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 38911ef83c5..5806a08bb24 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(Integer.valueOf(10)));
+        assertFalse(TermType.AND.equals(new Integer(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 0aff28c746d..3d31bc67df1 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(Integer.valueOf(1), ws.addToken("foo"));
-        assertEquals(Integer.valueOf(2), ws.addToken("bar", 2));
-        assertEquals(Integer.valueOf(3), ws.addToken("baz", 3));
+        assertEquals(new Integer(1), ws.addToken("foo"));
+        assertEquals(new Integer(2), ws.addToken("bar", 2));
+        assertEquals(new Integer(3), ws.addToken("baz", 3));
 
         // check state
         assertEquals(3, ws.getNumTokens());
-        assertEquals(Integer.valueOf(1), ws.getTokenWeight("foo"));
-        assertEquals(Integer.valueOf(2), ws.getTokenWeight("bar"));
-        assertEquals(Integer.valueOf(3), ws.getTokenWeight("baz"));
+        assertEquals(new Integer(1), ws.getTokenWeight("foo"));
+        assertEquals(new Integer(2), ws.getTokenWeight("bar"));
+        assertEquals(new Integer(3), ws.getTokenWeight("baz"));
 
         // add duplicate tokens
-        assertEquals(Integer.valueOf(2), ws.addToken("foo", 2));
-        assertEquals(Integer.valueOf(3), ws.addToken("baz", 2));
+        assertEquals(new Integer(2), ws.addToken("foo", 2));
+        assertEquals(new Integer(3), ws.addToken("baz", 2));
 
         // check state
         assertEquals(3, ws.getNumTokens());
-        assertEquals(Integer.valueOf(2), ws.getTokenWeight("foo"));
-        assertEquals(Integer.valueOf(2), ws.getTokenWeight("bar"));
-        assertEquals(Integer.valueOf(3), ws.getTokenWeight("baz"));
+        assertEquals(new Integer(2), ws.getTokenWeight("foo"));
+        assertEquals(new Integer(2), ws.getTokenWeight("bar"));
+        assertEquals(new Integer(3), ws.getTokenWeight("baz"));
 
         // remove token
-        assertEquals(Integer.valueOf(2), ws.removeToken("bar"));
+        assertEquals(new Integer(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(Integer.valueOf(-10), ws.addToken("bad", -10));
+        assertEquals(new Integer(-10), ws.addToken("bad", -10));
         assertEquals(1, ws.getNumTokens());
-        assertEquals(Integer.valueOf(-10), ws.getTokenWeight("bad"));        
+        assertEquals(new Integer(-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 ee735104caa..6c4253bff2d 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", Integer.valueOf(42));
+        hit.setField("title", new Integer(42));
         r.hits().add(hit);
         docsource.addResultSet(q, r);
         Result check = doSearch(s, q, 0, 10, chained);
         // should not quote non-string properties
-        assertEquals(Integer.valueOf(42), check.hits().get(0).getField("title"));
+        assertEquals(new Integer(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 93955da383e..be6256c1711 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(Integer.valueOf(1), item.getTokenWeight("a"));
-        assertEquals(Integer.valueOf(2), item.getTokenWeight("b"));
-        assertEquals(Integer.valueOf(3), item.getTokenWeight("c"));
+        assertEquals(new Integer(1), item.getTokenWeight("a"));
+        assertEquals(new Integer(2), item.getTokenWeight("b"));
+        assertEquals(new Integer(3), item.getTokenWeight("c"));
     }
 
     @Test