Merge remote-tracking branch 'origin/master'

robeio · Jan 5, 2016 · 7191c66 · 7191c66
2 parents b5d45ae + 3465431
commit 7191c66
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -305,7 +305,7 @@
     </dependencies>
 
 
-    <profiles>
+  <profiles>
         <profile>
             <id>release-sign-artifacts</id>
             <activation>
@@ -433,7 +433,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
                 <version>1.5</version>

diff --git a/robe-quartz/src/main/java/io/robe/quartz/ManagedQuartz.java b/robe-quartz/src/main/java/io/robe/quartz/ManagedQuartz.java
@@ -6,6 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashSet;
 import java.util.Set;
 
 
@@ -14,6 +15,11 @@ public class ManagedQuartz implements Managed {
     private Set<JobDetail> onStartJobs;
     private Set<JobDetail> onStopJobs;
 
+    public ManagedQuartz() {
+        this.onStartJobs = new HashSet<>();
+        this.onStopJobs = new HashSet<>();
+    }
+
     public ManagedQuartz(Set<JobDetail> onStartJobs, Set<JobDetail> onStopJobs) {
         this.onStartJobs = onStartJobs;
         this.onStopJobs = onStopJobs;
@@ -38,22 +44,22 @@ public void stop() throws SchedulerException {
 
     private void scheduleAllJobsOnApplicationStop() throws SchedulerException {
         for (JobDetail detail : onStopJobs) {
-            if(!JobManager.getInstance().checkExists(detail.getKey()))
+            if (!JobManager.getInstance().checkExists(detail.getKey()))
                 JobManager.getInstance().scheduleJob(detail, executeNowTrigger());
             else
-                JobManager.getInstance().scheduleJob(detail,addNowTrigger(detail.getKey()),true);
+                JobManager.getInstance().scheduleJob(detail, addNowTrigger(detail.getKey()), true);
 
         }
     }
 
 
     private void scheduleAllJobsOnApplicationStart() throws SchedulerException {
         LOGGER.info("Jobs to run on application start: " + onStartJobs);
-        for (JobDetail detail  : onStartJobs) {
-            if(!JobManager.getInstance().checkExists(detail.getKey()))
+        for (JobDetail detail : onStartJobs) {
+            if (!JobManager.getInstance().checkExists(detail.getKey()))
                 JobManager.getInstance().scheduleJob(detail, executeNowTrigger());
             else
-                JobManager.getInstance().scheduleJob(detail, addNowTrigger(detail.getKey()),true);
+                JobManager.getInstance().scheduleJob(detail, addNowTrigger(detail.getKey()), true);
         }
     }
 
@@ -64,7 +70,7 @@ private Trigger executeNowTrigger() {
     private Set<Trigger> addNowTrigger(JobKey key) throws SchedulerException {
         Set<Trigger> triggers = Sets.newHashSet(JobManager.getInstance().getTriggersOfJob(key.getName(), key.getGroup()));
         triggers.add(executeNowTrigger());
-        return  triggers;
+        return triggers;
 
     }