Merge pull request #16 from jblayneyXpanxion/master

Adding overrides & flexibility to AdHocScheduler

Author: chrisgleissner

README.md

@@ -80,7 +80,7 @@ Maven:
 <dependency>
     <groupId>com.github.chrisgleissner</groupId>
     <artifactId>spring-batch-rest-api</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.3</version>
 </dependency>
 ```
 
@@ -99,7 +99,7 @@ Maven:
 <dependency>
     <groupId>com.github.chrisgleissner</groupId>
     <artifactId>spring-batch-rest-quartz-api</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.3</version>
 </dependency>
 ```
 

api/src/test/java/com/github/chrisgleissner/springbatchrest/api/core/RestTest.java

@@ -2,9 +2,10 @@
 
 import com.github.chrisgleissner.springbatchrest.api.core.jobexecution.JobExecution;
 import com.github.chrisgleissner.springbatchrest.api.core.jobexecution.JobExecutionResource;
-import com.github.chrisgleissner.springbatchrest.util.core.AdHocBatchConfig;
 import com.github.chrisgleissner.springbatchrest.util.core.JobBuilder;
 import com.github.chrisgleissner.springbatchrest.util.core.JobConfig;
+import com.github.chrisgleissner.springbatchrest.util.core.config.AdHocBatchConfig;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,7 +29,6 @@
 import static com.github.chrisgleissner.springbatchrest.util.core.property.JobPropertyResolvers.JobProperties;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.batch.core.ExitStatus.COMPLETED;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 @RunWith(SpringRunner.class)

api/src/test/resources/application.properties

@@ -1,4 +1,5 @@
 spring.main.banner-mode=off
 spring.boot.admin.client.url: "http://localhost:8090"
 management.endpoints.web.exposure.include: "*"
-spring.resources.add-mappings=true
+spring.resources.add-mappings=true
+server.port=9090

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.5.RELEASE</version>
+        <version>2.2.6.RELEASE</version>
     </parent>
 
     <groupId>com.github.chrisgleissner</groupId>

quartz-api/src/test/java/com/github/chrisgleissner/springbatchrest/api/quartz/RestTest.java

@@ -2,9 +2,9 @@
 
 import com.github.chrisgleissner.springbatchrest.api.core.jobexecution.JobExecution;
 import com.github.chrisgleissner.springbatchrest.api.core.jobexecution.JobExecutionResource;
-import com.github.chrisgleissner.springbatchrest.util.core.AdHocBatchConfig;
 import com.github.chrisgleissner.springbatchrest.util.core.JobBuilder;
 import com.github.chrisgleissner.springbatchrest.util.core.JobConfig;
+import com.github.chrisgleissner.springbatchrest.util.core.config.AdHocBatchConfig;
 import com.github.chrisgleissner.springbatchrest.util.quartz.AdHocScheduler;
 import org.junit.Before;
 import org.junit.Test;

quartz-api/src/test/resources/application.properties

@@ -1,4 +1,5 @@
 spring.main.banner-mode=off
 spring.boot.admin.client.url: "http://localhost:8090"
 management.endpoints.web.exposure.include: "*"
-spring.resources.add-mappings=true
+spring.resources.add-mappings=true
+server.port=9090

util/src/main/java/com/github/chrisgleissner/springbatchrest/util/JobParamUtil.java

@@ -0,0 +1,34 @@
+package com.github.chrisgleissner.springbatchrest.util;
+
+import static java.util.Collections.emptyMap;
+import static java.util.stream.Collectors.toMap;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.batch.core.JobParameter;
+import org.springframework.batch.core.JobParameters;
+
+public class JobParamUtil {
+
+	public static JobParameters convertRawToJobParams(Map<String, Object> properties) {
+		return new JobParameters(convertRawToParamMap(properties));
+	}
+
+	public static Map<String, JobParameter> convertRawToParamMap(Map<String, Object> properties) {
+		return Optional.ofNullable(properties).orElse(emptyMap()).entrySet().stream()
+				.collect(toMap(Map.Entry::getKey, e -> createJobParameter(e.getValue())));
+	}
+
+	public static JobParameter createJobParameter(Object value) {
+		if (value instanceof Date)
+			return new JobParameter((Date) value);
+		else if (value instanceof Long)
+			return new JobParameter((Long) value);
+		else if (value instanceof Double)
+			return new JobParameter((Double) value);
+		else
+			return new JobParameter("" + value);
+	}
+}

util/src/main/java/com/github/chrisgleissner/springbatchrest/util/TriggerUtil.java

