[MIN] RESTXQ: error messages. #1708

Author: ChristianGruen

basex-api/src/main/java/org/basex/http/web/WebFunction.java

@@ -152,13 +152,13 @@ protected final QNm checkVariable(final QNm name, final boolean[] declared)
    * Binds a value to a function argument.
    * @param name variable name
    * @param args arguments
-   * @param value value to be bound
+   * @param value value to be bound (can be {@code null})
    * @param qc query context
-   * @param info info string
+   * @param input input description
    * @throws QueryException query exception
    */
   protected final void bind(final QNm name, final Expr[] args, final Value value,
-      final QueryContext qc, final String info) throws QueryException {
+      final QueryContext qc, final String input) throws QueryException {
 
     // skip nulled values
     if(value == null) return;
@@ -171,7 +171,7 @@ protected final void bind(final QNm name, final Expr[] args, final Value value,
         // casts and binds the value
         final SeqType st = var.declaredType();
         args[p] = value.seqType().instanceOf(st) ? value : st.cast(value, false, qc, null);
-        if(args[p] == null) throw error(ARG_TYPE_X_X_X, info, st, value);
+        if(args[p] == null) throw error(ARG_TYPE_X_X_X, input, st, value.toErrorString());
         break;
       }
     }

basex-api/src/main/java/org/basex/http/web/WebModules.java

@@ -216,8 +216,8 @@ public WsFunction websocket(final WebSocket ws, final Annotation ann)
    */
   private static String toString(final List<? extends WebFunction> funcs) {
     final TokenBuilder tb = new TokenBuilder();
-    for(final WebFunction func : funcs) tb.add(Text.NL).add(Text.LI).add(func);
-    return tb.toString();
+    for(final WebFunction func : funcs) tb.add(tb.isEmpty() ? " " : ", ").add(func);
+    return tb.add('.').toString();
   }
 
   /**

basex-api/src/main/java/org/basex/http/web/WebText.java

@@ -64,7 +64,7 @@ public interface WebText {
   /** Error message. */
   String INV_NONS_X = "No namespace declared for '%'.";
   /** Error message. */
-  String ARG_TYPE_X_X_X = "% must be %, supplied: %.";
+  String ARG_TYPE_X_X_X = "% must be of type %, supplied: %.";
   /** Error message. */
   String PARAM_MISSING_X = "Parameter $% missing in function declaration.";
   /** Error message. */
@@ -82,9 +82,9 @@ public interface WebText {
   /** Error message. */
   String BODY_TYPE_X_X = "Body cannot be parsed as %: %.";
   /** Error message. */
-  String PATH_CONFLICT_X_X = "Multiple services defined for path \"%\":%";
+  String PATH_CONFLICT_X_X = "Multiple functions exist for path \"%\":%";
   /** Error message. */
-  String ERROR_CONFLICT_X_X = "Multiple services defined for error \"%\":%";
+  String ERROR_CONFLICT_X_X = "Multiple functions exist for error path \"%\":%";
   /** Error message. */
   String ERROR_QS_X = "Invalid quality factor: qs=%";
   /** Error message. */