Making SpringLockableTaskSchedulerFactoryBean public to enable XML configuration

lukas-krecan · lukas-krecan · commit e7ed0aa9edc1 · 2017-06-23T07:16:04.000+02:00
diff --git a/shedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactory.java b/shedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactory.java
@@ -28,7 +28,7 @@
 
 /**
  * Helper class to simplify configuration of Spring LockableTaskScheduler.
- * @deprecated Use {@link ScheduledLockConfigurationBuilder} instead.
+ * @deprecated Use {@link ScheduledLockConfigurationBuilder} instead. Objects created through this class will not support string annotation param resolution.
  */
 @Deprecated
 public class SpringLockableTaskSchedulerFactory {
diff --git a/shedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactoryBean.java b/shedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactoryBean.java
@@ -22,13 +22,14 @@
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.util.StringValueResolver;
 
+import java.time.Duration;
 import java.time.temporal.TemporalAmount;
 
 /**
  * Helper class to simplify configuration of Spring LockableTaskScheduler. embeddedValueResolver is injected by Spring automatically.
  * That's why this class implements FactoryBean.
  */
-class SpringLockableTaskSchedulerFactoryBean implements FactoryBean<LockableTaskScheduler>, EmbeddedValueResolverAware, ScheduledLockConfiguration {
+public class SpringLockableTaskSchedulerFactoryBean implements FactoryBean<LockableTaskScheduler>, EmbeddedValueResolverAware, ScheduledLockConfiguration {
     private final TaskScheduler taskScheduler;
 
     private final LockProvider lockProvider;
@@ -39,7 +40,11 @@ class SpringLockableTaskSchedulerFactoryBean implements FactoryBean<LockableTask
 
     private StringValueResolver embeddedValueResolver;
 
-    SpringLockableTaskSchedulerFactoryBean(TaskScheduler taskScheduler, LockProvider lockProvider, TemporalAmount defaultLockAtMostFor, TemporalAmount defaultLockAtLeastFor) {
+    public SpringLockableTaskSchedulerFactoryBean(TaskScheduler taskScheduler, LockProvider lockProvider, TemporalAmount defaultLockAtMostFor) {
+        this(taskScheduler, lockProvider, defaultLockAtMostFor, Duration.ZERO);
+    }
+
+    public SpringLockableTaskSchedulerFactoryBean(TaskScheduler taskScheduler, LockProvider lockProvider, TemporalAmount defaultLockAtMostFor, TemporalAmount defaultLockAtLeastFor) {
         this.taskScheduler = taskScheduler;
         this.lockProvider = lockProvider;
         this.defaultLockAtMostFor = defaultLockAtMostFor;
diff --git a/shedlock-spring/src/test/resources/applicationContext.xml b/shedlock-spring/src/test/resources/applicationContext.xml
@@ -8,12 +8,16 @@
         <constructor-arg value="net.javacrumbs.shedlock.core.LockProvider"/>
     </bean>
 
-    <bean id="scheduler" class="net.javacrumbs.shedlock.spring.SpringLockableTaskSchedulerFactory"
-          factory-method="newLockableTaskScheduler">
+    <bean id="scheduler" class="net.javacrumbs.shedlock.spring.SpringLockableTaskSchedulerFactoryBean">
         <constructor-arg>
             <task:scheduler id="sch" pool-size="10"/>
         </constructor-arg>
         <constructor-arg ref="lockProvider"/>
+        <constructor-arg name="defaultLockAtMostFor">
+            <bean class="java.time.Duration" factory-method="ofMinutes">
+                <constructor-arg value="10"/>
+            </bean>
+        </constructor-arg>
     </bean>
 
 
