From 66a0191ffab01cd5b2c5320756bdbfc94c85314c Mon Sep 17 00:00:00 2001
From: Martin Kouba <mkouba@redhat.com>
Date: Tue, 4 May 2021 08:41:42 +0200
Subject: [PATCH] Quartz - remove the deprecated StoreType.DB

---
 .../io/quarkus/quartz/test/MissingDataSourceTest.java |  2 +-
 .../quarkus/quartz/runtime/QuartzBuildTimeConfig.java |  5 +++--
 .../java/io/quarkus/quartz/runtime/StoreType.java     | 11 +----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java
index 04a1694bdfbc9..167b89b2e1b96 100644
--- a/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java
+++ b/extensions/quartz/deployment/src/test/java/io/quarkus/quartz/test/MissingDataSourceTest.java
@@ -17,7 +17,7 @@ public class MissingDataSourceTest {
             .setExpectedException(ConfigurationError.class)
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClasses(SimpleJobs.class)
-                    .addAsResource(new StringAsset("quarkus.quartz.store-type=db"), "application.properties"));
+                    .addAsResource(new StringAsset("quarkus.quartz.store-type=jdbc-cmt"), "application.properties"));
 
     @Test
     public void shouldFailAndNotReachHere() {
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java
index a1f90ee2ac095..cda45a3e3496a 100644
--- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzBuildTimeConfig.java
@@ -28,8 +28,9 @@ public class QuartzBuildTimeConfig {
     /**
      * The type of store to use.
      * <p>
-     * When using the `db` store type configuration value make sure that you have the datasource configured.
-     * See <a href="https://quarkus.io/guides/datasource"> Configuring your datasource</a> for more information.
+     * When using {@link StoreType#JDBC_CMT} or {@link StoreType#JDBC_TX} configuration values make sure that you have the
+     * datasource configured. See <a href="https://quarkus.io/guides/datasource"> Configuring your datasource</a> for more
+     * information.
      * <p>
      * To create Quartz tables, you can perform a schema migration via the <a href="https://quarkus.io/guides/flyway"> Flyway
      * extension</a> using a SQL script matching your database picked from <a href=
diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/StoreType.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/StoreType.java
index acec0259a9b6e..57e10a02fe6e5 100644
--- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/StoreType.java
+++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/StoreType.java
@@ -3,16 +3,7 @@
 public enum StoreType {
     RAM("org.quartz.simpl.RAMJobStore", "RAMJobStore"),
     JDBC_TX("org.quartz.impl.jdbcjobstore.JobStoreTX", "JobStoreTX"),
-    JDBC_CMT("org.quartz.impl.jdbcjobstore.JobStoreCMT", "JobStoreCMT"),
-
-    /**
-     * @deprecated This is retained for retained for compatibility reasons
-     *             and will be removed post Quarkus 1.6. Use {@link StoreType#JDBC_CMT}
-     *             or Use {@link StoreType#JDBC_TX} instead depending on the
-     *             transaction behaviour you need.
-     */
-    @Deprecated
-    DB("org.quartz.impl.jdbcjobstore.JobStoreCMT", "JobStoreCMT");
+    JDBC_CMT("org.quartz.impl.jdbcjobstore.JobStoreCMT", "JobStoreCMT");
 
     public String clazz;
     public String simpleName;