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

#1434 - Remove deprecated API from EbeanServer - finder methods that take explicit transaction. Migrate to use ebeanServer.extended()

Browse Source
This commit is contained in:
rob bygrave
2018-06-18 21:34:51 +12:00
parent 8d976f83a9
commit 3a64cf6952
13 changed files with 30 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java
+6 -6
View File
@@ -22,13 +22,13 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
ResetBasicData.reset();
EbeanServer server = Ebean.getServer(null);
EbeanServer server = Ebean.getDefaultServer();
Query<Customer> query = server.createQuery(Customer.class)
.where().eq("doesNotExist", "this will fail")
.query();
FutureRowCount<Customer> futureRowCount = server.findFutureCount(query, null);
FutureRowCount<Customer> futureRowCount = query.findFutureCount();
QueryFutureRowCount<Customer> internalRowCount = (QueryFutureRowCount<Customer>) futureRowCount;
Transaction t = internalRowCount.getTransaction();
@@ -49,13 +49,13 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
ResetBasicData.reset();
EbeanServer server = Ebean.getServer(null);
EbeanServer server = Ebean.getDefaultServer();
Query<Customer> query = server.createQuery(Customer.class)
.where().eq("doesNotExist", "this will fail")
.query();
FutureIds<Customer> futureIds = server.findFutureIds(query, null);
FutureIds<Customer> futureIds = query.findFutureIds();
QueryFutureIds<Customer> internalFuture = (QueryFutureIds<Customer>) futureIds;
Transaction t = internalFuture.getTransaction();
@@ -77,13 +77,13 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
ResetBasicData.reset();
EbeanServer server = Ebean.getServer(null);
EbeanServer server = Ebean.getDefaultServer();
Query<Customer> query = server.createQuery(Customer.class)
.where().eq("doesNotExist", "this will fail")
.query();
FutureList<Customer> futureList = server.findFutureList(query, null);
FutureList<Customer> futureList = query.findFutureList();
QueryFutureList<Customer> internalFuture = (QueryFutureList<Customer>) futureList;
Transaction t = internalFuture.getTransaction();
src/test/java/org/tests/basic/TestFetchId.java
+2 -2
View File
@@ -27,10 +27,10 @@ public class TestFetchId extends BaseTestCase {
.gt("details.id", 0)
.query();
List<Object> ids = Ebean.getServer(null).findIds(query, null);
List<Object> ids = query.findIds();
assertThat(ids).isNotEmpty();
FutureIds<Order> futureIds = Ebean.getServer(null).findFutureIds(query, null);
FutureIds<Order> futureIds = query.findFutureIds();
// wait for all the id's to be fetched
List<Object> idList = futureIds.get();
src/test/java/org/tests/basic/TestQueryForUpdate.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class TestQueryForUpdate extends BaseTestCase {
.where().idEq(first.getId())
.forUpdateNoWait();
server.findOne(query2, txn2);
server.extended().findOne(query2, txn2);
assertTrue(false); // never get here
} catch (AcquireLockException e) {
logger.info("... got AcquireLockException " + e);
src/test/java/org/tests/delete/TestDeleteByQuery.java
+3 -3
View File
@@ -29,7 +29,7 @@ public class TestDeleteByQuery extends BaseTestCase {
Query<Contact> query = server.find(Contact.class).where().eq("group.name", "NahYeahMaybe").query();
LoggedSqlCollector.start();
server.delete(query, null);
query.delete();
List<String> loggedSql = LoggedSqlCollector.stop();
assertThat(loggedSql).hasSize(1);
@@ -38,7 +38,7 @@ public class TestDeleteByQuery extends BaseTestCase {
Query<Contact> query2 = server.find(Contact.class).where().eq("firstName", "NotARealFirstName").query();
LoggedSqlCollector.start();
server.delete(query2, null);
query2.delete();
loggedSql = LoggedSqlCollector.stop();
assertThat(loggedSql).hasSize(1);
@@ -75,7 +75,7 @@ public class TestDeleteByQuery extends BaseTestCase {
Ebean.find(Customer.class)
.where().eq("name", "Don Roberto")
.query().setForUpdate(true)
.query().forUpdate()
.delete();
List<String> sql = LoggedSqlCollector.stop();
src/test/java/org/tests/query/other/TestQuerySingleAttribute.java
+1 -1
View File
@@ -321,7 +321,7 @@ public class TestQuerySingleAttribute extends BaseTestCase {
Query<EUncle> query = Ebean.find(EUncle.class)
.fetch("parent", "more");
Ebean.getDefaultServer().findSingleAttributeList(query, null);
query.findSingleAttributeList();
assertThat(sqlOf(query)).contains("select t1.more from rawinherit_uncle t0 join rawinherit_parent t1 on t1.id = t0.parent_id");
}
src/test/java/org/tests/transaction/TestAutoCommitDataSource.java
+3 -3
View File
@@ -60,7 +60,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
EbeanServer ebeanServer = EbeanServerFactory.create(config);
Query<UTMaster> query = ebeanServer.find(UTMaster.class);
List<UTMaster> details = ebeanServer.findList(query, null);
List<UTMaster> details = query.findList();
assertEquals(0, details.size());
UTMaster bean1 = new UTMaster("one1");
@@ -77,7 +77,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
ebeanServer.save(bean2);
Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
details = ebeanServer.findList(query2, otherTxn);
details = ebeanServer.extended().findList(query2, otherTxn);
assertEquals(2, details.size());
ebeanServer.save(bean3);
@@ -89,7 +89,7 @@ public class TestAutoCommitDataSource extends BaseTestCase {
}
Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
details = ebeanServer.findList(query3, otherTxn);
details = ebeanServer.extended().findList(query3, otherTxn);
assertEquals(3, details.size());
}
src/test/java/org/tests/transaction/TestExplicitTransactionMode.java
+3 -3
View File
@@ -62,7 +62,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
System.clearProperty("ebean.ignoreExtraDdl");
Query<UTMaster> query = ebeanServer.find(UTMaster.class);
List<UTMaster> details = ebeanServer.findList(query, null);
List<UTMaster> details = query.findList();
assertEquals(0, details.size());
UTMaster bean0 = new UTMaster("one0");
@@ -91,7 +91,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
// not visible in other transaction
Query<UTMaster> query2 = ebeanServer.find(UTMaster.class);
details = ebeanServer.findList(query2, otherTxn);
details = ebeanServer.extended().findList(query2, otherTxn);
assertEquals(0, details.size());
ebeanServer.save(bean3);
@@ -104,7 +104,7 @@ public class TestExplicitTransactionMode extends BaseTestCase {
// commit as expected
Query<UTMaster> query3 = ebeanServer.find(UTMaster.class);
details = ebeanServer.findList(query3, otherTxn);
details = ebeanServer.extended().findList(query3, otherTxn);
assertEquals(3, details.size());
}
}