use REST API modules database for Data Services #1061

Author: ehennum

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

@@ -1620,6 +1620,18 @@ 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;
+        }
+        @Override
+        public Stream<File> many(MultipleCallResponse response) {
+          return null;
+        }
+      });
+ */
       put(InputStream.class, new ReturnConverter<InputStream>() {
         @Override
         public InputStream one(SingleCallResponse response) {

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

@@ -63,8 +63,6 @@ public class Common {
   final public static int     MODULES_WAIT  = Integer.parseInt(System.getProperty("TEST_MODULES_WAIT",  WITH_WAIT ? "1200" : "0"));
   final public static int     PROPERTY_WAIT = Integer.parseInt(System.getProperty("TEST_PROPERTY_WAIT", WITH_WAIT ? "8200" : "0"));
 
-  final public static int DATA_SERVICE_PORT = Integer.parseInt(System.getProperty("TEST_DATA_SERVICE_PORT", "8016"));
-
   final public static DatabaseClient.ConnectionType CONNECTION_TYPE =
       DatabaseClient.ConnectionType.valueOf(System.getProperty("TEST_CONNECT_TYPE", "DIRECT"));
 
@@ -102,11 +100,6 @@ public static DatabaseClient connectReadOnly() {
       readOnlyClient = newReadOnlyClient();
     return readOnlyClient;
   }
-  public static DatabaseClient connectDataService() {
-    if (dataServiceClient == null)
-      dataServiceClient = newDataServiceClient();
-    return dataServiceClient;
-  }
   public static DatabaseClient newClient() {
     return newClient(null);
   }
@@ -144,11 +137,6 @@ public static DatabaseClient newReadOnlyClient() {
       Common.HOST, Common.PORT, new DigestAuthContext(Common.READ_ONLY_USER, Common.READ_ONLY_PASS),
           CONNECTION_TYPE);
   }
-  public static DatabaseClient newDataServiceClient() {
-    return DatabaseClientFactory.newClient(Common.HOST, Common.DATA_SERVICE_PORT,
-            new DatabaseClientFactory.DigestAuthContext(Common.USER, Common.PASS),
-            CONNECTION_TYPE);
-  }
 
   public static byte[] streamToBytes(InputStream is) throws IOException {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();

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

@@ -65,7 +65,7 @@ public class CallManagerTest {
 
     private final static Map<String, Format> NODE_FORMATS = new HashMap<>();
 
-    private DatabaseClient db      = Common.connectDataService();
+    private DatabaseClient db      = Common.connect();
     private CallManager    callMgr = CallManager.on(db);
 
     private JacksonHandle serviceHandle;
@@ -86,7 +86,7 @@ public static void setup() {
         NODE_FORMATS.put("textDocument",   Format.TEXT);
         NODE_FORMATS.put("xmlDocument",    Format.XML);
 
-        DatabaseClient adminClient = Common.newServerAdminClient("DBFUnitTestModules");
+        DatabaseClient adminClient = Common.newServerAdminClient("java-unittest-modules");
         JSONDocumentManager docMgr = adminClient.newJSONDocumentManager();
 
         DocumentMetadataHandle docMeta = new DocumentMetadataHandle();
@@ -131,13 +131,11 @@ public static void setup() {
         setupNoParamReturnEndpoint(docMgr, docMeta, "noParamReturn", "double", "5.6");
         setupNoParamNoReturnEndpoint(docMgr, docMeta, "noParamNoReturn");
 
-// TODO: negative tests
-
         adminClient.release();
     }
     @AfterClass
     public static void teardown() {
-        DatabaseClient adminClient = Common.newServerAdminClient("DBFUnitTestModules");
+        DatabaseClient adminClient = Common.newServerAdminClient("java-unittest-modules");
 
         QueryManager queryMgr = adminClient.newQueryManager();
         DeleteQueryDefinition deletedef = queryMgr.newDeleteDefinition();
@@ -792,13 +790,19 @@ public void testBinaryDocument() {
 
         testNode(functionName, callableEndpoint, values);
 
-// TODO: File
-
         BytesHandle[] values2 = convert(values, CallManagerTest::BytesHandle, BytesHandle.class);
-        CallManager.ManyCaller<BinaryReadHandle> caller4 = makeManyCaller(callableEndpoint, BinaryReadHandle.class);
+        CallManager.ManyCaller<BinaryReadHandle> caller2 = makeManyCaller(callableEndpoint, BinaryReadHandle.class);
+        testConvertedCall(
+                functionName, caller2, caller2.args().param("param1", values2), values, CallManagerTest::string
+        );
+
+/* TODO:
+        File value3 = new File("src/test/resources/test.bin");
+        CallManager.ManyCaller<File> caller3 = makeManyCaller(callableEndpoint, File.class);
         testConvertedCall(
-                functionName, caller4, caller4.args().param("param1", values2), values, CallManagerTest::string
+                functionName, caller3, caller3.args().param("param1", value3), new String[]{CallManagerTest.string(value3)}, CallManagerTest::string
         );
+        */
     }
     @Test
     public void testJsonDocument() {
@@ -810,8 +814,6 @@ public void testJsonDocument() {
 
         testCharacterNode(functionName, callableEndpoint, values);
 
-// TODO: File
-
         JsonNode[] values2 = convert(values, CallManagerTest::jsonNode, JsonNode.class);
         CallManager.ManyCaller<JsonNode> caller2 = makeManyCaller(callableEndpoint, JsonNode.class);
         testConvertedCall(
@@ -829,6 +831,15 @@ public void testJsonDocument() {
         testConvertedCall(
                 functionName, caller4, caller4.args().param("param1", values4), values, CallManagerTest::string
         );
+
+/* TODO:
+        File value5 = new File("src/test/resources/basic1.json");
+        CallManager.ManyCaller<File> caller5 = makeManyCaller(callableEndpoint, File.class);
+        testConvertedCall(
+                functionName, caller3, caller3.args().param("param1", value5),
+                new String[]{CallManagerTest.string(value5)}, CallManagerTest::string
+        );
+ */
     }
     @Test
     public void testArray() {
@@ -941,13 +952,20 @@ public void testTextDocument() {
 
         testCharacterNode(functionName, callableEndpoint, values);
 
-// TODO: File
-
         StringHandle[] values2 = convert(values, StringHandle::new, StringHandle.class);
         CallManager.ManyCaller<TextReadHandle> caller2 = makeManyCaller(callableEndpoint, TextReadHandle.class);
         testConvertedCall(
                 functionName, caller2, caller2.args().param("param1", values2), values, CallManagerTest::string
         );
+
+/* TODO:
+        File value3 = new File("src/test/resources/hola.txt");
+        CallManager.ManyCaller<File> caller3 = makeManyCaller(callableEndpoint, File.class);
+        testConvertedCall(
+                functionName, caller3, caller3.args().param("param1", value3),
+                new String[]{CallManagerTest.string(value3)}, CallManagerTest::string
+        );
+        */
     }
     @Test
     public void testMultipleNullNode() {
@@ -973,8 +991,6 @@ public void testXmlDocument() {
                 functionName, caller2, caller2.args().param("param1", values2), values, CallManagerTest::xmlString
         );
 
-// TODO: File
-
         InputStream[] values3 = convert(values, CallManagerTest::inputStream, InputStream.class);
         CallManager.ManyCaller<InputStream> caller3 = makeManyCaller(callableEndpoint, InputStream.class);
         testConvertedCall(
@@ -1027,6 +1043,15 @@ public void testXmlDocument() {
         testConvertedCall(
                 functionName, caller11, caller11.args().param("param1", values11), values, CallManagerTest::xmlString
         );
+
+/* TODO:
+        File value12 = new File("src/test/resources/test.xml");
+        CallManager.ManyCaller<File> caller12 = makeManyCaller(callableEndpoint, File.class);
+        testConvertedCall(
+                functionName, caller3, caller3.args().param("param1", value12),
+                new String[]{CallManagerTest.string(value12)}, CallManagerTest::string
+        );
+        */
     }
     @Test
     public void testNullNode() {
@@ -1166,6 +1191,13 @@ private static String string(byte[] value) {
     private static String string(Document value) {
         return string(new DOMSource(value));
     }
+    private static String string(File value) {
+        try {
+            return string(new FileInputStream(value));
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
     private static String string(InputStreamHandle value) {
         return string(value.get());
     }