Merge pull request #16711 from mkouba/quartz-remove-deprecated-config

Quartz - remove the deprecated quarkus.quartz.force-start property
quarkusio · Apr 22, 2021 · eb46690 · eb46690
2 parents 56fbbdb + d672f91
commit eb46690
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 96 deletions.
diff --git a/...t/src/test/java/io/quarkus/quartz/test/InjectDeprecatedForceStartQuartzSchedulerTest.java b/...t/src/test/java/io/quarkus/quartz/test/InjectDeprecatedForceStartQuartzSchedulerTest.java
diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/InjectJobTest.java
@@ -37,7 +37,7 @@ public class InjectJobTest {
     static final QuarkusUnitTest test = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(Starter.class, Service.class, CountDownLatchProducer.class)
-                    .addAsResource(new StringAsset("quarkus.quartz.force-start=true"),
+                    .addAsResource(new StringAsset("quarkus.quartz.start-mode=forced"),
                             "application.properties"));
 
     @Test

diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzRuntimeConfig.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzRuntimeConfig.java
@@ -1,7 +1,5 @@
 package io.quarkus.quartz.runtime;
 
-import java.util.Optional;
-
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -27,17 +25,6 @@ public class QuartzRuntimeConfig {
     @ConfigItem(defaultValue = "5")
     public int threadPriority;
 
-    /**
-     * By default, the scheduler is not started unless a {@link io.quarkus.scheduler.Scheduled} business method is found.
-     * If set to true the scheduler will be started even if no scheduled business methods are found. This is necessary for
-     * "pure" programmatic scheduling.
-     *
-     * @deprecated use quarkus.quartz.start-mode=forced instead.
-     */
-    @Deprecated
-    @ConfigItem
-    public Optional<Boolean> forceStart;
-
     /**
      * Scheduler can be started in different modes: normal, forced or halted.
      * By default, the scheduler is not started unless a {@link io.quarkus.scheduler.Scheduled} business method

diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java
@@ -72,15 +72,14 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Sc
             Event<SkippedExecution> skippedExecutionEvent, Instance<Job> jobs, Instance<UserTransaction> userTransaction) {
         enabled = schedulerRuntimeConfig.enabled;
         final QuartzRuntimeConfig runtimeConfig = quartzSupport.getRuntimeConfig();
-        warnDeprecated(runtimeConfig);
 
         boolean forceStart;
         if (runtimeConfig.startMode != QuartzStartMode.NORMAL) {
             startHalted = (runtimeConfig.startMode == QuartzStartMode.HALTED);
             forceStart = startHalted || (runtimeConfig.startMode == QuartzStartMode.FORCED);
         } else {
             startHalted = false;
-            forceStart = runtimeConfig.forceStart.orElse(false);
+            forceStart = false;
         }
 
         if (!enabled) {
@@ -206,18 +205,6 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Sc
         }
     }
 
-    /**
-     * Warn if there's any deprecated configuration
-     *
-     * @param runtimeConfig {@link QuartzRuntimeConfig} quartz scheduler configurations
-     */
-    private static void warnDeprecated(QuartzRuntimeConfig runtimeConfig) {
-        if (runtimeConfig.forceStart.isPresent()) {
-            LOGGER.warn("`quarkus.quartz.force-start` is deprecated and will be removed in a future version - it is "
-                    + "recommended to switch to `quarkus.quartz.start-mode`");
-        }
-    }
-
     @Produces
     @Singleton
     org.quartz.Scheduler produceQuartzScheduler() {