Support Quartz trigger without JobDetail
This commit allows to create a Quartz trigger implementation via either `CronTriggerFactoryBean` or `SimpleTriggerFactoryBean` even if no job detail is provided. Issue: SPR-13604
This commit is contained in:
parent
0d04af14f8
commit
29700658d4
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2014 the original author or authors.
|
* Copyright 2002-2016 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -237,7 +237,9 @@ public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNam
|
||||||
CronTriggerImpl cti = new CronTriggerImpl();
|
CronTriggerImpl cti = new CronTriggerImpl();
|
||||||
cti.setName(this.name);
|
cti.setName(this.name);
|
||||||
cti.setGroup(this.group);
|
cti.setGroup(this.group);
|
||||||
|
if (this.jobDetail != null) {
|
||||||
cti.setJobKey(this.jobDetail.getKey());
|
cti.setJobKey(this.jobDetail.getKey());
|
||||||
|
}
|
||||||
cti.setJobDataMap(this.jobDataMap);
|
cti.setJobDataMap(this.jobDataMap);
|
||||||
cti.setStartTime(this.startTime);
|
cti.setStartTime(this.startTime);
|
||||||
cti.setCronExpression(this.cronExpression);
|
cti.setCronExpression(this.cronExpression);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2014 the original author or authors.
|
* Copyright 2002-2016 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -228,7 +228,9 @@ public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, Bea
|
||||||
SimpleTriggerImpl sti = new SimpleTriggerImpl();
|
SimpleTriggerImpl sti = new SimpleTriggerImpl();
|
||||||
sti.setName(this.name);
|
sti.setName(this.name);
|
||||||
sti.setGroup(this.group);
|
sti.setGroup(this.group);
|
||||||
|
if (this.jobDetail != null) {
|
||||||
sti.setJobKey(this.jobDetail.getKey());
|
sti.setJobKey(this.jobDetail.getKey());
|
||||||
|
}
|
||||||
sti.setJobDataMap(this.jobDataMap);
|
sti.setJobDataMap(this.jobDataMap);
|
||||||
sti.setStartTime(this.startTime);
|
sti.setStartTime(this.startTime);
|
||||||
sti.setRepeatInterval(this.repeatInterval);
|
sti.setRepeatInterval(this.repeatInterval);
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2002-2016 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed 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.springframework.scheduling.quartz;
|
||||||
|
|
||||||
|
import java.text.ParseException;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.quartz.CronTrigger;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Stephane Nicoll
|
||||||
|
*/
|
||||||
|
public class CronTriggerFactoryBeanTests {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void createWithoutJobDetail() throws ParseException {
|
||||||
|
CronTriggerFactoryBean factory = new CronTriggerFactoryBean();
|
||||||
|
factory.setName("myTrigger");
|
||||||
|
factory.setCronExpression("0 15 10 ? * *");
|
||||||
|
factory.afterPropertiesSet();
|
||||||
|
CronTrigger trigger = factory.getObject();
|
||||||
|
assertEquals("0 15 10 ? * *", trigger.getCronExpression());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2002-2016 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed 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.springframework.scheduling.quartz;
|
||||||
|
|
||||||
|
import java.text.ParseException;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.quartz.SimpleTrigger;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Stephane Nicoll
|
||||||
|
*/
|
||||||
|
public class SimpleTriggerFactoryBeanTests {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void createWithoutJobDetail() throws ParseException {
|
||||||
|
SimpleTriggerFactoryBean factory = new SimpleTriggerFactoryBean();
|
||||||
|
factory.setName("myTrigger");
|
||||||
|
factory.setRepeatCount(5);
|
||||||
|
factory.setRepeatInterval(1000L);
|
||||||
|
factory.afterPropertiesSet();
|
||||||
|
SimpleTrigger trigger = factory.getObject();
|
||||||
|
assertEquals(5, trigger.getRepeatCount());
|
||||||
|
assertEquals(1000L, trigger.getRepeatInterval());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue