fix #284 - add bulk document delete

Author: sammefford

src/main/java/com/marklogic/client/document/DocumentManager.java

@@ -852,6 +852,25 @@ public void delete(String docId)
      */
     public void delete(String docId, Transaction transaction)
     	throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+    /**
+     * Deletes the documents' metadata and content
+     *
+     * To call delete(), an application must authenticate as rest-writer or rest-admin.
+     *
+     * @param uris	the identifiers for the documents to delete
+     */
+    public void delete(String... uris)
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
+    /**
+     * Deletes the documents' metadata and content from an open database transaction
+     *
+     * To call delete(), an application must authenticate as rest-writer or rest-admin.
+     *
+     * @param transaction	an open transaction
+     * @param uris	the identifiers for the documents to delete
+     */
+    public void delete(Transaction transaction, String... uris)
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
     /**
      * Deletes the document metadata and content from the database
      * 

src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java

@@ -843,6 +843,22 @@ public void delete(String uri, Transaction transaction)
     delete(new DocumentDescriptorImpl(uri, true), transaction);
   }
 
+  @Override
+  public void delete(String... uris)
+      throws ResourceNotFoundException, ForbiddenUserException,
+      FailedRequestException
+  {
+    services.delete(requestLogger, null, uris);
+  }
+
+  @Override
+  public void delete(Transaction transaction, String... uris)
+      throws ResourceNotFoundException, ForbiddenUserException,
+      FailedRequestException
+  {
+    services.delete(requestLogger, transaction, uris);
+  }
+
   @Override
   public void delete(DocumentDescriptor desc) throws ResourceNotFoundException,
       ForbiddenUserException, FailedRequestException {

src/main/java/com/marklogic/client/impl/JerseyServices.java

@@ -2290,13 +2290,24 @@ public void deleteSearch(RequestLogger reqlog, DeleteQueryDefinition queryDef,
 			throw new FailedRequestException("delete failed: "
 					+ status.getReasonPhrase(), extractErrorFields(response));
 		}
-		
+
+		response.close();
+
 		logRequest(
 				reqlog,
 				"deleted search results in %s transaction",
 				getTransactionId(transaction));
 	}
 
+	@Override
+	public void delete(RequestLogger logger, Transaction transaction, String... uris)
+		throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException
+	{
+		RequestParameters params = new RequestParameters();
+		addEncodedParam(((RequestParametersImplementation) params).getMapImpl(), "uri", uris);
+		deleteResource(logger, "documents", transaction, params, null);
+	}
+
 	@Override
 	public <T> T values(Class<T> as, ValuesDefinition valDef, String mimetype,
 		long start, long pageLength, Transaction transaction
@@ -4450,15 +4461,20 @@ private void checkStatus(ClientResponse response,
 			ClientResponse.Status status, String operation, String entityType,
 			String path, ResponseStatus expected) {
 		if (!expected.isExpected(status)) {
+			FailedRequest failure = extractErrorFields(response);
 			if (status == ClientResponse.Status.NOT_FOUND) {
 				throw new ResourceNotFoundException("Could not " + operation
 						+ " " + entityType + " at " + path,
-						extractErrorFields(response));
+						failure);
 			}
 			if (status == ClientResponse.Status.FORBIDDEN) {
+				if (failure.getMessageCode().equals("RESTAPI-CONTENTNOVERSION")) {
+					throw new FailedRequestException("Content version required to " +
+						operation + " " + entityType + " at " + path, failure);
+				}
 				throw new ForbiddenUserException("User is not allowed to "
 						+ operation + " " + entityType + " at " + path,
-						extractErrorFields(response));
+						failure);
 			}
 			throw new FailedRequestException("failed to " + operation + " "
 					+ entityType + " at " + path + ": "

src/main/java/com/marklogic/client/impl/RESTServices.java

@@ -120,6 +120,8 @@ public <T> T search(RequestLogger reqlog, Class<T> as, QueryDefinition queryDef,
 
     public void deleteSearch(RequestLogger logger, DeleteQueryDefinition queryDef, Transaction transaction)
             throws ForbiddenUserException, FailedRequestException;
+    public void delete(RequestLogger logger, Transaction transaction, String... uris)
+        throws ResourceNotFoundException, ForbiddenUserException, FailedRequestException;
 
     public Transaction openTransaction(String name, int timeLimit)
 		throws ForbiddenUserException, FailedRequestException;

src/test/java/com/marklogic/client/test/BulkReadWriteTest.java

@@ -256,7 +256,6 @@ public void testC_BulkSearch() {
         }
     }
 
-    //public void testMixedLoad() {
     @Test
     public void testD_JsonLoad() {
         JSONDocumentManager docMgr = Common.client.newJSONDocumentManager();
@@ -342,7 +341,7 @@ public void testE_TextLoad() {
     }
 
     @Test
-    public void testF_DefaultMetadata() {
+    public void testF_DefaultMetadata() throws Throwable {
         // Synthesize input content
         StringHandle doc1 = new StringHandle(
                 "{\"number\": 1}").withFormat(Format.JSON);
@@ -452,6 +451,24 @@ public void testF_DefaultMetadata() {
         } finally {
             documents.close();
         }
+        jdm.setMetadataCategories();
+        String[] uris = new String[] { "doc1.json", "doc2.json", "doc3.json", "doc4.json", "doc5.json",
+            "doc6.json", "doc7.json", "doc8.json"};
+        Transaction t1 = Common.client.openTransaction();
+        try {
+            // delete from within the transaction
+            jdm.delete(t1, uris);
+            // read from outside any transaction (the docs are still there)
+            documents = jdm.read(uris);
+            documents.close();
+            assertEquals(8, documents.size());
+            // read from inside the transaction (the docs are gone)
+            documents = jdm.read(t1, uris);
+            documents.close();
+            assertEquals(0, documents.size());
+        } finally {
+            t1.commit();
+        }
     }
 
     @Test
@@ -712,9 +729,5 @@ public static void cleanUp() {
         DeleteQueryDefinition deleteQuery = queryMgr.newDeleteDefinition();
         deleteQuery.setDirectory("/cities/");
         queryMgr.delete(deleteQuery);
-        JSONDocumentManager docMgr = Common.client.newJSONDocumentManager();
-        for ( int i=1; i <= 8; i++ ) {
-            docMgr.delete("doc" + i + ".json");
-        }
     }
 }