From 75dc74eb5886a251c6a5c90dded513f7753055e4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 6 Apr 2022 20:32:50 +1200
Subject: [PATCH] Remove deprecated methods in ebean-api - ServerCacheManager
 ServerCacheRegion

These methods are deprecated getters, migrate to the associated accessor method.
---
 .../io/ebean/cache/ServerCacheManager.java    | 49 -------------------
 .../io/ebean/cache/ServerCacheRegion.java     |  8 ---
 2 files changed, 57 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java
index 67156a642..0168a4d58 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java
@@ -23,14 +23,6 @@ public interface ServerCacheManager {
    */
   boolean localL2Caching();
 
-  /**
-   * Deprecated migrate to localL2Caching().
-   */
-  @Deprecated
-  default boolean isLocalL2Caching() {
-    return localL2Caching();
-  }
-
   /**
    * Return all the cache regions.
    */
@@ -46,77 +38,36 @@ public interface ServerCacheManager {
    */
   void enabledRegions(String regions);
 
-  /**
-   * Deprecated migrate to enabledRegions().
-   */
-  @Deprecated
-  default void setEnabledRegions(String regions) {
-    enabledRegions(regions);
-  }
-
   /**
    * Enable or disable all the cache regions.
    */
   void allRegionsEnabled(boolean enabled);
 
-  /**
-   * Deprecated migrate to allRegionsEnabled().
-   */
-  @Deprecated
-  default void setAllRegionsEnabled(boolean enabled) {
-    allRegionsEnabled(enabled);
-  }
-
   /**
    * Return the cache region by name. Typically, to enable or disable the region.
    */
   ServerCacheRegion region(String name);
 
-  @Deprecated
-  default ServerCacheRegion getRegion(String name) {
-    return region(name);
-  }
-
   /**
    * Return the cache for mapping natural keys to id values.
    */
   ServerCache naturalKeyCache(Class<?> beanType);
 
-  @Deprecated
-  default ServerCache getNaturalKeyCache(Class<?> beanType) {
-    return naturalKeyCache(beanType);
-  }
-
   /**
    * Return the cache for beans of a particular type.
    */
   ServerCache beanCache(Class<?> beanType);
 
-  @Deprecated
-  default ServerCache getBeanCache(Class<?> beanType) {
-    return beanCache(beanType);
-  }
-
   /**
    * Return the cache for associated many properties of a bean type.
    */
   ServerCache collectionIdsCache(Class<?> beanType, String propertyName);
 
-  @Deprecated
-  default ServerCache getCollectionIdsCache(Class<?> beanType, String propertyName) {
-    return collectionIdsCache(beanType, propertyName);
-  }
-
   /**
    * Return the cache for query results of a particular type of bean.
    */
   ServerCache queryCache(Class<?> beanType);
 
-  @Deprecated
-  default ServerCache getQueryCache(Class<?> beanType) {
-    return queryCache(beanType);
-  }
-
   /**
    * This clears both the bean and query cache for a given type.
    */
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
index c798b5a35..5cfd3c595 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
@@ -10,14 +10,6 @@ public interface ServerCacheRegion {
    */
   String name();
 
-  /**
-   * Deprecated migrate to name().
-   */
-  @Deprecated
-  default String getName() {
-    return name();
-  }
-
   /**
    * Return true if the cache region is enabled.
    */