#2347 - Rename Database.getPlatform() to platform() with deprecation

ebean-api/src/main/java/io/ebean/DB.java

@@ -1254,7 +1254,7 @@ public final class DB {
    * queries.
    */
   public static BackgroundExecutor getBackgroundExecutor() {
-    return getDefault().getBackgroundExecutor();
+    return getDefault().backgroundExecutor();
   }
 
   /**

ebean-api/src/main/java/io/ebean/Database.java

@@ -214,12 +214,28 @@ public interface Database {
    *
    * @return platform for this database instance
    */
-  Platform getPlatform();
+  Platform platform();
+
+  /**
+   * Deprecated migrate to platform().
+   */
+  @Deprecated
+  default Platform getPlatform() {
+    return platform();
+  }
 
   /**
    * Return the extended API intended for use by plugins.
    */
-  SpiServer getPluginApi();
+  SpiServer pluginApi();
+
+  /**
+   * Deprecated migrate to pluginApi().
+   */
+  @Deprecated
+  default SpiServer getPluginApi() {
+    return pluginApi();
+  }
 
   /**
    * Return the BeanState for a given entity bean.
@@ -1485,7 +1501,15 @@ public interface Database {
    * Return the BackgroundExecutor service for asynchronous processing of
    * queries.
    */
-  BackgroundExecutor getBackgroundExecutor();
+  BackgroundExecutor backgroundExecutor();
+
+  /**
+   * Deprecated migrate to backgroundExecutor().
+   */
+  @Deprecated
+  default BackgroundExecutor getBackgroundExecutor() {
+    return backgroundExecutor();
+  }
 
   /**
    * Return the JsonContext for reading/writing JSON.

ebean-api/src/main/java/io/ebean/Ebean.java

@@ -1216,7 +1216,7 @@ public final class Ebean {
    * queries.
    */
   public static BackgroundExecutor getBackgroundExecutor() {
-    return getDefault().getBackgroundExecutor();
+    return getDefault().backgroundExecutor();
   }
 
   /**

ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java

@@ -843,7 +843,7 @@ public final class EntityBeanIntercept implements Serializable {
         }
         // For stand alone reference bean or after deserialisation lazy load
         // using the ebeanServer. Synchronise only on the bean.
-        loadBeanInternal(loadProperty, database.getPluginApi().beanLoader());
+        loadBeanInternal(loadProperty, database.pluginApi().beanLoader());
         return;
       }
     } finally {

ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java

@@ -39,7 +39,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      database.getPluginApi().loadBeanL2(ebi);
+      database.pluginApi().loadBeanL2(ebi);
     }
   }
 
@@ -53,7 +53,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      database.getPluginApi().loadBeanRef(ebi);
+      database.pluginApi().loadBeanRef(ebi);
     }
   }
 
@@ -67,7 +67,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      database.getPluginApi().loadBean(ebi);
+      database.pluginApi().loadBean(ebi);
     }
   }
 }

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java

@@ -77,7 +77,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
       loadTuningFile();
       if (isRuntimeTuningUpdates()) {
         // periodically gather and update query tuning
-        server.getBackgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
+        server.backgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
       }
     }
   }

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -330,17 +330,17 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public Platform getPlatform() {
+  public Platform platform() {
     return databasePlatform.getPlatform();
   }
 
   @Override
-  public SpiServer getPluginApi() {
+  public SpiServer pluginApi() {
     return this;
   }
 
   @Override
-  public BackgroundExecutor getBackgroundExecutor() {
+  public BackgroundExecutor backgroundExecutor() {
     return backgroundExecutor;
   }
 

ebean-core/src/test/java/io/ebean/ConditionalTestRunner.java

@@ -37,7 +37,7 @@ public class ConditionalTestRunner extends BlockJUnit4ClassRunner {
 
   }
   private boolean platformMath(Platform[] platforms) {
-    Platform basePlatform = DB.getDefault().getPlatform().base();
+    Platform basePlatform = DB.getDefault().platform().base();
     for (Platform platform : platforms) {
       if (platform.equals(basePlatform)) {
         return true;

ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java

@@ -20,35 +20,35 @@ public class DatabasePlatformTest extends BaseTestCase {
   @Test
   @ForPlatform(Platform.H2)
   public void h2_platform() {
-    final Platform platform = DB.getDefault().getPlatform();
+    final Platform platform = DB.getDefault().platform();
     assertThat(platform).isSameAs(Platform.H2);
   }
 
   @Test
   @ForPlatform(Platform.POSTGRES)
   public void postgres_platform() {
-    final Platform platform = DB.getDefault().getPlatform().base();
+    final Platform platform = DB.getDefault().platform().base();
     assertThat(platform).isSameAs(Platform.POSTGRES);
   }
 
   @Test
   @ForPlatform(Platform.MYSQL)
   public void mysql_platform() {
-    final Platform platform = DB.getDefault().getPlatform().base();
+    final Platform platform = DB.getDefault().platform().base();
     assertThat(platform).isSameAs(Platform.MYSQL);
   }
 
   @Test
   @ForPlatform(Platform.MARIADB)
   public void mariadb_platform() {
-    final Platform platform = DB.getDefault().getPlatform().base();
+    final Platform platform = DB.getDefault().platform().base();
     assertThat(platform).isSameAs(Platform.MARIADB);
   }
 
   @Test
   @ForPlatform(Platform.SQLSERVER)
   public void sqlserver_platform() {
-    final Platform platform = DB.getDefault().getPlatform().base();
+    final Platform platform = DB.getDefault().platform().base();
     assertThat(platform).isSameAs(Platform.SQLSERVER);
   }
 

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

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

ebean-core/src/test/java/io/ebean/plugin/BeanTypeTest.java

@@ -28,7 +28,7 @@ public class BeanTypeTest {
   private static Database db = DB.getDefault();
 
   private <T> BeanType<T> beanType(Class<T> cls) {
-    return db.getPluginApi().getBeanType(cls);
+    return db.pluginApi().getBeanType(cls);
   }
 
   @Test

ebean-core/src/test/java/io/ebean/plugin/ExpressionPathTest.java

@@ -15,7 +15,7 @@ public class ExpressionPathTest {
   static EbeanServer server = Ebean.getDefaultServer();
 
   <T> BeanType<T> beanType(Class<T> cls) {
-    return server.getPluginApi().getBeanType(cls);
+    return server.pluginApi().getBeanType(cls);
   }
 
   @Test

ebean-core/src/test/java/io/ebean/plugin/PropertyTest.java

@@ -15,7 +15,7 @@ public class PropertyTest {
   static EbeanServer server = Ebean.getDefaultServer();
 
   <T> BeanType<T> beanType(Class<T> cls) {
-    return server.getPluginApi().getBeanType(cls);
+    return server.pluginApi().getBeanType(cls);
   }
 
   @Test

ebean-core/src/test/java/io/ebean/plugin/SpiServerTest.java

@@ -23,7 +23,7 @@ public class SpiServerTest extends BaseTestCase {
   public void test() {
 
     EbeanServer defaultServer = Ebean.getDefaultServer();
-    SpiServer pluginApi = defaultServer.getPluginApi();
+    SpiServer pluginApi = defaultServer.pluginApi();
 
     BeanType<Customer> beanType = pluginApi.getBeanType(Customer.class);
     assertEquals("o_customer", beanType.getBaseTable());

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

@@ -143,12 +143,12 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public Platform getPlatform() {
+  public Platform platform() {
     return Platform.GENERIC;
   }
 
   @Override
-  public SpiServer getPluginApi() {
+  public SpiServer pluginApi() {
     return null;
   }
 
@@ -924,7 +924,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public BackgroundExecutor getBackgroundExecutor() {
+  public BackgroundExecutor backgroundExecutor() {
     return null;
   }
 

ebean-core/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java

@@ -16,7 +16,7 @@ public class DefaultChangeLogListenerTest extends BaseTestCase {
     DefaultChangeLogListener changeLogListener = new DefaultChangeLogListener();
 
     EbeanServer defaultServer = Ebean.getDefaultServer();
-    changeLogListener.configure(defaultServer.getPluginApi());
+    changeLogListener.configure(defaultServer.pluginApi());
 
     ChangeSet changeSet = helper.createChangeSet("INT-001", 13);
 

ebean-core/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java

@@ -15,7 +15,7 @@ public class TestShutdownWithBackgroundTasks extends BaseTestCase {
   public void test() {
 
     Database server = DB.getDefault();
-    final BackgroundExecutor bg = server.getBackgroundExecutor();
+    final BackgroundExecutor bg = server.backgroundExecutor();
     try {
       for (int i = 0; i < 12; i++) {
         bg.execute(new Job(server, 500, i));

ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java

@@ -22,7 +22,7 @@ public class DocStoreDeleteEventTest {
   static EbeanServer server = Ebean.getDefaultServer();
 
   <T> BeanType<T> beanType(Class<T> cls) {
-    return server.getPluginApi().getBeanType(cls);
+    return server.pluginApi().getBeanType(cls);
   }
 
   BeanType<Order> orderType() {

ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java

@@ -20,7 +20,7 @@ public class DocStoreIndexEventTest {
   static EbeanServer server = Ebean.getDefaultServer();
 
   <T> BeanType<T> beanType(Class<T> cls) {
-    return server.getPluginApi().getBeanType(cls);
+    return server.pluginApi().getBeanType(cls);
   }
 
   BeanType<Order> orderType() {

ebean-core/src/test/java/org/tests/cache/TestQueryCache.java

@@ -300,7 +300,7 @@ public class TestQueryCache extends BaseTestCase {
 
   @Test
   public void findCountDifferentQueriesBit() {
-    DB.getDefault().getPluginApi().getServerCacheManager().clearAll();
+    DB.getDefault().pluginApi().getServerCacheManager().clearAll();
     differentFindCount(q->q.bitwiseAny("id",1), q->q.bitwiseAny("id",0));
     differentFindCount(q->q.bitwiseAll("id",1), q->q.bitwiseAll("id",0));
     // differentFindCount(q->q.bitwiseNot("id",1), q->q.bitwiseNot("id",0)); NOT 1 == AND 1 = 0

ebean-core/src/test/java/org/tests/ddd/iud/TestDPersonEl.java

@@ -23,7 +23,7 @@ public class TestDPersonEl {
 
     Currency NZD = Currency.getInstance("NZD");
     assertThat(NZD).isNotNull();
-    
+
     DPerson p = new DPerson();
     p.setFirstName("first");
     p.setLastName("last");
@@ -31,7 +31,7 @@ public class TestDPersonEl {
 
     Ebean.save(p);
 
-    SpiServer server = Ebean.getDefaultServer().getPluginApi();
+    SpiServer server = Ebean.getDefaultServer().pluginApi();
 
     BeanType<DPerson> descriptor = server.getBeanType(DPerson.class);
 

ebean-core/src/test/java/org/tests/el/TestPathExpression.java

@@ -20,7 +20,7 @@ public class TestPathExpression {
   final ExpressionPath city;
 
   public TestPathExpression() {
-    SpiServer server = Ebean.getDefaultServer().getPluginApi();
+    SpiServer server = Ebean.getDefaultServer().pluginApi();
     beanType = server.getBeanType(Customer.class);
     billingId = beanType.getExpressionPath("billingAddress.id");
     line1 = beanType.getExpressionPath("billingAddress.line1");

ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson.java

@@ -37,7 +37,7 @@ public class TestDbJson_Jackson extends BaseTestCase {
     bean.getValueMap().put(1, "one");
     bean.getValueMap().put(2, "two");
 
-    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper();
+    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper();
 
     String json = mapper.writeValueAsString(bean);
     EBasicJsonJackson found = mapper.readValue(json, EBasicJsonJackson.class);
@@ -83,7 +83,7 @@ public class TestDbJson_Jackson extends BaseTestCase {
     bean.getValueMap().put(1, new StringJacksonType("A"));
     bean.getValueMap().put(2, new LongJacksonType(7l));
 
-    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper();
+    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper();
 
     String json = mapper.writeValueAsString(bean);
     assertThat(json)

ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson2.java

@@ -34,7 +34,7 @@ public class TestDbJson_Jackson2 extends BaseTestCase {
     bean.getValueMap().put(1, new StringJacksonType("A"));
     bean.getValueMap().put(2, new LongJacksonType(7l));
 
-    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().getPluginApi().getServerConfig().getObjectMapper();
+    ObjectMapper mapper = (ObjectMapper) Ebean.getDefaultServer().pluginApi().getServerConfig().getObjectMapper();
 
     String json = mapper.writeValueAsString(bean);
     found = mapper.readValue(json, EBasicJsonJackson2.class);

ebean-core/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java

@@ -20,7 +20,7 @@ public class TestEmbeddedManyToOne extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    BeanType<EAddr> embType = Ebean.getDefaultServer().getPluginApi().getBeanType(EAddr.class);
+    BeanType<EAddr> embType = Ebean.getDefaultServer().pluginApi().getBeanType(EAddr.class);
 
     Ebean.getDefaultServer().getServerCacheManager().clearAll();
 

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

@@ -232,7 +232,7 @@ public class TestQueryFindIterate extends BaseTestCase {
   public void findIterateCloseConnection(boolean withLoadBatch) {
     ResetBasicData.reset();
 
-    SpiServer pluginApi = server().getPluginApi();
+    SpiServer pluginApi = server().pluginApi();
     DataSourcePool dsPool = (DataSourcePool) pluginApi.getServerConfig().getReadOnlyDataSource();
     if (dsPool == null) {
       dsPool = (DataSourcePool) server().dataSource();

ebean-core/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java

@@ -1,7 +1,6 @@
 package org.tests.query.cancel;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.sql.SQLException;
@@ -76,7 +75,7 @@ public class SqlQueryCancelTest extends BaseTestCase {
       EBasic model = new EBasic("Basic " + i);
       DB.save(model);
     }
-    if (Platform.H2.equals(DB.getDefault().getPlatform())) {
+    if (Platform.H2.equals(DB.getDefault().platform())) {
       SlowDownEBasic.setSelectWaitMillis(0);
     }
   }

ebean-core/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java

@@ -36,9 +36,9 @@ public class TestNativeILikeExpression extends BaseTestCase {
 
   private boolean isExpectNative() {
 
-    SpiServer pluginApi = server().getPluginApi();
+    SpiServer pluginApi = server().pluginApi();
     boolean expressionNativeIlike = pluginApi.getServerConfig().isExpressionNativeIlike();
-    Platform platform = pluginApi.getPlatform().base();
+    Platform platform = pluginApi.platform().base();
 
     return expressionNativeIlike && platform == Platform.POSTGRES;
   }

ebean-core/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java

@@ -16,9 +16,9 @@ public class TestTextJsonInvokeLazy extends BaseTestCase {
 
   @Before
   public void clearBeanCache() {
-    server().getPluginApi().getBeanType(Customer.class).clearBeanCache();
+    server().pluginApi().getBeanType(Customer.class).clearBeanCache();
   }
-  
+
   @Test
   public void test() throws IOException {
 

ebean-core/src/test/java/org/tests/types/TestNewTypes.java

@@ -216,7 +216,7 @@ public class TestNewTypes extends BaseTestCase {
 
   private void testSetGetPath(SomeNewTypesBean refBean) {
     SomeNewTypesBean testBean = new SomeNewTypesBean();
-    BeanType<SomeNewTypesBean> beanType = DB.getDefault().getPluginApi().getBeanType(SomeNewTypesBean.class);
+    BeanType<SomeNewTypesBean> beanType = DB.getDefault().pluginApi().getBeanType(SomeNewTypesBean.class);
     ExpressionPath localDate = beanType.getExpressionPath("localDate");
     ExpressionPath localDateTime = beanType.getExpressionPath("localDateTime");
     ExpressionPath offsetDateTime = beanType.getExpressionPath("offsetDateTime");

ebean-ddl-generator/src/test/java/io/ebean/ConditionalTestRunner.java

@@ -37,7 +37,7 @@ public class ConditionalTestRunner extends BlockJUnit4ClassRunner {
 
   }
   private boolean platformMath(Platform[] platforms) {
-    Platform basePlatform = DB.getDefault().getPlatform().base();
+    Platform basePlatform = DB.getDefault().platform().base();
     for (Platform platform : platforms) {
       if (platform.equals(basePlatform)) {
         return true;

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java

@@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DbMigrationTest extends BaseTestCase {
 
   private void runScript(boolean expectErrors, String scriptName) throws IOException {
-    String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().getPlatform().name().toLowerCase() + "/" + scriptName);
+    String ddl = Helper.asText(this, "/dbmigration/migrationtest/" + server().platform().name().toLowerCase() + "/" + scriptName);
     runScript(expectErrors, ddl, scriptName);
   }
 

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java

@@ -33,7 +33,7 @@ public class PlatformDdl_AlterColumnTest {
   private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
 
   {
-    DatabaseConfig serverConfig = DB.getDefault().getPluginApi().getServerConfig();
+    DatabaseConfig serverConfig = DB.getDefault().pluginApi().getServerConfig();
     sqlServerDdl.configure(serverConfig);
   }
 

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java

@@ -25,7 +25,7 @@ public class PlatformDdl_CreateIndexTest {
   private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform());
 
   {
-    DatabaseConfig config = DB.getDefault().getPluginApi().getServerConfig();
+    DatabaseConfig config = DB.getDefault().pluginApi().getServerConfig();
     h2Ddl.configure(config);
     pgDdl.configure(config);
     mysqlDdl.configure(config);

ebean-redis/src/test/java/org/integration/ClusterTest.java

@@ -30,7 +30,7 @@ public class ClusterTest {
   public void testBothNear() {
     // ensure the default server exists first
     final Database db = DB.getDefault();
-    Database other = createOther(db.getPluginApi().dataSource());
+    Database other = createOther(db.pluginApi().dataSource());
 
     new QPerson()
       .name.eq("Someone")
@@ -62,7 +62,7 @@ public class ClusterTest {
   public void test() throws InterruptedException {
     // ensure the default server exists first
     final Database db = DB.getDefault();
-    Database other = createOther(db.getPluginApi().dataSource());
+    Database other = createOther(db.pluginApi().dataSource());
 
     for (int i = 0; i < 10; i++) {
       Person foo = new Person("name " + i);