diff options
13 files changed, 17 insertions, 17 deletions
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 d9b3bb87002..64e47ac4f85 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 @@ -275,10 +275,10 @@ public class DomV20ClientsBuilder { retryenabled = Boolean.valueOf(childval); break; case "retrydelay": - retrydelay = new Double(childval); + retrydelay = Double.valueOf(childval); break; case "timeout": - timeout = new Double(childval); + timeout = Double.valueOf(childval); break; case "route": route = 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 4c9237b6fc1..71813fb098a 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 new Double(value); + return Double.valueOf(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 7fd4a9a3b43..c4a8bf8f864 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionBuilder.java @@ -136,7 +136,7 @@ public class ConfigDefinitionBuilder { static void addNode(ConfigDefinition def, LeafCNode.DoubleLeaf leaf) { if (leaf.getDefaultValue() != null) { - def.addDoubleDef(leaf.getName(), new Double(leaf.getDefaultValue().getValue())); + def.addDoubleDef(leaf.getName(), Double.valueOf(leaf.getDefaultValue().getValue())); } else { def.addDoubleDef(leaf.getName()); } 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 93b4687a2da..2e24937856c 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 @@ -157,7 +157,7 @@ public class IntItem extends TermItem { catch (NumberFormatException e) { return new BigInteger(numberString); } - return new Double(numberString); + return Double.valueOf(numberString); } /** Sets the number expression of this - a number or range */ 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 b7dc080b52a..ea4a07508b6 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 @@ -1371,7 +1371,7 @@ final class ProgramParser { case yqlplusParser.INT: return Integer.valueOf(text); case yqlplusParser.FLOAT: - return new Double(text); + return Double.valueOf(text); case yqlplusParser.STRING: return StringUnescaper.unquote(text); case yqlplusParser.TRUE: 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 07ffe7ac706..116bab43645 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(new Double(70), null); + QueryTimeoutFixture f = new QueryTimeoutFixture(Double.valueOf(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, new Double(5)); + QueryTimeoutFixture f = new QueryTimeoutFixture(null, Double.valueOf(5)); f.query.setTimeout(5001); f.query.getRanking().setQueryCache(true); f.search(); diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFieldReader.java index bfe15c8c45b..c0db20032cb 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(new Double(dataParsed)); + value.assign(Double.valueOf(dataParsed)); } catch (Exception e) { throw newDeserializeException(field, "Invalid double \"" + dataParsed + "\"."); } diff --git a/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java b/document/src/test/java/com/yahoo/document/DocumentCalculatorTestCase.java index 0f8e28f107c..619f6598247 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", new Double(3.0)); - vars.put("y", new Double(5.0)); + vars.put("x", Double.valueOf(3.0)); + vars.put("y", Double.valueOf(5.0)); DocumentCalculator calculator = new DocumentCalculator("($x + $y) / 2"); assertEquals(4.0, calculator.evaluate(doc, vars)); } 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 33c8b861c9c..5a6131e2245 100644 --- a/processing/src/main/java/com/yahoo/processing/request/Properties.java +++ b/processing/src/main/java/com/yahoo/processing/request/Properties.java @@ -550,7 +550,7 @@ public class Properties implements Cloneable { if (stringValue.isEmpty()) return defaultValue; - return new Double(value.toString()); + return Double.valueOf(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 89629ad1f87..551b20ae480 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 new Double(value); + return Double.valueOf(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 d3b98703a01..abfcfa55ee6 100644 --- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java +++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java @@ -303,7 +303,7 @@ public class ExpressionTestCase extends TestCase { assertEquals(a.getInteger(), 7); assertEquals(a.getFloat(), 7.3); assertEquals(a.getString(), "7.3"); - assertEquals(a.getNumber(), new Double(7.3)); + assertEquals(a.getNumber(), Double.valueOf(7.3)); byte[] raw = a.getRaw(); assertEquals(raw.length, 8); assertResultNode(a); @@ -315,7 +315,7 @@ public class ExpressionTestCase extends TestCase { assertEquals(b.getInteger(), 8); assertEquals(b.getFloat(), 7.5); assertEquals(b.getString(), "7.5"); - assertEquals(b.getNumber(), new Double(7.5)); + assertEquals(b.getNumber(), Double.valueOf(7.5)); } public void testGetDocIdNamespaceSpecificFunctionNode() { 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 1c387fc2a93..7d6d75e0ee2 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 new Double(o.score).compareTo(score); + return Double.valueOf(o.score).compareTo(score); } } private class ScoredNode { 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 f0dc2fbc6e8..8c38cd07a34 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() ^ new Double(capacity).hashCode() ^ new Double(reliability).hashCode(); + return state.hashCode() ^ diskStates.hashCode() ^ Double.valueOf(capacity).hashCode() ^ Double.valueOf(reliability).hashCode(); } /** |