MLE-20182:mlcp import failing with XDMP-DOCSTARTTAGCHAR upon using aggregates as input_file_type option (#533)

Author: DarrenJAN

src/main/java/com/marklogic/contentpump/AggregateXMLReader.java

@@ -304,7 +304,7 @@ private void processStartElement() throws XMLStreamException {
                     if (LOG.isTraceEnabled()) {
                         LOG.trace(nsDeclPrefix + ":" + nsDeclUri);
                     }
-                    if (DEFAULT_NS == nsDeclPrefix) {
+                    if (DEFAULT_NS == nsDeclPrefix || ("".equals(nsDeclPrefix))) {
                         sb.append(" xmlns=\"" + nsDeclUri + "\"");
                     } else {
                         sb.append(" xmlns:" + nsDeclPrefix + "=\"" + nsDeclUri

src/test/java/com/marklogic/contentpump/TestImportAggregate.java

@@ -601,4 +601,28 @@ public void testImportMedlineAutoID() throws Exception {
         assertEquals("2", result.next().asString());
         Utils.closeSession();
     }
+
+    @Test
+    public void testBug20182() throws Exception {
+        String cmd = "IMPORT -host localhost -username admin -password"
+            + " admin -input_file_path " + Constants.TEST_PATH.toUri()
+            + "/agg/20182.xml"
+            + " -thread_count 1"
+            + " -input_file_type aggregates"
+            + " -port " + Constants.port + " -database " + Constants.testDb;
+        String[] args = cmd.split(" ");
+        assertFalse(args.length == 0);
+
+        Utils.clearDB(Utils.getTestDbXccUri(), Constants.testDb);
+
+        String[] expandedArgs = null;
+        expandedArgs = OptionsFileUtil.expandArguments(args);
+        ContentPump.runCommand(expandedArgs);
+
+        ResultSequence result = Utils.runQuery(
+            Utils.getTestDbXccUri(), "fn:count(fn:collection())");
+        assertTrue(result.hasNext());
+        assertEquals("2", result.next().asString());
+        Utils.closeSession();
+    }
 }

src/test/resources/agg/20182.xml

@@ -0,0 +1,10 @@
+<people>
+    <person>
+        <first xmlns="http://marklogic.com/examples">George</first>
+        <last>Washington</last>
+    </person>
+    <person>
+        <first xmlns="http://marklogic.com/examples">Betsy</first>
+        <last>Ross</last>
+    </person>
+</people>