#871 - Corrected the serialization and added unit tests for the same

Author: vivekmuniyandi

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

@@ -252,8 +252,8 @@ public void writeCall(JSONStringWriter serializer, CallImpl call) {
         } else {
           serializer.writeStartArray();
           for (Object value: call.args) {
-            serializer.writeStartObject();
-            serializer.writeStartEntry("value");
+            serializer.writeStartObjectInLoop();
+            serializer.writeStartEntry("$value");
             serializer.writeStringValue(value);
             serializer.writeEndObject();
           }

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

@@ -38,6 +38,13 @@ public void writeStartObject() {
     builder.append("{");
     isFirst = true;
   }
+  public void writeStartObjectInLoop() {
+    if (isFirst)
+      isFirst = false;
+    else
+      builder.append(", ");
+    writeStartObject();
+  }
   public void writeStartEntry(String key) {
     if (isFirst)
       isFirst = false;

marklogic-client-api/src/test/java/com/marklogic/client/test/JSONDocumentTest.java

@@ -24,6 +24,7 @@
 import java.io.Reader;
 import java.nio.charset.Charset;
 
+import com.marklogic.client.admin.ExtensionLibrariesManager;
 import org.custommonkey.xmlunit.exceptions.XpathException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -53,6 +54,7 @@
 
 public class JSONDocumentTest {
 
+  private static ExtensionLibrariesManager libsMgr = null;
   final static String metadata =
     "  {\"collections\":\n" +
     "    [\"collection1\",\n" +
@@ -73,11 +75,20 @@ public class JSONDocumentTest {
 
   @BeforeClass
   public static void beforeClass() {
+    Common.connectAdmin();
+    // get a manager
+    libsMgr = Common.adminClient
+      .newServerConfigManager().newExtensionLibrariesManager();
+
+    // write XQuery file to the modules database
+    libsMgr.write("/ext/my-lib.xqy", new FileHandle(
+      new File("src/test/resources/my-lib.xqy")).withFormat(Format.TEXT));
     Common.connect();
   }
 
   @AfterClass
   public static void afterClass() {
+    libsMgr.delete("/ext/my-lib.xqy");
   }
 
   @Test
@@ -124,6 +135,7 @@ public void testJsonPathPatch() throws IOException {
     String docId = "/test/testWrite1.json";
     ObjectMapper mapper = new ObjectMapper();
     ObjectNode sourceNode = makeContent(mapper);
+    sourceNode.put("numberKey3" , 31);
     String content = mapper.writeValueAsString(sourceNode);
     JSONDocumentManager docMgr = Common.client.newJSONDocumentManager();
     docMgr.write(docId, new StringHandle().with(content));
@@ -156,6 +168,10 @@ public void testJsonPathPatch() throws IOException {
     patchBldr.replaceValue("$.booleanKey", true);
     patchBldr.replaceValue("$.numberKey2", 2);
     patchBldr.replaceValue("$.nullKey", null);
+    patchBldr.library("http://marklogic.com/java-unit-test/my-lib",
+      "/ext/my-lib.xqy");
+    patchBldr.replaceApply("$.numberKey3",
+      patchBldr.call().applyLibraryValues("getMin", 18, 21));
 
     DocumentPatchHandle patchHandle = patchBldr.pathLanguage(
       PathLanguage.JSONPATH).build();
@@ -185,7 +201,7 @@ public void testJsonPathPatch() throws IOException {
     expectedNode.put("booleanKey", true);
     expectedNode.put("numberKey2", 2);
     expectedNode.putNull("nullKey");
-
+    expectedNode.put("numberKey3" , 18);
 
     String docText = docMgr.read(docId, new StringHandle()).get();
     assertNotNull("Read null string for patched JSON content", docText);
@@ -268,6 +284,7 @@ public void testXPathPatch() throws IOException {
     String docId = "/test/testWrite1.json";
     ObjectMapper mapper = new ObjectMapper();
     ObjectNode sourceNode = makeContent(mapper);
+    sourceNode.put("numberKey3", 31);
     String content = mapper.writeValueAsString(sourceNode);
 
     JSONDocumentManager docMgr = Common.client.newJSONDocumentManager();
@@ -292,7 +309,10 @@ public void testXPathPatch() throws IOException {
     patchBldr.replaceValue("/booleanKey", true);
     patchBldr.replaceValue("/numberKey2", 2);
     patchBldr.replaceValue("/nullKey", null);
-
+    patchBldr.library("http://marklogic.com/java-unit-test/my-lib",
+      "/ext/my-lib.xqy");
+    patchBldr.replaceApply("/numberKey3",
+      patchBldr.call().applyLibraryValues("getMin", 18, 21));
     //patchBldr.replaceApply("/node()/arrayKey/node()[string(.) eq '3']",
     //		patchBldr.call().add(2));
 
@@ -329,6 +349,7 @@ public void testXPathPatch() throws IOException {
     expectedNode.put("booleanKey", true);
     expectedNode.put("numberKey2", 2);
     expectedNode.putNull("nullKey");
+    expectedNode.put("numberKey3", 18);
 
     String docText = docMgr.read(docId, new StringHandle()).get();
 

marklogic-client-api/src/test/java/com/marklogic/client/test/XMLDocumentTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.HashMap;
@@ -40,6 +41,8 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import com.marklogic.client.admin.ExtensionLibrariesManager;
+import com.marklogic.client.io.*;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -57,23 +60,29 @@
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.document.DocumentPatchBuilder.Position;
 import com.marklogic.client.document.XMLDocumentManager.DocumentRepair;
-import com.marklogic.client.io.DOMHandle;
-import com.marklogic.client.io.InputSourceHandle;
-import com.marklogic.client.io.SourceHandle;
-import com.marklogic.client.io.StringHandle;
-import com.marklogic.client.io.XMLEventReaderHandle;
-import com.marklogic.client.io.XMLStreamReaderHandle;
 import com.marklogic.client.io.marker.DocumentPatchHandle;
 import com.marklogic.client.util.EditableNamespaceContext;
 import java.util.Map;
 
 public class XMLDocumentTest {
+
+  private static ExtensionLibrariesManager libsMgr = null;
+
   @BeforeClass
   public static void beforeClass() {
+    Common.connectAdmin();
+    // get a manager
+    libsMgr = Common.adminClient
+      .newServerConfigManager().newExtensionLibrariesManager();
+
+    // write XQuery file to the modules database
+    libsMgr.write("/ext/my-lib.xqy", new FileHandle(
+      new File("src/test/resources/my-lib.xqy")).withFormat(Format.TEXT));
     Common.connect();
   }
   @AfterClass
   public static void afterClass() {
+    libsMgr.delete("/ext/my-lib.xqy");
   }
 
   @SuppressWarnings("unchecked")
@@ -333,6 +342,11 @@ public void testPatch() throws Exception {
     patchBldr.delete("fourthChild");
     patchBldr.replaceApply("fifthChild", Cardinality.ONE, patchBldr.call().multiply(3));
 
+    patchBldr.library("http://marklogic.com/java-unit-test/my-lib",
+      "/ext/my-lib.xqy");
+    patchBldr.replaceApply("/root/sixthChild",
+      patchBldr.call().applyLibraryValues("getMin", 18, 21));
+
     DocumentPatchHandle patchHandle = patchBldr.build();
 
     for (int i=0; i < 2; i++) {
@@ -352,6 +366,9 @@ public void testPatch() throws Exception {
       Element fifthChild = domDocument.createElement("fifthChild");
       fifthChild.setTextContent("5");
       root.appendChild(fifthChild);
+      Element sixthChild = domDocument.createElement("sixthChild");
+      sixthChild.setTextContent("31");
+      root.appendChild(sixthChild);
       domDocument.appendChild(root);
 
       docMgr.write(docId, new DOMHandle().with(domDocument));
@@ -379,6 +396,7 @@ public void testPatch() throws Exception {
       root.replaceChild(domDocument.createElement("replacedSecondChild"), secondChild);
       thirdChild.setTextContent("new value");
       fifthChild.setTextContent("15");
+      sixthChild.setTextContent("18");
       root.removeChild(fourthChild);
 
       String expected = Common.testDocumentToString(domDocument);

marklogic-client-api/src/test/resources/my-lib.xqy

@@ -0,0 +1,27 @@
+xquery version "1.0-ml";
+
+module namespace my-lib = "http://marklogic.com/java-unit-test/my-lib";
+
+(: Find the minimum value in a sequence of value composed of :)
+(: the current node and a set of input values. :)
+declare function my-lib:getMin(
+        $current as node()?,
+        $args as item()*
+) as node()*
+{
+    if ($current/data() castable as xs:decimal)
+    then
+        let $new-value := fn:min(($current, $args))
+        return
+            typeswitch($current)
+                case element()           (: XML :)
+                    return element {fn:node-name($current)} {$new-value}
+                case number-node()       (: JSON :)
+                    return number-node {$new-value}
+                default return fn:error((), "RESTAPI-SRVEXERR",
+                        ("400", "Bad Request",
+                        fn:concat("Not an element or number node: ",
+                                xdmp:path($current))))
+    else fn:error((), "RESTAPI-SRVEXERR", ("400", "Bad Request",
+    fn:concat("Non-decimal data: ", $current)))
+};