Addresses #192

Author: Scott Stafford

infrastructure/src/main/java/com/marklogic/spring/batch/item/tasklet/DeleteDocumentsTasklet.java

@@ -1,12 +1,18 @@
 package com.marklogic.spring.batch.item.tasklet;
 
 import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.datamovement.DataMovementManager;
+import com.marklogic.client.datamovement.DeleteListener;
+import com.marklogic.client.datamovement.JobTicket;
+import com.marklogic.client.datamovement.QueryBatcher;
 import com.marklogic.client.document.GenericDocumentManager;
 import com.marklogic.client.helper.DatabaseClientProvider;
 import com.marklogic.client.io.SearchHandle;
 import com.marklogic.client.query.MatchDocumentSummary;
 import com.marklogic.client.query.QueryManager;
 import com.marklogic.client.query.StructuredQueryDefinition;
+import com.marklogic.mgmt.admin.AdminConfig;
+import com.marklogic.mgmt.admin.AdminManager;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -16,6 +22,7 @@ public class DeleteDocumentsTasklet implements Tasklet {
 
     private DatabaseClient databaseClient;
     private StructuredQueryDefinition queryDefinition;
+    private String marklogicVersion = "8";
 
     public DeleteDocumentsTasklet(DatabaseClientProvider databaseClientProvider, StructuredQueryDefinition queryDef) {
         this.databaseClient = databaseClientProvider.getDatabaseClient();
@@ -24,26 +31,31 @@ public DeleteDocumentsTasklet(DatabaseClientProvider databaseClientProvider, Str
 
     @Override
     public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
-        QueryManager qryMgr = databaseClient.newQueryManager();
-        GenericDocumentManager docMgr = databaseClient.newDocumentManager();
-        SearchHandle handle = qryMgr.search(queryDefinition, new SearchHandle());
-        MatchDocumentSummary[] results = handle.getMatchResults();
-        for (int i = 0; i < results.length; i++) {
-            docMgr.delete(results[i].getUri());
-        }
+        if (marklogicVersion.equals("8")) {
+            QueryManager qryMgr = databaseClient.newQueryManager();
+            GenericDocumentManager docMgr = databaseClient.newDocumentManager();
+            SearchHandle handle = qryMgr.search(queryDefinition, new SearchHandle());
+            MatchDocumentSummary[] results = handle.getMatchResults();
+            for (int i = 0; i < results.length; i++) {
+                docMgr.delete(results[i].getUri());
+            }
+        } else if (marklogicVersion.equals("9")) {
+            final DataMovementManager dataMovementManager = databaseClient.newDataMovementManager();
+            QueryBatcher qb = dataMovementManager.newQueryBatcher(queryDefinition)
+                    .withBatchSize(2500)
+                    .withConsistentSnapshot()
+                    .onUrisReady(new DeleteListener())
+                    .onQueryFailure(throwable -> throwable.printStackTrace());
+            JobTicket ticket = dataMovementManager.startJob(qb);
+            qb.awaitCompletion();
+            dataMovementManager.stopJob(ticket);
 
-    /*
-        final DataMovementManager dataMovementManager = databaseClient.newDataMovementManager();
-        QueryBatcher qb = dataMovementManager.newQueryBatcher(queryDefinition)
-                .withBatchSize(2500)
-                .withConsistentSnapshot()
-                .onUrisReady(new DeleteListener())
-                .onQueryFailure(throwable -> throwable.printStackTrace());
-        JobTicket ticket = dataMovementManager.startJob(qb);
-        qb.awaitCompletion();
-        dataMovementManager.stopJob(ticket);
-     */
+        }
         return RepeatStatus.FINISHED;
     }
 
+
+    public void setMarklogicVersion(String marklogicVersion) {
+        this.marklogicVersion = marklogicVersion;
+    }
 }

samples/src/main/java/com/marklogic/spring/batch/samples/DeleteDocumentsJob.java

@@ -31,9 +31,11 @@ public Job job(JobBuilderFactory jobBuilderFactory,
     @JobScope
     public Step deleteDocumentsStep(StepBuilderFactory stepBuilderFactory,
                      DatabaseClientProvider databaseClientProvider,
-                     @Value("#{jobParameters['output_collections']}") String[] collections) {
+                     @Value("#{jobParameters['output_collections']}") String[] collections,
+                     @Value("#{jobParameters['marklogic_version'] ?: \"8\"}") String marklogicVersion) {
         StructuredQueryDefinition query = new StructuredQueryBuilder().collection(collections);
-        Tasklet deleteDocumentsTasklet = new DeleteDocumentsTasklet(databaseClientProvider, query);
+        DeleteDocumentsTasklet deleteDocumentsTasklet = new DeleteDocumentsTasklet(databaseClientProvider, query);
+        deleteDocumentsTasklet.setMarklogicVersion(marklogicVersion);
         return stepBuilderFactory.get("Delete Documents").tasklet(deleteDocumentsTasklet).build();
     }
 }

samples/src/test/java/com.marklogic.spring.batch.samples/DeleteDocumentsJobTest.java

@@ -27,15 +27,23 @@ public void insertDocument(String uri, String collections, String xml) {
 
     @Before
     public void setup() {
-        Assume.assumeTrue(isMarkLogic9());
         for (int i = 0; i < 10; i++) {
             insertDocument("doc" + i, "monster", "<hello />");
         }
     }
 
-    //Ignoring this test for now, I'm using DMSDK for this test and for some reason,
-    //DMSDK is ignoring the host name that I send to the DataManager.  It works if I put in the
-    //host that it expects but fails on my CI build.
+    @Test
+    public void deleteMonsterCollectionWithDmsdkTest() throws Exception {
+        Assume.assumeTrue(isMarkLogic9());
+        JobParametersBuilder jpb = new JobParametersBuilder();
+        jpb.addString("output_collections", "monster");
+        jpb.addString("marklogic_version", "9");
+        JobExecution jobExecution = getJobLauncherTestUtils().launchJob(jpb.toJobParameters());
+        assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+        getClientTestHelper().assertCollectionSize("Expecting zero documents in monster collection", "monster", 0);
+    }
+
+
     @Test
     public void deleteMonsterCollectionTest() throws Exception {
         JobParametersBuilder jpb = new JobParametersBuilder();