diff options
author | gjoranv <gjoranv@gmail.com> | 2018-05-02 12:23:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 12:23:17 +0200 |
commit | 8e80aede65732210a72dbdfe6e7863ff502bd5ac (patch) | |
tree | f8b7d0da3fc9e28a7cfed66c6154ee603ba7c60f /searchlib | |
parent | bbb5bcd8fa10bde6d3275e68c54b0a83c2ab94ad (diff) |
Revert "Revert "Gjoranv/java9 prep 05""
Diffstat (limited to 'searchlib')
6 files changed, 8 insertions, 8 deletions
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/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/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/IntegerResultNode.java index 5107cbbd849..039e52f57af 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 new Long(value); + return Long.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 12a4cacaa97..ad50d3cc3d4 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(), new Double(7.3)); + assertEquals(a.getNumber(), Double.valueOf(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(), new Double(7.5)); + assertEquals(b.getNumber(), Double.valueOf(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(), new Long(7)); + assertEquals(a.getNumber(), Long.valueOf(7)); byte[] raw = a.getRaw(); assertEquals(raw.length, 8); assertResultNode(a); |