diff options
54 files changed, 173 insertions, 199 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 d8fb0d7f584..7af863a37c3 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 = Integer.valueOf(lhs.classPriority()).compareTo(rhs.classPriority()); + int result = new Integer(lhs.classPriority()).compareTo(rhs.classPriority()); return result != 0 ? result : - Integer.valueOf(lhs.priority).compareTo(rhs.priority); + new Integer(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 77ca7e12711..b0287c3fcb3 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", Integer.valueOf(0).toString().getBytes(utf8)); + createNode(zooKeeperRoot, "latestversion", new Integer(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/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncTest.java index 130dea84fc6..2817c83a041 100644 --- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncTest.java +++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncTest.java @@ -118,7 +118,7 @@ public class AsyncTest { op.setResult("123"); assertEquals(true, deleteRequest.isDone()); assertEquals(true, deleteRequest.isSuccess()); - assertEquals(Integer.valueOf(123), deleteRequest.getResult()); + assertEquals(new Integer(123), deleteRequest.getResult()); assertEquals("desc", deleteRequest.getDescription()); assertEquals("test", deleteRequest.getName()); assertEquals(1, result.size()); @@ -161,7 +161,7 @@ public class AsyncTest { source.setResult("5"); assertTrue(target.isDone()); assertTrue(target.isSuccess()); - assertEquals(Integer.valueOf(5), target.getResult()); + assertEquals(new Integer(5), target.getResult()); } { final AsyncOperationImpl<Integer> target = new AsyncOperationImpl<>("foo"); diff --git a/component/src/main/java/com/yahoo/component/VersionSpecification.java b/component/src/main/java/com/yahoo/component/VersionSpecification.java index c926df4a80b..223e6b05b6a 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 = Integer.valueOf(s); + major = new Integer(s); } } if (components.length > 1) { String s = components[1]; if (! s.equals("*")) { - minor = Integer.valueOf(s); + minor = new Integer(s); } } if (components.length > 2) { String s = components[2]; if (! s.equals("*")) { - micro = Integer.valueOf(s); + micro = new Integer(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 64e47ac4f85..d3d62f83e2c 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,28 +266,28 @@ public class DomV20ClientsBuilder { abortondocumenterror = Boolean.valueOf(childval); break; case "maxpendingdocs": - maxpendingdocs = Integer.valueOf(childval); + maxpendingdocs = new Integer(childval); break; case "maxpendingbytes": - maxpendingbytes = Integer.valueOf(childval); + maxpendingbytes = new Integer(childval); break; case "retryenabled": retryenabled = Boolean.valueOf(childval); break; case "retrydelay": - retrydelay = Double.valueOf(childval); + retrydelay = new Double(childval); break; case "timeout": - timeout = Double.valueOf(childval); + timeout = new Double(childval); break; case "route": route = childval; break; case "tracelevel": - tracelevel = Integer.valueOf(childval); + tracelevel = new Integer(childval); break; case "mbusport": - mbusport = Integer.valueOf(childval); + mbusport = new Integer(childval); break; case "docprocchain": docprocChain = childval; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java index 71813fb098a..4c9237b6fc1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java @@ -24,7 +24,7 @@ public class TimeParser { if (matcher.group(3) != null) { value /= milliSecondsPerSecond; } - return Double.valueOf(value); + return new Double(value); } public static int asMilliSeconds(String timeout) { 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 c4a8bf8f864..b7faee5b062 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(), Integer.valueOf(leaf.getDefaultValue().getValue())); + def.addIntDef(leaf.getName(), new Integer(leaf.getDefaultValue().getValue())); } else { def.addIntDef(leaf.getName()); } @@ -120,7 +120,7 @@ public class ConfigDefinitionBuilder { static void addNode(ConfigDefinition def, LeafCNode.LongLeaf leaf) { if (leaf.getDefaultValue() != null) { - def.addLongDef(leaf.getName(), Long.valueOf(leaf.getDefaultValue().getValue())); + def.addLongDef(leaf.getName(), new Long(leaf.getDefaultValue().getValue())); } else { def.addLongDef(leaf.getName()); } @@ -136,7 +136,7 @@ public class ConfigDefinitionBuilder { static void addNode(ConfigDefinition def, LeafCNode.DoubleLeaf leaf) { if (leaf.getDefaultValue() != null) { - def.addDoubleDef(leaf.getName(), Double.valueOf(leaf.getDefaultValue().getValue())); + def.addDoubleDef(leaf.getName(), new Double(leaf.getDefaultValue().getValue())); } else { def.addDoubleDef(leaf.getName()); } diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java index c7e2a777695..52d26236ec7 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -345,7 +345,7 @@ public class LogFileHandler extends StreamHandler { etc = true; break; } - list.add(Long.valueOf(times.substring(j,i))); + list.add(new Long(times.substring(j,i))); } int size = list.size(); 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 diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java index c0db20032cb..bfe15c8c45b 100644 --- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java +++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java @@ -302,7 +302,7 @@ public class VespaXMLFieldReader extends VespaXMLReader implements FieldReader { try { String dataParsed = reader.getElementText(); try { - value.assign(Double.valueOf(dataParsed)); + value.assign(new Double(dataParsed)); } catch (Exception e) { throw newDeserializeException(field, "Invalid double \"" + dataParsed + "\"."); } diff --git a/document/src/test/java/com/yahoo/document/DataTypeTestCase.java b/document/src/test/java/com/yahoo/document/DataTypeTestCase.java index ee70c427aee..e497845248e 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")), Integer.valueOf(1)); + assertEquals(ws.get(new StringFieldValue("foo")), new Integer(1)); } { List<String> arrayArray = new ArrayList<>(); diff --git a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java index 619f6598247..0f8e28f107c 100755 --- a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java +++ b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java @@ -90,8 +90,8 @@ public class DocumentCalculatorTestCase { @Test public void testVariables() throws Exception { HashMap<String, Object> vars = new HashMap<>(); - vars.put("x", Double.valueOf(3.0)); - vars.put("y", Double.valueOf(5.0)); + vars.put("x", new Double(3.0)); + vars.put("y", new Double(5.0)); DocumentCalculator calculator = new DocumentCalculator("($x + $y) / 2"); assertEquals(4.0, calculator.evaluate(doc, vars)); } diff --git a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java index a0c891a3f30..a14640a2f86 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(Integer.valueOf(10), docWset.get(new StringFieldValue("hello hello"))); + assertEquals(new Integer(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(Integer.valueOf(5), docWset.get(new StringFieldValue("assigned val 0"))); - assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("assigned val 1"))); + assertEquals(new Integer(5), docWset.get(new StringFieldValue("assigned val 0"))); + assertEquals(new Integer(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(Integer.valueOf(243), docWset.get(new StringFieldValue("blahdi blahdi"))); + assertEquals(new Integer(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 f7cc6974176..44c82042d5c 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(Integer.valueOf(12))); + assertFalse(((Array)fv).contains(new Integer(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(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0"))); - assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1"))); + assertEquals(new Integer(50), wset.get(new StringFieldValue("Weighted 0"))); + assertEquals(new Integer(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(Integer.valueOf(50), wset.get(new StringFieldValue("Weighted 0"))); - assertEquals(Integer.valueOf(199), wset.get(new StringFieldValue("Weighted 1"))); + assertEquals(new Integer(50), wset.get(new StringFieldValue("Weighted 0"))); + assertEquals(new Integer(199), wset.get(new StringFieldValue("Weighted 1"))); } @Test @@ -1137,7 +1137,7 @@ public class DocumentTestCase extends DocumentTestCaseBase { Document doc = new Document(docMan.getDocumentType("testdoc"), new DocumentId("doc:testdoc:timetest")); assertNull(doc.getLastModified()); doc.setLastModified(4350129845023985L); - assertEquals(Long.valueOf(4350129845023985L), doc.getLastModified()); + assertEquals(new Long(4350129845023985L), doc.getLastModified()); doc.setLastModified(null); assertNull(doc.getLastModified()); diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java index 4392ea932b2..13474efc282 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(Integer.valueOf(10), docWset.get(new StringFieldValue("hello hello"))); + assertEquals(new Integer(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(Integer.valueOf(5), docWset.get(new StringFieldValue("assigned val 0"))); - assertEquals(Integer.valueOf(10), docWset.get(new StringFieldValue("assigned val 1"))); + assertEquals(new Integer(5), docWset.get(new StringFieldValue("assigned val 0"))); + assertEquals(new Integer(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 3436c73feae..19d5b4b3a7e 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")), Integer.valueOf(10)); + assertEquals(wset.get(new StringFieldValue("this is a test")), new Integer(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(Integer.valueOf(5), set.get(new StringFieldValue("hello"))); - assertEquals(Integer.valueOf(10), set.get(new StringFieldValue("aba"))); + assertEquals(new Integer(5), set.get(new StringFieldValue("hello"))); + assertEquals(new Integer(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(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"))); + 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"))); try { set.assign(set2); @@ -96,8 +96,8 @@ public class WeightedSetTestCase { } assertEquals(2, set.size()); - assertEquals(Integer.valueOf(5), set.get(new StringFieldValue("hello"))); - assertEquals(Integer.valueOf(10), set.get(new StringFieldValue("aba"))); + assertEquals(new Integer(5), set.get(new StringFieldValue("hello"))); + assertEquals(new Integer(10), set.get(new StringFieldValue("aba"))); } @Test @@ -154,7 +154,7 @@ public class WeightedSetTestCase { assertEquals(3, ws.size()); assertEquals(3, map.size()); - assertEquals(Integer.valueOf(1), ws.get(new StringFieldValue("sitronbrus"))); + assertEquals(new Integer(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 07f0a172caf..29ba244a9f1 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(Integer.valueOf(2), w.get(new StringFieldValue("nalle"))); - assertEquals(Integer.valueOf(7), w.get(new StringFieldValue("tralle"))); + assertEquals(new Integer(2), w.get(new StringFieldValue("nalle"))); + assertEquals(new Integer(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(Integer.valueOf(37), w.get(new StringFieldValue("person"))); - assertEquals(Integer.valueOf(41), w.get(new StringFieldValue("another person"))); + assertEquals(new Integer(37), w.get(new StringFieldValue("person"))); + assertEquals(new Integer(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 4c64f7c35cb..b5f74c8973e 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(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11))); - assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12))); + assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11))); + assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12))); WeightedSet strWset = (WeightedSet)doc.getFieldValue("weightedsetstring"); - assertEquals(Integer.valueOf(13), strWset.get(new StringFieldValue("string13"))); - assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14"))); + assertEquals(new Integer(13), strWset.get(new StringFieldValue("string13"))); + assertEquals(new Integer(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(Integer.valueOf(11), weightedsetint.get(new IntegerFieldValue(11))); - assertEquals(Integer.valueOf(12), weightedsetint.get(new IntegerFieldValue(12))); + assertEquals(new Integer(11), weightedsetint.get(new IntegerFieldValue(11))); + assertEquals(new Integer(12), weightedsetint.get(new IntegerFieldValue(12))); //weightedsetstring WeightedSet weightedsetstring = (WeightedSet)docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue(); - assertEquals(Integer.valueOf(13), weightedsetstring.get(new StringFieldValue("assign13"))); - assertEquals(Integer.valueOf(14), weightedsetstring.get(new StringFieldValue("assign14"))); + assertEquals(new Integer(13), weightedsetstring.get(new StringFieldValue("assign13"))); + assertEquals(new Integer(14), weightedsetstring.get(new StringFieldValue("assign14"))); } @@ -255,8 +255,8 @@ public class VespaXMLReaderTestCase { //weightedsetint WeightedSet weightedsetint = (WeightedSet)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0).getValue(); - assertEquals(Integer.valueOf(11), weightedsetint.get(new IntegerFieldValue(11))); - assertEquals(Integer.valueOf(12), weightedsetint.get(new IntegerFieldValue(12))); + assertEquals(new Integer(11), weightedsetint.get(new IntegerFieldValue(11))); + assertEquals(new Integer(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(Integer.valueOf(11), + assertEquals(new Integer(11), (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(0)) .getWeight()); assertEquals(new IntegerFieldValue(12), docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(1).getValue()); - assertEquals(Integer.valueOf(12), + assertEquals(new Integer(12), (Integer)((AddValueUpdate)docUpdate.getFieldUpdate("weightedsetint").getValueUpdate(1)) .getWeight()); //weightedsetstring assertEquals(new StringFieldValue("add13"), docUpdate.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue()); - assertEquals(Integer.valueOf(1), + assertEquals(new Integer(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(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11))); - assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12))); + assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11))); + assertEquals(new Integer(12), intWset.get(new IntegerFieldValue(12))); WeightedSet strWset = (WeightedSet)doc.getFieldValue("weightedsetstring"); - assertEquals(Integer.valueOf(13), strWset.get(new StringFieldValue("string13"))); - assertEquals(Integer.valueOf(14), strWset.get(new StringFieldValue("string14"))); + assertEquals(new Integer(13), strWset.get(new StringFieldValue("string13"))); + assertEquals(new Integer(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(Integer.valueOf(11), + assertEquals(new Integer(11), (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetint").getValueUpdate(0)) .getWeight()); assertEquals(new IntegerFieldValue(12), upd.getFieldUpdate("weightedsetint").getValueUpdate(1).getValue()); - assertEquals(Integer.valueOf(12), + assertEquals(new Integer(12), (Integer)((AddValueUpdate)upd.getFieldUpdate("weightedsetint").getValueUpdate(1)) .getWeight()); assertEquals(new StringFieldValue("add13"), upd.getFieldUpdate("weightedsetstring").getValueUpdate(0).getValue()); - assertEquals(Integer.valueOf(1), + assertEquals(new Integer(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(Integer.valueOf(11), intWset.get(new IntegerFieldValue(11))); - assertEquals(Integer.valueOf(12), intWset.get(new IntegerFieldValue(12))); + assertEquals(new Integer(11), intWset.get(new IntegerFieldValue(11))); + assertEquals(new Integer(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(Integer.valueOf(11), set.get(new IntegerFieldValue(11))); - assertEquals(Integer.valueOf(12), set.get(new IntegerFieldValue(12))); + assertEquals(new Integer(11), set.get(new IntegerFieldValue(11))); + assertEquals(new Integer(12), set.get(new IntegerFieldValue(12))); } { AssignFieldPathUpdate ass = (AssignFieldPathUpdate)docUpdate.getFieldPathUpdates().get(11); assertEquals("weightedsetstring", ass.getOriginalFieldPath()); WeightedSet set = (WeightedSet)ass.getNewValue(); - assertEquals(Integer.valueOf(13), set.get(new StringFieldValue("assign13"))); - assertEquals(Integer.valueOf(14), set.get(new StringFieldValue("assign14"))); + assertEquals(new Integer(13), set.get(new StringFieldValue("assign13"))); + assertEquals(new Integer(14), set.get(new StringFieldValue("assign14"))); } { AddFieldPathUpdate ass = (AddFieldPathUpdate)docUpdate.getFieldPathUpdates().get(12); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java index 39b77c40e1d..ad3e7538c4c 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java @@ -58,7 +58,7 @@ public class Response { public long getRequestId() { return requestId; } public int hashCode() { - return (Long.valueOf(requestId).hashCode()) + (textMessage == null ? 0 : textMessage.hashCode()) + + return (new Long(requestId).hashCode()) + (textMessage == null ? 0 : textMessage.hashCode()) + (success ? 1 : 0); } 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 c98620c573f..950e1842ea2 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(Integer.valueOf(9), after.get(new IntegerFieldValue(6))); - assertEquals(Integer.valueOf(6), after.get(new IntegerFieldValue(9))); + assertEquals(new Integer(9), after.get(new IntegerFieldValue(6))); + assertEquals(new Integer(6), after.get(new IntegerFieldValue(9))); } @Test diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java index ef2074b7703..8c10e045759 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/GuiceRepository.java @@ -2,27 +2,14 @@ package com.yahoo.jdisc.application; import com.google.common.collect.ImmutableSet; -import com.google.inject.Binding; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; +import com.google.inject.*; import com.google.inject.spi.DefaultElementVisitor; import com.google.inject.spi.Element; import com.google.inject.spi.Elements; import com.yahoo.jdisc.Container; import org.osgi.framework.Bundle; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.logging.Logger; /** diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java index 04be3c1e3d4..3f89ba04aa5 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ContentInputStream.java @@ -19,7 +19,6 @@ public final class ContentInputStream extends UnsafeContentInputStream { } @Override - @SuppressWarnings("deprecation") // finalize() is deprecated from Java 9 public void finalize() throws Throwable { try { close(); 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 965a132cd92..e8fb53892f0 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 @@ -1,25 +1,22 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; -import com.google.inject.Binding; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; +import com.google.inject.*; import com.yahoo.jdisc.application.ContainerActivator; import com.yahoo.jdisc.application.ContainerBuilder; import com.yahoo.jdisc.application.OsgiFramework; import com.yahoo.jdisc.service.CurrentContainer; import com.yahoo.jdisc.test.NonWorkingOsgiFramework; -import org.junit.Test; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.concurrent.ThreadFactory; -import static java.util.Collections.emptyList; -import static org.junit.Assert.assertNotNull; +import org.junit.Test; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertNotNull; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> @@ -40,7 +37,8 @@ public class ApplicationEnvironmentModuleTestCase { expected.add(entry.getKey().getTypeLiteral().getRawType()); } - ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(), emptyList()); + ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(), + Collections.<Module>emptyList()); injector = Guice.createInjector(new ApplicationEnvironmentModule(loader)); for (Map.Entry<Key<?>, Binding<?>> entry : injector.getBindings().entrySet()) { assertNotNull(expected.remove(entry.getKey().getTypeLiteral().getRawType())); @@ -50,7 +48,8 @@ public class ApplicationEnvironmentModuleTestCase { @Test public void requireThatContainerBuilderCanBeInjected() { - ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(), emptyList()); + ApplicationLoader loader = new ApplicationLoader(new NonWorkingOsgiFramework(), + Collections.<Module>emptyList()); assertNotNull(new ApplicationEnvironmentModule(loader).containerBuilder()); assertNotNull(Guice.createInjector(new ApplicationEnvironmentModule(loader)) .getInstance(ContainerBuilder.class)); 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 7dca8c45d0b..a5897bea124 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 @@ -70,8 +70,6 @@ public class OsgiLogHandlerTestCase { } @Test - // TODO: Remove deprecation annotation and replace calls to LogRecord.setMillis() when we no longer have to support Java 8 - @SuppressWarnings("deprecation") public void requireThatJdk14PropertiesAreAvailableThroughServiceReference() { MyLogService logService = new MyLogService(); diff --git a/jrt/tests/com/yahoo/jrt/QueueTest.java b/jrt/tests/com/yahoo/jrt/QueueTest.java index eced2941d6e..c3bac34db69 100644 --- a/jrt/tests/com/yahoo/jrt/QueueTest.java +++ b/jrt/tests/com/yahoo/jrt/QueueTest.java @@ -23,11 +23,11 @@ public class QueueTest { @org.junit.Test public void testEnqueueDequeue() { Queue queue = new Queue(); - Integer int1 = 1; - Integer int2 = 2; - Integer int3 = 3; - Integer int4 = 4; - Integer int5 = 5; + Integer int1 = new Integer(1); + Integer int2 = new Integer(2); + Integer int3 = new Integer(3); + Integer int4 = new Integer(4); + Integer int5 = new Integer(5); assertEquals(queue.size(), 0); queue.enqueue(int1); @@ -75,9 +75,9 @@ public class QueueTest { public void testFlush() { Queue src = new Queue(); Queue dst = new Queue(); - Integer int1 = 1; - Integer int2 = 2; - Integer int3 = 3; + Integer int1 = new Integer(1); + Integer int2 = new Integer(2); + Integer int3 = new Integer(3); assertTrue(src.flush(dst) == 0); assertEquals(src.size(), 0); diff --git a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java index db2ed6b0b83..619643a32b6 100644 --- a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java +++ b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java @@ -5,7 +5,6 @@ import com.yahoo.log.LogLevel; import com.yahoo.plugin.Plugin; import com.yahoo.plugin.SystemPropertyConfig; -import java.lang.reflect.InvocationTargetException; import java.util.logging.Logger; /** @@ -21,8 +20,8 @@ public abstract class AbstractPluginLoader implements PluginLoader { protected void loadFromClass(Class<? extends Plugin> pluginClass) { Plugin plugin; try { - plugin = pluginClass.getDeclaredConstructor().newInstance(); - } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { + plugin = (Plugin) pluginClass.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { log.log(LogLevel.ERROR, pluginClass.getName() + ": load failed: " + e); throw new RuntimeException(e); } diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java index 36b1c3e31a0..f87c66ecd92 100644 --- a/logserver/src/main/java/com/yahoo/logserver/Server.java +++ b/logserver/src/main/java/com/yahoo/logserver/Server.java @@ -50,6 +50,9 @@ public class Server implements Runnable { private final boolean isInitialized; + /** + * Server constructor + */ private Server() { dispatch = new LogDispatcher(); dispatch.setBatchedMode(true); @@ -72,7 +75,7 @@ public class Server implements Runnable { return ht; } - private void registerPluginLoader(PluginLoader loader) { + public void registerPluginLoader(PluginLoader loader) { loader.loadPlugins(); } @@ -87,7 +90,7 @@ public class Server implements Runnable { unregisterLogHandler(lh, threadName); } - private void unregisterLogHandler(LogHandler lh, String threadName) { + public void unregisterLogHandler(LogHandler lh, String threadName) { HandlerThread ht = getHandlerThread(threadName); ht.unregisterHandler(lh); threadNameForHandler.remove(lh); diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java index 434131878c0..2e0b3d67c49 100644 --- a/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java +++ b/logserver/src/test/java/com/yahoo/logserver/handlers/logmetrics/test/LogMetricsTestCase.java @@ -83,29 +83,20 @@ public class LogMetricsTestCase { assertEquals(levelCount.entrySet().size(), 5); for (Map.Entry<String, Long> entry : levelCount.entrySet()) { String key = entry.getKey(); - switch (key) { - case "config": - assertEquals(entry.getValue(), Long.valueOf(1)); - break; - case "info": - assertEquals(entry.getValue(), Long.valueOf(4)); - break; - case "warning": - assertEquals(entry.getValue(), Long.valueOf(1)); - break; - case "severe": - assertEquals(entry.getValue(), Long.valueOf(0)); - break; - case "error": - assertEquals(entry.getValue(), Long.valueOf(1)); - break; - case "fatal": - assertEquals(entry.getValue(), Long.valueOf(1)); - break; - case "debug": - assertEquals(entry.getValue(), Long.valueOf(0)); // always 0 - - break; + if (key.equals("config")) { + assertEquals(entry.getValue(), new Long(1)); + } else if (key.equals("info")) { + assertEquals(entry.getValue(), new Long(4)); + } else if (key.equals("warning")) { + assertEquals(entry.getValue(), new Long(1)); + } else if (key.equals("severe")) { + assertEquals(entry.getValue(), new Long(0)); + } else if (key.equals("error")) { + assertEquals(entry.getValue(), new Long(1)); + } else if (key.equals("fatal")) { + assertEquals(entry.getValue(), new Long(1)); + } else if (key.equals("debug")) { + assertEquals(entry.getValue(), new Long(0)); // always 0 } } a.close(); diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java index cae074f5397..0ee3c256bf0 100644 --- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java +++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java @@ -35,10 +35,8 @@ public class RangeEdgePartition extends RangePartition { @Override public int hashCode() { - return super.hashCode() - + Long.valueOf(value).hashCode() - + Integer.valueOf(lowerBound).hashCode() - + Integer.valueOf(upperBound).hashCode(); + return super.hashCode() + new Long(value).hashCode() + + new Integer(lowerBound).hashCode() + new Integer(upperBound).hashCode(); } @Override 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 5a6131e2245..524c65463e4 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 Integer.valueOf(stringValue); + return new Integer(stringValue); } catch (IllegalArgumentException e) { throw new NumberFormatException("Not a valid integer"); } @@ -484,7 +484,7 @@ public class Properties implements Cloneable { if (stringValue.isEmpty()) return defaultValue; - return Long.valueOf(value.toString()); + return new Long(value.toString()); } catch (IllegalArgumentException e) { throw new NumberFormatException("Not a valid long"); } @@ -550,7 +550,7 @@ public class Properties implements Cloneable { if (stringValue.isEmpty()) return defaultValue; - return Double.valueOf(value.toString()); + return new Double(value.toString()); } catch (IllegalArgumentException e) { throw new NumberFormatException("Not a valid double"); } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java index 551b20ae480..89629ad1f87 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/FloatResultNode.java @@ -129,7 +129,7 @@ public class FloatResultNode extends NumericResultNode { @Override public Object getNumber() { - return Double.valueOf(value); + return new Double(value); } @Override 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 a2103ca0cdd..0c7410a39ca 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 Integer.valueOf(value); + return new Integer(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 ccb54e42d1c..7edcbca5168 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 Integer.valueOf(value); + return new Integer(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 a36ce210dbe..421f09ea96c 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 Integer.valueOf(value); + return new Integer(value); } @Override diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java index 039e52f57af..5107cbbd849 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java @@ -138,7 +138,7 @@ public class IntegerResultNode extends NumericResultNode { @Override public Object getNumber() { - return Long.valueOf(value); + return new Long(value); } @Override diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java index ad50d3cc3d4..12a4cacaa97 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java @@ -331,7 +331,7 @@ public class ExpressionTestCase { assertEquals(a.getInteger(), 7); assertEquals(a.getFloat(), 7.3, delta); assertEquals(a.getString(), "7.3"); - assertEquals(a.getNumber(), Double.valueOf(7.3)); + assertEquals(a.getNumber(), new Double(7.3)); byte[] raw = a.getRaw(); assertEquals(raw.length, 8); assertResultNode(a); @@ -343,7 +343,7 @@ public class ExpressionTestCase { assertEquals(b.getInteger(), 8); assertEquals(b.getFloat(), 7.5, delta); assertEquals(b.getString(), "7.5"); - assertEquals(b.getNumber(), Double.valueOf(7.5)); + assertEquals(b.getNumber(), new Double(7.5)); } @Test @@ -394,7 +394,7 @@ public class ExpressionTestCase { assertEquals(a.getInteger(), 7); assertEquals(a.getFloat(), 7.0, delta); assertEquals(a.getString(), "7"); - assertEquals(a.getNumber(), Long.valueOf(7)); + assertEquals(a.getNumber(), new Long(7)); byte[] raw = a.getRaw(); assertEquals(raw.length, 8); assertResultNode(a); diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java index 7d6d75e0ee2..1c387fc2a93 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java @@ -149,7 +149,7 @@ public class Distribution { @Override public int compareTo(ScoredGroup o) { // Sorts by highest first. - return Double.valueOf(o.score).compareTo(score); + return new Double(o.score).compareTo(score); } } private class ScoredNode { 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 e3caaeb455c..a553cfa9e71 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 Integer.valueOf(index).compareTo(o.getIndex()); + return new Integer(index).compareTo(o.getIndex()); } @Override diff --git a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java index 8c38cd07a34..f0dc2fbc6e8 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/state/NodeState.java @@ -103,7 +103,7 @@ public class NodeState implements Cloneable { return true; } public int hashCode() { - return state.hashCode() ^ diskStates.hashCode() ^ Double.valueOf(capacity).hashCode() ^ Double.valueOf(reliability).hashCode(); + return state.hashCode() ^ diskStates.hashCode() ^ new Double(capacity).hashCode() ^ new Double(reliability).hashCode(); } /** diff --git a/vespajlib/src/main/java/com/yahoo/text/HTML.java b/vespajlib/src/main/java/com/yahoo/text/HTML.java index 0ae69287ff8..594935acaac 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", Integer.valueOf(39)}, // ' - apostrophe + // {"#39", new Integer(39)}, // ' - apostrophe {"quot", 34}, // " - double-quote {"amp", 38}, // & - ampersand {"lt", 60}, // < - less-than |