Replace deprecated BigDecimal rounding mode

Author: dizzzz

exist-core/src/main/java/org/exist/xquery/value/DayTimeDurationValue.java

@@ -30,6 +30,7 @@
 import javax.xml.datatype.Duration;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 
 /**
  * @author <a href="mailto:[email protected]">Piotr Kaminski</a>
@@ -230,7 +231,7 @@ public ComputableValue div(ComputableValue other) throws XPathException {
         if (other.getType() == Type.DAY_TIME_DURATION) {
             final DecimalValue a = new DecimalValue(secondsValueSigned());
             final DecimalValue b = new DecimalValue(((DayTimeDurationValue) other).secondsValueSigned());
-            return new DecimalValue(a.value.divide(b.value, 20, BigDecimal.ROUND_HALF_UP));
+            return new DecimalValue(a.value.divide(b.value, 20, RoundingMode.HALF_UP));
         }
         if (other instanceof NumericValue) {
             if (((NumericValue) other).isNaN()) {
@@ -248,7 +249,7 @@ public ComputableValue div(ComputableValue other) throws XPathException {
         final BigDecimal divisor = numberToBigDecimal(other, "Operand to div should be of xdt:dayTimeDuration or numeric type; got: ");
         final boolean isDivisorNegative = divisor.signum() < 0;
         final BigDecimal secondsValueSigned = secondsValueSigned();
-        final DayTimeDurationValue quotient = fromDecimalSeconds(secondsValueSigned.divide(divisor.abs(), Math.max(Math.max(3, secondsValueSigned.scale()), divisor.scale()), BigDecimal.ROUND_HALF_UP));
+        final DayTimeDurationValue quotient = fromDecimalSeconds(secondsValueSigned.divide(divisor.abs(), Math.max(Math.max(3, secondsValueSigned.scale()), divisor.scale()), RoundingMode.HALF_UP));
         if (isDivisorNegative) {
             return new DayTimeDurationValue(quotient.negate().getCanonicalDuration());
         }

exist-core/src/main/java/org/exist/xquery/value/DecimalValue.java

@@ -32,6 +32,7 @@
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.util.function.IntSupplier;
 import java.util.regex.Pattern;
 
@@ -300,14 +301,14 @@ public NumericValue negate() throws XPathException {
      * @see org.exist.xquery.value.NumericValue#ceiling()
      */
     public NumericValue ceiling() throws XPathException {
-        return new DecimalValue(value.setScale(0, BigDecimal.ROUND_CEILING));
+        return new DecimalValue(value.setScale(0, RoundingMode.CEILING));
     }
 
     /* (non-Javadoc)
      * @see org.exist.xquery.value.NumericValue#floor()
      */
     public NumericValue floor() throws XPathException {
-        return new DecimalValue(value.setScale(0, BigDecimal.ROUND_FLOOR));
+        return new DecimalValue(value.setScale(0, RoundingMode.FLOOR));
     }
 
     /* (non-Javadoc)
@@ -316,11 +317,11 @@ public NumericValue floor() throws XPathException {
     public NumericValue round() throws XPathException {
         switch (value.signum()) {
             case -1:
-                return new DecimalValue(value.setScale(0, BigDecimal.ROUND_HALF_DOWN));
+                return new DecimalValue(value.setScale(0, RoundingMode.HALF_DOWN));
             case 0:
                 return this;
             case 1:
-                return new DecimalValue(value.setScale(0, BigDecimal.ROUND_HALF_UP));
+                return new DecimalValue(value.setScale(0, RoundingMode.HALF_UP));
             default:
                 return this;
         }
@@ -342,11 +343,11 @@ public NumericValue round(IntegerValue precision) throws XPathException {
         }
 
         if (pre >= 0) {
-            return new DecimalValue(value.setScale(pre, BigDecimal.ROUND_HALF_EVEN));
+            return new DecimalValue(value.setScale(pre, RoundingMode.HALF_EVEN));
         } else {
             return new DecimalValue(
                     value.movePointRight(pre).
-                            setScale(0, BigDecimal.ROUND_HALF_EVEN).
+                            setScale(0, RoundingMode.HALF_EVEN).
                             movePointLeft(pre));
         }
     }
@@ -416,7 +417,7 @@ public ComputableValue div(ComputableValue other) throws XPathException {
 
                 //Copied from Saxon 8.6.1
                 final int scale = Math.max(DIVIDE_PRECISION, Math.max(value.scale(), ((DecimalValue) other).value.scale()));
-                final BigDecimal result = value.divide(((DecimalValue) other).value, scale, BigDecimal.ROUND_HALF_DOWN);
+                final BigDecimal result = value.divide(((DecimalValue) other).value, scale, RoundingMode.HALF_DOWN);
                 return new DecimalValue(result);
             //End of copy
         }
@@ -428,7 +429,7 @@ public IntegerValue idiv(NumericValue other) throws XPathException {
         }
 
         final DecimalValue dv = (DecimalValue) other.convertTo(Type.DECIMAL);
-        final BigInteger quot = value.divide(dv.value, 0, BigDecimal.ROUND_DOWN).toBigInteger();
+        final BigInteger quot = value.divide(dv.value, 0, RoundingMode.DOWN).toBigInteger();
         return new IntegerValue(quot);
     }
 
@@ -441,8 +442,8 @@ public NumericValue mod(NumericValue other) throws XPathException {
                 throw new XPathException(ErrorCodes.FOAR0001, "division by zero");
             }
 
-            final BigDecimal quotient = value.divide(((DecimalValue) other).value, 0, BigDecimal.ROUND_DOWN);
-            final BigDecimal remainder = value.subtract(quotient.setScale(0, BigDecimal.ROUND_DOWN).multiply(((DecimalValue) other).value));
+            final BigDecimal quotient = value.divide(((DecimalValue) other).value, 0, RoundingMode.DOWN);
+            final BigDecimal remainder = value.subtract(quotient.setScale(0, RoundingMode.DOWN).multiply(((DecimalValue) other).value));
             return new DecimalValue(remainder);
         } else {
             return ((NumericValue) convertTo(other.getType())).mod(other);

exist-core/src/main/java/org/exist/xquery/value/DurationValue.java

@@ -31,6 +31,7 @@
 import javax.xml.datatype.Duration;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 
 /**
  * @author <a href="mailto:[email protected]">Piotr Kaminski</a>
@@ -172,7 +173,7 @@ private void canonicalize() {
 
         // segment to be replaced:
         final BigDecimal secondsValue = secondsValue();
-        final BigDecimal m = secondsValue.divide(SIXTY_DECIMAL, 0, BigDecimal.ROUND_DOWN);
+        final BigDecimal m = secondsValue.divide(SIXTY_DECIMAL, 0, RoundingMode.DOWN);
         seconds = nullIfZero(secondsValue.subtract(SIXTY_DECIMAL.multiply(m)));
         r = m.toBigInteger().divideAndRemainder(SIXTY);
 

exist-core/src/main/java/org/exist/xquery/value/IntegerValue.java

@@ -29,6 +29,7 @@
 import javax.annotation.Nullable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.util.function.IntSupplier;
 
 /**
@@ -380,7 +381,7 @@ public ComputableValue div(final ComputableValue other) throws XPathException {
             final BigDecimal d = new BigDecimal(value);
             final BigDecimal od = new BigDecimal(((IntegerValue) other).value);
             final int scale = Math.max(18, Math.max(d.scale(), od.scale()));
-            return new DecimalValue(d.divide(od, scale, BigDecimal.ROUND_HALF_DOWN));
+            return new DecimalValue(d.divide(od, scale, RoundingMode.HALF_DOWN));
         } else {
             //TODO : review type promotion
             return ((ComputableValue) convertTo(other.getType())).div(other);