support for reading Files in dynamic Data Services #1063

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/dataservices/CallManagerImpl.java

@@ -21,7 +21,6 @@
 import com.marklogic.client.SessionState;
 import com.marklogic.client.impl.BaseProxy;
 import com.marklogic.client.impl.NodeConverter;
-import com.marklogic.client.impl.RESTServices;
 import com.marklogic.client.impl.RESTServices.CallField;
 import com.marklogic.client.impl.RESTServices.MultipleAtomicCallField;
 import com.marklogic.client.impl.RESTServices.MultipleCallResponse;
@@ -1620,18 +1619,16 @@ public Stream<byte[]> many(MultipleCallResponse response) {
           return response.asStreamOfBytes();
         }
       });
-/* TODO: related to #1055
       put(File.class, new ReturnConverter<File>() {
         @Override
         public File one(SingleCallResponse response) {
-          return null;
+          return NodeConverter.InputStreamToFile(response.asInputStream());
         }
         @Override
         public Stream<File> many(MultipleCallResponse response) {
-          return null;
+          return NodeConverter.InputStreamToFile(response.asStreamOfInputStream());
         }
       });
- */
       put(InputStream.class, new ReturnConverter<InputStream>() {
         @Override
         public InputStream one(SingleCallResponse response) {

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

@@ -36,6 +36,9 @@
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -342,6 +345,21 @@ static public Document InputStreamToDocument(InputStream inputStream) {
    static public Stream<Document> InputStreamToDocument(Stream<? extends InputStream> values) {
       return (values == null) ? null : values.map(NodeConverter::InputStreamToDocument);
    }
+   static public File InputStreamToFile(InputStream inputStream) {
+      if (inputStream == null) {
+         return null;
+      }
+      try {
+         Path tempFile = Files.createTempFile("tmp", null);
+         Files.copy(inputStream, tempFile, StandardCopyOption.REPLACE_EXISTING);
+         return tempFile.toFile();
+      } catch (IOException e) {
+         throw new RuntimeException(e);
+      }
+   }
+   static public Stream<File> InputStreamToFile(Stream<? extends InputStream> values) {
+      return (values == null) ? null : values.map(NodeConverter::InputStreamToFile);
+   }
    static public InputSource ReaderToInputSource(Reader reader) {
       return (reader == null) ? null : new InputSource(reader);
    }

marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/CallManagerTest.java

@@ -117,6 +117,11 @@ public static void setup() {
         setupEndpointSingleRequired(docMgr, docMeta, "singleAtomic", "dateTime");
         setupEndpointSingleRequired(docMgr, docMeta, "singleNode", "object");
 
+        setupEndpointSingleRequired(docMgr, docMeta, "singleBinary", "binaryDocument");
+        setupEndpointSingleRequired(docMgr, docMeta, "singleJson", "jsonDocument");
+        setupEndpointSingleRequired(docMgr, docMeta, "singleText", "textDocument");
+        setupEndpointSingleRequired(docMgr, docMeta, "singleXml", "xmlDocument");
+
         setupEndpointSingleNulled(docMgr, docMeta, "nullAtomic", "decimal");
         setupEndpointSingleNulled(docMgr, docMeta, "nullNode", "xmlDocument");
 
@@ -382,7 +387,7 @@ public void testBadParamAtomicType() {
     public void testBadParamNodeType() {
         String functionName = "jsonDocument";
 
-        CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName );
+        CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName);
 
         CallManager.ManyCaller<String> caller = makeManyCaller(callableEndpoint, String.class);
 
@@ -796,13 +801,16 @@ public void testBinaryDocument() {
                 functionName, caller2, caller2.args().param("param1", values2), values, CallManagerTest::string
         );
 
-/* TODO:
+        String functionName3 = "singleBinary";
+
+        CallManager.CallableEndpoint callableEndpoint3 = makeCallableEndpoint(functionName3);
+
         File value3 = new File("src/test/resources/test.bin");
-        CallManager.ManyCaller<File> caller3 = makeManyCaller(callableEndpoint, File.class);
+        CallManager.OneCaller<File> caller3 = makeOneCaller(callableEndpoint3, File.class);
         testConvertedCall(
-                functionName, caller3, caller3.args().param("param1", value3), new String[]{CallManagerTest.string(value3)}, CallManagerTest::string
+                functionName3, caller3, caller3.args().param("param1", value3),
+                CallManagerTest.string(value3), CallManagerTest::string
         );
-        */
     }
     @Test
     public void testJsonDocument() {
@@ -832,14 +840,16 @@ public void testJsonDocument() {
                 functionName, caller4, caller4.args().param("param1", values4), values, CallManagerTest::string
         );
 
-/* TODO:
+
+        String functionName5 = "singleJson";
+        CallManager.CallableEndpoint callableEndpoint5 = makeCallableEndpoint(functionName5);
+
         File value5 = new File("src/test/resources/basic1.json");
-        CallManager.ManyCaller<File> caller5 = makeManyCaller(callableEndpoint, File.class);
+        CallManager.OneCaller<File> caller5 = makeOneCaller(callableEndpoint5, File.class);
         testConvertedCall(
-                functionName, caller3, caller3.args().param("param1", value5),
-                new String[]{CallManagerTest.string(value5)}, CallManagerTest::string
+                functionName5, caller5, caller5.args().param("param1", value5),
+                CallManagerTest.string(value5).trim(), CallManagerTest::string
         );
- */
     }
     @Test
     public void testArray() {
@@ -958,14 +968,15 @@ public void testTextDocument() {
                 functionName, caller2, caller2.args().param("param1", values2), values, CallManagerTest::string
         );
 
-/* TODO:
+        String functionName3 = "singleText";
+        CallManager.CallableEndpoint callableEndpoint3 = makeCallableEndpoint(functionName3);
+
         File value3 = new File("src/test/resources/hola.txt");
-        CallManager.ManyCaller<File> caller3 = makeManyCaller(callableEndpoint, File.class);
+        CallManager.OneCaller<File> caller3 = makeOneCaller(callableEndpoint3, File.class);
         testConvertedCall(
-                functionName, caller3, caller3.args().param("param1", value3),
-                new String[]{CallManagerTest.string(value3)}, CallManagerTest::string
+                functionName3, caller3, caller3.args().param("param1", value3),
+                CallManagerTest.string(value3), CallManagerTest::string
         );
-        */
     }
     @Test
     public void testMultipleNullNode() {
@@ -979,7 +990,7 @@ public void testMultipleNullNode() {
     public void testXmlDocument() {
         String functionName = "xmlDocument";
 
-        CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName );
+        CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName);
 
         String[] values = new String[]{"<root><child>text1</child></root>", "<root><child>text2</child></root>"};
 
@@ -1044,20 +1055,21 @@ public void testXmlDocument() {
                 functionName, caller11, caller11.args().param("param1", values11), values, CallManagerTest::xmlString
         );
 
-/* TODO:
+        String functionName12 = "singleXml";
+        CallManager.CallableEndpoint callableEndpoint12 = makeCallableEndpoint(functionName12);
+
         File value12 = new File("src/test/resources/test.xml");
-        CallManager.ManyCaller<File> caller12 = makeManyCaller(callableEndpoint, File.class);
+        CallManager.OneCaller<File> caller12 = makeOneCaller(callableEndpoint12, File.class);
         testConvertedCall(
-                functionName, caller3, caller3.args().param("param1", value12),
-                new String[]{CallManagerTest.string(value12)}, CallManagerTest::string
+                functionName12, caller12, caller12.args().param("param1", value12),
+                CallManagerTest.string(value12).trim(), CallManagerTest::xmlString
         );
-        */
     }
     @Test
     public void testNullNode() {
         String functionName = "nullNode";
 
-        CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName );
+        CallManager.CallableEndpoint callableEndpoint = makeCallableEndpoint(functionName);
 
         testCharacterNodeOne(functionName, callableEndpoint);
 
@@ -1263,6 +1275,9 @@ private static XMLStreamReader xmlStreamReader(String value) {
     private static String xmlString(byte[] value) {
         return string(new StreamSource(new ByteArrayInputStream(value)));
     }
+    private static String xmlString(File value) {
+        return string(new StreamSource(value));
+    }
     private static String xmlString(InputStream value) {
         return string(new StreamSource(value));
     }

marklogic-client-api/src/test/resources/basic1.json

@@ -1 +1 @@
-{a:{b1:{c:"jsonValue1"}, b2:["b2 val1", "b2 val2"]}}
+{"a":{"b1":{"c":"jsonValue1"}, "b2":["b2 val1", "b2 val2"]}}