From 058e16d1a8570c67dd5b0b5c739e791ca9aa0328 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Fri, 3 Sep 2021 09:32:47 +1200
Subject: [PATCH] #2349 - Rename Database.getBeanId() to beanId() with
 deprecation

---
 ebean-api/src/main/java/io/ebean/DB.java               | 10 +++++++++-
 .../cascadedelete/TestInheritanceDeleteCascade.java    |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java
index 6851a6129..a6a831853 100644
--- a/ebean-api/src/main/java/io/ebean/DB.java
+++ b/ebean-api/src/main/java/io/ebean/DB.java
@@ -1238,10 +1238,18 @@ public final class DB {
   /**
    * Return the value of the Id property for a given bean.
    */
-  public static Object getBeanId(Object bean) {
+  public static Object beanId(Object bean) {
     return getDefault().beanId(bean);
   }
 
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  public static Object getBeanId(Object bean) {
+    return beanId(bean);
+  }
+
   /**
    * Return the manager of the level 2 cache ("L2" cache).
    */
diff --git a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java
index e4da9b23d..269642b2f 100644
--- a/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java
+++ b/ebean-core/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java
@@ -19,8 +19,8 @@ public class TestInheritanceDeleteCascade extends BaseTestCase {
     DB.save(referencingBean);
     DB.delete(referencingBean);
 
-    assertNull(DB.find(RootBean.class, DB.getBeanId(bean1)));
-    assertNull(DB.find(RootBean.class, DB.getBeanId(bean2)));
+    assertNull(DB.find(RootBean.class, DB.beanId(bean1)));
+    assertNull(DB.find(RootBean.class, DB.beanId(bean2)));
   }
 
 }