@@ -0,0 +1,32 @@
+package com.github.chrisgleissner.springbatchrest.util;
+
+import static org.quartz.TriggerBuilder.newTrigger;
+
+import java.util.Date;
+
+import org.quartz.CronScheduleBuilder;
+import org.quartz.Trigger;
+
+public class TriggerUtil {
+
+	// Defined for clarity - passing in null is not obvious to what is happening
+	// under the covers
+	public static final String QUARTZ_DEFAULT_GROUP = null;
+
+	public static Trigger triggerFor(String cronExpression, String jobName) {
+		return triggerFor(cronExpression, jobName, QUARTZ_DEFAULT_GROUP);
+	}
+
+	public static Trigger triggerFor(String cronExpression, String jobName, String groupName) {
+		CronScheduleBuilder builder = CronScheduleBuilder.cronSchedule(cronExpression);
+		return newTrigger().withIdentity(jobName, groupName).withSchedule(builder).forJob(jobName, groupName).build();
+	}
+
+	public static Trigger triggerFor(Date dateToRun, String jobName) {
+		return triggerFor(dateToRun, jobName, QUARTZ_DEFAULT_GROUP);
+	}
+
+	public static Trigger triggerFor(Date dateToRun, String jobName, String groupName) {
+		return newTrigger().withIdentity(jobName, groupName).startAt(dateToRun).forJob(jobName, groupName).build();
+	}
+}

util/src/main/java/com/github/chrisgleissner/springbatchrest/util/core/AdHocStarter.java

@@ -1,5 +1,6 @@
 package com.github.chrisgleissner.springbatchrest.util.core;
 
+import com.github.chrisgleissner.springbatchrest.util.JobParamUtil;
 import com.github.chrisgleissner.springbatchrest.util.core.JobConfig.JobConfigBuilder;
 import com.github.chrisgleissner.springbatchrest.util.core.property.JobPropertyResolvers;
 import lombok.extern.slf4j.Slf4j;
@@ -17,15 +18,11 @@
 import org.springframework.stereotype.Component;
 
 import javax.batch.operations.BatchRuntimeException;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 
 import static java.lang.String.format;
-import static java.util.Collections.emptyMap;
-import static java.util.stream.Collectors.toMap;
 
 @Slf4j
 @Component
@@ -70,7 +67,7 @@ public JobExecution start(Job job, Boolean async, Map<String, Object> properties
 		}
 		JobConfigBuilder builder = new JobConfigBuilder();
 		JobConfig jobConfig = builder
-				.asynchronous(true)
+				.asynchronous(async)
 				.properties(properties == null ? new HashMap<>() : properties)
 				.name(job.getName()).build();
 		JobBuilder.registerJob(jobRegistry, existingJob == null ? job : existingJob);
@@ -82,8 +79,7 @@ public JobExecution start(JobConfig jobConfig) {
             Job job = jobLocator.getJob(jobConfig.getName());
             jobPropertyResolvers.started(jobConfig);
 
-            Map<String, JobParameter> params = Optional.ofNullable(jobConfig.getProperties()).orElse(emptyMap()).entrySet().stream()
-                    .collect(toMap(Map.Entry::getKey, e -> createJobParameter(e.getValue())));
+            Map<String, JobParameter> params = JobParamUtil.convertRawToParamMap(jobConfig.getProperties());
             if (addUniqueJobParameter)
                 params.put("uuid", new JobParameter(UUID.randomUUID().toString()));
             JobParameters jobParameters = new JobParameters(params);
@@ -99,15 +95,4 @@ public JobExecution start(JobConfig jobConfig) {
                     jobConfig.getName(), jobConfig, e.getMessage()), e);
         }
     }
-
-    private JobParameter createJobParameter(Object value) {
-        if (value instanceof Date)
-            return new JobParameter((Date) value);
-        else if (value instanceof Long)
-            return new JobParameter((Long) value);
-        else if (value instanceof Double)
-            return new JobParameter((Double) value);
-        else
-            return new JobParameter("" + value);
-    }
 }

util/src/main/java/com/github/chrisgleissner/springbatchrest/util/core/JobParamsDetail.java

@@ -0,0 +1,47 @@
+package com.github.chrisgleissner.springbatchrest.util.core;
+
+import java.util.Map;
+
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.impl.JobDetailImpl;
+import org.quartz.utils.Key;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Extension class to add JobParameters to a JobDetail for scheduled execution
+ * with JobParameters.
+ * 
+ * @author theJeff77
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class JobParamsDetail extends JobDetailImpl {
+
+	private static final long serialVersionUID = -4813776846767160965L;
+	private Map<String, Object> rawJobParameters;
+
+	// Constructor to do a deep copy all data from JobDetail into this subclass.
+	// Based off of JobBuilder's construction code.
+	public JobParamsDetail(JobDetail jobDetail) {
+
+		this.setJobClass(jobDetail.getJobClass());
+		this.setDescription(jobDetail.getDescription());
+		if (jobDetail.getKey() == null)
+			this.setKey(new JobKey(Key.createUniqueName(null), null));
+		this.setKey(jobDetail.getKey());
+		this.setDurability(jobDetail.isDurable());
+		this.setRequestsRecovery(jobDetail.requestsRecovery());
+
+		if (!jobDetail.getJobDataMap().isEmpty())
+			this.setJobDataMap(jobDetail.getJobDataMap());
+	}
+
+	public JobParamsDetail(JobDetail jobDetail, Map<String, Object> rawJobParameters) {
+		this(jobDetail);
+		this.rawJobParameters = rawJobParameters;
+	}
+}