use JSON serialization only without namespaces #1283

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java

@@ -27,8 +27,7 @@
 import com.marklogic.client.datamovement.QueryBatchException;
 import com.marklogic.client.datamovement.QueryEvent;
 import com.marklogic.client.datamovement.QueryBatcherListener;
-import com.marklogic.client.impl.HandleAccessor;
-import com.marklogic.client.impl.HandleImplementation;
+import com.marklogic.client.impl.*;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.io.marker.StructureWriteHandle;
@@ -39,8 +38,6 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.ResourceNotFoundException;
-import com.marklogic.client.impl.QueryManagerImpl;
-import com.marklogic.client.impl.UrisHandle;
 
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -93,8 +90,11 @@ public class QueryBatcherImpl extends BatcherImpl implements QueryBatcher {
           String serializedCtsQuery, Boolean filtered, int maxDocToUriBatchRatio, int defaultDocBatchSize, int maxUriBatchSize
   ) {
     this(moveMgr, forestConfig, maxDocToUriBatchRatio, defaultDocBatchSize, maxUriBatchSize);
-    QueryManagerImpl queryMgr = (QueryManagerImpl) getPrimaryClient().newQueryManager();
-    if (serializedCtsQuery != null && serializedCtsQuery.length() > 0) {
+    // TODO:  skip conversion in DataMovementManagerImpl.newQueryBatcherImpl() unless canSerializeQueryAsJSON()
+    if (serializedCtsQuery != null && serializedCtsQuery.length() > 0 &&
+            originalQuery instanceof AbstractSearchQueryDefinition &&
+            ((AbstractSearchQueryDefinition) originalQuery).canSerializeQueryAsJSON()) {
+      QueryManagerImpl queryMgr = (QueryManagerImpl) getPrimaryClient().newQueryManager();
       this.queryMethod = "POST";
       this.query = queryMgr.newRawCtsQueryDefinition(new StringHandle(serializedCtsQuery).withFormat(Format.JSON));
       this.originalQuery = originalQuery;

marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractSearchQueryDefinition.java

@@ -41,4 +41,6 @@ public ServerTransform getResponseTransform() {
     public void setResponseTransform(ServerTransform transform) {
         this.transform = transform;
     }
+
+    public abstract boolean canSerializeQueryAsJSON();
 }

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

@@ -111,6 +111,10 @@ public Format getFormat() {
       return format;
     }
 
+    @Override
+    public boolean canSerializeQueryAsJSON() {
+      return getFormat() == Format.JSON && getOptionsName() == null;
+    }
   }
 
   @Override

marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsQueryDefinitionImpl.java

@@ -48,4 +48,9 @@ public String serialize() {
         str.append("}}");
         return str.toString();
     }
+
+    @Override
+    public boolean canSerializeQueryAsJSON() {
+        return getOptionsName() == null;
+    }
 }

marklogic-client-api/src/main/java/com/marklogic/client/impl/DeleteQueryDefinitionImpl.java

@@ -39,4 +39,9 @@ public ServerTransform getResponseTransform() {
   public void setResponseTransform(ServerTransform transform) {
     throw new UnsupportedOperationException("A server transform has no meaning on a DeleteQueryDefinition");
   }
+
+  @Override
+  public boolean canSerializeQueryAsJSON() {
+    return true;
+  }
 }

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

@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.impl;
 
+import com.marklogic.client.io.Format;
 import com.marklogic.client.io.marker.CtsQueryWriteHandle;
 import com.marklogic.client.io.marker.StructureWriteHandle;
 import com.marklogic.client.query.RawCombinedQueryDefinition;
@@ -176,4 +177,12 @@ public String toString() {
     }
     return handle.toString();
   }
+
+  @Override
+  public boolean canSerializeQueryAsJSON() {
+    StructureWriteHandle handle = getHandle();
+    if (handle == null) return false;
+    return HandleAccessor.checkHandle(handle, "raw query").getFormat() == Format.JSON &&
+            getOptionsName() == null;
+  }
 }

marklogic-client-api/src/main/java/com/marklogic/client/impl/StringQueryDefinitionImpl.java

@@ -39,4 +39,9 @@ public StringQueryDefinition withCriteria(String criteria) {
     setCriteria(criteria);
     return this;
   }
+
+  @Override
+  public boolean canSerializeQueryAsJSON() {
+    return getOptionsName() == null;
+  }
 }

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

@@ -1237,6 +1237,11 @@ public String serialize() {
     }
 
     public abstract void innerSerialize(XMLStreamWriter serializer) throws XMLStreamException;
+
+    @Override
+    public boolean canSerializeQueryAsJSON() {
+      return StructuredQueryBuilder.this.getNamespaces() == null && getOptionsName() == null;
+    }
   }
 
   protected class AndQuery