Merge pull request #10 from chrisgleissner/feature/decoupled-core-and-quartz

Support for JobConfig properties with non-String types. No-arg and al…

Author: chrisgleissner

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

@@ -14,6 +14,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.batch.operations.BatchRuntimeException;
+import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -55,7 +56,7 @@ public JobExecution start(JobConfig jobConfig) {
             jobPropertyResolvers.started(jobConfig);
 
             Map<String, JobParameter> params = Optional.ofNullable(jobConfig.getProperties()).orElse(emptyMap()).entrySet().stream()
-                    .collect(toMap(e -> e.getKey(), e -> new JobParameter(e.getValue())));
+                    .collect(toMap(Map.Entry::getKey, e -> createJobParameter(e.getValue())));
             if (addUniqueJobParameter)
                 params.put("uuid", new JobParameter(UUID.randomUUID().toString()));
             JobParameters jobParameters = new JobParameters(params);
@@ -71,4 +72,15 @@ 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/JobConfig.java

@@ -1,18 +1,14 @@
 package com.github.chrisgleissner.springbatchrest.util.core;
 
-import lombok.Builder;
-import lombok.Data;
-import lombok.Singular;
+import lombok.*;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@Data
-@Builder(toBuilder = true)
+@Data @NoArgsConstructor @AllArgsConstructor @Builder(toBuilder = true)
 public class JobConfig {
-
     private String name;
     @Singular("property")
-    private Map<String, String> properties = new HashMap<>();
+    private Map<String, Object> properties = new HashMap<>();
     private boolean asynchronous;
 }