From 847aa8108ff11212cb9d1254cb493c602c0c29d0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 5 Nov 2022 17:15:50 -0400 Subject: [PATCH] new Double --> Double.valueOf (#142) * new Double --> Double.valueOf * use NaN constant --- .../main/org/jaxen/expr/DefaultDivExpr.java | 2 +- .../main/org/jaxen/expr/DefaultMinusExpr.java | 2 +- .../main/org/jaxen/expr/DefaultModExpr.java | 2 +- .../org/jaxen/expr/DefaultMultiplyExpr.java | 2 +- .../main/org/jaxen/expr/DefaultPlusExpr.java | 2 +- .../main/org/jaxen/expr/DefaultUnaryExpr.java | 2 +- .../org/jaxen/expr/DefaultXPathFactory.java | 4 ++-- .../org/jaxen/function/CeilingFunction.java | 2 +- .../main/org/jaxen/function/CountFunction.java | 2 +- .../main/org/jaxen/function/FloorFunction.java | 2 +- .../main/org/jaxen/function/LastFunction.java | 2 +- .../main/org/jaxen/function/NumberFunction.java | 17 +++++++---------- .../org/jaxen/function/PositionFunction.java | 2 +- .../main/org/jaxen/function/RoundFunction.java | 2 +- .../jaxen/function/StringLengthFunction.java | 2 +- .../main/org/jaxen/function/SumFunction.java | 2 +- .../org/jaxen/test/ExtensionFunctionTest.java | 6 +++--- .../java/test/org/jaxen/test/NumberTest.java | 2 +- .../jaxen/test/SimpleVariableContextTest.java | 6 +++--- .../test/org/jaxen/test/ExprComparator.java | 2 +- 20 files changed, 31 insertions(+), 34 deletions(-) diff --git a/core/src/java/main/org/jaxen/expr/DefaultDivExpr.java b/core/src/java/main/org/jaxen/expr/DefaultDivExpr.java index 0061558f..7d442e55 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultDivExpr.java +++ b/core/src/java/main/org/jaxen/expr/DefaultDivExpr.java @@ -78,7 +78,7 @@ public Object evaluate(Context context) throws JaxenException double result = lhsValue.doubleValue() / rhsValue.doubleValue(); - return new Double( result ); + return Double.valueOf( result ); } } diff --git a/core/src/java/main/org/jaxen/expr/DefaultMinusExpr.java b/core/src/java/main/org/jaxen/expr/DefaultMinusExpr.java index 7099aca6..9be3f1ec 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultMinusExpr.java +++ b/core/src/java/main/org/jaxen/expr/DefaultMinusExpr.java @@ -78,7 +78,7 @@ public Object evaluate(Context context) throws JaxenException context.getNavigator() ); double result = lhsValue.doubleValue() - rhsValue.doubleValue(); - return new Double( result ); + return Double.valueOf( result ); } } diff --git a/core/src/java/main/org/jaxen/expr/DefaultModExpr.java b/core/src/java/main/org/jaxen/expr/DefaultModExpr.java index 0d71f20a..32093e95 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultModExpr.java +++ b/core/src/java/main/org/jaxen/expr/DefaultModExpr.java @@ -76,7 +76,7 @@ public Object evaluate( Context context ) throws JaxenException context.getNavigator() ); double result = lhsValue.doubleValue() % rhsValue.doubleValue(); - return new Double( result ); + return Double.valueOf( result ); } } diff --git a/core/src/java/main/org/jaxen/expr/DefaultMultiplyExpr.java b/core/src/java/main/org/jaxen/expr/DefaultMultiplyExpr.java index 00d83243..75a2bfb9 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultMultiplyExpr.java +++ b/core/src/java/main/org/jaxen/expr/DefaultMultiplyExpr.java @@ -77,7 +77,7 @@ public Object evaluate( Context context ) throws JaxenException double result = lhsValue.doubleValue() * rhsValue.doubleValue(); - return new Double( result ); + return Double.valueOf( result ); } } diff --git a/core/src/java/main/org/jaxen/expr/DefaultPlusExpr.java b/core/src/java/main/org/jaxen/expr/DefaultPlusExpr.java index 682b13c0..c5bda862 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultPlusExpr.java +++ b/core/src/java/main/org/jaxen/expr/DefaultPlusExpr.java @@ -77,7 +77,7 @@ public Object evaluate(Context context) throws JaxenException double result = lhsValue.doubleValue() + rhsValue.doubleValue(); - return new Double( result ); + return Double.valueOf( result ); } } diff --git a/core/src/java/main/org/jaxen/expr/DefaultUnaryExpr.java b/core/src/java/main/org/jaxen/expr/DefaultUnaryExpr.java index 6c7709be..da53e4f9 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultUnaryExpr.java +++ b/core/src/java/main/org/jaxen/expr/DefaultUnaryExpr.java @@ -91,7 +91,7 @@ public Object evaluate(Context context) throws JaxenException Number number = NumberFunction.evaluate( getExpr().evaluate( context ), context.getNavigator() ); - return new Double( number.doubleValue() * -1 ); + return Double.valueOf( number.doubleValue() * -1 ); } } diff --git a/core/src/java/main/org/jaxen/expr/DefaultXPathFactory.java b/core/src/java/main/org/jaxen/expr/DefaultXPathFactory.java index e1aaf649..125defc6 100644 --- a/core/src/java/main/org/jaxen/expr/DefaultXPathFactory.java +++ b/core/src/java/main/org/jaxen/expr/DefaultXPathFactory.java @@ -238,12 +238,12 @@ public FunctionCallExpr createFunctionCallExpr( String prefix, public NumberExpr createNumberExpr( int number ) throws JaxenException { - return new DefaultNumberExpr( new Double( number ) ); + return new DefaultNumberExpr( Double.valueOf( number ) ); } public NumberExpr createNumberExpr( double number ) throws JaxenException { - return new DefaultNumberExpr( new Double( number ) ); + return new DefaultNumberExpr( Double.valueOf( number ) ); } public LiteralExpr createLiteralExpr( String literal ) throws JaxenException diff --git a/core/src/java/main/org/jaxen/function/CeilingFunction.java b/core/src/java/main/org/jaxen/function/CeilingFunction.java index 792bbcff..1d267d75 100644 --- a/core/src/java/main/org/jaxen/function/CeilingFunction.java +++ b/core/src/java/main/org/jaxen/function/CeilingFunction.java @@ -125,6 +125,6 @@ public static Double evaluate(Object obj, Double value = NumberFunction.evaluate( obj, nav ); - return new Double( Math.ceil( value.doubleValue() ) ); + return Double.valueOf( Math.ceil( value.doubleValue() ) ); } } diff --git a/core/src/java/main/org/jaxen/function/CountFunction.java b/core/src/java/main/org/jaxen/function/CountFunction.java index 1e0bb4a6..82908502 100644 --- a/core/src/java/main/org/jaxen/function/CountFunction.java +++ b/core/src/java/main/org/jaxen/function/CountFunction.java @@ -107,7 +107,7 @@ public static Double evaluate(Object obj) throws FunctionCallException if (obj instanceof List) { - return new Double( ((List) obj).size() ); + return Double.valueOf( ((List) obj).size() ); } throw new FunctionCallException("count() function can only be used for node-sets"); diff --git a/core/src/java/main/org/jaxen/function/FloorFunction.java b/core/src/java/main/org/jaxen/function/FloorFunction.java index 99b8b963..1c987697 100644 --- a/core/src/java/main/org/jaxen/function/FloorFunction.java +++ b/core/src/java/main/org/jaxen/function/FloorFunction.java @@ -123,7 +123,7 @@ public static Double evaluate(Object obj, Double value = NumberFunction.evaluate( obj, nav ); - return new Double( Math.floor( value.doubleValue() ) ); + return Double.valueOf( Math.floor( value.doubleValue() ) ); } } diff --git a/core/src/java/main/org/jaxen/function/LastFunction.java b/core/src/java/main/org/jaxen/function/LastFunction.java index b7939446..166e9a8c 100644 --- a/core/src/java/main/org/jaxen/function/LastFunction.java +++ b/core/src/java/main/org/jaxen/function/LastFunction.java @@ -108,7 +108,7 @@ public Object call(Context context, */ public static Double evaluate(Context context) { - return new Double( context.getSize() ); + return Double.valueOf( context.getSize() ); } } diff --git a/core/src/java/main/org/jaxen/function/NumberFunction.java b/core/src/java/main/org/jaxen/function/NumberFunction.java index e5fd7e15..6f6a1754 100644 --- a/core/src/java/main/org/jaxen/function/NumberFunction.java +++ b/core/src/java/main/org/jaxen/function/NumberFunction.java @@ -125,10 +125,7 @@ * target="_top">Section 4.4 of the XPath Specification */ public class NumberFunction implements Function -{ - - private final static Double NaN = new Double( Double.NaN ); - +{ /** * Create a new NumberFunction object. @@ -183,12 +180,12 @@ else if ( obj instanceof String ) String str = (String) obj; try { - Double doubleValue = new Double( str ); + Double doubleValue = Double.valueOf( str ); return doubleValue; } catch (NumberFormatException e) { - return NaN; + return Double.NaN; } } else if ( obj instanceof List || obj instanceof Iterator ) @@ -205,14 +202,14 @@ else if ( obj instanceof Boolean ) { if ( Boolean.TRUE.equals(obj) ) { - return new Double( 1 ); + return Double.valueOf( 1 ); } else { - return new Double( 0 ); + return Double.valueOf( 0 ); } } - return NaN; + return Double.NaN; } /** @@ -236,7 +233,7 @@ public static boolean isNaN( double val ) */ public static boolean isNaN( Double val ) { - return val.equals( NaN ); + return val.equals( Double.NaN ); } } diff --git a/core/src/java/main/org/jaxen/function/PositionFunction.java b/core/src/java/main/org/jaxen/function/PositionFunction.java index 758c2cf2..51b976c5 100644 --- a/core/src/java/main/org/jaxen/function/PositionFunction.java +++ b/core/src/java/main/org/jaxen/function/PositionFunction.java @@ -109,7 +109,7 @@ public Object call(Context context, List args) throws FunctionCallException */ public static Double evaluate(Context context) { - return new Double( context.getPosition() ); + return Double.valueOf( context.getPosition() ); } } diff --git a/core/src/java/main/org/jaxen/function/RoundFunction.java b/core/src/java/main/org/jaxen/function/RoundFunction.java index 474ac89b..a3e5cc5d 100644 --- a/core/src/java/main/org/jaxen/function/RoundFunction.java +++ b/core/src/java/main/org/jaxen/function/RoundFunction.java @@ -128,6 +128,6 @@ public static Double evaluate(Object obj, } double value = d.doubleValue(); - return new Double( Math.round( value ) ); + return Double.valueOf( Math.round( value ) ); } } diff --git a/core/src/java/main/org/jaxen/function/StringLengthFunction.java b/core/src/java/main/org/jaxen/function/StringLengthFunction.java index 55e6c1cd..50ccf036 100644 --- a/core/src/java/main/org/jaxen/function/StringLengthFunction.java +++ b/core/src/java/main/org/jaxen/function/StringLengthFunction.java @@ -150,7 +150,7 @@ public static Double evaluate(Object obj, Navigator nav) throws FunctionCallExce } } } - return new Double(length); + return Double.valueOf(length); } } diff --git a/core/src/java/main/org/jaxen/function/SumFunction.java b/core/src/java/main/org/jaxen/function/SumFunction.java index 76182b8e..0aabcb03 100644 --- a/core/src/java/main/org/jaxen/function/SumFunction.java +++ b/core/src/java/main/org/jaxen/function/SumFunction.java @@ -131,7 +131,7 @@ public static Double evaluate(Object obj, throw new FunctionCallException("The argument to the sum function must be a node-set"); } - return new Double(sum); + return Double.valueOf(sum); } } diff --git a/core/src/java/test/org/jaxen/test/ExtensionFunctionTest.java b/core/src/java/test/org/jaxen/test/ExtensionFunctionTest.java index ce60e084..9a805264 100644 --- a/core/src/java/test/org/jaxen/test/ExtensionFunctionTest.java +++ b/core/src/java/test/org/jaxen/test/ExtensionFunctionTest.java @@ -87,7 +87,7 @@ class MinFunction implements Function { public Object call(Context context, List args) { - if (args.isEmpty()) return new Double(Double.NaN); + if (args.isEmpty()) return Double.valueOf(Double.NaN); Navigator navigator = context.getNavigator(); double min = Double.MAX_VALUE; @@ -96,7 +96,7 @@ public Object call(Context context, List args) { double next = NumberFunction.evaluate(iterator.next(), navigator).doubleValue(); min = Math.min(min, next); } - return new Double(min); + return Double.valueOf(min); } } @@ -130,7 +130,7 @@ public void testRegisterExtensionFunction() throws JaxenException { x4.appendChild(doc.createTextNode("4")); Double result = (Double) xpath.evaluate(doc); - assertEquals(new Double(2), result); + assertEquals(Double.valueOf(2), result); } diff --git a/core/src/java/test/org/jaxen/test/NumberTest.java b/core/src/java/test/org/jaxen/test/NumberTest.java index 2063c035..f3685f07 100644 --- a/core/src/java/test/org/jaxen/test/NumberTest.java +++ b/core/src/java/test/org/jaxen/test/NumberTest.java @@ -155,7 +155,7 @@ public void testNumberFunctionAppliedToNonNumericString() XPath xpath = new DOMXPath("number('Marx')"); Double result = (Double) xpath.evaluate(doc); - assertEquals(new Double(Double.NaN), result); + assertEquals(Double.valueOf(Double.NaN), result); } diff --git a/core/src/java/test/org/jaxen/test/SimpleVariableContextTest.java b/core/src/java/test/org/jaxen/test/SimpleVariableContextTest.java index 4cc1cf60..4a5b55a1 100644 --- a/core/src/java/test/org/jaxen/test/SimpleVariableContextTest.java +++ b/core/src/java/test/org/jaxen/test/SimpleVariableContextTest.java @@ -81,7 +81,7 @@ public void testRoundTripSerialization() // construct test object SimpleVariableContext original = new SimpleVariableContext(); original.setVariableValue("s", "String Value"); - original.setVariableValue("x", new Double(3.1415292)); + original.setVariableValue("x", Double.valueOf(3.1415292)); original.setVariableValue("b", Boolean.TRUE); // serialize @@ -99,7 +99,7 @@ public void testRoundTripSerialization() // test the result assertEquals("String Value", copy.getVariableValue("", "", "s")); - assertEquals(new Double(3.1415292), copy.getVariableValue("", "", "x")); + assertEquals(Double.valueOf(3.1415292), copy.getVariableValue("", "", "x")); assertEquals(Boolean.TRUE, copy.getVariableValue("", "", "b")); assertEquals("", ""); @@ -120,7 +120,7 @@ public void testSerializationFormatHasNotChanged() // test the result assertEquals("String Value", context.getVariableValue("", "", "s")); - assertEquals(new Double(3.1415292), context.getVariableValue("", "", "x")); + assertEquals(Double.valueOf(3.1415292), context.getVariableValue("", "", "x")); assertEquals(Boolean.TRUE, context.getVariableValue("", "", "b")); assertEquals("", ""); } diff --git a/integration-tests/src/java/test/org/jaxen/test/ExprComparator.java b/integration-tests/src/java/test/org/jaxen/test/ExprComparator.java index b6feb392..f99fb152 100644 --- a/integration-tests/src/java/test/org/jaxen/test/ExprComparator.java +++ b/integration-tests/src/java/test/org/jaxen/test/ExprComparator.java @@ -240,7 +240,7 @@ else if (locationPath1.isAbsolute()) case TYPE_NUMBER_EXPR: NumberExpr numberExpr1 = (NumberExpr)o1; NumberExpr numberExpr2 = (NumberExpr)o2; - cmp = new Double(numberExpr1.getNumber().doubleValue()).compareTo(new Double(numberExpr2.getNumber().doubleValue())); + cmp = Double.valueOf(numberExpr1.getNumber().doubleValue()).compareTo(Double.valueOf(numberExpr2.getNumber().doubleValue())); break; case TYPE_PATH_EXPR: PathExpr pathExpr1 = (PathExpr)o1;