Review comments - fn:round

Use simplest function DSL methods
Rename tests to .xqm

Author: alanpaxton

exist-core/src/main/java/org/exist/xquery/functions/fn/FunRound.java

@@ -21,12 +21,16 @@
  */
 package org.exist.xquery.functions.fn;
 
-import org.exist.dom.QName;
-import org.exist.xquery.*;
+import org.exist.xquery.Cardinality;
+import org.exist.xquery.FunctionSignature;
+import org.exist.xquery.XPathException;
+import org.exist.xquery.XQueryContext;
 import org.exist.xquery.value.*;
 
 import java.math.RoundingMode;
-import java.util.Objects;
+
+import static org.exist.xquery.FunctionDSL.optParam;
+import static org.exist.xquery.functions.fn.FnModule.functionSignature;
 
 /**
  * Implement fn:round() function
@@ -36,7 +40,7 @@
  */
 public class FunRound extends FunRoundBase {
 
-	private static final QName qName = new QName("round", Function.BUILTIN_FUNCTION_NS);
+	private static final String FN_NAME = "round";
 	private static final String description = "The function returns the nearest (that is, numerically closest) " +
 			"value to $arg that is a multiple of ten to the power of minus $precision. " +
 			"If two such values are equally near (for example, if the fractional part in $arg is exactly .5), " +
@@ -61,11 +65,11 @@ public class FunRound extends FunRoundBase {
 	private static final FunctionReturnSequenceType returnType = new FunctionReturnSequenceType(Type.NUMBER, Cardinality.ZERO_OR_ONE, "the rounded value");
 
 	public static final FunctionSignature[] FN_ROUND_SIGNATURES = {
-			FunctionDSL.functionSignature(FunRound.qName, FunRound.description, FunRound.returnType,
-					new FunctionParameterSequenceType("arg", Type.NUMBER, Cardinality.ZERO_OR_ONE, "The input number")),
-			FunctionDSL.functionSignature(FunRound.qName, FunRound.description, FunRound.returnType,
-					new FunctionParameterSequenceType("arg", Type.NUMBER, Cardinality.ZERO_OR_ONE, "The input number"),
-					new FunctionParameterSequenceType("precision", Type.INTEGER, Cardinality.ZERO_OR_ONE, "The input number"))
+			functionSignature(FN_NAME, FunRound.description, FunRound.returnType,
+					optParam("arg", Type.NUMBER, "The input number")),
+			functionSignature(FN_NAME, FunRound.description, FunRound.returnType,
+					optParam("arg", Type.NUMBER, "The input number"),
+					optParam("precision", Type.INTEGER, "The input number"))
 	};
 
 	public FunRound(final XQueryContext context, final FunctionSignature signature) {

exist-core/src/main/java/org/exist/xquery/functions/fn/FunRoundHalfToEven.java

@@ -21,19 +21,18 @@
  */
 package org.exist.xquery.functions.fn;
 
-import org.exist.dom.QName;
-import org.exist.xquery.*;
-import org.exist.xquery.value.FunctionParameterSequenceType;
+import org.exist.xquery.Cardinality;
+import org.exist.xquery.FunctionSignature;
+import org.exist.xquery.XQueryContext;
 import org.exist.xquery.value.FunctionReturnSequenceType;
-import org.exist.xquery.value.IntegerValue;
-import org.exist.xquery.value.Item;
 import org.exist.xquery.value.NumericValue;
-import org.exist.xquery.value.Sequence;
-import org.exist.xquery.value.SequenceType;
 import org.exist.xquery.value.Type;
 
 import java.math.RoundingMode;
 
+import static org.exist.xquery.FunctionDSL.optParam;
+import static org.exist.xquery.functions.fn.FnModule.functionSignature;
+
 /**
  * Implements the fn:round-half-to-even() function.
  *
@@ -45,7 +44,7 @@
  */
 public class FunRoundHalfToEven extends FunRoundBase {
 
-	private static final QName qName = new QName("round-half-to-even", Function.BUILTIN_FUNCTION_NS);
+	private static final String FN_NAME = "round-half-to-even";
 
 	protected static final String FUNCTION_DESCRIPTION_1_PARAM = 
         "The value returned is the nearest (that is, numerically closest) " +
@@ -78,16 +77,15 @@ public class FunRoundHalfToEven extends FunRoundBase {
 		"If $arg is of type xs:float or xs:double, rounding occurs on the " +
 		"value of the mantissa computed with exponent = 0.";
 
-	protected static final FunctionParameterSequenceType ARG_PARAM = new FunctionParameterSequenceType("arg", Type.NUMBER, Cardinality.ZERO_OR_ONE, "The input number");
-	protected static final FunctionParameterSequenceType PRECISION_PARAM = new FunctionParameterSequenceType("precision", Type.INTEGER, Cardinality.EXACTLY_ONE, "The precision factor");
 	protected static final FunctionReturnSequenceType RETURN_TYPE = new FunctionReturnSequenceType(Type.NUMBER, Cardinality.ZERO_OR_ONE, "the rounded value");
 
 	public static final FunctionSignature[] FN_ROUND_HALF_TO_EVEN_SIGNATURES = {
-			FunctionDSL.functionSignature(FunRoundHalfToEven.qName, FunRoundHalfToEven.FUNCTION_DESCRIPTION_1_PARAM + FunRoundHalfToEven.FUNCTION_DESCRIPTION_COMMON, FunRoundHalfToEven.RETURN_TYPE,
-					new FunctionParameterSequenceType("arg", Type.NUMBER, Cardinality.ZERO_OR_ONE, "The input number")),
-			FunctionDSL.functionSignature(FunRoundHalfToEven.qName, FunRoundHalfToEven.FUNCTION_DESCRIPTION_2_PARAM + FunRoundHalfToEven.FUNCTION_DESCRIPTION_COMMON, RETURN_TYPE,
-					new FunctionParameterSequenceType("arg", Type.NUMBER, Cardinality.ZERO_OR_ONE, "The input number"),
-					new FunctionParameterSequenceType("precision", Type.INTEGER, Cardinality.ZERO_OR_ONE, "The input number")) };
+			functionSignature(FN_NAME, FunRoundHalfToEven.FUNCTION_DESCRIPTION_1_PARAM + FunRoundHalfToEven.FUNCTION_DESCRIPTION_COMMON, FunRoundHalfToEven.RETURN_TYPE,
+					optParam("arg", Type.NUMBER, "The input number")),
+			functionSignature(FN_NAME, FunRoundHalfToEven.FUNCTION_DESCRIPTION_2_PARAM + FunRoundHalfToEven.FUNCTION_DESCRIPTION_COMMON, RETURN_TYPE,
+					optParam("arg", Type.NUMBER, "The input number"),
+					optParam("precision", Type.INTEGER, "Precision to round to"))
+	};
 
 	public FunRoundHalfToEven(final XQueryContext context,
 							  final FunctionSignature signature) {