diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index 985d85c06..3522131f1 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -378,6 +378,8 @@ public class ServerConfig { private Encryptor encryptor; + private boolean dbOffline; + private DbEncrypt dbEncrypt; private ServerCachePlugin serverCachePlugin; @@ -1623,6 +1625,24 @@ public class ServerConfig { this.encryptor = encryptor; } + /** + * Return true if the EbeanServer instance should be created in offline mode. + */ + public boolean isDbOffline() { + return dbOffline; + } + + /** + * Set to true if the EbeanServer instance should be created in offline mode. + *
+ * Typically used to create an EbeanServer instance for DDL Migration generation + * without requiring a real DataSource / Database to connect to. + *
+ */ + public void setDbOffline(boolean dbOffline) { + this.dbOffline = dbOffline; + } + /** * Return the DbEncrypt used to encrypt and decrypt properties. *@@ -2507,6 +2527,7 @@ public class ServerConfig { encryptDeployManager = createInstance(p, EncryptDeployManager.class, "encryptDeployManager", encryptDeployManager); encryptor = createInstance(p, Encryptor.class, "encryptor", encryptor); dbEncrypt = createInstance(p, DbEncrypt.class, "dbEncrypt", dbEncrypt); + dbOffline = p.getBoolean("dbOffline", dbOffline); serverCachePlugin = createInstance(p, ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin); if (packages != null) { diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index 1bfb3d77b..9b9826181 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -265,7 +265,7 @@ public class DefaultContainer implements SpiContainer { private DataSource getDataSourceFromConfig(ServerConfig config) { - if (DbOffline.isSet()) { + if (config.isDbOffline() || DbOffline.isSet()) { logger.debug("... DbOffline using platform [{}]", DbOffline.getPlatform()); return null; } @@ -333,7 +333,7 @@ public class DefaultContainer implements SpiContainer { */ private boolean checkDataSource(ServerConfig serverConfig) { - if (DbOffline.isSet()) { + if (serverConfig.isDbOffline() || DbOffline.isSet()) { return false; } diff --git a/src/test/java/io/ebean/config/ServerConfigTest.java b/src/test/java/io/ebean/config/ServerConfigTest.java index 5e0e829b2..2e7c34122 100644 --- a/src/test/java/io/ebean/config/ServerConfigTest.java +++ b/src/test/java/io/ebean/config/ServerConfigTest.java @@ -35,10 +35,12 @@ public class ServerConfigTest { props.setProperty("backgroundExecutorShutdownSecs", "98"); props.setProperty("backgroundExecutorSchedulePoolSize", "4"); props.setProperty("h2ProductionMode", "true"); + props.setProperty("dbOffline", "true"); serverConfig.loadFromProperties(props); assertTrue(serverConfig.isH2ProductionMode()); + assertTrue(serverConfig.isDbOffline()); assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatch()); assertEquals(PersistBatch.INSERT, serverConfig.getPersistBatchOnCascade()); assertEquals(ServerConfig.DbUuid.BINARY, serverConfig.getDbTypeConfig().getDbUuid());