#2349 - Rename Database.getBeanId() to beanId() with deprecation

ebean-api/src/main/java/io/ebean/DB.java

@@ -1239,7 +1239,7 @@ public final class DB {
    * Return the value of the Id property for a given bean.
    */
   public static Object getBeanId(Object bean) {
-    return getDefault().getBeanId(bean);
+    return getDefault().beanId(bean);
   }
 
   /**

ebean-api/src/main/java/io/ebean/Database.java

@@ -248,7 +248,15 @@ public interface Database {
   /**
    * Return the value of the Id property for a given bean.
    */
-  Object getBeanId(Object bean);
+  Object beanId(Object bean);
+
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  default Object getBeanId(Object bean) {
+    return beanId(bean);
+  }
 
   /**
    * Set the Id value onto the bean converting the type of the id value if necessary.
@@ -260,7 +268,15 @@ public interface Database {
    * @param bean The entity bean to set the id value on.
    * @param id   The id value to set.
    */
-  Object setBeanId(Object bean, Object id);
+  Object beanId(Object bean, Object id);
+
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  default Object setBeanId(Object bean, Object id) {
+    return beanId(bean, id);
+  }
 
   /**
    * Return a map of the differences between two objects of the same type.

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -2079,7 +2079,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public Object setBeanId(Object bean, Object id) {
+  public Object beanId(Object bean, Object id) {
     EntityBean eb = checkEntityBean(bean);
     BeanDescriptor<?> desc = getBeanDescriptor(bean.getClass());
     if (desc == null) {
@@ -2089,7 +2089,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public Object getBeanId(Object bean) {
+  public Object beanId(Object bean) {
     EntityBean eb = checkEntityBean(bean);
     BeanDescriptor<?> desc = getBeanDescriptor(bean.getClass());
     if (desc == null) {

ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java

@@ -368,12 +368,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public Object setBeanId(Object bean, Object id) {
+  public Object beanId(Object bean, Object id) {
     return id;
   }
 
   @Override
-  public Object getBeanId(Object bean) {
+  public Object beanId(Object bean) {
     return null;
   }
 

ebean-core/src/test/java/org/tests/basic/TestExplicitInsert.java

@@ -22,7 +22,7 @@ public class TestExplicitInsert extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
 
     Customer cust = new Customer();
-    Object returnId = server.setBeanId(cust, "42");
+    Object returnId = server.beanId(cust, "42");
 
     assertThat(returnId).isEqualTo(42);
     assertThat(cust.getId()).isEqualTo(42);
@@ -34,7 +34,7 @@ public class TestExplicitInsert extends BaseTestCase {
     EbeanServer server = Ebean.getDefaultServer();
 
     Customer customer = new Customer();
-    Object returnId = server.setBeanId(customer, 42);
+    Object returnId = server.beanId(customer, 42);
 
     assertThat(returnId).isEqualTo(42);
     assertThat(customer.getId()).isEqualTo(42);
@@ -57,7 +57,7 @@ public class TestExplicitInsert extends BaseTestCase {
 
     Assert.assertNotNull(b.getId());
 
-    Assert.assertEquals(b.getId(), server.getBeanId(b));
+    Assert.assertEquals(b.getId(), server.beanId(b));
 
 
     EBasic b2 = server.find(EBasic.class, b.getId());

ebean-core/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java

@@ -31,7 +31,7 @@ public class TestBatchSaveWithGetBeanId extends BaseTestCase {
 
     // should invoke a flush which then means the
     // insert occurs and the bean has an Id value
-    Object beanId = server.getBeanId(model);
+    Object beanId = server.beanId(model);
     assertNotNull(beanId);
 
     Ebean.delete(Customer.class, beanId);

ebean-core/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java

@@ -57,8 +57,8 @@ public class TestInheritanceBothSides extends BaseTestCase {
 
     final Database db = DB.getDefault();
 
-    final SourceBase foundA = DB.find(SourceBase.class, db.getBeanId(sourceA));
+    final SourceBase foundA = DB.find(SourceBase.class, db.beanId(sourceA));
-    final SourceBase foundB = DB.find(SourceBase.class, db.getBeanId(sourceB));
+    final SourceBase foundB = DB.find(SourceBase.class, db.beanId(sourceB));
 
     assertSourceBaseEqual(foundA, sourceA);
     assertThat(foundA).isInstanceOf(SourceA.class);