#2085 - Refactor promote getDataSource() and getReadOnlyDataSource() to Database from plugin.SpiServer interface

ebean-core/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java

@@ -27,7 +27,7 @@ public class SqlServerStepSequenceTest extends BaseTestCase {
     server().sqlUpdate("create sequence sqls_testseq_9876 start with 1 increment by 50").execute();
 
     BackgroundExecutor be = server().getBackgroundExecutor();
-    DataSource ds = server().getPluginApi().getDataSource();
+    DataSource ds = server().getDataSource();
 
     SqlServerStepSequence s = new SqlServerStepSequence(be, ds, "sqls_testseq_9876", 50);
 

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

@@ -53,6 +53,7 @@ import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
 import java.lang.reflect.Type;
 import java.time.Clock;
 import java.util.Collection;
@@ -336,6 +337,16 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public DataSource getDataSource() {
+    return null;
+  }
+
+  @Override
+  public DataSource getReadOnlyDataSource() {
+    return null;
+  }
+
   @Override
   public String getName() {
     return name;

ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java

@@ -258,7 +258,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
       "join o_customer c on o.kcustomer_id = c.id " +
       "where c.id = ? and o.id > ?";
 
-    final DataSource dataSource = DB.getDefault().getPluginApi().getDataSource();
+    final DataSource dataSource = DB.getDefault().getDataSource();
 
     try (Connection connection = dataSource.getConnection()) {
       try (PreparedStatement stmt = connection.prepareStatement(sql)) {

ebean-core/src/test/java/org/Main.java

@@ -15,7 +15,7 @@ public class Main {
 
 
     EbeanServer ms = Ebean.getServer("ms");
-    DataSource dataSource = ms.getPluginApi().getDataSource();
+    DataSource dataSource = ms.getDataSource();
 
     Connection connection = dataSource.getConnection();
     PreparedStatement statement = connection.prepareStatement("select next VALUE for j2_seq");

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

@@ -24,7 +24,7 @@ public class TestQueryUsingConnection extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    DataSource dataSource = DB.getDefault().getPluginApi().getDataSource();
+    DataSource dataSource = DB.getDefault().getDataSource();
 
     try (Connection connection = dataSource.getConnection()) {
 

ebean-core/src/test/java/org/tests/query/TestQueryFindIterate.java

@@ -235,7 +235,7 @@ public class TestQueryFindIterate extends BaseTestCase {
     SpiServer pluginApi = server().getPluginApi();
     DataSourcePool dsPool = (DataSourcePool) pluginApi.getServerConfig().getReadOnlyDataSource();
     if (dsPool == null) {
-      dsPool = (DataSourcePool) server().getPluginApi().getDataSource();
+      dsPool = (DataSourcePool) server().getDataSource();
     }
 
     int startConns = dsPool.getStatus(false).getBusy();