This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 1ff34d6 [KARAF-5486] Add reschedule command and add the scheduler job
name completer
1ff34d6 is described below
commit 1ff34d683832a368631ccc53a73d46949fce2299
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Thu Dec 14 14:38:36 2017 +0100
[KARAF-5486] Add reschedule command and add the scheduler job name completer
---
.../java/org/apache/karaf/scheduler/Scheduler.java | 9 +++
.../apache/karaf/scheduler/command/Reschedule.java | 84 ++++++++++++++++++++++
.../apache/karaf/scheduler/command/Unschedule.java | 3 +
.../JobNameCompleter.java} | 35 +++++----
.../karaf/scheduler/core/QuartzScheduler.java | 38 ++++++++--
5 files changed, 150 insertions(+), 19 deletions(-)
diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
b/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
index 975e2d4..647b48d 100644
--- a/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
+++ b/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
@@ -82,6 +82,15 @@ public interface Scheduler {
void schedule(Object job, ScheduleOptions options) throws
IllegalArgumentException, SchedulerError;
/**
+ * Update the scheduling of an existing job.
+ * @param jobName
+ * @param options
+ * @throws IllegalArgumentException
+ * @throws SchedulerError
+ */
+ void reschedule(String jobName, ScheduleOptions options) throws
IllegalArgumentException, SchedulerError;
+
+ /**
* Remove a scheduled job by name.
*
* @param jobName The name of the job.
diff --git
a/scheduler/src/main/java/org/apache/karaf/scheduler/command/Reschedule.java
b/scheduler/src/main/java/org/apache/karaf/scheduler/command/Reschedule.java
new file mode 100644
index 0000000..8cc790f
--- /dev/null
+++ b/scheduler/src/main/java/org/apache/karaf/scheduler/command/Reschedule.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.scheduler.command;
+
+import org.apache.karaf.scheduler.ScheduleOptions;
+import org.apache.karaf.scheduler.Scheduler;
+import org.apache.karaf.scheduler.command.completers.JobNameCompleter;
+import org.apache.karaf.shell.api.action.*;
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+
+import javax.xml.bind.DatatypeConverter;
+import java.util.Date;
+
+@Command(scope = "scheduler", name = "reschedule", description = "Update
scheduling of an existing job")
+@Service
+public class Reschedule implements Action {
+
+ @Argument(name = "name", required = true, description = "The job name")
+ @Completion(JobNameCompleter.class)
+ String name;
+
+ @Option(name = "--concurrent", description = "Should jobs run concurrently
or not (defaults to false)")
+ boolean concurrent;
+
+ @Option(name = "--cron", description = "The cron expression")
+ String cron;
+
+ @Option(name = "--at", description = "Absolute date in ISO format (ex:
2014-05-13T13:56:45)")
+ String at;
+
+ @Option(name = "--times", description = "Number of times this job should
be executed")
+ int times = -1;
+
+ @Option(name = "--period", description = "Time during executions (in
seconds)")
+ long period;
+
+ @Reference
+ Scheduler scheduler;
+
+ @Override
+ public Object execute() throws Exception {
+ if (cron != null && (at != null || times != -1 || period != 0)) {
+ throw new IllegalArgumentException("Both cron expression and
explicit execution time can not be specified");
+ }
+ ScheduleOptions options;
+ if (cron != null) {
+ options = scheduler.EXPR(cron);
+ } else {
+ Date date;
+ if (at != null) {
+ date = DatatypeConverter.parseDateTime(at).getTime();
+ } else {
+ date = new Date();
+ }
+ if (period > 0) {
+ options = scheduler.AT(date, times, period);
+ } else {
+ options = scheduler.AT(date);
+ }
+ }
+ options.name(name);
+ if (concurrent) {
+ options.canRunConcurrently(concurrent);
+ }
+ scheduler.reschedule(name, options);
+ return null;
+ }
+
+}
diff --git
a/scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
b/scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
index 3395af7..27018bd 100644
--- a/scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
+++ b/scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
@@ -17,9 +17,11 @@
package org.apache.karaf.scheduler.command;
import org.apache.karaf.scheduler.Scheduler;
+import org.apache.karaf.scheduler.command.completers.JobNameCompleter;
import org.apache.karaf.shell.api.action.Action;
import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Completion;
import org.apache.karaf.shell.api.action.lifecycle.Reference;
import org.apache.karaf.shell.api.action.lifecycle.Service;
@@ -28,6 +30,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Service;
public class Unschedule implements Action {
@Argument(name = "name")
+ @Completion(JobNameCompleter.class)
String name;
@Reference
diff --git
a/scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
b/scheduler/src/main/java/org/apache/karaf/scheduler/command/completers/JobNameCompleter.java
similarity index 51%
copy from
scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
copy to
scheduler/src/main/java/org/apache/karaf/scheduler/command/completers/JobNameCompleter.java
index 3395af7..ca44ee8 100644
--- a/scheduler/src/main/java/org/apache/karaf/scheduler/command/Unschedule.java
+++
b/scheduler/src/main/java/org/apache/karaf/scheduler/command/completers/JobNameCompleter.java
@@ -14,28 +14,39 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.scheduler.command;
+package org.apache.karaf.scheduler.command.completers;
+import org.apache.karaf.scheduler.ScheduleOptions;
import org.apache.karaf.scheduler.Scheduler;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.lifecycle.Reference;
import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.console.CommandLine;
+import org.apache.karaf.shell.api.console.Completer;
+import org.apache.karaf.shell.api.console.Session;
+import org.apache.karaf.shell.support.completers.StringsCompleter;
-@Command(scope = "scheduler", name = "unschedule", description = "Unschedule a
job")
-@Service
-public class Unschedule implements Action {
+import java.util.List;
+import java.util.Map;
- @Argument(name = "name")
- String name;
+@Service
+public class JobNameCompleter implements Completer {
@Reference
Scheduler scheduler;
@Override
- public Object execute() throws Exception {
- scheduler.unschedule(name);
- return null;
+ public int complete(Session session, CommandLine commandLine, List<String>
candidates) {
+ StringsCompleter delegate = new StringsCompleter();
+ try {
+ Map<Object, ScheduleOptions> jobs = scheduler.getJobs();
+ for (Map.Entry<Object, ScheduleOptions> job : jobs.entrySet()) {
+ String name = job.getValue().name();
+ delegate.getStrings().add(name);
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+ return delegate.complete(session, commandLine, candidates);
}
+
}
diff --git
a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java
b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java
index 8641a5d..275ef04 100644
---
a/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java
+++
b/scheduler/src/main/java/org/apache/karaf/scheduler/core/QuartzScheduler.java
@@ -26,12 +26,7 @@ import org.apache.karaf.scheduler.Job;
import org.apache.karaf.scheduler.ScheduleOptions;
import org.apache.karaf.scheduler.Scheduler;
import org.apache.karaf.scheduler.SchedulerError;
-import org.quartz.JobBuilder;
-import org.quartz.JobDataMap;
-import org.quartz.JobDetail;
-import org.quartz.JobKey;
-import org.quartz.SchedulerException;
-import org.quartz.Trigger;
+import org.quartz.*;
import org.quartz.impl.DirectSchedulerFactory;
import org.quartz.impl.matchers.GroupMatcher;
import org.quartz.simpl.RAMJobStore;
@@ -259,12 +254,41 @@ public class QuartzScheduler implements Scheduler {
}
}
+ @Override
+ public void reschedule(String name, ScheduleOptions options) throws
SchedulerError {
+ final org.quartz.Scheduler s = this.scheduler;
+ if (name == null) {
+ throw new IllegalArgumentException("Job name is mandatory");
+ }
+ JobKey key = JobKey.jobKey(name);
+ if (key == null) {
+ throw new IllegalStateException("No job found with name " + name);
+ }
+ try {
+ JobDetail detail = s.getJobDetail(key);
+
+ Object job = detail.getJobDataMap().get(DATA_MAP_OBJECT);
+
+ s.deleteJob(key);
+
+ final InternalScheduleOptions opts =
(InternalScheduleOptions)options;
+ Trigger trigger = opts.trigger.withIdentity(name).build();
+ JobDataMap jobDataMap = this.initDataMap(name, job, opts);
+ detail = createJobDetail(name, jobDataMap,
opts.canRunConcurrently);
+
+ logger.debug("Update job scheduling {} with name {} and trigger
{}", job, name, trigger);
+ s.scheduleJob(detail, trigger);
+ } catch (SchedulerException e) {
+ throw new SchedulerError(e);
+ }
+ }
+
/**
* @see org.apache.karaf.scheduler.Scheduler#unschedule(java.lang.String)
*/
public boolean unschedule(final String jobName) {
final org.quartz.Scheduler s = this.scheduler;
- if ( jobName != null && s != null ) {
+ if (jobName != null && s != null) {
try {
final JobKey key = JobKey.jobKey(jobName);
final JobDetail jobdetail = s.getJobDetail(key);
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
