Issue #249 fixes replaceValue with numbers or booleans

Author: Charles Greer

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

@@ -86,23 +86,32 @@ static class ContentReplaceOperation extends PatchOperation {
 		String      selectPath;
 		Cardinality cardinality;
 		boolean     isFragment = true;
-		String      input;
+		Object      input;
+		String      inputAsString;
 		ContentReplaceOperation(String selectPath, Cardinality cardinality, boolean isFragment,
 				Object input
 				) {
 			super();
 			this.selectPath  = selectPath;
 			this.cardinality = cardinality;
 			this.isFragment  = isFragment;
-			this.input       = (input instanceof String) ?
-					(String) input : input.toString();
+			this.input       = input;
+			this.inputAsString = null;
+			if (input != null) {
+				inputAsString = (input instanceof String)  ? (String) input : input.toString();
+			}
 		}
 		@Override
 		public void write(JSONStringWriter serializer) {
 			writeStartReplace(serializer, selectPath, cardinality);
 			serializer.writeStartEntry("content");
 			if (isFragment) {
-				serializer.writeFragment(input);
+				serializer.writeFragment(inputAsString);
+			} else if (input instanceof Boolean) {
+				serializer.writeBooleanValue(input);
+			}
+			else if (input instanceof Number) {
+				serializer.writeNumberValue(input);
 			} else {
 				serializer.writeStringValue(input);
 			}
@@ -115,9 +124,9 @@ public void write(XMLOutputSerializer out) throws Exception {
 			writeStartReplace(out, selectPath, cardinality);
 			if (isFragment) {
 				serializer.writeCharacters(""); // force the tag close
-				out.getWriter().write(input);
+				out.getWriter().write(inputAsString);
 			} else {
-				serializer.writeCharacters(input);
+				serializer.writeCharacters(inputAsString);
 			}
 			serializer.writeEndElement();
 		}

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

@@ -153,4 +153,5 @@ and the control characters (U+0000 through U+001F)
 
 		return out.toString();
 	}
+
 }

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

@@ -35,6 +35,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.BooleanNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.marklogic.client.document.DocumentManager.Metadata;
 import com.marklogic.client.document.DocumentMetadataPatchBuilder.Cardinality;
@@ -153,6 +154,9 @@ public void testJsonPathPatch() throws IOException {
 		fragment = mapper.writeValueAsString(fragmentNode);
 		patchBldr.insertFragment("$.[\"arrayKey\"]", Position.LAST_CHILD,
 				Cardinality.ZERO_OR_ONE, fragment);
+		patchBldr.replaceValue("$.booleanKey", true);
+		patchBldr.replaceValue("$.numberKey2", 2);
+		patchBldr.replaceValue("$.nullKey", null);
 
 		DocumentPatchHandle patchHandle = patchBldr.pathLanguage(
 				PathLanguage.JSONPATH).build();
@@ -179,6 +183,10 @@ public void testJsonPathPatch() throws IOException {
 		childNode.put("appendedKey", "appended item");
 		childArray.add(childNode);
 		expectedNode.set("arrayKey", childArray);
+		expectedNode.put("booleanKey", true);
+		expectedNode.put("numberKey2", 2);
+		expectedNode.putNull("nullKey");
+
 
 		String docText = docMgr.read(docId, new StringHandle()).get();
 		assertNotNull("Read null string for patched JSON content", docText);
@@ -272,6 +280,9 @@ public void testXPathPatch() throws IOException {
 		fragment = mapper.writeValueAsString(fragmentNode);
 		patchBldr.insertFragment("/array-node('arrayKey')", Position.BEFORE,
 				fragment);
+		patchBldr.replaceValue("/booleanKey", true);
+		patchBldr.replaceValue("/numberKey2", 2);
+		patchBldr.replaceValue("/nullKey", null);
 
 		//patchBldr.replaceApply("/node()/arrayKey/node()[string(.) eq '3']",
 		//		patchBldr.call().add(2));
@@ -306,18 +317,19 @@ public void testXPathPatch() throws IOException {
 		childNode.put("appendedKey", "appended item");
 		childArray.add(childNode);
 		expectedNode.set("arrayKey", childArray);
+		expectedNode.put("booleanKey", true);
+		expectedNode.put("numberKey2", 2);
+		expectedNode.putNull("nullKey");
 
 		String docText = docMgr.read(docId, new StringHandle()).get();
-		
+
 		assertNotNull("Read null string for patched JSON content", docText);
 		JsonNode readNode = mapper.readTree(docText);
-		
 
 		logger.debug("Before3:" + content);
 		logger.debug("After3:"+docText);
 		logger.debug("Expected3:" + mapper.writeValueAsString(expectedNode));
-		
-		
+
 		assertTrue("Patched JSON document without expected result",
 				expectedNode.equals(readNode));
 
@@ -400,6 +412,9 @@ private ObjectNode makeContent(ObjectMapper mapper) throws IOException {
 		childNode.put("itemObjectKey", "item object value");
 		childArray.add(childNode);
 		sourceNode.set("arrayKey", childArray);
+		sourceNode.put("booleanKey", false);
+		sourceNode.put("numberKey2", 1);
+		sourceNode.put("nullKey", 0);
 
 		return sourceNode;
 	}