better diagnostic messages for invalid state #1258

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOEndpointImpl.java

@@ -311,8 +311,8 @@ boolean checkQueue(BlockingQueue<I> queue, int batchSize) {
                 case INTERRUPTED:
                 case COMPLETED:
                     throw new IllegalStateException(
-                            "cannot accept more input as current phase is  " + getPhase().name()
-                    );
+                        "can only accept input when initializing or running and not when input is "+
+                        getPhase().name().toLowerCase());
                 default:
                     throw new MarkLogicInternalException(
                             "unexpected state for " + callContext.getEndpoint().getEndpointPath() + " during loop: " + getPhase().name());

marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputEndpointImpl.java

@@ -151,9 +151,10 @@ public void awaitCompletion() {
             if (getOutputListener() == null)
                 throw new IllegalStateException("Output consumer is null");
 
-            if(getPhase() != WorkPhase.INITIALIZING) {
+            if (getPhase() != WorkPhase.INITIALIZING) {
                 throw new IllegalStateException(
-                        "Cannot process output since current phase is  " + getPhase().name());
+                        "Can only await completion when starting output and not while output is "+
+                        getPhase().name().toLowerCase());
             }
 
             setPhase(WorkPhase.RUNNING);

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

@@ -125,7 +125,9 @@ public void bulkInputEndpointInterruptTest() throws Exception {
         loader.interrupt();
 
         expectedException.expect(IllegalStateException.class);
-        expectedException.expect(new ThrowableMessageMatcher(new StringContains("cannot accept more input as current phase is  INTERRUPTING")));
+        expectedException.expect(new ThrowableMessageMatcher(new StringContains(
+                "can only accept input when initializing or running and not when input is interrupting"
+        )));
         input2.forEach(loader::accept);
     }