Merge branch 'develop-failover' into develop

Author: ehennum

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnFromSparql.java

@@ -100,7 +100,6 @@ public void setUpBeforTest() {
    * @param client
    * @param filename
    * @param uri
-   * @param type
    * @throws IOException
    * @throws ParserConfigurationException
    * @throws SAXException

marklogic-client-api/build.gradle

@@ -33,32 +33,14 @@ dependencies {
     compileOnly group: 'com.opencsv', name: 'opencsv', version: '4.1'
     compileOnly group: 'org.geonames', name: 'geonames', version:'1.0'
     compileOnly group: 'org.springframework', name: 'spring-jdbc', version: '5.0.4.RELEASE'
-// uncomment to build XOMHandle
-//  compileOnly group: 'com.io7m.xom', name: 'xom', version: '1.2.10'
-}
-
-// comment the exclusion to build XOMHandle
-compileJava {
-    exclude (
-            'com/marklogic/client/extra/xom/**',
-            'com/marklogic/client/example/handle/XOMHandleExample.java'
-    )
-}
-
-// comment the exclusion to test XOMHandle
-compileTestJava {
-    exclude (
-            'com/marklogic/client/test/extra/XOMHandleTest.java'
-    )
 }
 
 jar {
     exclude (
             'search.xsd', 'search-bindings.xjb', 'query-options-template.xml',
             'com/marklogic/client/example/**', 'data/**', 'Example.properties',
             'example/**', 'scripts/**', '*.txt', 'property.xsd',
-            'restapi-bindings.xjb', 'security.xsd',
-            'com/marklogic/client/extra/xom/**'
+            'restapi-bindings.xjb', 'security.xsd'
     )
 }
 task sourcesJar(type: Jar) {
@@ -78,9 +60,7 @@ javadoc {
     options.use = true
     options.addBooleanOption('html4', true)
     exclude([
-            '**/impl/**', '**/jaxb/**', '**/test/**',
-            'com/marklogic/client/extra/xom/**',
-            'com/marklogic/client/example/handle/XOMHandleExample.java'
+            '**/impl/**', '**/jaxb/**', '**/test/**'
     ])
 // workaround for bug in options.docFilesSubDirs = true
     doLast{

marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicServerException.java

@@ -23,8 +23,6 @@
  * the FailedRequest Java object.  The MarkLogicServerException contains the FailedRequest object which
  * is incorporated into getMessage() or can be examined via getFailedRequest()
  *
- * @see FailedRequest
- *
  */
 @SuppressWarnings("serial")
 public abstract class MarkLogicServerException extends RuntimeException {
@@ -60,6 +58,43 @@ else if (failedRequest != null) {
     else return super.getMessage();
   }
 
+  /**
+   * Gets the HTTP status code (if any) associated with the error on the server.
+   * @return  the status code
+   */
+  public int getServerStatusCode() {
+    return (failedRequest == null) ? null : failedRequest.getStatusCode();
+  }
+  /**
+   * Gets the HTTP status message (if any) associated with the error on the server.
+   * @return  the status message
+   */
+  public String getServerStatus() {
+    return (failedRequest == null) ? null : failedRequest.getStatus();
+  }
+  /**
+   * Gets the error code (if any) specific to the error on the server.
+   * @return  the error code
+   */
+  public String getServerMessageCode() {
+    return (failedRequest == null) ? null : failedRequest.getMessageCode();
+  }
+  /**
+   * Gets the error message (if any) specific to the error on the server.
+   * @return  the error message
+   */
+  public String getServerMessage() {
+    return (failedRequest == null) ? null : failedRequest.getMessage();
+  }
+  /**
+   * Gets the stack trace (if any) specific to the error on the server.
+   * @return  the server stack trace
+   */
+  public String getServerStackTrace() {
+    return (failedRequest == null) ? null : failedRequest.getStackTrace();
+  }
+
+  @Deprecated
   public FailedRequest getFailedRequest() {
     return failedRequest;
   }

marklogic-client-api/src/main/java/com/marklogic/client/dataservices/CallBatcher.java renamed to marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/CallBatcher.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.marklogic.client.dataservices;
+package com.marklogic.client.dataservices.impl;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import com.marklogic.client.datamovement.BatchEvent;
 import com.marklogic.client.datamovement.Batcher;
 import com.marklogic.client.datamovement.DataMovementManager;
 import com.marklogic.client.datamovement.ForestConfiguration;
 import com.marklogic.client.datamovement.JobTicket;
-import com.marklogic.client.dataservices.CallManager.CallArgs;
-import com.marklogic.client.dataservices.CallManager.CallEvent;
+import com.marklogic.client.dataservices.impl.CallManager.CallArgs;
 
 /**
  * A CallBatcher executes multiple concurrent calls to a Data Service endpoint
@@ -45,7 +45,7 @@
  * @param <W>  the type of the input passed to the add() method of the CallBatcher
  * @param <E>  the CallEvent subinterface for the results of a successful call
  */
-public interface CallBatcher<W,E extends CallManager.CallEvent> extends Batcher {
+public interface CallBatcher<W,E extends CallBatcher.CallEvent> extends Batcher {
     /**
      * Registers a lambda function for processing the CallEvent for a successful call.
      * @param listener  the lambda function for a successful result
@@ -258,7 +258,7 @@ public interface CallBatcher<W,E extends CallManager.CallEvent> extends Batcher
      * then call the batcher() method on the caller to use the CallBatcherBuilder.
      * @param <E>  the CallEvent subinterface for the results of a successful call
      */
-    interface CallBatcherBuilder<E extends CallManager.CallEvent> {
+    interface CallBatcherBuilder<E extends CallEvent> {
         /**
          * Builds a CallBatcher that takes input values for a parameter, making
          * a call after accumulating a batch of values for the parameter.
@@ -290,9 +290,32 @@ interface CallBatcherBuilder<E extends CallManager.CallEvent> {
          * @return a CallBatcher for chaining with other methods.
          */
         CallBatcher<Void,E> forArgsGenerator(CallArgsGenerator<E> generator);
+        /**
+         * Takes a callback and the forest name for generating the arguments for calls. 
+         * The callback takes the CallEvent and the forest name from the previous call in 
+         * the thread and returns the CallArgs for the next call in the thread.
+         * 
+         * @param generator instance implementing {@link CallArgsGenerator}
+         * @param forestName is the name of the forest.
+         * @return a CallBatcher for chaining with other methods.
+         */
+        CallBatcher<Void,E> forArgsGenerator(CallArgsGenerator<E> generator, String forestName);
     }
 
     @FunctionalInterface
     public interface CallArgsGenerator<E extends CallEvent> extends Function<E, CallArgs> {
     }
+    
+    interface CallEvent extends BatchEvent {
+        CallArgs getArgs();
+        CallManager.EndpointDefiner getEndpointDefiner();
+    }
+
+    interface ManyCallEvent<R> extends CallEvent {
+        Stream<R> getItems();
+    }
+
+    interface OneCallEvent<R> extends CallEvent {
+        R getItem();
+    }
 }