github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rbygrave
2021-09-03 09:31:16 +12:00
parent 0ed6ccf499
commit a5f9beabdf
7 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 foundB = DB.find(SourceBase.class, db.getBeanId(sourceB));
final SourceBase foundA = DB.find(SourceBase.class, db.beanId(sourceA));
final SourceBase foundB = DB.find(SourceBase.class, db.beanId(sourceB));
assertSourceBaseEqual(foundA, sourceA);
assertThat(foundA).isInstanceOf(SourceA.class);