From 7c2a77081b4b3c37bf54821cfaea2a3700960b52 Mon Sep 17 00:00:00 2001 From: rbygrave Date: Fri, 3 Sep 2021 10:50:29 +1200 Subject: [PATCH] #2351 - Rename Database.getReference() to reference() with deprecation --- ebean-api/src/main/java/io/ebean/DB.java | 14 ++++++++++---- .../basic/TestQueryForUpdatePostgresLock.java | 2 +- .../java/org/tests/model/m2m/TestM2MWithWhere.java | 8 +++----- .../java/org/tests/o2m/TestOneToManyOnlyBean.java | 2 +- .../o2m/jointable/TestOneToManyJoinTable.java | 2 +- .../org/tests/transaction/TestExecuteComplete.java | 6 +++--- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 636889b4e..d5f281599 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -658,24 +658,30 @@ public final class DB { * @param beanType the type of entity bean * @param id the id value */ - public static T getReference(Class beanType, Object id) { + public static T reference(Class beanType, Object id) { return getDefault().reference(beanType, id); } + /** + * Deprecated migrate to beanId(). + */ + @Deprecated + public static T getReference(Class beanType, Object id) { + return reference(beanType, id); + } + /** * Sort the list using the sortByClause which can contain a comma delimited * list of property names and keywords asc, desc, nullsHigh and nullsLow. *
    *
  • asc - ascending order (which is the default)
    • *
  • desc - Descending order
    • - *
  • nullsHigh - Treat null values as high/large values (which is the - * default)
    • + *
  • nullsHigh - Treat null values as high/large values (which is the default)
    • *
  • nullsLow- Treat null values as low/very small values
    • *
*

* If you leave off any keywords the defaults are ascending order and treating * nulls as high values. - *

*

* Note that the sorting uses a Comparator and Collections.sort(); and does * not invoke a DB query. diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index ecda6bee2..eee072594 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -71,7 +71,7 @@ public class TestQueryForUpdatePostgresLock extends BaseTestCase { log.info("insert start"); timePreInsert = System.currentTimeMillis(); Section section = new Section(); - section.setArticle(DB.getReference(Article.class, id)); + section.setArticle(DB.reference(Article.class, id)); DB.save(section); timePostInsert = System.currentTimeMillis(); log.info("inserted"); diff --git a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index da8d83dd5..6a6c8e85e 100644 --- a/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-core/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -5,8 +5,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; import org.junit.Test; -import org.tests.model.m2m.MnyEdge; -import org.tests.model.m2m.MnyNode; import io.ebean.BaseTestCase; import io.ebean.DB; @@ -108,8 +106,8 @@ public class TestM2MWithWhere extends BaseTestCase { sb.append("from = ").append(from).append(" |"); for (int to = 1; to <= 5; to++) { MnyEdge edge = new MnyEdge(); - edge.setFrom(DB.getReference(MnyNode.class, from)); - edge.setTo(DB.getReference(MnyNode.class, to)); + edge.setFrom(DB.reference(MnyNode.class, from)); + edge.setTo(DB.reference(MnyNode.class, to)); int flags = 0; if (from < to) { flags |= 1; @@ -125,7 +123,7 @@ public class TestM2MWithWhere extends BaseTestCase { } // System.out.println(sb); dump the table } - + @Test public void testWithDbTableName() { diff --git a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index 2dccb4a1e..a07c415d4 100644 --- a/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-core/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -33,7 +33,7 @@ public class TestOneToManyOnlyBean extends BaseTestCase { @Test public void isReference_when_getReference_expectTrue() { - OMVertex myBean = DB.getReference(OMVertex.class, UUID.randomUUID()); + OMVertex myBean = DB.reference(OMVertex.class, UUID.randomUUID()); assertTrue(isReference(myBean)); } diff --git a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 1fb128e09..c0747fb7a 100644 --- a/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-core/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -85,7 +85,7 @@ public class TestOneToManyJoinTable extends BaseTestCase { // make m2 dirty ... cascades to an update on Uim m2.setFoodPreference("Apple"); trainer.getMonkeys().add(m2); - trainer.getMonkeys().add(DB.getReference(JtMonkey.class, m1.getMid())); + trainer.getMonkeys().add(DB.reference(JtMonkey.class, m1.getMid())); trainer.getMonkeys().add(new JtMonkey("FAlp")); trainer.getMonkeys().add(new JtMonkey("FBet")); trainer.getMonkeys().add(new JtMonkey("FThe")); diff --git a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java index 6632816a5..60b6e6e03 100644 --- a/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-core/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -27,7 +27,7 @@ public class TestExecuteComplete extends BaseTestCase { try { DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> { - Customer customer = DB.getReference(Customer.class, 42424242L); + Customer customer = DB.reference(Customer.class, 42424242L); Order order = new Order(); order.setCustomer(customer); @@ -48,7 +48,7 @@ public class TestExecuteComplete extends BaseTestCase { DB.execute(TxScope.required().setBatch(PersistBatch.ALL), () -> DB.execute(() -> { - Customer customer = DB.getReference(Customer.class, 42424242L); + Customer customer = DB.reference(Customer.class, 42424242L); Order order = new Order(); order.setCustomer(customer); @@ -75,7 +75,7 @@ public class TestExecuteComplete extends BaseTestCase { @Transactional(batchSize = 10) private void errorOnCommit() { - Customer customer = DB.getReference(Customer.class, 42424242L); + Customer customer = DB.reference(Customer.class, 42424242L); Order order = new Order(); order.setCustomer(customer);