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

#1892 - Refactor change internal use of Ebean to DB

Browse Source
This commit is contained in:
rob bygrave
2019-12-13 14:17:05 +13:00
parent 502b20be67
commit 5cd74bc468
14 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/ebean/BaseTestCase.java
+3 -3
View File
@@ -70,7 +70,7 @@ public abstract class BaseTestCase {
}
try {
// First try, if we get the default server. If this fails, all tests will fail.
Ebean.getDefaultServer();
DB.getDefault();
} catch (Throwable e) {
logger.error("Fatal error while getting ebean-server. Exiting...", e);
System.exit(1);
@@ -239,7 +239,7 @@ public abstract class BaseTestCase {
}
protected SpiEbeanServer spiEbeanServer() {
return (SpiEbeanServer) Ebean.getDefaultServer();
return (SpiEbeanServer) DB.getDefault();
}
protected EbeanServer server() {
@@ -248,7 +248,7 @@ public abstract class BaseTestCase {
protected void loadCountryCache() {
Ebean.find(Country.class)
DB.find(Country.class)
.setBeanCacheMode(CacheMode.PUT)
.findList();
}
src/test/java/io/ebean/ConditionalTestRunner.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class ConditionalTestRunner extends BlockJUnit4ClassRunner {
}
private boolean platformMath(Platform[] platforms) {
Platform current = Ebean.getDefaultServer().getPluginApi().getDatabasePlatform().getPlatform();
Platform current = DB.getDefault().getPluginApi().getDatabasePlatform().getPlatform();
for (Platform p : platforms) {
if (p.equals(current)) {
return true;