fix #388 (builds on fixes for #261 and #382) - when woodstox is on the classpath we get errors so we need to (1) flush XMLStreamWriter before writing to the underlying stream, (2) use writeNamespace for xs types since woodstox doesn't catch them when it tries to obey isRepairingNamespaces, (3) never send null to writeCharacters(), (4) don't rely on the default namespace for root elements--explicitly set the namespace to match the default namespace, (5) don't expect XMLEventReader.close() to close the underlying handle (we never should have--the javadocs say it shouldn't), (6) don't rely on XMLEvent.toString() to provide the text contents of an element, instead use asCharacters().getData(), (7) don't expect namespaces in the order they usually come--use JUnit assertXMLEquals instead of assertEquals when comparing XML

(cherry picked from commit 1e0c4d0)

Author: sammefford

src/main/java/com/marklogic/client/alerting/RuleDefinition.java

@@ -261,7 +261,8 @@ public void write(OutputStream out) throws IOException {
 
 			serializer.writeStartElement(RequestConstants.RESTAPI_PREFIX,
 					"description", RequestConstants.RESTAPI_NS);
-			serializer.writeCharacters(getDescription());
+			String description = getDescription();
+			if ( description != null ) serializer.writeCharacters(description);
 			serializer.writeEndElement();
 			serializer.flush();
 
@@ -415,6 +416,7 @@ private void writeMetadataElement(final XMLStreamWriter serializer)
 			TransformerException {
 		serializer.writeStartElement("rapi", "rule-metadata",
 				RequestConstants.RESTAPI_NS);
+		serializer.writeNamespace("xs", XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
 		for (Map.Entry<QName, Object> metadataProperty : getMetadata()
 				.entrySet()) {

src/main/java/com/marklogic/client/impl/CombinedQueryBuilderImpl.java

@@ -46,6 +46,7 @@
 import com.marklogic.client.query.RawCombinedQueryDefinition;
 import com.marklogic.client.query.RawQueryDefinition;
 import com.marklogic.client.query.RawStructuredQueryDefinition;
+import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.query.StructuredQueryDefinition;
 
 public class CombinedQueryBuilderImpl implements CombinedQueryBuilder {
@@ -273,7 +274,7 @@ private String makeXMLCombinedQuery(CombinedQueryDefinitionImpl qdef) {
             XMLStreamWriter serializer = makeXMLSerializer(out);
 
             serializer.writeStartDocument();
-            serializer.writeStartElement("search");
+            serializer.writeStartElement(StructuredQueryBuilder.SEARCH_API_NS, "search");
             if ( qtext != null ) {
                 serializer.writeStartElement("qtext");
                 serializer.writeCharacters(qtext);

src/main/java/com/marklogic/client/impl/DocumentMetadataPatchBuilderImpl.java

@@ -267,6 +267,7 @@ public void writeCall(XMLOutputSerializer out, CallImpl call) throws Exception {
 			XMLStreamWriter serializer = out.getSerializer();
 			if (call.isFragment) {
 				serializer.writeCharacters(""); // force the tag close
+				serializer.flush();
 				for (Object fragment: call.args) {
 					out.getWriter().write(
 							(fragment instanceof String) ?
@@ -325,6 +326,7 @@ public void process(Object original, String type, String value) {
 			if (original == null)
 				return;
 			try {
+				serializer.writeNamespace("xs", XMLConstants.W3C_XML_SCHEMA_NS_URI);
 				serializer.writeAttribute(
 					"xsi",  XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "type", type);
 				serializer.writeCharacters(value);
@@ -1059,15 +1061,16 @@ public PatchHandle build() throws MarkLogicIOException {
 
 				XMLOutputSerializer out = new XMLOutputSerializer(writer, serializer);
 
+				serializer.writeStartDocument("utf-8", "1.0");
+
+				serializer.writeStartElement("rapi", "patch", REST_API_NS);
 				for (String nsPrefix: namespaces.getAllPrefixes()) {
 					serializer.setPrefix(
 						nsPrefix, namespaces.getNamespaceURI(nsPrefix)
 						);
+					serializer.writeNamespace(nsPrefix, namespaces.getNamespaceURI(nsPrefix));
 				}
 
-				serializer.writeStartDocument("utf-8", "1.0");
-
-				serializer.writeStartElement("rapi", "patch", REST_API_NS);
 
 				if (libraryNs != null && libraryAt != null) {
 					serializer.writeStartElement("rapi", "replace-library", REST_API_NS);

src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java

@@ -125,6 +125,7 @@ public void write(XMLOutputSerializer out) throws Exception {
 			writeStartReplace(out, selectPath, cardinality);
 			if (isFragment) {
 				serializer.writeCharacters(""); // force the tag close
+				serializer.flush();
 				out.getWriter().write(inputAsString);
 			} else {
 				serializer.writeCharacters(inputAsString);
@@ -167,6 +168,7 @@ public void write(XMLOutputSerializer out) throws Exception {
 					out, selectPath, contextPath, position.toString(), cardinality
 					);
 			serializer.writeCharacters(""); // force the tag close
+			serializer.flush();
 			out.getWriter().write(fragment);
 			serializer.writeEndElement();
 		}

src/main/java/com/marklogic/client/io/SearchHandle.java

@@ -166,6 +166,11 @@ protected void receiveContent(InputStream content) {
 			SearchResponseImpl response = new SearchResponseImpl();
 			response.parse(reader);
 			reader.close();
+			try {
+				content.close();
+			} catch (IOException e) {
+				// ignore.
+			}
 
 			summary          =
 				(response.tempSummary == null || response.tempSummary.size() < 1) ?
@@ -595,7 +600,12 @@ private void populateExtractedResult(ExtractedResultImpl result, List<XMLEvent>
                     result.setItems( populateExtractedItems(getSlice(events, extractedItemEvents)) );
                 // if extractSelected is "include", this is not a root document node
                 } else if ( Format.JSON == getFormat() && "include".equals(extractSelected) ) {
-                    String json = events.get(startChildren).toString();
+                    XMLEvent event = events.get(startChildren);
+                    if ( XMLStreamConstants.CHARACTERS != event.getEventType() ) {
+                        throw new MarkLogicIOException("Cannot parse JSON for " +
+                            getPath() + "--content should be characters");
+                    }
+                    String json = event.asCharacters().getData();
                     try {
                         JsonNode jsonArray = new ObjectMapper().readTree(json);
                         ArrayList<String> items = new ArrayList<String>(jsonArray.size());
@@ -608,8 +618,14 @@ private void populateExtractedResult(ExtractedResultImpl result, List<XMLEvent>
                             getPath(), e);
                     }
                 } else {
+                    XMLEvent event = events.get(startChildren);
+                    if ( XMLStreamConstants.CHARACTERS != event.getEventType() ) {
+                        throw new MarkLogicIOException("Cannot read " +
+                            getPath() + "--content should be characters");
+                    }
+                    String text = event.asCharacters().getData();
                     ArrayList<String> items = new ArrayList<String>(1);
-                    items.add( events.get(startChildren).toString() );
+                    items.add( event.asCharacters().getData() );
                     result.setItems( items );
                 }
             }

src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java

@@ -60,7 +60,7 @@
  * <pre>StructuredQueryDefinition andQry = structuredQueryBuilder.and(... query definitions ...);</pre>
  */
 public class StructuredQueryBuilder {
-	final static private String SEARCH_API_NS="http://marklogic.com/appservices/search";
+	public static final String SEARCH_API_NS="http://marklogic.com/appservices/search";
 
 	/*
 	 * This map is used to prevent reuse of reserved prefixes in path expressions.
@@ -2422,7 +2422,7 @@ static private XMLStreamWriter makeSerializer(OutputStream out) {
 		try {
 			XMLStreamWriter serializer = factory.createXMLStreamWriter(out, "UTF-8");
 
-			serializer.setDefaultNamespace("http://marklogic.com/appservices/search");
+			serializer.setDefaultNamespace(SEARCH_API_NS);
 			serializer.setPrefix("xs",  XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
 			return serializer;
@@ -2456,7 +2456,7 @@ private void writeStructuredQueryImpl(OutputStream out, Object... objects) {
 
 // omit the XML prolog
 //			serializer.writeStartDocument();
-			serializer.writeStartElement("query");
+			serializer.writeStartElement(SEARCH_API_NS, "query");
 
 			if (objects != null) {
 				if (objects instanceof AbstractStructuredQuery[]) {

src/test/java/com/marklogic/client/test/CombinedQueryBuilderTest.java

@@ -91,7 +91,7 @@ public void buildCombinedQuery() throws Exception {
     public String buildExpected(String qtext, String collection) throws XMLStreamException, UnsupportedEncodingException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMLStreamWriter writer = makeXMLStreamWriter(baos);
-        writer.writeStartElement("search");
+        writer.writeStartElement(StructuredQueryBuilder.SEARCH_API_NS, "search");
             writer.writeStartElement("qtext");
                 writer.writeCharacters(qtext);
             writer.writeEndElement();
@@ -104,6 +104,7 @@ public String buildExpected(String qtext, String collection) throws XMLStreamExc
             writer.writeEndElement();
             writeOptions(writer);
         writer.writeEndElement();
+        writer.flush();
         return baos.toString("UTF-8");
     }
 
@@ -119,6 +120,7 @@ public void writeOptions(XMLStreamWriter writer) throws XMLStreamException {
                 writer.writeCharacters("filtered");
             writer.writeEndElement();
         writer.writeEndElement();
+        writer.flush();
     }
 
     public XMLStreamWriter makeXMLStreamWriter(OutputStream out) throws XMLStreamException {