Add support for delete operations in MongoDB DAOs

Partially resolved in previous commits:

- eadb079
- f1cf529
- ddbb617

Resolves #5060

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoExecutionContextDao.java

@@ -16,6 +16,7 @@
 package org.springframework.batch.core.repository.dao.mongodb;
 
 import java.util.Collection;
+import java.util.Collections;
 
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.step.StepExecution;
@@ -112,4 +113,22 @@ public void updateExecutionContext(StepExecution stepExecution) {
 		saveExecutionContext(stepExecution);
 	}
 
+	@Override
+	public void deleteExecutionContext(JobExecution jobExecution) {
+		Query query = new Query(where("jobExecutionId").is(jobExecution.getId()));
+		org.springframework.batch.core.repository.persistence.ExecutionContext executionContext = new org.springframework.batch.core.repository.persistence.ExecutionContext(
+				Collections.emptyMap(), false);
+		Update executionContextRemovalUpdate = new Update().set("executionContext", executionContext);
+		this.mongoOperations.updateFirst(query, executionContextRemovalUpdate, JOB_EXECUTIONS_COLLECTION_NAME);
+	}
+
+	@Override
+	public void deleteExecutionContext(StepExecution stepExecution) {
+		Query query = new Query(where("stepExecutionId").is(stepExecution.getId()));
+		org.springframework.batch.core.repository.persistence.ExecutionContext executionContext = new org.springframework.batch.core.repository.persistence.ExecutionContext(
+				Collections.emptyMap(), false);
+		Update executionContextRemovalUpdate = new Update().set("executionContext", executionContext);
+		this.mongoOperations.updateFirst(query, executionContextRemovalUpdate, STEP_EXECUTIONS_COLLECTION_NAME);
+	}
+
 }

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobExecutionDao.java

@@ -19,6 +19,7 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -33,6 +34,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 import org.springframework.util.CollectionUtils;
 
@@ -160,6 +162,13 @@ public void deleteJobExecution(JobExecution jobExecution) {
 
 	}
 
+	@Override
+	public void deleteJobExecutionParameters(JobExecution jobExecution) {
+		Query query = new Query(where("jobExecutionId").is(jobExecution.getId()));
+		Update jobParametersRemovalUpdate = new Update().set("jobParameters", Collections.emptyList());
+		this.mongoOperations.updateFirst(query, jobParametersRemovalUpdate, JOB_EXECUTIONS_COLLECTION_NAME);
+	}
+
 	private JobExecution convert(org.springframework.batch.core.repository.persistence.JobExecution jobExecution,
 			org.springframework.batch.core.job.JobInstance jobInstance) {
 		Set<JobParameter<?>> parameters = jobExecution.getJobParameters();

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MongoDBJobRepositoryIntegrationTests.java

@@ -81,9 +81,9 @@ void testJobExecution(@Autowired JobOperator jobOperator, @Autowired Job job) th
 		Assertions.assertEquals(2, stepExecutionsCollection.countDocuments());
 
 		// dump results for inspection
-		// dump(jobInstancesCollection, "job instance = ");
-		// dump(jobExecutionsCollection, "job execution = ");
-		// dump(stepExecutionsCollection, "step execution = ");
+		dump(jobInstancesCollection, "job instance = ");
+		dump(jobExecutionsCollection, "job execution = ");
+		dump(stepExecutionsCollection, "step execution = ");
 	}
 
 	private static void dump(MongoCollection<Document> collection, String prefix) {

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MongoExecutionContextDaoIntegrationTests.java

@@ -23,6 +23,7 @@
 import org.springframework.batch.core.job.JobInstance;
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.repository.dao.JobExecutionDao;
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.launch.JobOperator;
 import org.springframework.batch.core.repository.dao.ExecutionContextDao;
@@ -107,4 +108,25 @@ void testSaveStepExecution(@Autowired JobOperator jobOperator, @Autowired Job jo
 		assertEquals("bar", actual.get("foo"));
 	}
 
+	@Test
+	void testDeleteExecutionContext(@Autowired JobOperator jobOperator, @Autowired Job job,
+			@Autowired ExecutionContextDao executionContextDao) throws Exception {
+		// given
+		JobParameters jobParameters = new JobParametersBuilder().addString("name", "foo")
+			.addLocalDateTime("runtime", LocalDateTime.now())
+			.toJobParameters();
+		JobExecution jobExecution = jobOperator.start(job, jobParameters);
+		StepExecution stepExecution = jobExecution.getStepExecutions().stream().findFirst().orElseThrow();
+
+		// when
+		executionContextDao.deleteExecutionContext(jobExecution);
+		executionContextDao.deleteExecutionContext(stepExecution);
+
+		// then
+		ExecutionContext updatedJobExecutionContext = executionContextDao.getExecutionContext(jobExecution);
+		ExecutionContext updatedStepExecutionContext = executionContextDao.getExecutionContext(stepExecution);
+		assertTrue(updatedJobExecutionContext.isEmpty());
+		assertTrue(updatedStepExecutionContext.isEmpty());
+	}
+
 }

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/MongoJobExecutionDaoIntegrationTests.java

@@ -356,6 +356,20 @@ void testDeleteJobExecution() {
 		assertNull(dao.getJobExecution(execution.getId()));
 	}
 
+	@Test
+	void testDeleteJobExecutionParameters() {
+		// given
+		JobParameters jobParameters = new JobParametersBuilder().addString("name", "foo").toJobParameters();
+		JobExecution execution = dao.createJobExecution(jobInstance, jobParameters);
+
+		// when
+		dao.deleteJobExecutionParameters(execution);
+
+		// then
+		JobExecution updatedJobExecution = dao.getJobExecution(execution.getId());
+		assertTrue(updatedJobExecution.getJobParameters().isEmpty());
+	}
+
 	/*
 	 * Check to make sure the executions are equal. Normally, comparing the id's is
 	 * sufficient. However, for testing purposes, especially of a DAO, we need to make