Merge pull request #3222 from adamretter/hotfix/java-doc

Fix broken javadoc

Author: dizzzz

exist-core/src/main/java/org/exist/xmldb/RemoteXMLResource.java

@@ -135,7 +135,7 @@ public RemoteXMLResource(final RemoteCollection parent, final XmldbURI docId, fi
      *
      * @throws XMLDBException if an error occurs during construction
      *
-     * @deprecared Use {@link #RemoteXMLResource(RemoteCollection, int, int, XmldbURI, Optional, Optional)}.
+     * @deprecated Use {@link #RemoteXMLResource(RemoteCollection, int, int, XmldbURI, Optional, Optional)}.
      */
     @Deprecated
     public RemoteXMLResource(

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

@@ -174,7 +174,7 @@ private Sequence toxml(Sequence json, String handleDuplicates, JsonFactory facto
             final MemTreeBuilder builder = context.getDocumentBuilder();
             builder.startDocument();
             factory.configure(JsonParser.Feature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER, false);
-            jsonToXml(context, builder, parser, handleDuplicates);
+            jsonToXml(builder, parser);
             return builder.getDocument() == null ? Sequence.EMPTY_SEQUENCE : builder.getDocument();
         }  catch (IOException e) {
             throw new XPathException(this, ErrorCodes.FOJS0001, e.getMessage());
@@ -292,14 +292,12 @@ private static Item readValue(XQueryContext context, JsonParser parser, Item par
     /**
      * Generate an XML from the tokens delivered by the JSON parser.
      *
-     * @param context the XQueryContext
+     * @param builder the memtree builder
      * @param parser parser to use
-     * @param handleDuplicates string indicating how to handle duplicate property names
-     * @return the top item read
-     * @throws IOException
-     * @throws XPathException
+     *
+     * @throws IOException if an I/O error occurs
      */
-    public static void jsonToXml(XQueryContext context, MemTreeBuilder builder, JsonParser parser, String handleDuplicates) throws IOException, XPathException {
+    public static void jsonToXml(MemTreeBuilder builder, JsonParser parser) throws IOException {
         JsonToken token;
 
         while ((token = parser.nextValue()) != null) {