clean up on handles and service customization #1111

Author: ehennum

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

@@ -93,7 +93,9 @@ public BaseProxy(DatabaseClient db, String endpointDir, JSONWriteHandle serviceD
    }
    // backward-compatible constructor for 4.x legacy
    public BaseProxy(DatabaseClient db, String endpointDir) {
-      this();
+      this(db, endpointDir, null);
+   }
+   private void init(DatabaseClient db, String endpointDir) {
       if (db == null) {
          throw new IllegalArgumentException("Cannot connect with null database client");
       } else if (db.getDatabase() != null) {

ml-development-tools/src/main/kotlin/com/marklogic/client/tools/proxy/Generator.kt

@@ -330,6 +330,7 @@ class Generator {
 ${funcImports}
 
 import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.io.marker.JSONWriteHandle;
 
 import com.marklogic.client.impl.BaseProxy;
 
@@ -344,14 +345,33 @@ public interface ${className} {
      * client object can be used for any number of requests and in multiple threads.
      *
      * @param db	provides a client for communicating with the database server
-     * @return	an object for session state
+     * @return	an object for executing database operations
      */
     static ${className} on(DatabaseClient db) {
+      return on(db, null);
+    }
+    /**
+     * Creates a ${className} object for executing operations on the database server.
+     *
+     * The DatabaseClientFactory class can create the DatabaseClient parameter. A single
+     * client object can be used for any number of requests and in multiple threads.
+     *
+     * The service declaration uses a custom implementation of the same service instead
+     * of the default implementation of the service by specifying an endpoint directory
+     * in the modules database with the implementation. A service.json file with the
+     * declaration can be read with FileHandle or a string serialization of the JSON
+     * declaration with StringHandle.
+     *
+     * @param db	provides a client for communicating with the database server
+     * @param serviceDeclaration	substitutes a custom implementation of the service
+     * @return	an object for executing database operations
+     */
+    static ${className} on(DatabaseClient db, JSONWriteHandle serviceDeclaration) {
         final class ${className}Impl implements ${className} {
             private BaseProxy baseProxy;
 
-            private ${className}Impl(DatabaseClient dbClient) {
-                baseProxy = new BaseProxy(dbClient, "${requestDir}");
+            private ${className}Impl(DatabaseClient dbClient, JSONWriteHandle servDecl) {
+                baseProxy = new BaseProxy(dbClient, "${requestDir}", servDecl);
             }${
     if (!hasSession) ""
     else """
@@ -363,7 +383,7 @@ public interface ${className} {
 ${funcSrc}
         }
 
-        return new ${className}Impl(db);
+        return new ${className}Impl(db, serviceDeclaration);
     }${
     if (!hasSession) ""
     else """