diff options
author | gjoranv <gjoranv@gmail.com> | 2018-05-02 10:27:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-02 10:27:09 +0200 |
commit | 2680d03d7160d97be2ae85429e7c457160b056fe (patch) | |
tree | fd0112e1748ba73c0efb95dbd6be52c43b04740d /searchlib | |
parent | 5a47ec87c934f42f66700437c9541ee5be7b669f (diff) |
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 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); |