Merge pull request #4470 from evolvedbinary/bugfix/cardinality-enforcement

Bugfix/cardinality enforcement

Author: adamretter

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

@@ -60,8 +60,8 @@ public class ExtCollection extends Function {
                             " Documents contained in sub-collections are also included. If no value is supplied, the statically know documents are used, for the REST Server this could be the addressed collection.",
                     new SequenceType[]{
                             //Different from the official specs
-                            new FunctionParameterSequenceType("collection-uris", Type.STRING,
-                                    Cardinality.ZERO_OR_MORE, "The collection-URIs for which to include the documents")},
+                            new FunctionParameterSequenceType("collection-uri", Type.STRING,
+                                    Cardinality.ZERO_OR_ONE, "The collection URI for which to include the documents")},
                     new FunctionReturnSequenceType(Type.ITEM, Cardinality.ZERO_OR_MORE,
                             "The document nodes contained in or under the given collections"),
                     true);
@@ -109,20 +109,18 @@ public Sequence eval(final Sequence contextSequence, final Item contextItem) thr
                     result = dynamicCollection;
                 } else {
                     final MutableDocumentSet ndocs = new DefaultDocumentSet();
-                    for (final String next : args) {
-                        final XmldbURI uri = new AnyURIValue(this, next).toXmldbURI();
-                        try (final Collection coll = context.getBroker().openCollection(uri, Lock.LockMode.READ_LOCK)) {
-                            if (coll == null) {
-                                if (context.isRaiseErrorOnFailedRetrieval()) {
-                                    throw new XPathException(this, ErrorCodes.FODC0002, "Can not access collection '" + uri + "'");
-                                }
+                    final XmldbURI uri = new AnyURIValue(this, args.get(0)).toXmldbURI();
+                    try (final Collection coll = context.getBroker().openCollection(uri, Lock.LockMode.READ_LOCK)) {
+                        if (coll == null) {
+                            if (context.isRaiseErrorOnFailedRetrieval()) {
+                                throw new XPathException(this, ErrorCodes.FODC0002, "Can not access collection '" + uri + "'");
+                            }
+                        } else {
+                            if (context.inProtectedMode()) {
+                                context.getProtectedDocs().getDocsByCollection(coll, ndocs);
                             } else {
-                                if (context.inProtectedMode()) {
-                                    context.getProtectedDocs().getDocsByCollection(coll, ndocs);
-                                } else {
-                                    coll.allDocs(context.getBroker(), ndocs,
-                                            includeSubCollections, context.getProtectedDocs());
-                                }
+                                coll.allDocs(context.getBroker(), ndocs,
+                                        includeSubCollections, context.getProtectedDocs());
                             }
                         }
                     }

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

@@ -46,7 +46,7 @@
  */
 public class FnFormatIntegers extends BasicFunction {
 
-    private static final FunctionParameterSequenceType FS_PARAM_VALUE = optParam("value", Type.NUMBER, "The number to format");
+    private static final FunctionParameterSequenceType FS_PARAM_VALUE = optParam("value", Type.INTEGER, "The number to format");
     private static final FunctionParameterSequenceType FS_PARAM_PICTURE = param("picture", Type.STRING, "The picture string to use for formatting. To understand the picture string syntax, see: https://www.w3.org/TR/xpath-functions-31/#func-format-number");
 
     private static final String FS_FORMAT_INTEGER_NAME = "format-integer";

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

@@ -27,7 +27,7 @@
 import org.exist.xquery.*;
 import org.exist.xquery.value.*;
 
-import static org.exist.xquery.FunctionDSL.optManyParam;
+import static org.exist.xquery.FunctionDSL.optParam;
 import static org.exist.xquery.FunctionDSL.returnsOpt;
 import static org.exist.xquery.functions.fn.FnModule.functionSignature;
 
@@ -37,7 +37,7 @@
  */
 public class FunDocumentURI extends Function {
 
-    private static final FunctionParameterSequenceType FS_PARAM_NODE = optManyParam("value", Type.NODE, "The document node.");
+    private static final FunctionParameterSequenceType FS_PARAM_NODE = optParam("value", Type.NODE, "The document node.");
 
     private static final String FS_DOCUMENT_URI = "document-uri";
     private static final String FS_DESCRIPTION = "Returns the URI of a resource where a document can be found, if available.";

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

@@ -48,7 +48,7 @@ public class FunXmlToJson extends BasicFunction {
 
     private static final String FS_XML_TO_JSON_NAME = "xml-to-json";
     private static final FunctionParameterSequenceType FS_XML_TO_JSON_OPT_PARAM_NODE = optParam("node", Type.NODE, "The input node");
-    private static final FunctionParameterSequenceType FS_XML_TO_JSON_OPT_PARAM_OPTIONS = optParam("options", Type.MAP, "The options map");
+    private static final FunctionParameterSequenceType FS_XML_TO_JSON_OPT_PARAM_OPTIONS = param("options", Type.MAP, "The options map");
     static final FunctionSignature[] FS_XML_TO_JSON = functionSignatures(
             new QName(FS_XML_TO_JSON_NAME, Function.BUILTIN_FUNCTION_NS),
             "Converts an XML tree (in w3c 'XML Representation of JSON' format) into a string conforming to the JSON grammar. Basic string (un)escaping.",
@@ -67,7 +67,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
         final Sequence result;
         final Sequence seq = (getArgumentCount() > 0) ? args[0] : Sequence.EMPTY_SEQUENCE;
         //TODO: implement handling of options
-        final MapType options = (getArgumentCount() > 1) ? (MapType) args[1].itemAt(0) : new MapType(this, context);
+        final MapType options = (getArgumentCount() == 2) ? (MapType) args[1].itemAt(0) : new MapType(this, context);
 
         if (seq.isEmpty()) {
             result = Sequence.EMPTY_SEQUENCE;

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

@@ -90,7 +90,7 @@ public class JSON extends BasicFunction {
     static final FunctionSignature[] FS_JSON_TO_XML = functionSignatures(
             FS_JSON_TO_XML_NAME,
             "Parses a string supplied in the form of a JSON text, returning the results in the form of an XML document node.",
-            returnsOpt(Type.ITEM, "The parsed data as XML"),
+            returnsOpt(Type.DOCUMENT, "The parsed data as XML"),
             arities(
                     arity(
                             FS_PARAM_JSON_TEXT