fix #581 - improper serialization of RawStructuredQueryDefinition with a FileHandle contents

Author: sammefford

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

@@ -2115,7 +2115,7 @@ void init() {
                     addEncodedParam(params, "q", text);
                 }
             }
-            if (queryDef instanceof StructuredQueryDefinition) {
+            if (queryDef instanceof StructuredQueryDefinition && ! (queryDef instanceof RawQueryDefinition)) {
                 structure = ((StructuredQueryDefinition) queryDef).serialize();
 
                 if (logger.isDebugEnabled()) {
@@ -2124,19 +2124,8 @@ void init() {
                     logger.debug("Searching for structure {}{}", structure, qtextMessage);
                 }
 
-                String payloadMimetype = "application/xml";
-                if (queryDef instanceof RawQueryDefinition) {
-                    StructureWriteHandle handle = ((RawQueryDefinition) queryDef).getHandle();
-                    baseHandle = HandleAccessor.checkHandle(handle, "search");
-
-                    Format payloadFormat = getStructuredQueryFormat(baseHandle);
-                    payloadMimetype = getMimetypeWithDefaultXML(payloadFormat, baseHandle);
-                }
-
                 webResource = getConnection().path("search").queryParams(params);
-                builder = (payloadMimetype != null) ?
-                    webResource.type(payloadMimetype).accept(mimetype) :
-                    webResource.accept(mimetype);
+                builder = webResource.type("application/xml").accept(mimetype);
             } else if (queryDef instanceof RawQueryDefinition) {
                 if (logger.isDebugEnabled())
                     logger.debug("Raw search");
@@ -2220,7 +2209,7 @@ ClientResponse getResponse() {
 
                 if (queryDef instanceof KeyValueQueryDefinition) {
                     response = doGet(builder);
-                } else if (queryDef instanceof StructuredQueryDefinition) {
+                } else if (queryDef instanceof StructuredQueryDefinition && ! (queryDef instanceof RawQueryDefinition)) {
                     response = doPost(reqlog, builder, structure, true);
                 } else if (queryDef instanceof CombinedQueryDefinition) {
                     response = doPost(reqlog, builder, structure, true);
@@ -2431,7 +2420,7 @@ public <T> T values(Class<T> as, ValuesDefinition valDef, String mimetype,
 					addEncodedParam(docParams, "q", text);
 				}
 			}
-			if (queryDef instanceof StructuredQueryDefinition) {
+			if (queryDef instanceof StructuredQueryDefinition && ! (queryDef instanceof RawQueryDefinition)) {
 				String structure = ((StructuredQueryDefinition) queryDef)
 						.serialize();
 				if (structure != null) {

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

@@ -63,7 +63,7 @@ public RawStructuredQueryDefinition withHandle(StructureWriteHandle handle) {
 		@Override
 		public String serialize() {
 			if (getHandle() == null) return "";
-			return getHandle().toString();
+			return HandleAccessor.contentAsString(getHandle());
 		}
 
 		@Override

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

@@ -49,6 +49,7 @@
 import com.marklogic.client.admin.QueryOptionsManager;
 import com.marklogic.client.document.JSONDocumentManager;
 import com.marklogic.client.document.XMLDocumentManager;
+import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.io.FileHandle;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.JacksonHandle;
@@ -65,6 +66,7 @@
 import com.marklogic.client.query.QueryManager;
 import com.marklogic.client.query.RawCombinedQueryDefinition;
 import com.marklogic.client.query.RawQueryByExampleDefinition;
+import com.marklogic.client.query.RawStructuredQueryDefinition;
 import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.query.StructuredQueryDefinition;
 import com.marklogic.client.query.Tuple;
@@ -547,6 +549,33 @@ public void testExtractDocumentData() throws Exception {
 		}
 	}
 
+	@Test
+	public void test_issue581_RawStructuredQueryFromFileHandle() throws Exception {
+		Common.client.newDocumentManager().write("test_issue581_RawStructuredQueryFromFileHandle.xml",
+			new FileHandle(new File("src/test/resources/constraint5.xml")));
+
+		// get the combined query
+		File file = new File("src/test/resources/combinedQueryOption.xml");
+
+		// create a handle for the search criteria
+		FileHandle rawHandle = new FileHandle(file);
+
+		QueryManager queryMgr = Common.client.newQueryManager();
+
+		// create a search definition based on the handle
+		RawStructuredQueryDefinition querydef = queryMgr.newRawStructuredQueryDefinition(rawHandle);
+
+		// create result handle
+		DOMHandle resultsHandle = new DOMHandle();
+		queryMgr.search(querydef, resultsHandle);
+
+		// get the result
+		Document resultDoc = resultsHandle.get();
+
+		assertXpathEvaluatesTo("1", "string(//*[local-name()='result'][last()]//@*[local-name()='index'])", resultDoc);
+		assertXpathEvaluatesTo("0026", "string(//*[local-name()='result'][1]//*[local-name()='id'])", resultDoc);
+	}
+
 	private static Document parseXml(String xml) throws Exception {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		DocumentBuilder builder = factory.newDocumentBuilder();

src/test/resources/combinedQueryOption.xml

@@ -0,0 +1,19 @@
+<search xmlns="http://marklogic.com/appservices/search">
+  <query>
+    <value-constraint-query>
+      <constraint-name>id</constraint-name>
+      <text>0026</text>
+    </value-constraint-query>
+  </query>
+  <options>
+    <return-metrics>false</return-metrics>
+    <return-qtext>false</return-qtext>
+    <debug>true</debug>
+    <transform-results apply="raw"/>
+      <constraint name="id">
+        <value>
+          <element ns="" name="id"/>
+        </value>
+      </constraint>
+  </options>
+</search>

src/test/resources/constraint5.xml

@@ -0,0 +1,8 @@
+<root>
+  <title>The memex</title>
+  <popularity>5</popularity>
+  <id>0026</id>
+  <date xmlns="http://purl.org/dc/elements/1.1/">2009-05-05</date>
+  <price xmlns="http://cloudbank.com" amt="123.45"/>
+  <p>The Memex, unfortunately, had no automated search feature.</p>
+</root>