introduce job/key trigger/key

Author: d-t-w

cronut-javax/src/cronut.clj

@@ -1,8 +1,9 @@
 (ns cronut
   (:refer-clojure :exclude [proxy])
   (:require [clojure.tools.logging :as log]
-            [cronut.job :as job])
-  (:import (org.quartz JobDetail JobKey Scheduler Trigger TriggerBuilder TriggerKey)
+            [cronut.job :as job]
+            [cronut.trigger :as trigger])
+  (:import (org.quartz JobDetail JobKey Scheduler Trigger TriggerBuilder)
            (org.quartz.impl StdSchedulerFactory)))
 
 (defn scheduler
@@ -57,37 +58,37 @@
 
 (defn pause-job
   ([^Scheduler scheduler name group]
-   (.pauseJob scheduler (JobKey. name group)))
+   (.pauseJob scheduler (job/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.pauseJob scheduler (.getJobKey trigger))))
 
 (defn resume-job
   ([^Scheduler scheduler name group]
-   (.resumeJob scheduler (JobKey. name group)))
+   (.resumeJob scheduler (job/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.resumeJob scheduler (.getJobKey trigger))))
 
 (defn unschedule-job
   ([^Scheduler scheduler name group]
-   (.unscheduleJob scheduler (TriggerKey. name group)))
+   (.unscheduleJob scheduler (trigger/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.unscheduleJob scheduler (.getKey trigger))))
 
 (defn delete-job
   ([^Scheduler scheduler name group]
-   (.deleteJob scheduler (JobKey. name group)))
+   (.deleteJob scheduler (job/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.deleteJob scheduler (.getJobKey trigger))))
 
 (defn pause-trigger
   ([^Scheduler scheduler name group]
-   (.pauseTrigger scheduler (TriggerKey. name group)))
+   (.pauseTrigger scheduler (trigger/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.pauseTrigger scheduler (.getKey trigger))))
 
 (defn resume-trigger
   ([^Scheduler scheduler name group]
-   (.resumeTrigger scheduler (TriggerKey. name group)))
+   (.resumeTrigger scheduler (trigger/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.resumeTrigger scheduler (.getKey trigger))))
 

cronut-javax/src/cronut/job.clj

@@ -1,5 +1,6 @@
 (ns cronut.job
-  (:import (org.quartz DisallowConcurrentExecution Job JobBuilder JobDataMap JobExecutionException)
+  (:refer-clojure :exclude [key])
+  (:import (org.quartz DisallowConcurrentExecution Job JobBuilder JobDataMap JobExecutionException JobKey)
            (org.quartz.spi JobFactory TriggerFiredBundle)))
 
 (defrecord ^{DisallowConcurrentExecution true} SerialProxyJob [proxied-job]
@@ -45,3 +46,9 @@
               description (.withDescription description)
               (boolean? recover?) (.requestRecovery recover?)
               (boolean? durable?) (.storeDurably durable?)))))
+
+(defn key
+  ([name]
+   (key name nil))
+  ([name group]
+   (JobKey. name group)))

cronut-javax/src/cronut/trigger.clj

@@ -1,6 +1,7 @@
 (ns cronut.trigger
+  (:refer-clojure :exclude [proxy])
   (:import (java.util TimeZone)
-           (org.quartz CronScheduleBuilder SimpleScheduleBuilder TriggerBuilder)))
+           (org.quartz CronScheduleBuilder SimpleScheduleBuilder TriggerBuilder TriggerKey)))
 
 (defn base-builder
   "Provide a base trigger-builder from configuration"
@@ -71,4 +72,10 @@
   "Trigger on a schedule defined by the cron expression"
   [cron]
   (builder {:type :cron
-            :cron cron}))
+            :cron cron}))
+
+(defn key
+  ([name]
+   (key name nil))
+  ([name group]
+   (TriggerKey. name group)))

cronut/src/cronut.clj

@@ -1,8 +1,9 @@
 (ns cronut
   (:refer-clojure :exclude [proxy])
   (:require [clojure.tools.logging :as log]
-            [cronut.job :as job])
-  (:import (org.quartz JobDetail JobKey Scheduler Trigger TriggerBuilder TriggerKey)
+            [cronut.job :as job]
+            [cronut.trigger :as trigger])
+  (:import (org.quartz JobDetail JobKey Scheduler Trigger TriggerBuilder)
            (org.quartz.impl StdSchedulerFactory)))
 
 (defn scheduler
@@ -57,37 +58,37 @@
 
 (defn pause-job
   ([^Scheduler scheduler name group]
-   (.pauseJob scheduler (JobKey. name group)))
+   (.pauseJob scheduler (job/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.pauseJob scheduler (.getJobKey trigger))))
 
 (defn resume-job
   ([^Scheduler scheduler name group]
-   (.resumeJob scheduler (JobKey. name group)))
+   (.resumeJob scheduler (job/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.resumeJob scheduler (.getJobKey trigger))))
 
 (defn unschedule-job
   ([^Scheduler scheduler name group]
-   (.unscheduleJob scheduler (TriggerKey. name group)))
+   (.unscheduleJob scheduler (trigger/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.unscheduleJob scheduler (.getKey trigger))))
 
 (defn delete-job
   ([^Scheduler scheduler name group]
-   (.deleteJob scheduler (JobKey. name group)))
+   (.deleteJob scheduler (job/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.deleteJob scheduler (.getJobKey trigger))))
 
 (defn pause-trigger
   ([^Scheduler scheduler name group]
-   (.pauseTrigger scheduler (TriggerKey. name group)))
+   (.pauseTrigger scheduler (trigger/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.pauseTrigger scheduler (.getKey trigger))))
 
 (defn resume-trigger
   ([^Scheduler scheduler name group]
-   (.resumeTrigger scheduler (TriggerKey. name group)))
+   (.resumeTrigger scheduler (trigger/key name group)))
   ([^Scheduler scheduler ^Trigger trigger]
    (.resumeTrigger scheduler (.getKey trigger))))
 

cronut/src/cronut/job.clj

@@ -1,5 +1,6 @@
 (ns cronut.job
-  (:import (org.quartz DisallowConcurrentExecution Job JobBuilder JobDataMap JobExecutionException)
+  (:refer-clojure :exclude [key])
+  (:import (org.quartz DisallowConcurrentExecution Job JobBuilder JobDataMap JobExecutionException JobKey)
            (org.quartz.spi JobFactory TriggerFiredBundle)))
 
 (defrecord ^{DisallowConcurrentExecution true} SerialProxyJob [proxied-job]
@@ -45,3 +46,9 @@
               description (.withDescription description)
               (boolean? recover?) (.requestRecovery recover?)
               (boolean? durable?) (.storeDurably durable?)))))
+
+(defn key
+  ([name]
+   (key name nil))
+  ([name group]
+   (JobKey. name group)))

cronut/src/cronut/trigger.clj

@@ -1,6 +1,7 @@
 (ns cronut.trigger
+  (:refer-clojure :exclude [proxy])
   (:import (java.util TimeZone)
-           (org.quartz CronScheduleBuilder SimpleScheduleBuilder TriggerBuilder)))
+           (org.quartz CronScheduleBuilder SimpleScheduleBuilder TriggerBuilder TriggerKey)))
 
 (defn base-builder
   "Provide a base trigger-builder from configuration"
@@ -71,4 +72,10 @@
   "Trigger on a schedule defined by the cron expression"
   [cron]
   (builder {:type :cron
-            :cron cron}))
+            :cron cron}))
+
+(defn key
+  ([name]
+   (key name nil))
+  ([name group]
+   (TriggerKey. name group)))