Refactor: relpaced system-property "ebean.ignoreExtraDdl" with serverConfig flag (#1597)

src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java

@@ -103,7 +103,6 @@ public class MultiTenantPartitionTest {
 
 
   private static EbeanServer init() {
-    System.setProperty("ebean.ignoreExtraDdl", "true");
 
     ServerConfig config = new ServerConfig();
 
@@ -111,6 +110,7 @@ public class MultiTenantPartitionTest {
     config.loadFromProperties();
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
     config.setRegister(false);
     config.setDefaultServer(false);
     config.setCurrentTenantProvider(new CurrentTenant());

src/test/java/org/tests/basic/MainDbBoolean.java

@@ -36,10 +36,9 @@ public class MainDbBoolean {
    */
   private EbeanServer createOracleEbeanServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig c = new ServerConfig();
     c.setName("ora");
+    c.setDdlExtra(false);
 
     // requires oracle driver in class path
     DataSourceConfig oraDb = new DataSourceConfig();
@@ -72,10 +71,9 @@ public class MainDbBoolean {
 
   private EbeanServer createEbeanServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig c = new ServerConfig();
     c.setName("pgtest");
+    c.setDdlExtra(false);
 
     // requires postgres driver in class path
     DataSourceConfig postgresDb = new DataSourceConfig();

src/test/java/org/tests/changelog/TestChangeLog.java

@@ -123,14 +123,14 @@ public class TestChangeLog extends BaseTestCase {
 
   private SpiEbeanServer getServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2other");
     config.loadFromProperties();
 
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setDefaultServer(false);
     config.setRegister(false);
     config.setChangeLogAsync(false);

src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java

@@ -32,10 +32,10 @@ public class TestPersistenceContextServerConfig extends BaseTestCase {
 
   static EbeanServer create() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
 
     ServerConfig config = new ServerConfig();
     config.setName("withPCQuery");
+    config.setDdlExtra(false);
 
     Properties properties = new Properties();
     properties.setProperty("datasource.withPCQuery.username", "sa");

src/test/java/org/tests/readaudit/TestReadAudit.java

@@ -306,14 +306,14 @@ public class TestReadAudit extends BaseTestCase {
 
   private SpiEbeanServer getServer() {
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2other");
     config.loadFromProperties();
 
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setDefaultServer(false);
     config.setRegister(false);
 

src/test/java/org/tests/transaction/TestAutoCommitDataSource.java

@@ -42,8 +42,6 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     assertTrue(connection.getAutoCommit());
     connection.close();
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2autocommit");
     config.loadFromProperties();
@@ -55,6 +53,8 @@ public class TestAutoCommitDataSource extends BaseTestCase {
     config.addClass(UTDetail.class);
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
+
     config.setAutoCommitMode(true);
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);

src/test/java/org/tests/transaction/TestExplicitTransactionMode.java

@@ -42,8 +42,6 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     assertTrue(connection.getAutoCommit());
     connection.close();
 
-    System.setProperty("ebean.ignoreExtraDdl", "true");
-
     ServerConfig config = new ServerConfig();
     config.setName("h2autocommit2");
     config.loadFromProperties();
@@ -56,11 +54,10 @@ public class TestExplicitTransactionMode extends BaseTestCase {
     config.addClass(UTDetail.class);
     config.setDdlGenerate(true);
     config.setDdlRun(true);
+    config.setDdlExtra(false);
 
     EbeanServer ebeanServer = EbeanServerFactory.create(config);
 
-    System.clearProperty("ebean.ignoreExtraDdl");
-
     Query<UTMaster> query = ebeanServer.find(UTMaster.class);
     List<UTMaster> details = query.findList();
     assertEquals(0, details.size());