Merge pull request #29 from evolvedbinary/7.x.x./hotfix/fn-xml-to-json-namespace

[7.x.x] Raise error FOJS0007 on all elements passed to fn:xmj-to-json that are missing Fn namespace

Author: adamretter

exist-core/pom.xml

@@ -792,6 +792,7 @@
                                 <include>src/test/xquery/util/util.xml</include>
                                 <include>src/test/xquery/xquery3/parse-xml.xqm</include>
                                 <include>src/test/xquery/xquery3/serialize.xql</include>
+                                <include>src/test/xquery/xquery3/xml-to-json.xql</include>
                                 <include>src/main/java/org/exist/Indexer.java</include>
                                 <include>src/test/java/org/exist/IndexerTest.java</include>
                                 <include>src/test/java/org/exist/IndexerTest2.java</include>
@@ -1128,6 +1129,7 @@
                                 <exclude>src/test/xquery/xquery3/parse-xml.xqm</exclude>
                                 <exclude>src/test/xquery/xquery3/postfix-expr.xqm</exclude>
                                 <exclude>src/test/xquery/xquery3/serialize.xql</exclude>
+                                <exclude>src/test/xquery/xquery3/xml-to-json.xql</exclude>
                                 <exclude>src/main/java/org/exist/Indexer.java</exclude>
                                 <exclude>src/test/java/org/exist/IndexerTest.java</exclude>
                                 <exclude>src/test/java/org/exist/IndexerTest2.java</exclude>

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

@@ -144,6 +144,7 @@ private void nodeValueToJson(final NodeValue nodeValue, final Writer writer) thr
                 status = reader.next();
                 switch (status) {
                     case XMLStreamReader.START_ELEMENT:
+                        checkNamespace(reader.getNamespaceURI());
                         tempStringBuilder.setLength(0);
                         final String elementAttributeEscapedValue = reader.getAttributeValue(null, "escaped");
                         elementValueIsEscaped = "true".equals(elementAttributeEscapedValue);
@@ -168,11 +169,9 @@ private void nodeValueToJson(final NodeValue nodeValue, final Writer writer) thr
                         }
                         switch (reader.getLocalName()) {
                             case "array":
-                                checkNamespace(reader.getNamespaceURI());
                                 jsonGenerator.writeStartArray();
                                 break;
                             case "map":
-                                checkNamespace(reader.getNamespaceURI());
                                 mapkeyArrayList.add(stackSeparator);
                                 jsonGenerator.writeStartObject();
                                 break;
@@ -188,15 +187,13 @@ private void nodeValueToJson(final NodeValue nodeValue, final Writer writer) thr
                         final String tempString = tempStringBuilder.toString();
                         switch (reader.getLocalName()) {
                             case "array":
-                                checkNamespace(reader.getNamespaceURI());
                                 jsonGenerator.writeEndArray();
                                 break;
                             case "boolean":
                                 final boolean tempBoolean = !(tempString.isEmpty() || "0".equals(tempString) || "false".equals(tempString));
                                 jsonGenerator.writeBoolean(tempBoolean);
                                 break;
                             case "map":
-                                checkNamespace(reader.getNamespaceURI());
                                 while (!mapkeyArrayList.isEmpty() && mapkeyArrayList.remove(mapkeyArrayList.size() - 1) != stackSeparator) {
                                 }
                                 jsonGenerator.writeEndObject();