From 430926c5a9116157810b34664dfe3876423f6c92 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Jun 2023 20:44:31 +1200
Subject: [PATCH] Remove deprecated Query setLoadBeanCache() - migrate to
 setBeanCacheMode()

Typically migrate to `.setBeanCacheMode(CacheMode.PUT)` or `.setBeanCacheMode(CacheMode.OFF)`

```java

  /**
   * Deprecated - migrate to use setBeanCacheMode(CacheMode.PUT) or other CacheMode.
   * <p>
   * When set to true all the beans from this query are loaded into the bean cache.
   */
  @Deprecated
  Query<T> setLoadBeanCache(boolean loadBeanCache);

```
---
 ebean-api/src/main/java/io/ebean/Query.java           |  8 --------
 .../server/query/DefaultFetchGroupQuery.java          |  5 -----
 .../server/querydefn/DefaultOrmQuery.java             |  6 ------
 .../src/main/java/io/ebean/typequery/TQRootBean.java  | 11 -----------
 .../test/java/org/tests/basic/TestLoadBeanCache.java  |  5 +++--
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index ad7a955ee..195c8948e 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -1579,14 +1579,6 @@ public interface Query<T> extends CancelableQuery {
    */
   Query<T> setReadOnly(boolean readOnly);
 
-  /**
-   * Deprecated - migrate to use setBeanCacheMode(CacheMode.PUT) or other CacheMode.
-   * <p>
-   * When set to true all the beans from this query are loaded into the bean cache.
-   */
-  @Deprecated
-  Query<T> setLoadBeanCache(boolean loadBeanCache);
-
   /**
    * Set a timeout on this query.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index b4ce3a696..5775fb693 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -500,11 +500,6 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public Query<T> setLoadBeanCache(boolean loadBeanCache) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public Query<T> setTimeout(int secs) {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index e5e6b8e5a..1b5dbff22 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1276,12 +1276,6 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return this;
   }
 
-  @Override
-  public final Query<T> setLoadBeanCache(boolean loadBeanCache) {
-    this.useBeanCache = loadBeanCache ? CacheMode.PUT : CacheMode.OFF;
-    return this;
-  }
-
   @Override
   public final Query<T> setTimeout(int secs) {
     this.timeout = secs;
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 847ff86b0..be8a42c7a 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -913,17 +913,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated migrate to setBeanCacheMode() or setUseCache().
-   * <p>
-   * When set to true all the beans from this query are loaded into the bean cache.
-   */
-  @Deprecated
-  public R setLoadBeanCache(boolean loadBeanCache) {
-    query.setLoadBeanCache(loadBeanCache);
-    return root;
-  }
-
   /**
    * Set the property to use as keys for a map.
    * <p>
diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java
index 3448e1c2c..2dea13ede 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java
@@ -1,5 +1,6 @@
 package org.tests.basic;
 
+import io.ebean.CacheMode;
 import io.ebean.Query;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
@@ -20,7 +21,7 @@ class TestLoadBeanCache extends BaseTestCase {
 
   @Test
   void loadBeanCache_false() {
-    Query<Country> query = DB.find(Country.class).setLoadBeanCache(false);
+    Query<Country> query = DB.find(Country.class).setBeanCacheMode(CacheMode.OFF);
 
     SpiQuery<?> spiQuery = (SpiQuery<?>) query;
     assertThat(spiQuery.isBeanCachePut()).isFalse();
@@ -32,7 +33,7 @@ class TestLoadBeanCache extends BaseTestCase {
     ResetBasicData.reset();
 
     Map<String, Country> map = DB.find(Country.class)
-      .setLoadBeanCache(true)
+      .setBeanCacheMode(CacheMode.PUT)
       .setUseQueryCache(true)
       .setReadOnly(true)
       .order("name")