From 8c30b66d39d2b73a5b15e95b306ddbced003aa91 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 27 Aug 2023 20:31:03 +1200
Subject: [PATCH] Add forRemoval = true on existing @Deprecated

---
 ebean-api/src/main/java/io/ebean/ExpressionList.java        | 4 ++--
 ebean-api/src/main/java/io/ebean/Query.java                 | 6 +++---
 ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 59d24512c..9db4faecf 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -56,7 +56,7 @@ public interface ExpressionList<T> {
   /**
    * Deprecated migrate to {@link #orderBy(String)}
    */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
   default ExpressionList<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -74,7 +74,7 @@ public interface ExpressionList<T> {
   /**
    * Deprecated migrate to orderBy().
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   default OrderBy<T> order() {
     return orderBy();
   }
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index c595b2749..f6d7bda47 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -1398,7 +1398,7 @@ public interface Query<T> extends CancelableQuery {
   /**
    * Deprecated migrate to orderBy().
    */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> order(String orderByClause) {
     return orderBy(orderByClause);
   }
@@ -1417,7 +1417,7 @@ public interface Query<T> extends CancelableQuery {
   /**
    * Deprecated migrate to orderBy().
    */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
   default OrderBy<T> order() {
     return orderBy();
   }
@@ -1430,7 +1430,7 @@ public interface Query<T> extends CancelableQuery {
   /**
    * Deprecated migrate to setOrderBy().
    */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
   default Query<T> setOrder(OrderBy<T> orderBy) {
     return setOrderBy(orderBy);
   }
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 8abaf3d13..de7d20ba5 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -2376,7 +2376,7 @@ public class DatabaseConfig {
    * Sorry if returning Set rather than List breaks code but it feels safer to
    * do that than a subtle change to return a shallow copy which you will not detect.
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public Set<Class<?>> getClasses() {
     return classes;
   }
@@ -3389,7 +3389,7 @@ public class DatabaseConfig {
   /**
    * Deprecated - migrate to isLoadModuleInfo().
    */
-  @Deprecated
+  @Deprecated(forRemoval = true)
   public boolean isAutoLoadModuleInfo() {
     return loadModuleInfo;
   }