From dbc1ab7a57a76b82b280078c4848bac7318f274c Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Sep 2021 14:25:10 +1200
Subject: [PATCH] #2359 - Rename methods and tidy in cache API

---
 .../src/main/java/io/ebean/cache/QueryCacheEntry.java  |  2 --
 .../main/java/io/ebean/cache/ServerCacheOptions.java   |  2 --
 .../main/java/io/ebean/cache/ServerCacheRegion.java    | 10 +++++++++-
 .../server/cache/DefaultServerCacheManager.java        | 10 +++++-----
 .../io/ebeaninternal/server/deploy/DCacheRegion.java   |  2 +-
 .../ebeaninternal/server/deploy/DCacheRegionNone.java  |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java b/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java
index 31f1134d9..9c07e3574 100644
--- a/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java
+++ b/ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java
@@ -13,9 +13,7 @@ import java.util.Set;
 public class QueryCacheEntry {
 
   private final Object value;
-
   private final Set<String> dependentTables;
-
   private final long timestamp;
 
   /**
diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java
index fe8fdb486..c455286ea 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java
@@ -18,7 +18,6 @@ public class ServerCacheOptions {
    * Construct with no set options.
    */
   public ServerCacheOptions() {
-
   }
 
   /**
@@ -73,7 +72,6 @@ public class ServerCacheOptions {
    * Return a copy of this object.
    */
   public ServerCacheOptions copy() {
-
     ServerCacheOptions copy = new ServerCacheOptions();
     copy.maxSize = maxSize;
     copy.maxIdleSecs = maxIdleSecs;
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 b63668d91..c798b5a35 100644
--- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
+++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java
@@ -8,7 +8,15 @@ public interface ServerCacheRegion {
   /**
    * Return the region name.
    */
-  String getName();
+  String name();
+
+  /**
+   * Deprecated migrate to name().
+   */
+  @Deprecated
+  default String getName() {
+    return name();
+  }
 
   /**
    * Return true if the cache region is enabled.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index 562a98371..d3a652437 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -65,17 +65,17 @@ public final class DefaultServerCacheManager implements SpiCacheManager {
       List<String> enabled = new ArrayList<>();
 
       for (SpiCacheRegion region : regionMap.values()) {
-        if (enabledRegionNames.contains(region.getName())) {
-          enabled.add(region.getName());
+        if (enabledRegionNames.contains(region.name())) {
+          enabled.add(region.name());
           if (!region.isEnabled()) {
             region.setEnabled(true);
-            log.debug("Cache region[{}] enabled", region.getName());
+            log.debug("Cache region[{}] enabled", region.name());
           }
         } else {
-          disabled.add(region.getName());
+          disabled.add(region.name());
           if (region.isEnabled()) {
             region.setEnabled(false);
-            log.debug("Cache region[{}] disabled", region.getName());
+            log.debug("Cache region[{}] disabled", region.name());
           }
         }
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
index d8867e904..0f9190782 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegion.java
@@ -12,7 +12,7 @@ public final class DCacheRegion implements SpiCacheRegion {
   }
 
   @Override
-  public String getName() {
+  public String name() {
     return name;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
index c7b20095a..cdb7783bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DCacheRegionNone.java
@@ -7,7 +7,7 @@ final class DCacheRegionNone implements SpiCacheRegion {
   static final SpiCacheRegion INSTANCE = new DCacheRegionNone();
 
   @Override
-  public String getName() {
+  public String name() {
     return "<none>";
   }