[maven-release-plugin] prepare release ebean-parent-12.6.0

Connection properties to help find leaks are capturestacktrace and maxStackTraceSize, e.g.

datasource.h2.capturestacktrace=true
datasource.h2.maxStackTraceSize=20

ebean-api/pom.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
+    <version>12.6.0</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
+  <name>ebean api</name>
+  <description>ebean api</description>
   <artifactId>ebean-api</artifactId>
 
   <properties>
-    <jackson-core.version>2.10.0</jackson-core.version>
-    <jackson-databind.version>2.10.0</jackson-databind.version>
+    <jackson-core.version>2.11.3</jackson-core.version>
+    <jackson-databind.version>2.11.3</jackson-databind.version>
   </properties>
 
   <dependencies>
@@ -23,14 +25,14 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.30</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>1.0</version>
+      <version>1.2</version>
     </dependency>
 
     <!--
@@ -64,14 +66,8 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>5.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>12.1.4</version>
+      <artifactId>ebean-datasource-api</artifactId>
+      <version>${ebean-datasource.version}</version>
     </dependency>
 
     <!-- Jackson core used internally by Ebean -->
@@ -79,6 +75,7 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>${jackson-core.version}</version>
+      <optional>true</optional>
     </dependency>
 
     <!-- provided scope for JsonNode support -->

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

@@ -70,6 +70,13 @@ public final class DB {
   private DB() {
   }
 
+  /**
+   * Backdoor for registering a mock implementation of Database as the default database.
+   */
+  protected static Database mock(String name, Database server, boolean defaultServer) {
+    return context.mock(name, server, defaultServer);
+  }
+
   /**
    * Return the default database.
    */

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

@@ -14,6 +14,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -121,6 +122,16 @@ public interface Database {
    */
   AutoTune getAutoTune();
 
+  /**
+   * Return the associated DataSource for this Database instance.
+   */
+  DataSource getDataSource();
+
+  /**
+   * Return the associated read only DataSource for this Database instance (can be null).
+   */
+  DataSource getReadOnlyDataSource();
+
   /**
    * Return the name. This is used with {@link DB#byName(String)} to get a
    * Database that was registered with the DB singleton.

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

@@ -9,6 +9,7 @@ import javax.persistence.PersistenceException;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.ServiceLoader;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Creates Database instances.
@@ -30,6 +31,7 @@ import java.util.ServiceLoader;
  */
 public class DatabaseFactory {
 
+  private static final ReentrantLock lock = new ReentrantLock(false);
   private static SpiContainer container;
 
   static {
@@ -42,44 +44,63 @@ public class DatabaseFactory {
    * Call this prior to creating any Database instances or alternatively set the
    * ContainerConfig on the DatabaseConfig when creating the first Database instance.
    */
-  public static synchronized void initialiseContainer(ContainerConfig containerConfig) {
-    getContainer(containerConfig);
+  public static void initialiseContainer(ContainerConfig containerConfig) {
+    lock.lock();
+    try {
+      getContainer(containerConfig);
+    } finally {
+      lock.unlock();
+    }
   }
 
   /**
    * Create using properties to configure the database.
    */
-  public static synchronized Database create(String name) {
-    // construct based on loading properties files
-    return getContainer(null).createServer(name);
+  public static Database create(String name) {
+    lock.lock();
+    try {
+      return getContainer(null).createServer(name);
+    } finally {
+      lock.unlock();
+    }
   }
 
   /**
    * Create using the DatabaseConfig object to configure the database.
    */
-  public static synchronized Database create(DatabaseConfig config) {
-    if (config.getName() == null) {
-      throw new PersistenceException("The name is null (it is required)");
+  public static Database create(DatabaseConfig config) {
+    lock.lock();
+    try {
+      if (config.getName() == null) {
+        throw new PersistenceException("The name is null (it is required)");
+      }
+      Database server = createInternal(config);
+      if (config.isRegister()) {
+        DbPrimary.setSkip(true);
+        DbContext.getInstance().register(server, config.isDefaultServer());
+      }
+      return server;
+    } finally {
+      lock.unlock();
     }
-    Database server = createInternal(config);
-    if (config.isRegister()) {
-      DbPrimary.setSkip(true);
-      DbContext.getInstance().register(server, config.isDefaultServer());
-    }
-    return server;
   }
 
   /**
    * Create using the DatabaseConfig additionally specifying a classLoader to use as the context class loader.
    */
-  public static synchronized Database createWithContextClassLoader(DatabaseConfig config, ClassLoader classLoader) {
-    ClassLoader currentContextLoader = Thread.currentThread().getContextClassLoader();
-    Thread.currentThread().setContextClassLoader(classLoader);
+  public static Database createWithContextClassLoader(DatabaseConfig config, ClassLoader classLoader) {
+    lock.lock();
     try {
-      return DatabaseFactory.create(config);
+      ClassLoader currentContextLoader = Thread.currentThread().getContextClassLoader();
+      Thread.currentThread().setContextClassLoader(classLoader);
+      try {
+        return DatabaseFactory.create(config);
+      } finally {
+        // set the currentContextLoader back
+        Thread.currentThread().setContextClassLoader(currentContextLoader);
+      }
     } finally {
-      // set the currentContextLoader back
-      Thread.currentThread().setContextClassLoader(currentContextLoader);
+      lock.unlock();
     }
   }
 
@@ -89,8 +110,13 @@ public class DatabaseFactory {
    * This is typically invoked via JVM shutdown hook and not explicitly called.
    * </p>
    */
-  public static synchronized void shutdown() {
-    container.shutdown();
+  public static void shutdown() {
+    lock.lock();
+    try {
+      container.shutdown();
+    } finally {
+      lock.unlock();
+    }
   }
 
   private static Database createInternal(DatabaseConfig config) {
@@ -103,8 +129,7 @@ public class DatabaseFactory {
    * @param containerConfig the configuration controlling clustering communication
    */
   private static SpiContainer getContainer(ContainerConfig containerConfig) {
-
-    // thread safe in that all calling methods are synchronized
+    // thread safe in that all calling methods hold lock
     if (container != null) {
       return container;
     }
@@ -123,7 +148,6 @@ public class DatabaseFactory {
    * Create the container instance using the configuration.
    */
   protected static SpiContainer createContainer(ContainerConfig containerConfig) {
-
     Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
     if (factories.hasNext()) {
       return factories.next().create(containerConfig);

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

@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import javax.persistence.PersistenceException;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Holds Database instances.
@@ -22,17 +23,11 @@ final class DbContext {
 
   private static final DbContext INSTANCE = new DbContext();
 
-  /**
-   * Cache for fast concurrent read access.
-   */
   private final ConcurrentHashMap<String, Database> concMap = new ConcurrentHashMap<>();
 
-  /**
-   * Cache for synchronized read, creation and put. Protected by the monitor object.
-   */
   private final HashMap<String, Database> syncMap = new HashMap<>();
 
-  private final Object monitor = new Object();
+  private final ReentrantLock lock = new ReentrantLock(false);
 
   /**
    * The 'default' Database.
@@ -91,27 +86,28 @@ final class DbContext {
     if (name == null || name.isEmpty()) {
       return defaultDatabase;
     }
-    // non-synchronized read
     Database server = concMap.get(name);
     if (server != null) {
       return server;
     }
-    // synchronized read, create and put
     return getWithCreate(name);
   }
 
   /**
-   * Synchronized read, create and put of Databases.
+   * Read, create and put of Databases.
    */
   private Database getWithCreate(String name) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       Database server = syncMap.get(name);
       if (server == null) {
         // register when creating server this way
-        server = EbeanServerFactory.create(name);
+        server = DatabaseFactory.create(name);
         register(server, false);
       }
       return server;
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -123,12 +119,15 @@ final class DbContext {
   }
 
   private void registerWithName(String name, Database server, boolean isDefault) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       concMap.put(name, server);
       syncMap.put(name, server);
       if (isDefault) {
         defaultDatabase = server;
       }
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -3,6 +3,7 @@ package io.ebean;
 import io.avaje.config.Config;
 
 import java.util.Properties;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Provides singleton state for the default database.
@@ -11,47 +12,66 @@ import java.util.Properties;
  */
 class DbPrimary {
 
+  private static final ReentrantLock lock = new ReentrantLock(false);
   private static String defaultServerName;
-
   private static boolean skip;
 
   /**
    * Set whether to skip automatically creating the primary database.
    */
-  static synchronized void setSkip(boolean skip) {
-    DbPrimary.skip = skip;
+  static void setSkip(boolean skip) {
+    lock.lock();
+    try {
+      DbPrimary.skip = skip;
+    } finally {
+      lock.unlock();
+    }
   }
 
   /**
    * Return true to skip automatically creating the primary database.
    */
-  static synchronized boolean isSkip() {
-    return skip;
+  static boolean isSkip() {
+    lock.lock();
+    try {
+      return skip;
+    } finally {
+      lock.unlock();
+    }
   }
 
   /**
    * Return the default database name.
    */
-  static synchronized String getDefaultServerName() {
-    getProperties();
-    return defaultServerName;
+  static String getDefaultServerName() {
+    lock.lock();
+    try {
+      getProperties();
+      return defaultServerName;
+    } finally {
+      lock.unlock();
+    }
   }
 
   /**
    * Return the default configuration Properties.
    */
-  static synchronized Properties getProperties() {
-    if (defaultServerName == null) {
-      defaultServerName = determineDefaultServerName();
+  static Properties getProperties() {
+    lock.lock();
+    try {
+      if (defaultServerName == null) {
+        defaultServerName = determineDefaultServerName();
+      }
+      return Config.asProperties();
+    } finally {
+      lock.unlock();
     }
-    return Config.asProperties();
   }
 
   /**
    * Determine and return the default server name checking system environment variables and then global properties.
    */
   private static String determineDefaultServerName() {
-
     String defaultServerName = System.getenv("EBEAN_DB");
     defaultServerName = System.getProperty("db", defaultServerName);
     defaultServerName = System.getProperty("ebean_db", defaultServerName);

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

@@ -2,8 +2,8 @@ package io.ebean;
 
 import io.ebean.docstore.DocQueryContext;
 import io.ebean.docstore.RawDoc;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

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

@@ -2,13 +2,6 @@ package io.ebean;
 
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.ServerConfig;
-import io.ebean.service.SpiContainer;
-import io.ebean.service.SpiContainerFactory;
-
-import javax.persistence.PersistenceException;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.ServiceLoader;
 
 /**
  * Deprecated - please migrate to DatabaseFactory.
@@ -39,28 +32,28 @@ public class EbeanServerFactory {
    * Call this prior to creating any EbeanServer instances or alternatively set the
    * ContainerConfig on the ServerConfig when creating the first EbeanServer instance.
    */
-  public static synchronized void initialiseContainer(ContainerConfig containerConfig) {
+  public static void initialiseContainer(ContainerConfig containerConfig) {
     DatabaseFactory.initialiseContainer(containerConfig);
   }
 
   /**
    * Create using ebean.properties to configure the database.
    */
-  public static synchronized EbeanServer create(String name) {
+  public static EbeanServer create(String name) {
     return (EbeanServer)DatabaseFactory.create(name);
   }
 
   /**
    * Create using the ServerConfig object to configure the database.
    */
-  public static synchronized EbeanServer create(ServerConfig config) {
+  public static EbeanServer create(ServerConfig config) {
     return (EbeanServer)DatabaseFactory.create(config);
   }
 
   /**
    * Create using the ServerConfig additionally specifying a classLoader to use as the context class loader.
    */
-  public static synchronized EbeanServer createWithContextClassLoader(ServerConfig config, ClassLoader classLoader) {
+  public static EbeanServer createWithContextClassLoader(ServerConfig config, ClassLoader classLoader) {
     return (EbeanServer)DatabaseFactory.createWithContextClassLoader(config, classLoader);
   }
 
@@ -70,7 +63,7 @@ public class EbeanServerFactory {
    * This is typically invoked via JVM shutdown hook and not explicitly called.
    * </p>
    */
-  public static synchronized void shutdown() {
+  public static void shutdown() {
     DatabaseFactory.shutdown();
   }
 

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

@@ -2,8 +2,8 @@ package io.ebean;
 
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
-import io.ebean.config.DocStoreConfig;
 import io.ebean.config.DatabaseConfig;
+import io.ebean.config.DocStoreConfig;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;

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

@@ -1,5 +1,7 @@
 package io.ebean.bean;
 
+import java.util.concurrent.locks.Lock;
+
 /**
  * Loads a entity bean.
  * <p>
@@ -18,4 +20,9 @@ public interface BeanLoader {
    */
   void loadBean(EntityBeanIntercept ebi);
 
+  /**
+   * Obtain a lock on the loader.
+   */
+  Lock lock();
+
 }

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

@@ -14,6 +14,8 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * This is the object added to every entity bean using byte code enhancement.
@@ -30,6 +32,8 @@ public final class EntityBeanIntercept implements Serializable {
   private static final int STATE_REFERENCE = 1;
   private static final int STATE_LOADED = 2;
 
+  private transient final ReentrantLock lock = new ReentrantLock(false);
+
   private transient NodeUsageCollector nodeUsageCollector;
 
   private transient PersistenceContext persistenceContext;
@@ -803,7 +807,8 @@ public final class EntityBeanIntercept implements Serializable {
    * Load the bean when it is a reference.
    */
   protected void loadBean(int loadProperty) {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (beanLoader == null) {
         final Database database = DB.byName(ebeanServerName);
         if (database == null) {
@@ -811,14 +816,19 @@ 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());
+        loadBeanInternal(loadProperty, database.getPluginApi().beanLoader());
         return;
       }
+    } finally {
+      lock.unlock();
     }
-    synchronized (beanLoader) {
+    final Lock lock = beanLoader.lock();
+    try {
       // Lazy loading using LoadBeanContext which supports batch loading
       // Synchronise on the beanLoader (a 'node' of the LoadBeanContext 'tree')
       loadBeanInternal(loadProperty, beanLoader);
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -2,11 +2,16 @@ package io.ebean.bean;
 
 import io.ebean.Database;
 
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * BeanLoader used when single beans are loaded (which is usually not ideal / N+1).
  */
 public abstract class SingleBeanLoader implements BeanLoader {
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   protected final Database database;
 
   SingleBeanLoader(Database database) {
@@ -18,6 +23,12 @@ public abstract class SingleBeanLoader implements BeanLoader {
     return database.getName();
   }
 
+  @Override
+  public Lock lock() {
+    lock.lock();
+    return lock;
+  }
+
   /**
    * Single bean lazy loaded when bean from L2 cache.
    */
@@ -45,4 +56,18 @@ public abstract class SingleBeanLoader implements BeanLoader {
       database.getPluginApi().loadBeanRef(ebi);
     }
   }
+
+  /**
+   * Single bean lazy loaded when a reference bean.
+   */
+  public static class Dflt extends SingleBeanLoader {
+    public Dflt(Database database) {
+      super(database);
+    }
+
+    @Override
+    public void loadBean(EntityBeanIntercept ebi) {
+      database.getPluginApi().loadBean(ebi);
+    }
+  }
 }

ebean-api/src/main/java/io/ebean/common/AbstractBeanCollection.java

@@ -7,6 +7,7 @@ import io.ebean.bean.BeanCollectionLoader;
 import io.ebean.bean.EntityBean;
 
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Base class for List Set and Map implementations of BeanCollection.
@@ -15,6 +16,8 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
 
   private static final long serialVersionUID = 3365725236140187588L;
 
+  protected final ReentrantLock lock = new ReentrantLock(false);
+
   protected boolean readOnly;
 
   protected boolean disableLazyLoad;

ebean-api/src/main/java/io/ebean/common/BeanList.java

@@ -115,7 +115,8 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
   }
 
   private void initClear() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (list == null) {
         if (!disableLazyLoad && modifyListening) {
           lazyLoadCollection(true);
@@ -123,11 +124,14 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
           list = new ArrayList<>();
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   private void init() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (list == null) {
         if (disableLazyLoad) {
           list = new ArrayList<>();
@@ -135,6 +139,8 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
           lazyLoadCollection(false);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-api/src/main/java/io/ebean/common/BeanMap.java

@@ -121,7 +121,8 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   private void initClear() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (map == null) {
         if (!disableLazyLoad && modifyListening) {
           lazyLoadCollection(true);
@@ -129,11 +130,14 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
           map = new LinkedHashMap<>();
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   private void init() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (map == null) {
         if (disableLazyLoad) {
           map = new LinkedHashMap<>();
@@ -141,6 +145,8 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
           lazyLoadCollection(false);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-api/src/main/java/io/ebean/common/BeanSet.java

@@ -114,7 +114,8 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
   }
 
   private void initClear() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (set == null) {
         if (!disableLazyLoad && modifyListening) {
           lazyLoadCollection(true);
@@ -122,11 +123,14 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
           set = new LinkedHashSet<>();
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   private void init() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (set == null) {
         if (disableLazyLoad) {
           set = new LinkedHashSet<>();
@@ -134,6 +138,8 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
           lazyLoadCollection(true);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-api/src/main/java/io/ebean/common/CopyOnFirstWriteList.java

@@ -6,25 +6,27 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
 /**
  * List that copies itself on first write access. Needed to keep memory footprint low and the ability
  * to modify lists from cache.
- * 
+ *
  * @author Roland Praml, FOCONIS AG
  */
 public final class CopyOnFirstWriteList<E> extends AbstractList<E> implements List<E>, Serializable {
 
   private static final long serialVersionUID = 1L;
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   /**
    * The underlying List implementation.
    */
   private List<E> list;
-  
-  
+
   public CopyOnFirstWriteList(List<E> list) {
     super();
     this.list = list;
@@ -166,14 +168,17 @@ public final class CopyOnFirstWriteList<E> extends AbstractList<E> implements Li
   public int lastIndexOf(Object o) {
     return list.lastIndexOf(o);
   }
-  
+
   private void checkCopyOnWrite() {
     if (!copied) {
-      synchronized (this) {
+      lock.lock();
+      try {
         if (!copied) {
           list = new ArrayList<>(list);
           copied = true;
         }
+      } finally {
+        lock.unlock();
       }
     }
   }

ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java

@@ -26,20 +26,6 @@ public class ClassLoadConfig {
     this.context = new ClassLoaderContext(classLoader);
   }
 
-  /**
-   * Return true if the Java.time types are available and should be supported.
-   */
-  public boolean isJavaTimePresent() {
-    return isPresent("java.time.LocalDate");
-  }
-
-  /**
-   * Return true if Java7 is present.
-   */
-  public boolean isJava7Present() {
-    return isPresent("java.nio.file.Path");
-  }
-
   /**
    * Return true if the Joda types are available and should be supported.
    */
@@ -69,6 +55,10 @@ public class ClassLoadConfig {
     return isPresent("com.fasterxml.jackson.annotation.JsonIgnore");
   }
 
+  public boolean isJacksonCorePresent() {
+    return isPresent("com.fasterxml.jackson.core.JsonParser");
+  }
+
   /**
    * Return true if Jackson ObjectMapper is present.
    */

ebean-api/src/main/java/io/ebean/config/CustomDbTypeMapping.java

@@ -1,7 +1,7 @@
 package io.ebean.config;
 
-import io.ebean.config.dbplatform.DbType;
 import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DbType;
 
 /**
  * Custom mappings for DB types that override the default.

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -3,6 +3,7 @@ package io.ebean.config;
 import com.fasterxml.jackson.core.JsonFactory;
 import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
+import io.ebean.EbeanVersion;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.Transaction;
@@ -28,12 +29,13 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
-import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
 
 import javax.persistence.EnumType;
 import javax.sql.DataSource;
 import java.time.Clock;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -277,6 +279,25 @@ public class DatabaseConfig {
 
   private String ddlSeedSql;
 
+  private String ddlHeader;
+
+  /**
+   * Mode used to check non-null columns added via migration have a default value specified etc.
+   */
+  private boolean ddlStrictMode = true;
+
+  /**
+   * Comma and equals delimited key/value placeholders to replace in DDL scripts.
+   */
+  private String ddlPlaceholders;
+
+  /**
+   * Map of key/value placeholders to replace in DDL scripts.
+   */
+  private Map<String, String> ddlPlaceholderMap;
+
+  private boolean runMigration;
+
   /**
    * When true L2 bean cache use is skipped after a write has occurred on a transaction.
    */
@@ -322,11 +343,6 @@ public class DatabaseConfig {
    */
   private String dbSchema;
 
-  /**
-   * The db migration config (migration resource path etc).
-   */
-  private DbMigrationConfig migrationConfig = new DbMigrationConfig();
-
   /**
    * The ClassLoadConfig used to detect Joda, Java8, Jackson etc and create plugin instances given a className.
    */
@@ -1212,20 +1228,6 @@ public class DatabaseConfig {
     this.dbSchema = dbSchema;
   }
 
-  /**
-   * Return the DB migration configuration.
-   */
-  public DbMigrationConfig getMigrationConfig() {
-    return migrationConfig;
-  }
-
-  /**
-   * Set the DB migration configuration.
-   */
-  public void setMigrationConfig(DbMigrationConfig migrationConfig) {
-    this.migrationConfig = migrationConfig;
-  }
-
   /**
    * Return the Geometry SRID.
    */
@@ -2026,7 +2028,15 @@ public class DatabaseConfig {
    * as it is often the only thing we need to configure for migrations.
    */
   public void setRunMigration(boolean runMigration) {
-    migrationConfig.setRunMigration(runMigration);
+    this.runMigration = runMigration;
+  }
+
+  /**
+   * Return true if the DB migration should run on server start.
+   */
+  public boolean isRunMigration() {
+    final String run = System.getProperty("ebean.migration.run");
+    return (run != null) ? Boolean.parseBoolean(run) : runMigration;
   }
 
   /**
@@ -2134,6 +2144,67 @@ public class DatabaseConfig {
     return ddlExtra;
   }
 
+  /**
+   * Set the header to use with DDL generation.
+   */
+  public void setDdlHeader(String ddlHeader) {
+    this.ddlHeader = ddlHeader;
+  }
+
+  /**
+   * Return the header to use with DDL generation.
+   */
+  public String getDdlHeader() {
+    if (ddlHeader != null && !ddlHeader.isEmpty()) {
+      String header = ddlHeader.replace("${version}", EbeanVersion.getVersion());
+      header = header.replace("${timestamp}", ZonedDateTime.now().format(DateTimeFormatter.ISO_INSTANT));
+      return header;
+    }
+    return ddlHeader;
+  }
+
+  /**
+   * Return true if strict mode is used which includes a check that non-null columns have a default value.
+   */
+  public boolean isDdlStrictMode() {
+    return ddlStrictMode;
+  }
+
+  /**
+   * Set to false to turn off strict mode allowing non-null columns to not have a default value.
+   */
+  public void setDdlStrictMode(boolean ddlStrictMode) {
+    this.ddlStrictMode = ddlStrictMode;
+  }
+
+  /**
+   * Return a comma and equals delimited placeholders that are substituted in DDL scripts.
+   */
+  public String getDdlPlaceholders() {
+    return ddlPlaceholders;
+  }
+
+  /**
+   * Set a comma and equals delimited placeholders that are substituted in DDL scripts.
+   */
+  public void setDdlPlaceholders(String ddlPlaceholders) {
+    this.ddlPlaceholders = ddlPlaceholders;
+  }
+
+  /**
+   * Return a map of placeholder values that are substituted in DDL scripts.
+   */
+  public Map<String, String> getDdlPlaceholderMap() {
+    return ddlPlaceholderMap;
+  }
+
+  /**
+   * Set a map of placeholder values that are substituted in DDL scripts.
+   */
+  public void setDdlPlaceholderMap(Map<String, String> ddlPlaceholderMap) {
+    this.ddlPlaceholderMap = ddlPlaceholderMap;
+  }
+
   /**
    * Return true if the class path search should be disabled.
    */
@@ -2699,13 +2770,8 @@ public class DatabaseConfig {
    * Load the configuration settings from the properties file.
    */
   protected void loadSettings(PropertiesWrapper p) {
-
     dbSchema = p.get("dbSchema", dbSchema);
-    if (dbSchema != null) {
-      migrationConfig.setDefaultDbSchema(dbSchema);
-    }
     profilingConfig.loadSettings(p, name);
-    migrationConfig.loadSettings(p, name);
     platformConfig.loadSettings(p);
     if (platformConfig.isAllQuotedIdentifiers()) {
       adjustNamingConventionForAllQuoted();
@@ -2807,12 +2873,16 @@ public class DatabaseConfig {
     jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
     jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
 
+    runMigration = p.getBoolean("migration.run", runMigration);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
     ddlExtra = p.getBoolean("ddl.extra", ddlExtra);
     ddlCreateOnly = p.getBoolean("ddl.createOnly", ddlCreateOnly);
     ddlInitSql = p.get("ddl.initSql", ddlInitSql);
     ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);
+    ddlStrictMode = p.getBoolean("ddl.strictMode", ddlStrictMode);
+    ddlPlaceholders = p.get("ddl.placeholders", ddlPlaceholders);
+    ddlHeader = p.get("ddl.header", ddlHeader);
 
     // read tenant-configuration from config:
     // tenant.mode = NONE | DB | SCHEMA | CATALOG | PARTITION
@@ -3034,17 +3104,6 @@ public class DatabaseConfig {
     this.queryPlanTTLSeconds = queryPlanTTLSeconds;
   }
 
-  /**
-   * Run the DB migration against the DataSource.
-   */
-  public DataSource runDbMigration(DataSource dataSource) {
-    if (migrationConfig.isRunMigration()) {
-      MigrationRunner runner = migrationConfig.createRunner(getClassLoadConfig().getClassLoader(), properties);
-      runner.run(dataSource);
-    }
-    return dataSource;
-  }
-
   /**
    * Create a new PlatformConfig based of the one held but with overridden properties by reading
    * properties with the given path and prefix.

ebean-api/src/main/java/io/ebean/config/DbMigrationConfig.java

@@ -1,509 +0,0 @@
-package io.ebean.config;
-
-import io.ebean.EbeanVersion;
-import io.ebean.annotation.Platform;
-import io.ebean.migration.MigrationConfig;
-import io.ebean.migration.MigrationRunner;
-import io.ebean.util.StringHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Map;
-import java.util.Properties;
-
-import static io.ebean.util.StringHelper.replace;
-
-/**
- * Configuration for the DB migration processing.
- */
-public class DbMigrationConfig {
-
-  protected static final Logger logger = LoggerFactory.getLogger(DbMigrationConfig.class);
-
-  protected MigrationConfig runnerConfig = new MigrationConfig();
-
-  /**
-   * The database platform to generate migration DDL for.
-   */
-  protected Platform platform;
-
-  /**
-   * Resource path for the migration xml and sql.
-   */
-  protected String migrationPath = "dbmigration";
-
-  protected String migrationInitPath = "dbinit";
-
-  /**
-   * Subdirectory the model xml files go into.
-   */
-  protected String modelPath = "model";
-
-  protected String applySuffix = ".sql";
-
-  /**
-   * Set this to "V" to be compatible with FlywayDB.
-   */
-  protected String applyPrefix = "";
-
-  protected String modelSuffix = ".model.xml";
-
-  /**
-   * For running migration the DB table that holds migration execution status.
-   */
-  protected String metaTable = "db_migration";
-
-  /**
-   * Flag set to true means to run any outstanding migrations on startup.
-   */
-  protected boolean runMigration;
-
-  /**
-   * Comma and equals delimited key/value placeholders to replace in DDL scripts.
-   */
-  protected String runPlaceholders;
-
-  /**
-   * Map of key/value placeholders to replace in DDL scripts.
-   */
-  protected Map<String, String> runPlaceholderMap;
-
-  /**
-   * DB schema used for the migration (and testing).
-   */
-  protected String dbSchema;
-
-  /**
-   * Set to true if we consider this the 'default schema' (Postgres schema that matches DB username)
-   */
-  protected boolean defaultDbSchema;
-
-  /**
-   * DB user used to run the DB migration.
-   */
-  protected String dbUsername;
-
-  /**
-   * DB password used to run the DB migration.
-   */
-  protected String dbPassword;
-
-  protected String patchInsertOn;
-
-  protected String patchResetChecksumOn;
-
-  /**
-   * Mode used to check non-null columns added via migration have a default value specified etc.
-   */
-  protected boolean strictMode = true;
-
-  /**
-   * Contains the DDL-header information.
-   */
-  protected String ddlHeader;
-
-  /**
-   * Return the DB platform to generate migration DDL for.
-   * <p>
-   * We typically need to explicitly specify this as migration can often be generated
-   * when running against H2.
-   */
-  public Platform getPlatform() {
-    return platform;
-  }
-
-  /**
-   * Set the DB platform to generate migration DDL for.
-   */
-  public void setPlatform(Platform platform) {
-    this.platform = platform;
-  }
-
-  /**
-   * Return the path for normal migrations or dbinit migrations.
-   *
-   * @param dbinitMigration When true return the path for dbinit migrations.
-   */
-  public String getMigrationPath(boolean dbinitMigration) {
-    return dbinitMigration ? migrationInitPath : migrationPath;
-  }
-
-  /**
-   * Return the resource path for db migrations.
-   */
-  public String getMigrationPath() {
-    return migrationPath;
-  }
-
-  /**
-   * Set the resource path for db migrations.
-   * <p>
-   * The default of "dbmigration" is reasonable in most cases. You may look to set this
-   * to be something like "dbmigration/myapp" where myapp gives it a unique resource path
-   * in the case there are multiple Database applications in the single classpath.
-   * </p>
-   */
-  public void setMigrationPath(String migrationPath) {
-    this.migrationPath = migrationPath;
-  }
-
-  /**
-   * Return the relative path for the model files (defaults to model).
-   */
-  public String getModelPath() {
-    return modelPath;
-  }
-
-  /**
-   * Set the relative path for the model files.
-   */
-  public void setModelPath(String modelPath) {
-    this.modelPath = modelPath;
-  }
-
-  /**
-   * Return the model suffix (defaults to model.xml)
-   */
-  public String getModelSuffix() {
-    return modelSuffix;
-  }
-
-  /**
-   * Set the model suffix.
-   */
-  public void setModelSuffix(String modelSuffix) {
-    this.modelSuffix = modelSuffix;
-  }
-
-  /**
-   * Return the apply script suffix (defaults to sql).
-   */
-  public String getApplySuffix() {
-    return applySuffix;
-  }
-
-  /**
-   * Set the apply script suffix (defaults to sql).
-   */
-  public void setApplySuffix(String applySuffix) {
-    this.applySuffix = applySuffix;
-  }
-
-  /**
-   * Return the apply prefix.
-   */
-  public String getApplyPrefix() {
-    return applyPrefix;
-  }
-
-  /**
-   * Set the apply prefix. This might be set to "V" for use with FlywayDB.
-   */
-  public void setApplyPrefix(String applyPrefix) {
-    this.applyPrefix = applyPrefix;
-  }
-
-  /**
-   * Return the table name that holds the migration run details
-   * (used by DB Migration runner only).
-   */
-  public String getMetaTable() {
-    return metaTable;
-  }
-
-  /**
-   * Set the table name that holds the migration run details
-   * (used by DB Migration runner only).
-   */
-  public void setMetaTable(String metaTable) {
-    this.metaTable = metaTable;
-  }
-
-  /**
-   * Return a comma and equals delimited placeholders that are substituted in SQL scripts when running migration
-   * (used by DB Migration runner only).
-   */
-  public String getRunPlaceholders() {
-    // environment properties take precedence
-    String placeholders = readEnvironment("ddl.migration.placeholders");
-    if (placeholders != null) {
-      return placeholders;
-    }
-    return runPlaceholders;
-  }
-
-  /**
-   * Set a comma and equals delimited placeholders that are substituted in SQL scripts when running migration
-   * (used by DB Migration runner only).
-   */
-  public void setRunPlaceholders(String runPlaceholders) {
-    this.runPlaceholders = runPlaceholders;
-  }
-
-  /**
-   * Return a map of placeholder values that are substituted in SQL scripts when running migration
-   * (used by DB Migration runner only).
-   */
-  public Map<String, String> getRunPlaceholderMap() {
-    return runPlaceholderMap;
-  }
-
-  /**
-   * Set a map of placeholder values that are substituted when running migration
-   * (used by DB Migration runner only).
-   */
-  public void setRunPlaceholderMap(Map<String, String> runPlaceholderMap) {
-    this.runPlaceholderMap = runPlaceholderMap;
-  }
-
-  /**
-   * Return true if the DB migration should be run on startup.
-   */
-  public boolean isRunMigration() {
-    // environment properties take precedence
-    String run = readEnvironment("ddl.migration.run");
-    if (run != null) {
-      return "true".equalsIgnoreCase(run.trim());
-    }
-    return runMigration;
-  }
-
-  /**
-   * Set to true to run the DB migration on startup.
-   */
-  public void setRunMigration(boolean runMigration) {
-    this.runMigration = runMigration;
-  }
-
-  /**
-   * Return the DB username to use for running DB migrations.
-   */
-  public String getDbUsername() {
-    // environment properties take precedence
-    String user = readEnvironment("ddl.migration.user");
-    if (user != null) {
-      return user;
-    }
-    return dbUsername;
-  }
-
-  /**
-   * Set the DB username to use for running DB migrations.
-   */
-  public void setDbUsername(String dbUsername) {
-    this.dbUsername = dbUsername;
-  }
-
-  /**
-   * Return the DB password to use for running DB migrations.
-   */
-  public String getDbPassword() {
-    String user = readEnvironment("ddl.migration.password");
-    if (user != null) {
-      return user;
-    }
-    return dbPassword;
-  }
-
-  /**
-   * Set the DB password to use for running DB migrations.
-   */
-  public void setDbPassword(String dbPassword) {
-    this.dbPassword = dbPassword;
-  }
-
-  /**
-   * Return the DB schema to use (for migration, testing etc).
-   */
-  public String getDbSchema() {
-    String schema = readEnvironment("ddl.migration.schema");
-    if (schema != null) {
-      return schema;
-    }
-    return dbSchema;
-  }
-
-  /**
-   * Set the Db schema to use.
-   */
-  public void setDbSchema(String dbSchema) {
-    this.dbSchema = dbSchema;
-  }
-
-  /**
-   * Set the Db schema if it hasn't already been defined.
-   */
-  public void setDefaultDbSchema(String dbSchema) {
-    this.defaultDbSchema = true;
-    this.dbSchema = dbSchema;
-  }
-
-  /**
-   * Return true if this is considered the default DB schema (Postgres schema matching DB username).
-   */
-  public boolean isDefaultDbSchema() {
-    return defaultDbSchema;
-  }
-
-  /**
-   * Return migration versions that should be added to history without running.
-   */
-  public String getPatchInsertOn() {
-    return patchInsertOn;
-  }
-
-  /**
-   * Set migration versions that should be added to history without running.
-   * <p>
-   * Value can be a string containing comma delimited list of version numbers.
-   * </p>
-   */
-  public void setPatchInsertOn(String patchInsertOn) {
-    this.patchInsertOn = patchInsertOn;
-  }
-
-  /**
-   * Return migration versions that should have their checksum reset and not run.
-   */
-  public String getPatchResetChecksumOn() {
-    return patchResetChecksumOn;
-  }
-
-  /**
-   * Returns a DDL header prepend for each DDL. E.g. for copyright headers
-   * You can use placeholders like ${version} or ${timestamp} in properties file.
-   */
-  public String getDdlHeader() {
-    if (ddlHeader != null && !ddlHeader.isEmpty()) {
-      ddlHeader = replace(ddlHeader, "${version}", EbeanVersion.getVersion());
-      ddlHeader = replace(ddlHeader, "${timestamp}", ZonedDateTime.now().format( DateTimeFormatter.ISO_INSTANT ));
-    }
-    return ddlHeader;
-  }
-
-  /**
-   * Set the header prepended to the DDL.
-   */
-  public void setDdlHeader(String ddlHeader) {
-    this.ddlHeader = ddlHeader;
-  }
-
-  /**
-   * Set migration versions that should have their checksum reset and not run.
-   * <p>
-   * Value can be a string containing comma delimited list of version numbers.
-   * </p>
-   */
-  public void setPatchResetChecksumOn(String patchResetChecksumOn) {
-    this.patchResetChecksumOn = patchResetChecksumOn;
-  }
-
-  /**
-   * Return true if strict mode is used which includes a check that non-null columns have a default value.
-   */
-  public boolean isStrictMode() {
-    String envValue = readEnvironment("ddl.migration.strictMode");
-    if (!isEmpty(envValue)) {
-      return Boolean.parseBoolean(envValue.trim());
-    }
-    return strictMode;
-  }
-
-  /**
-   * Set to false to turn off strict mode allowing non-null columns to not have a default value.
-   */
-  public void setStrictMode(boolean strictMode) {
-    this.strictMode = strictMode;
-  }
-
-  /**
-   * Return the underlying migration runner configuration allowing for more advanced settings.
-   */
-  public MigrationConfig getRunnerConfig() {
-    return runnerConfig;
-  }
-
-  /**
-   * Load the settings from the PropertiesWrapper.
-   */
-  public void loadSettings(PropertiesWrapper properties, String serverName) {
-
-    migrationPath = properties.get("migration.migrationPath", migrationPath);
-    migrationInitPath = properties.get("migration.migrationInitPath", migrationInitPath);
-    modelPath = properties.get("migration.modelPath", modelPath);
-    applyPrefix = properties.get("migration.applyPrefix", applyPrefix);
-    applySuffix = properties.get("migration.applySuffix", applySuffix);
-    modelSuffix = properties.get("migration.modelSuffix", modelSuffix);
-
-    platform = properties.getEnum(Platform.class, "migration.platform", platform);
-    patchInsertOn = properties.get("migration.patchInsertOn", patchInsertOn);
-    patchResetChecksumOn = properties.get("migration.patchResetChecksumOn", patchResetChecksumOn);
-
-    runMigration = properties.getBoolean("migration.run", runMigration);
-    metaTable = properties.get("migration.metaTable", metaTable);
-    runPlaceholders = properties.get("migration.placeholders", runPlaceholders);
-    dbSchema = properties.get("migration.dbSchema", dbSchema);
-
-    //Do not set user and pass from "datasource.db.username"
-    //There is a null test in MigrationRunner::getConnection to handle this
-    //String adminUser = properties.get("datasource." + serverName + ".username", dbUsername);
-    String adminUser = properties.get("datasource." + serverName + ".adminusername", dbUsername);
-    dbUsername = properties.get("migration.dbusername", adminUser);
-
-    //String adminPwd = properties.get("datasource." + serverName + ".password", dbPassword);
-    String adminPwd = properties.get("datasource." + serverName + ".adminpassword", dbPassword);
-    dbPassword = properties.get("migration.dbpassword", adminPwd);
-    ddlHeader = properties.get("ddl.header", ddlHeader);
-  }
-
-  /**
-   * Return the system or environment property.
-   */
-  protected String readEnvironment(String key) {
-
-    String val = System.getProperty(key);
-    if (val == null) {
-      val = System.getenv(key);
-    }
-    return val;
-  }
-
-  /**
-   * Return true if the string is null or empty.
-   */
-  protected boolean isEmpty(String val) {
-    return val == null || val.trim().isEmpty();
-  }
-
-  /**
-   * Create the MigrationRunner to run migrations if necessary.
-   */
-  public MigrationRunner createRunner(ClassLoader classLoader, Properties properties) {
-
-    runnerConfig.setMetaTable(metaTable);
-    runnerConfig.setApplySuffix(applySuffix);
-    runnerConfig.setMigrationPath(migrationPath);
-    runnerConfig.setMigrationInitPath(migrationInitPath);
-    runnerConfig.setRunPlaceholderMap(runPlaceholderMap);
-    runnerConfig.setRunPlaceholders(runPlaceholders);
-    runnerConfig.setDbUsername(getDbUsername());
-    runnerConfig.setDbPassword(getDbPassword());
-    runnerConfig.setDbSchema(getDbSchema());
-    if (defaultDbSchema) {
-      runnerConfig.setSetCurrentSchema(false);
-    }
-    runnerConfig.setClassLoader(classLoader);
-    if (patchInsertOn != null) {
-      runnerConfig.setPatchInsertOn(patchInsertOn);
-    }
-    if (patchResetChecksumOn != null) {
-      runnerConfig.setPatchResetChecksumOn(patchResetChecksumOn);
-    }
-    if (properties != null) {
-      runnerConfig.load(properties);
-    }
-    return new MigrationRunner(runnerConfig);
-  }
-}

ebean-api/src/main/java/io/ebean/config/ServerConfig.java

@@ -1,47 +1,6 @@
 package io.ebean.config;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
-import io.ebean.PersistenceContextScope;
-import io.ebean.Query;
-import io.ebean.Transaction;
-import io.ebean.annotation.Encrypted;
-import io.ebean.annotation.PersistBatch;
-import io.ebean.annotation.Platform;
-import io.ebean.cache.ServerCachePlugin;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbEncrypt;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.datasource.DataSourceConfig;
-import io.ebean.event.BeanFindController;
-import io.ebean.event.BeanPersistController;
-import io.ebean.event.BeanPersistListener;
-import io.ebean.event.BeanPostConstructListener;
-import io.ebean.event.BeanPostLoad;
-import io.ebean.event.BeanQueryAdapter;
-import io.ebean.event.BulkTableEventListener;
-import io.ebean.event.ServerConfigStartup;
-import io.ebean.event.changelog.ChangeLogListener;
-import io.ebean.event.changelog.ChangeLogPrepare;
-import io.ebean.event.changelog.ChangeLogRegister;
-import io.ebean.event.readaudit.ReadAuditLogger;
-import io.ebean.event.readaudit.ReadAuditPrepare;
-import io.ebean.migration.MigrationRunner;
-import io.ebean.util.StringHelper;
-
-import javax.persistence.EnumType;
-import javax.sql.DataSource;
-import java.time.Clock;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
 
 /**
  * Deprecated - please migrate to <code>io.ebean.DatabaseConfig</code>.

ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -16,6 +16,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.NavigableSet;
 import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Database sequence based IdGenerator.
@@ -24,15 +26,9 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected static final Logger logger = LoggerFactory.getLogger("io.ebean.SEQ");
 
-  /**
-   * Used to synchronise the idList access.
-   */
-  protected final Object monitor = new Object();
+  private final ReentrantLock lock = new ReentrantLock(false);
 
-  /**
-   * Used to synchronise background loading (loadBatchInBackground).
-   */
-  protected final Object backgroundLoadMonitor = new Object();
+  private final ReentrantLock loadLock = new ReentrantLock(false);
 
   /**
    * The actual sequence name.
@@ -47,7 +43,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected final int allocationSize;
 
-  protected boolean currentlyBackgroundLoading;
+  protected AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false);
 
   /**
    * Construct given a dataSource and sql to return the next sequence value.
@@ -97,7 +93,8 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
    */
   @Override
   public Object nextId(Transaction t) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       int size = idList.size();
       if (size > 0) {
         maybeLoadMoreInBackground(size);
@@ -105,6 +102,8 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
         loadMore(allocationSize);
       }
       return idList.pollFirst();
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -118,8 +117,11 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   private void loadMore(int requestSize) {
     List<Long> newIds = getMoreIds(requestSize);
-    synchronized (monitor) {
+    lock.lock();
+    try {
       idList.addAll(newIds);
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -127,24 +129,16 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
    * Load another batch of Id's using a background thread.
    */
   protected void loadInBackground(final int requestSize) {
-
-    // single threaded processing...
-    synchronized (backgroundLoadMonitor) {
-      if (currentlyBackgroundLoading) {
-        // skip as already background loading
-        logger.debug("... skip background sequence load (another load in progress)");
-        return;
-      }
-
-      currentlyBackgroundLoading = true;
-
-      backgroundExecutor.execute(() -> {
-        loadMore(requestSize);
-        synchronized (backgroundLoadMonitor) {
-          currentlyBackgroundLoading = false;
-        }
-      });
+    if (currentlyBackgroundLoading.get()) {
+      // skip as already background loading
+      logger.debug("... skip background sequence load (another load in progress)");
+      return;
     }
+    currentlyBackgroundLoading.set(true);
+    backgroundExecutor.execute(() -> {
+      loadMore(requestSize);
+      currentlyBackgroundLoading.set(false);
+    });
   }
 
   /**

ebean-api/src/main/java/io/ebean/event/ShutdownManager.java

@@ -11,6 +11,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Manages the shutdown of the JVM Runtime.
@@ -22,6 +23,8 @@ public final class ShutdownManager {
 
   private static final Logger logger = LoggerFactory.getLogger(ShutdownManager.class);
 
+  private static final ReentrantLock lock = new ReentrantLock(false);
+
   private static final List<Database> databases = new ArrayList<>();
 
   private static final ShutdownHook shutdownHook = new ShutdownHook();
@@ -56,9 +59,11 @@ public final class ShutdownManager {
    * Return true if the system is in the process of stopping.
    */
   public static boolean isStopping() {
-    //noinspection SynchronizationOnStaticField
-    synchronized (databases) {
+    lock.lock();
+    try {
       return stopping;
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -74,15 +79,15 @@ public final class ShutdownManager {
    * </p>
    */
   public static void deregisterShutdownHook() {
-    //noinspection SynchronizationOnStaticField
-    synchronized (databases) {
-      try {
-        Runtime.getRuntime().removeShutdownHook(shutdownHook);
-      } catch (IllegalStateException ex) {
-        if (!ex.getMessage().equals("Shutdown in progress")) {
-          throw ex;
-        }
+    lock.lock();
+    try {
+      Runtime.getRuntime().removeShutdownHook(shutdownHook);
+    } catch (IllegalStateException ex) {
+      if (!ex.getMessage().equals("Shutdown in progress")) {
+        throw ex;
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -90,18 +95,18 @@ public final class ShutdownManager {
    * Register the shutdown hook with the Runtime.
    */
   protected static void registerShutdownHook() {
-    //noinspection SynchronizationOnStaticField
-    synchronized (databases) {
-      try {
-        String value = System.getProperty("ebean.registerShutdownHook");
-        if (value == null || !value.trim().equalsIgnoreCase("false")) {
-          Runtime.getRuntime().addShutdownHook(shutdownHook);
-        }
-      } catch (IllegalStateException ex) {
-        if (!ex.getMessage().equals("Shutdown in progress")) {
-          throw ex;
-        }
+    lock.lock();
+    try {
+      String value = System.getProperty("ebean.registerShutdownHook");
+      if (value == null || !value.trim().equalsIgnoreCase("false")) {
+        Runtime.getRuntime().addShutdownHook(shutdownHook);
       }
+    } catch (IllegalStateException ex) {
+      if (!ex.getMessage().equals("Shutdown in progress")) {
+        throw ex;
+      }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -112,8 +117,8 @@ public final class ShutdownManager {
    * </p>
    */
   public static void shutdown() {
-    //noinspection SynchronizationOnStaticField
-    synchronized (databases) {
+    lock.lock();
+    try {
       if (stopping) {
         // Already run shutdown...
         return;
@@ -157,6 +162,8 @@ public final class ShutdownManager {
       if ("true".equalsIgnoreCase(System.getProperty("ebean.datasource.deregisterAllDrivers", "false"))) {
         deregisterAllJdbcDrivers();
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -178,9 +185,11 @@ public final class ShutdownManager {
    * Register an ebeanServer to be shutdown when the JVM is shutdown.
    */
   public static void registerDatabase(Database server) {
-    //noinspection SynchronizationOnStaticField
-    synchronized (databases) {
+    lock.lock();
+    try {
       databases.add(server);
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -191,9 +200,11 @@ public final class ShutdownManager {
    * </p>
    */
   public static void unregisterDatabase(Database server) {
-    //noinspection SynchronizationOnStaticField
-    synchronized (databases) {
+    lock.lock();
+    try {
       databases.remove(server);
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-api/src/main/java/io/ebean/plugin/BeanType.java

@@ -2,11 +2,11 @@ package io.ebean.plugin;
 
 import io.ebean.Query;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.docstore.DocMapping;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;
-import io.ebean.docstore.DocMapping;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;

ebean-api/src/main/java/io/ebean/plugin/SpiServer.java

@@ -1,18 +1,17 @@
 package io.ebean.plugin;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
-import javax.sql.DataSource;
 import java.util.List;
 
 /**
  * Extensions to Database API made available to plugins.
  */
-public interface SpiServer extends EbeanServer, BeanLoader {
+public interface SpiServer extends Database {
 
   /**
    * Return the DatabaseConfig.
@@ -45,14 +44,9 @@ public interface SpiServer extends EbeanServer, BeanLoader {
   BeanType<?> getBeanTypeForQueueId(String queueId);
 
   /**
-   * Return the associated DataSource for this Database instance.
+   * Return a BeanLoader.
    */
-  DataSource getDataSource();
-
-  /**
-   * Return the associated read only DataSource for this Database instance (can be null).
-   */
-  DataSource getReadOnlyDataSource();
+  BeanLoader beanLoader();
 
   /**
    * Invoke lazy loading on this single bean (reference bean).

ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java

@@ -1,7 +1,7 @@
 package io.ebean.text.json;
 
-import io.ebean.bean.PersistenceContext;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.bean.PersistenceContext;
 
 /**
  * Provides a JSON reader that can hold a persistence context and load context while reading JSON.

ebean-api/src/main/java/io/ebean/text/json/JsonContext.java

@@ -1,9 +1,9 @@
 package io.ebean.text.json;
 
-import io.ebean.FetchPath;
-import io.ebean.plugin.BeanType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.FetchPath;
+import io.ebean.plugin.BeanType;
 
 import java.io.IOException;
 import java.io.Reader;

ebean-autotune/pom.xml

@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
+    <version>12.6.0</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java8-oss</artifactId>-->
+<!--    <version>2.2</version>-->
+<!--  </parent>-->
 
+  <scm>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
+    <tag>ebean-parent-12.6.0</tag>
+  </scm>
+
+  <name>ebean autotune</name>
+  <description>ebean automatic query tuning module</description>
   <artifactId>ebean-autotune</artifactId>
 
   <dependencies>
@@ -14,7 +26,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>${project.version}</version>
+      <version>12.6.0</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- needed for java 11+ -->
@@ -25,6 +38,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
@@ -39,7 +59,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>

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

@@ -14,6 +14,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Implementation of the AutoTuneService which is comprised of profiling and query tuning.
@@ -22,6 +23,8 @@ public class DefaultAutoTuneService implements AutoTuneService {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultAutoTuneService.class);
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final SpiEbeanServer server;
 
   private final long defaultGarbageCollectionWait;
@@ -127,8 +130,8 @@ public class DefaultAutoTuneService implements AutoTuneService {
    * Collect profiling, check for new/diff to existing tuning and apply changes.
    */
   private void runtimeTuningUpdate() {
-
-    synchronized (this) {
+    lock.lock();
+    try {
       try {
         long start = System.currentTimeMillis();
 
@@ -150,12 +153,14 @@ public class DefaultAutoTuneService implements AutoTuneService {
       } catch (Throwable e) {
         logger.error("Error collecting or applying automatic query tuning", e);
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   private void saveProfilingOnShutdown(boolean reset) {
-
-    synchronized (this) {
+    lock.lock();
+    try {
       if (isRuntimeTuningUpdates()) {
         runtimeTuningUpdate();
         outputAllTuning();
@@ -174,6 +179,8 @@ public class DefaultAutoTuneService implements AutoTuneService {
           logger.info("writing new:{} diff:{} profiling entries for server:{}", event.getNewCount(), event.getDiffCount(), serverName);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -11,12 +11,15 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Manages the collection of object graph usage profiling.
  */
 public class ProfileManager implements ProfilingListener {
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final boolean queryTuningAddVersion;
 
   /**
@@ -32,8 +35,6 @@ public class ProfileManager implements ProfilingListener {
    */
   private final Map<String, ProfileOrigin> profileMap = new ConcurrentHashMap<>();
 
-  private final Object monitor = new Object();
-
   private final SpiEbeanServer server;
 
   public ProfileManager(AutoTuneConfig config, SpiEbeanServer server) {
@@ -101,8 +102,11 @@ public class ProfileManager implements ProfilingListener {
   }
 
   private ProfileOrigin getProfileOrigin(ObjectGraphOrigin originQueryPoint) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       return profileMap.computeIfAbsent(originQueryPoint.getKey(), k -> new ProfileOrigin(originQueryPoint, queryTuningAddVersion, profilingBase, profilingRate));
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -12,9 +12,12 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantLock;
 
 public class ProfileOrigin {
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private static final long RESET_COUNT = -1000000000L;
 
   private final ObjectGraphOrigin origin;
@@ -29,8 +32,6 @@ public class ProfileOrigin {
 
   private final Map<String, ProfileOriginNodeUsage> nodeUsageMap = new ConcurrentHashMap<>();
 
-  private final Object monitor = new Object();
-
   private final AtomicLong requestCount = new AtomicLong();
 
   private final AtomicLong profileCount = new AtomicLong();
@@ -74,8 +75,8 @@ public class ProfileOrigin {
    * Collect profiling information with the option to reset the underlying profiling detail.
    */
   public void profilingCollection(BeanDescriptor<?> rootDesc, AutoTuneCollection req, boolean reset) {
-
-    synchronized (monitor) {
+    lock.lock();
+    try {
       if (nodeUsageMap.isEmpty()) {
         return;
       }
@@ -94,6 +95,8 @@ public class ProfileOrigin {
           profileCount.set(0);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -155,8 +158,8 @@ public class ProfileOrigin {
   }
 
   private ProfileOriginNodeUsage getNodeStats(String path) {
-
-    synchronized (monitor) {
+    lock.lock();
+    try {
       // handle null paths as using ConcurrentHashMap
       path = (path == null) ? "" : path;
       ProfileOriginNodeUsage nodeStats = nodeUsageMap.get(path);
@@ -165,6 +168,8 @@ public class ProfileOrigin {
         nodeUsageMap.put(path, nodeStats);
       }
       return nodeStats;
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Collects usages statistics for a given node in the object graph.
@@ -20,7 +21,7 @@ public class ProfileOriginNodeUsage {
 
   private static final Logger logger = LoggerFactory.getLogger(ProfileOriginNodeUsage.class);
 
-  private final Object monitor = new Object();
+  private final ReentrantLock lock = new ReentrantLock(false);
 
   private final String path;
 
@@ -38,9 +39,8 @@ public class ProfileOriginNodeUsage {
   }
 
   protected void buildTunedFetch(PathProperties pathProps, BeanDescriptor<?> rootDesc, boolean addVersionProperty) {
-
-    synchronized (monitor) {
-
+    lock.lock();
+    try {
       BeanDescriptor<?> desc = rootDesc;
       if (path != null) {
         ElPropertyValue elGetValue = rootDesc.getElGetValue(path);
@@ -95,6 +95,8 @@ public class ProfileOriginNodeUsage {
         ElPropertyValue assocOne = rootDesc.getElGetValue(path);
         pathProps.addToPath(SplitName.parent(path), assocOne.getName());
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -102,9 +104,8 @@ public class ProfileOriginNodeUsage {
    * Collect usage from a node.
    */
   protected void collectUsageInfo(NodeUsageCollector profile) {
-
-    synchronized (monitor) {
-
+    lock.lock();
+    try {
       Set<String> used = profile.getUsed();
 
       profileCount++;
@@ -115,6 +116,8 @@ public class ProfileOriginNodeUsage {
       if (profile.isModified()) {
         modified = true;
       }
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-bom/pom.xml

@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
+    <version>12.6.0</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
+  <name>ebean bom</name>
+  <description>ebean bill of materials pom</description>
   <artifactId>ebean-bom</artifactId>
   <packaging>pom</packaging>
 
   <properties>
-    <ebean-agent.version>12.5.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.5.0</ebean-maven-plugin.version>
+    <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
+    <ebean-migration-auto.version>1.0</ebean-migration-auto.version>
+    <ebean-migration.version>12.2.0</ebean-migration.version>
+    <ebean-test-docker.version>4.0</ebean-test-docker.version>
+    <ebean-datasource.version>7.0</ebean-datasource.version>
+    <ebean-agent.version>12.6.0</ebean-agent.version>
+    <ebean-maven-plugin.version>12.6.0</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -21,6 +28,36 @@
 
       <!-- dependencies external to this ebean.git build -->
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-ddl-runner</artifactId>
+        <version>${ebean-ddl-runner.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-migration-auto</artifactId>
+        <version>${ebean-migration-auto.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-migration</artifactId>
+        <version>${ebean-migration.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-datasource-api</artifactId>
+        <version>${ebean-datasource.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-datasource</artifactId>
+        <version>${ebean-datasource.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-agent</artifactId>
@@ -33,74 +70,80 @@
         <version>${ebean-maven-plugin.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-test-docker</artifactId>
+        <version>${ebean-test-docker.version}</version>
+      </dependency>
+
       <!-- modules -->
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
-        <artifactId>ebean-ddlgen</artifactId>
-        <version>${project.version}</version>
+        <artifactId>ebean-ddl-generator</artifactId>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>${project.version}</version>
+        <version>12.6.0</version>
         <scope>test</scope>
       </dependency>
 

ebean-core/pom.xml

@@ -3,23 +3,24 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
+    <version>12.6.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
   <packaging>jar</packaging>
 
-  <name>ebean-core</name>
-  <url>http://ebean-orm.github.io/</url>
+  <name>ebean core</name>
+  <description>ebean core module</description>
+  <url>https://ebean.io/</url>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.6.0</tag>
   </scm>
 
   <properties>
-    <jackson-core.version>2.10.0</jackson-core.version>
-    <jackson-databind.version>2.10.0</jackson-databind.version>
+    <jackson-core.version>2.11.3</jackson-core.version>
+    <jackson-databind.version>2.11.3</jackson-databind.version>
   </properties>
 
   <profiles>
@@ -47,14 +48,40 @@
   </profiles>
   <dependencies>
 
-    <!-- keep testing in core using ebean-ddlgen -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-runner</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>classpath-scanner</artifactId>
+      <version>4.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration-auto</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <!-- keep testing in core using ebean-ddl-generator & ebean-migration -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>12.2.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.0</version>
+      <version>12.5.2A</version>
       <scope>test</scope>
     </dependency>
-    <!-- test scope for supporting ebean-ddlgen -->
+
+    <!-- test scope for supporting ebean-ddl-generator -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
@@ -65,13 +92,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>${project.version}</version>
+      <version>12.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>${project.version}</version>
+      <version>12.6.0</version>
     </dependency>
 
     <dependency>
@@ -91,12 +118,6 @@
       <scope>provided</scope>
     </dependency>
 
-<!--    <dependency>-->
-<!--      <groupId>io.ebean</groupId>-->
-<!--      <artifactId>ebean-migration</artifactId>-->
-<!--      <version>12.1.4</version>-->
-<!--    </dependency>-->
-
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
@@ -131,9 +152,9 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
       <version>${jackson-core.version}</version>
+      <optional>true</optional>
     </dependency>
 
-    <!-- provided scope for JsonNode support -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -151,6 +172,13 @@
 
     <!-- Test scope -->
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.nuodb.jdbc</groupId>
       <artifactId>nuodb-jdbc</artifactId>
@@ -166,9 +194,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.ebean.test</groupId>
+      <groupId>io.ebean</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>3.1.5</version>
+      <version>4.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/GeoTypeProvider.java

@@ -0,0 +1,15 @@
+package io.ebeaninternal.api;
+
+import io.ebean.config.DatabaseConfig;
+import io.ebeaninternal.server.type.GeoTypeBinder;
+
+/**
+ * Provider of Geometry type binder support.
+ */
+public interface GeoTypeProvider {
+
+  /**
+   * Create a binder for binding geometry types.
+   */
+  GeoTypeBinder createBinder(DatabaseConfig config);
+}

ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java

@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Manages the construction of caches.
@@ -26,17 +27,14 @@ class DefaultCacheHolder {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.ALL");
 
+  private final ReentrantLock lock = new ReentrantLock(false);
   private final ConcurrentHashMap<String, ServerCache> allCaches = new ConcurrentHashMap<>();
-
   private final ConcurrentHashMap<String, Set<String>> collectIdCaches = new ConcurrentHashMap<>();
 
   private final ServerCacheFactory cacheFactory;
-
   private final ServerCacheOptions beanDefault;
   private final ServerCacheOptions queryDefault;
-
   private final CurrentTenantProvider tenantProvider;
-
   private final QueryCacheEntryValidate queryCacheEntryValidate;
 
   DefaultCacheHolder(CacheManagerOptions builder) {
@@ -87,8 +85,11 @@ class DefaultCacheHolder {
   private ServerCache createCache(Class<?> beanType, ServerCacheType type, String key, String shortName) {
     ServerCacheOptions options = getCacheOptions(beanType, type);
     if (type == ServerCacheType.COLLECTION_IDS) {
-      synchronized (this) {
+      lock.lock();
+      try {
         collectIdCaches.computeIfAbsent(beanType.getName(), s -> new ConcurrentSkipListSet<>()).add(key);
+      } finally {
+        lock.unlock();
       }
     }
     return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, tenantProvider, queryCacheEntryValidate));

ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java

@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Manages the cluster service.
@@ -17,6 +18,8 @@ public class ClusterManager implements ServerLookup {
 
   private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final ConcurrentHashMap<String, EbeanServer> serverMap = new ConcurrentHashMap<>();
 
   private final Object monitor = new Object();
@@ -51,18 +54,24 @@ public class ClusterManager implements ServerLookup {
   }
 
   public void registerServer(EbeanServer server) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       serverMap.put(server.getName(), server);
       if (!started) {
         startup();
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public EbeanServer getServer(String name) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       return serverMap.get(name);
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.ScriptRunner;
-import io.ebean.migration.ddl.DdlRunner;
-import io.ebean.migration.runner.ScriptTransform;
+import io.ebean.ddlrunner.DdlRunner;
+import io.ebean.ddlrunner.ScriptTransform;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.util.UrlHelper;
 
@@ -102,7 +102,7 @@ class DScriptRunner implements ScriptRunner {
 
   private Connection obtainConnection() {
     try {
-      return server.getPluginApi().getDataSource().getConnection();
+      return server.getDataSource().getConnection();
     } catch (SQLException e) {
       throw new PersistenceException("Failed to obtain connection to run script", e);
     }

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

@@ -26,6 +26,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.ServiceLoader;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Default Server side implementation of ServerFactory.
@@ -34,6 +35,7 @@ public class DefaultContainer implements SpiContainer {
 
   private static final Logger logger = LoggerFactory.getLogger("io.ebean.internal.DefaultContainer");
 
+  private final ReentrantLock lock = new ReentrantLock(false);
   private final ClusterManager clusterManager;
 
   public DefaultContainer(ContainerConfig containerConfig) {
@@ -72,7 +74,8 @@ public class DefaultContainer implements SpiContainer {
    */
   @Override
   public SpiEbeanServer createServer(DatabaseConfig config) {
-    synchronized (this) {
+    lock.lock();
+    try {
       applyConfigServices(config);
       setNamingConvention(config);
       BootupClasses bootupClasses = getBootupClasses(config);
@@ -114,6 +117,8 @@ public class DefaultContainer implements SpiContainer {
       }
       DbOffline.reset();
       return server;
+    } finally {
+      lock.unlock();
     }
   }
 

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

@@ -36,11 +36,13 @@ import io.ebean.Version;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.bean.BeanCollection;
+import io.ebean.bean.BeanLoader;
 import io.ebean.bean.CallOrigin;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.bean.PersistenceContext.WithOption;
+import io.ebean.bean.SingleBeanLoader;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.common.CopyOnFirstWriteList;
 import io.ebean.config.CurrentTenantProvider;
@@ -59,6 +61,7 @@ import io.ebean.meta.MetaQueryPlan;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.meta.QueryPlanInit;
 import io.ebean.meta.QueryPlanRequest;
+import io.ebean.migration.auto.AutoMigrationRunner;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.Property;
@@ -142,6 +145,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.Spliterator;
 import java.util.concurrent.Callable;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -157,98 +161,47 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultServer.class);
 
+  private final ReentrantLock lock = new ReentrantLock(false);
   private final DatabaseConfig config;
-
   private final String serverName;
-
   private final DatabasePlatform databasePlatform;
-
   private final TransactionManager transactionManager;
-
   private final QueryPlanManager queryPlanManager;
-
   private final ExtraMetrics extraMetrics;
-
   private final DataTimeZone dataTimeZone;
-
-  /**
-   * Clock to use for WhenModified and WhenCreated.
-   */
   private final ClockService clockService;
-
   private final CallOriginFactory callStackFactory;
-
-  /**
-   * Handles the save, delete, updateSql CallableSql.
-   */
   private final Persister persister;
-
   private final OrmQueryEngine queryEngine;
-
   private final RelationalQueryEngine relationalQueryEngine;
   private final DtoQueryEngine dtoQueryEngine;
-
   private final ServerCacheManager serverCacheManager;
-
   private final DtoBeanManager dtoBeanManager;
   private final BeanDescriptorManager beanDescriptorManager;
-
   private final AutoTuneService autoTuneService;
-
   private final ReadAuditPrepare readAuditPrepare;
-
   private final ReadAuditLogger readAuditLogger;
-
   private final CQueryEngine cqueryEngine;
-
   private final List<Plugin> serverPlugins;
-
   private final SpiDdlGenerator ddlGenerator;
-
   private final ScriptRunner scriptRunner;
-
   private final ExpressionFactory expressionFactory;
-
   private final SpiBackgroundExecutor backgroundExecutor;
-
   private final DefaultBeanLoader beanLoader;
-
   private final EncryptKeyManager encryptKeyManager;
-
   private final SpiJsonContext jsonContext;
-
   private final DocumentStore documentStore;
-
   private final MetaInfoManager metaInfoManager;
-
   private final CurrentTenantProvider currentTenantProvider;
-
   private final SpiLogManager logManager;
-
-  /**
-   * The default PersistenceContextScope used if it is not explicitly set on a query.
-   */
   private final PersistenceContextScope defaultPersistenceContextScope;
-
-  /**
-   * Flag set when the server has shutdown.
-   */
-  private boolean shutdown;
-
-  /**
-   * The default batch size for lazy loading beans or collections.
-   */
   private final int lazyLoadBatchSize;
-
   private final int queryBatchSize;
-
   private final boolean updateAllPropertiesInBatch;
-
   private final long slowQueryMicros;
-
   private final SlowQueryListener slowQueryListener;
-
   private final boolean disableL2Cache;
+  private boolean shutdown;
 
   /**
    * Create the DefaultServer.
@@ -445,15 +398,27 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Start any services after registering with the ClusterManager.
    */
   public void start() {
-    if (TenantMode.DB != config.getTenantMode()) {
-      config.runDbMigration(config.getDataSource());
+    if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) {
+      final AutoMigrationRunner migrationRunner = config.service(AutoMigrationRunner.class);
+      if (migrationRunner == null) {
+        throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?");
+      }
+      final String dbSchema = config.getDbSchema();
+      if (dbSchema != null) {
+        migrationRunner.setDefaultDbSchema(dbSchema);
+      }
+      migrationRunner.loadProperties(config.getProperties());
+      migrationRunner.run(config.getDataSource());
     }
   }
 
   @Override
   public void shutdown() {
-    synchronized (this) {
+    lock.lock();
+    try {
       shutdownInternal(true, false);
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -462,10 +427,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) {
-    synchronized (this) {
-      // Unregister from JVM Shutdown hook
+    lock.lock();
+    try {
       ShutdownManager.unregisterDatabase(this);
       shutdownInternal(shutdownDataSource, deregisterDriver);
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -575,6 +542,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     beanLoader.loadBean(loadRequest);
   }
 
+  @Override
+  public BeanLoader beanLoader() {
+    return new SingleBeanLoader.Dflt(this);
+  }
+
   @Override
   public void loadBean(EntityBeanIntercept ebi) {
     beanLoader.loadBean(ebi);

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

@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import java.util.HashMap;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Used to reduce memory consumption of strings used in deployment processing.
@@ -12,6 +13,8 @@ public final class InternString {
 
   private static final HashMap<String, String> map = new HashMap<>();
 
+  private static final ReentrantLock lock = new ReentrantLock(false);
+
   /**
    * Return the shared instance of this string.
    */
@@ -19,8 +22,8 @@ public final class InternString {
     if (s == null) {
       return null;
     }
-    //noinspection SynchronizationOnStaticField
-    synchronized (map) {
+    lock.lock();
+    try {
       String v = map.get(s);
       if (v != null) {
         return v;
@@ -28,6 +31,8 @@ public final class InternString {
         map.put(s, s);
         return s;
       }
+    } finally {
+      lock.unlock();
     }
   }
 }

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

@@ -118,69 +118,41 @@ public class InternalConfiguration {
   private static final Logger logger = LoggerFactory.getLogger(InternalConfiguration.class);
 
   private final TableModState tableModState;
-
   private final boolean online;
-
   private final DatabaseConfig config;
-
   private final BootupClasses bootupClasses;
-
   private final DatabasePlatform databasePlatform;
-
   private final DeployInherit deployInherit;
-
   private final TypeManager typeManager;
-
   private final DtoBeanManager dtoBeanManager;
-
   private final ClockService clockService;
-
   private final DataTimeZone dataTimeZone;
-
   private final Binder binder;
-
   private final DeployCreateProperties deployCreateProperties;
-
   private final DeployUtil deployUtil;
-
   private final BeanDescriptorManager beanDescriptorManager;
-
   private final CQueryEngine cQueryEngine;
-
   private final ClusterManager clusterManager;
-
   private final SpiCacheManager cacheManager;
-
   private final ServerCachePlugin serverCachePlugin;
-
-  private ServerCacheNotify cacheNotify;
-
-  private boolean localL2Caching;
-
+  private final boolean jacksonCorePresent;
   private final ExpressionFactory expressionFactory;
-
   private final SpiBackgroundExecutor backgroundExecutor;
-
   private final JsonFactory jsonFactory;
-
   private final DocStoreFactory docStoreFactory;
-
-  /**
-   * List of plugins (that ultimately the DefaultServer configures late in construction).
-   */
   private final List<Plugin> plugins = new ArrayList<>();
-
   private final MultiValueBind multiValueBind;
-
   private final SpiLogManager logManager;
-
   private final ExtraMetrics extraMetrics = new ExtraMetrics();
+  private ServerCacheNotify cacheNotify;
+  private boolean localL2Caching;
 
   InternalConfiguration(boolean online, ClusterManager clusterManager, SpiBackgroundExecutor backgroundExecutor,
                         DatabaseConfig config, BootupClasses bootupClasses) {
 
     this.online = online;
     this.config = config;
+    this.jacksonCorePresent = config.getClassLoadConfig().isJacksonCorePresent();
     this.clockService = new ClockService(config.getClock());
     this.tableModState = new TableModState();
     this.logManager = initLogManager();
@@ -210,6 +182,10 @@ public class InternalConfiguration {
     this.cQueryEngine = new CQueryEngine(config, databasePlatform, binder, asOfTableMapping, draftTableMap);
   }
 
+  public boolean isJacksonCorePresent() {
+    return jacksonCorePresent;
+  }
+
   private InternalConfigXmlMap initExternalMapping() {
     final List<XmapEbean> xmEbeans = readExternalMapping();
     return new InternalConfigXmlMap(xmEbeans, config.getClassLoadConfig().getClassLoader());
@@ -307,7 +283,7 @@ public class InternalConfiguration {
    * Return the ChangeLogListener to use with a default implementation if none defined.
    */
   public ChangeLogListener changeLogListener(ChangeLogListener listener) {
-    return plugin((listener != null) ? listener : new DefaultChangeLogListener());
+    return plugin((listener != null) ? listener : jacksonCorePresent ? new DefaultChangeLogListener() : null);
   }
 
   /**
@@ -315,7 +291,7 @@ public class InternalConfiguration {
    */
   ReadAuditLogger getReadAuditLogger() {
     ReadAuditLogger found = bootupClasses.getReadAuditLogger();
-    return plugin(found != null ? found : new DefaultReadAuditLogger());
+    return plugin(found != null ? found : jacksonCorePresent? new DefaultReadAuditLogger(): null);
   }
 
   /**
@@ -356,7 +332,7 @@ public class InternalConfiguration {
   }
 
   SpiJsonContext createJsonContext(SpiEbeanServer server) {
-    return new DJsonContext(server, jsonFactory, typeManager);
+    return jacksonCorePresent ? new DJsonContext(server, jsonFactory, typeManager) : null;
   }
 
   AutoTuneService createAutoTuneService(SpiEbeanServer server) {

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -432,7 +432,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     boolean noRelationships = propertiesOne.length + propertiesMany.length == 0;
     this.cacheSharableBeans = noRelationships && deploy.getCacheOptions().isReadOnly();
     this.cacheHelp = new BeanDescriptorCacheHelp<>(this, owner.getCacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported);
-    this.jsonHelp = new BeanDescriptorJsonHelp<>(this);
+    this.jsonHelp = initJsonHelp();
     this.draftHelp = new BeanDescriptorDraftHelp<>(this);
     this.docStoreAdapter = owner.createDocStoreBeanAdapter(this, deploy);
     this.docStoreQueueId = docStoreAdapter.getQueueId();
@@ -469,6 +469,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
+  public boolean isJacksonCorePresent() {
+    return owner.isJacksonCorePresent();
+  }
+
+  private BeanDescriptorJsonHelp<T> initJsonHelp() {
+    return isJacksonCorePresent() ? new BeanDescriptorJsonHelp<>(this) : null;
+  }
+
   /**
    * Return true if the bean should be treated as a reference bean when it only has its id populated.
    * To be true it has other scalar properties that are not generated on insert.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -95,87 +95,47 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   private static final BeanDescComparator beanDescComparator = new BeanDescComparator();
 
   private final ReadAnnotations readAnnotations;
-
   private final TransientProperties transientProperties;
-
-  /**
-   * Helper to derive inheritance information.
-   */
   private final DeployInherit deplyInherit;
-
   private final BeanPropertyAccess beanPropertyAccess = new EnhanceBeanPropertyAccess();
-
   private final DeployUtil deployUtil;
-
   private final PersistControllerManager persistControllerManager;
-
   private final PostLoadManager postLoadManager;
-
   private final PostConstructManager postConstructManager;
-
   private final BeanFinderManager beanFinderManager;
-
   private final PersistListenerManager persistListenerManager;
-
   private final BeanQueryAdapterManager beanQueryAdapterManager;
-
   private final NamingConvention namingConvention;
-
   private final DeployCreateProperties createProperties;
-
   private final BeanManagerFactory beanManagerFactory;
-
   private final DatabaseConfig config;
-
   private final ChangeLogListener changeLogListener;
-
   private final ChangeLogRegister changeLogRegister;
-
   private final ChangeLogPrepare changeLogPrepare;
-
   private final DocStoreFactory docStoreFactory;
-
   private final MultiValueBind multiValueBind;
-
   private final TypeManager typeManager;
-
-  private int entityBeanCount;
-
   private final BootupClasses bootupClasses;
-
   private final String serverName;
-
   private final Map<Class<?>, BeanTable> beanTableMap = new HashMap<>();
-
   private final Map<String, BeanDescriptor<?>> descMap = new HashMap<>();
-
   private final Map<String, BeanDescriptor<?>> descQueueMap = new HashMap<>();
-
   private final Map<String, BeanManager<?>> beanManagerMap = new HashMap<>();
-
   private final Map<String, List<BeanDescriptor<?>>> tableToDescMap = new HashMap<>();
-
   private final Map<String, List<BeanDescriptor<?>>> tableToViewDescMap = new HashMap<>();
-
-  private List<BeanDescriptor<?>> immutableDescriptorList;
-
   private final DbIdentity dbIdentity;
-
   private final DataSource dataSource;
-
   private final DatabasePlatform databasePlatform;
-
   private final SpiCacheManager cacheManager;
-
   private final BackgroundExecutor backgroundExecutor;
-
   private final EncryptKeyManager encryptKeyManager;
-
   private final IdBinderFactory idBinderFactory;
-
   private final BeanLifecycleAdapterFactory beanLifecycleAdapterFactory;
-
   private final String asOfViewSuffix;
+  private final boolean jacksonCorePresent;
+  private final int queryPlanTTLSeconds;
+  private int entityBeanCount;
+  private List<BeanDescriptor<?>> immutableDescriptorList;
 
   /**
    * Map of base tables to 'with history views' used to support 'as of' queries.
@@ -187,8 +147,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private final Map<String, String> draftTableMap = new HashMap<>();
 
-  private final int queryPlanTTLSeconds;
-
   // temporary collections used during startup and then cleared
 
   private Map<Class<?>, DeployBeanInfo<?>> deployInfoMap = new HashMap<>();
@@ -232,6 +190,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     this.changeLogPrepare = config.changeLogPrepare(bootupClasses.getChangeLogPrepare());
     this.changeLogListener = config.changeLogListener(bootupClasses.getChangeLogListener());
     this.changeLogRegister = config.changeLogRegister(bootupClasses.getChangeLogRegister());
+    this.jacksonCorePresent = config.isJacksonCorePresent();
+  }
+
+  @Override
+  public boolean isJacksonCorePresent() {
+    return jacksonCorePresent;
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorMap.java

@@ -71,4 +71,9 @@ public interface BeanDescriptorMap {
    * Return the scalarType for the given logical type.
    */
   ScalarType<?> getScalarType(String cast);
+
+  /**
+   * Return true if Jackson core is present on the classpath.
+   */
+  boolean isJacksonCorePresent();
 }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -144,7 +144,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
     this.inverseJoin = deploy.createInverseTableJoin();
     this.modifyListenMode = deploy.getModifyListenMode();
-    this.jsonHelp = new BeanPropertyAssocManyJsonHelp(this);
+    this.jsonHelp = descriptor.isJacksonCorePresent() ? new BeanPropertyAssocManyJsonHelp(this) : null;
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java

@@ -26,12 +26,10 @@ class InsertTimestampFactory {
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
 
-    if (classLoadConfig.isJavaTimePresent()) {
-      map.put(Instant.class, new GeneratedInsertJavaTime.InstantDT());
-      map.put(LocalDateTime.class, new GeneratedInsertJavaTime.LocalDT());
-      map.put(OffsetDateTime.class, new GeneratedInsertJavaTime.OffsetDT());
-      map.put(ZonedDateTime.class, new GeneratedInsertJavaTime.ZonedDT());
-    }
+    map.put(Instant.class, new GeneratedInsertJavaTime.InstantDT());
+    map.put(LocalDateTime.class, new GeneratedInsertJavaTime.LocalDT());
+    map.put(OffsetDateTime.class, new GeneratedInsertJavaTime.OffsetDT());
+    map.put(ZonedDateTime.class, new GeneratedInsertJavaTime.ZonedDT());
     if (classLoadConfig.isJodaTimePresent()) {
       map.put(org.joda.time.LocalDateTime.class, new GeneratedInsertJodaTime.LocalDT());
       map.put(org.joda.time.DateTime.class, new GeneratedInsertJodaTime.DateTimeDT());

ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java

@@ -26,12 +26,11 @@ class UpdateTimestampFactory {
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
 
-    if (classLoadConfig.isJavaTimePresent()) {
-      map.put(Instant.class, new GeneratedUpdateJavaTime.InstantDT());
-      map.put(LocalDateTime.class, new GeneratedUpdateJavaTime.LocalDT());
-      map.put(OffsetDateTime.class, new GeneratedUpdateJavaTime.OffsetDT());
-      map.put(ZonedDateTime.class, new GeneratedUpdateJavaTime.ZonedDT());
-    }
+    map.put(Instant.class, new GeneratedUpdateJavaTime.InstantDT());
+    map.put(LocalDateTime.class, new GeneratedUpdateJavaTime.LocalDT());
+    map.put(OffsetDateTime.class, new GeneratedUpdateJavaTime.OffsetDT());
+    map.put(ZonedDateTime.class, new GeneratedUpdateJavaTime.ZonedDT());
+
     if (classLoadConfig.isJodaTimePresent()) {
       map.put(org.joda.time.LocalDateTime.class, new GeneratedUpdateJodaTime.LocalDT());
       map.put(org.joda.time.DateTime.class, new GeneratedUpdateJodaTime.DateTimeDT());

ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java

@@ -7,6 +7,7 @@ import java.security.SecureRandom;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +45,8 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
 
   private AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime());
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
 
   /**
    * Returns the uuid epoch.
@@ -106,7 +109,8 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
           logger.info("Clock skew of {} ms detected", delta / -10000);
           // The clock was adjusted back about 2 seconds, or we were generating a lot of ids too fast
           // if so, we try to set the current as last and also increment the clockSeq.
-          synchronized (this) {
+          lock.lock();
+          try {
             if (clockSeq.compareAndSet(seq, seq + 1)) {
               timeStamp.set(current);
               saveState();
@@ -114,6 +118,8 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
             } else {
               continue;
             }
+          } finally {
+            lock.unlock();
           }
         }
         // If current is in the future (most of the cases) try to set it.

ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonExecutorService.java

@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * A "CachedThreadPool" based on Daemon threads.
@@ -16,6 +17,8 @@ public final class DaemonExecutorService {
 
   private static final Logger logger = LoggerFactory.getLogger(DaemonExecutorService.class);
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final String namePrefix;
 
   private final int shutdownWaitSeconds;
@@ -49,7 +52,8 @@ public final class DaemonExecutorService {
    * </p>
    */
   public void shutdown() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (service.isShutdown()) {
         logger.debug("DaemonExecutorService[{}] already shut down", namePrefix);
         return;
@@ -66,6 +70,8 @@ public final class DaemonExecutorService {
         logger.error("Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
         e.printStackTrace();
       }
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java

@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Daemon based ScheduleThreadPool.
@@ -16,6 +17,8 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
 
   private static final Logger logger = LoggerFactory.getLogger(DaemonScheduleThreadPool.class);
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final String namePrefix;
 
   private final int shutdownWaitSeconds;
@@ -38,7 +41,8 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
    */
   @Override
   public void shutdown() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (super.isShutdown()) {
         logger.debug("DaemonScheduleThreadPool {} already shut down", namePrefix);
         return;
@@ -55,6 +59,8 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
         logger.error("Error during shutdown of " + namePrefix, e);
         e.printStackTrace();
       }
+    } finally {
+      lock.unlock();
     }
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBaseContext.java

@@ -7,11 +7,15 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * Base class for Bean and BeanCollection loading (lazy loading and query join loading).
  */
 abstract class DLoadBaseContext {
 
+  protected final ReentrantLock lock = new ReentrantLock(false);
+
   protected final DLoadContext parent;
 
   protected final BeanDescriptor<?> desc;

ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java

@@ -17,6 +17,8 @@ import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * ToOne bean load context.
@@ -86,11 +88,11 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
   @Override
   public void loadSecondaryQuery(OrmQueryRequest<?> parentRequest, boolean forEach) {
-
     if (!queryFetch) {
       throw new IllegalStateException("Not expecting loadSecondaryQuery() to be called?");
     }
-    synchronized (this) {
+    lock.lock();
+    try {
       if (bufferList != null) {
         for (LoadBuffer loadBuffer : bufferList) {
           if (!loadBuffer.list.isEmpty()) {
@@ -108,6 +110,8 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
           }
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -116,6 +120,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
    */
   static class LoadBuffer implements BeanLoader, LoadBeanBuffer {
 
+    private final ReentrantLock bufferLock = new ReentrantLock(false);
     private final DLoadBeanContext context;
     private final int batchSize;
     private final List<EntityBeanIntercept> list;
@@ -127,6 +132,12 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
       this.list = new ArrayList<>(batchSize);
     }
 
+    @Override
+    public Lock lock() {
+      bufferLock.lock();
+      return bufferLock;
+    }
+
     @Override
     public int getBatchSize() {
       return batchSize;
@@ -182,7 +193,7 @@ class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      // A synchronized (this) is effectively held by EntityBeanIntercept.loadBean()
+      // A lock is effectively held by EntityBeanIntercept.loadBean()
       if (context.desc.lazyLoadMany(ebi, context)) {
         // lazy load property was a Many
         return;

ebean-core/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java

@@ -16,6 +16,7 @@ import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * ToMany bean load context.
@@ -94,11 +95,11 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
 
   @Override
   public void loadSecondaryQuery(OrmQueryRequest<?> parentRequest, boolean forEach) {
-
     if (!queryFetch) {
       throw new IllegalStateException("Not expecting loadSecondaryQuery() to be called?");
     }
-    synchronized (this) {
+    lock.lock();
+    try {
       if (bufferList != null) {
         for (LoadBuffer loadBuffer : bufferList) {
           if (!loadBuffer.list.isEmpty()) {
@@ -118,6 +119,8 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
           this.bufferList = null;
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -127,6 +130,7 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
    */
   static class LoadBuffer implements BeanCollectionLoader, LoadManyBuffer {
 
+    private final ReentrantLock lock = new ReentrantLock(false);
     private final PersistenceContext persistenceContext;
     private final DLoadManyContext context;
     private final int batchSize;
@@ -208,7 +212,8 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
     @Override
     public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
 
-      synchronized (this) {
+      lock.lock();
+      try {
         boolean useCache = !onlyIds && context.hitCache && context.property.isUseCache();
         if (useCache) {
           EntityBean ownerBean = bc.getOwnerBean();
@@ -231,6 +236,8 @@ class DLoadManyContext extends DLoadBaseContext implements LoadManyContext {
 
         LoadManyRequest req = new LoadManyRequest(this, onlyIds, useCache);
         context.parent.getEbeanServer().loadMany(req);
+      } finally {
+        lock.unlock();
       }
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java

@@ -8,6 +8,7 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.DataBind;
 import io.ebeaninternal.server.type.DataReader;
+import io.ebeaninternal.server.type.GeoTypeBinder;
 import io.ebeaninternal.server.type.PostgresHelper;
 import io.ebeaninternal.server.type.RsetDataReader;
 import io.ebeaninternal.server.type.ScalarType;
@@ -35,26 +36,18 @@ public class Binder {
   private static final Logger logger = LoggerFactory.getLogger(Binder.class);
 
   private final TypeManager typeManager;
-
   private final int asOfBindCount;
-
   private final boolean asOfStandardsBased;
-
   private final DbExpressionHandler dbExpressionHandler;
-
   private final DataTimeZone dataTimeZone;
-
   private final MultiValueBind multiValueBind;
-
   private final boolean enableBindLog;
+  private final GeoTypeBinder geoTypeBinder;
 
-  /**
-   * Set the PreparedStatement with which to bind variables to.
-   */
   public Binder(TypeManager typeManager, SpiLogManager logManager, int asOfBindCount, boolean asOfStandardsBased,
                 DbExpressionHandler dbExpressionHandler, DataTimeZone dataTimeZone, MultiValueBind multiValueBind) {
-
     this.typeManager = typeManager;
+    this.geoTypeBinder = typeManager.getGeoTypeBinder();
     this.asOfBindCount = asOfBindCount;
     this.asOfStandardsBased = asOfStandardsBased;
     this.dbExpressionHandler = dbExpressionHandler;
@@ -88,9 +81,7 @@ public class Binder {
    * Bind the values to the Prepared Statement.
    */
   public void bind(BindValues bindValues, DataBind dataBind, StringBuilder bindBuf) throws SQLException {
-
     String logPrefix = "";
-
     ArrayList<BindValues.Value> list = bindValues.values();
     for (BindValues.Value bindValue : list) {
       Object val = bindValue.getValue();
@@ -124,7 +115,6 @@ public class Binder {
    * Bind the list of positionedParameters in BindParams.
    */
   private String bind(BindParams bindParams, DataBind dataBind) throws SQLException {
-
     StringBuilder bindLog = new StringBuilder();
     bind(bindParams, dataBind, bindLog);
     return bindLog.toString();
@@ -134,7 +124,6 @@ public class Binder {
    * Bind the list of positionedParameters in BindParams.
    */
   public void bind(BindParams bindParams, DataBind dataBind, StringBuilder bindLog) throws SQLException {
-
     bind(bindParams.positionedParameters(), dataBind, bindLog);
   }
 
@@ -142,13 +131,10 @@ public class Binder {
    * Bind the list of parameters..
    */
   private void bind(List<BindParams.Param> list, DataBind dataBind, StringBuilder bindLog) throws SQLException {
-
     CallableStatement cstmt = null;
-
     if (dataBind.getPstmt() instanceof CallableStatement) {
       cstmt = (CallableStatement) dataBind.getPstmt();
     }
-
     // the iterator is assumed to be in the correct order
     Object value = null;
     try {
@@ -211,7 +197,6 @@ public class Binder {
    * Bind an Object with unknown data type.
    */
   public Object bindObject(DataBind dataBind, Object value) throws SQLException {
-
     if (value == null) {
       // null of unknown type
       bindObject(dataBind, null, Types.OTHER);
@@ -233,9 +218,7 @@ public class Binder {
         // convert to a JDBC native type
         value = type.toJdbcType(value);
       }
-
-      int dbType = type.getJdbcType();
-      bindObject(dataBind, value, dbType);
+      bindObject(dataBind, value, type.getJdbcType());
       return value;
     }
   }
@@ -261,12 +244,10 @@ public class Binder {
    * </p>
    */
   private void bindObject(DataBind dataBind, Object data, int dbType) throws SQLException {
-
     if (data == null) {
       dataBind.setNull(dbType);
       return;
     }
-
     switch (dbType) {
       case java.sql.Types.LONGVARCHAR:
         bindLongVarChar(dataBind, data);
@@ -293,7 +274,6 @@ public class Binder {
    * Binds the value to the statement according to the data type.
    */
   private void bindSimpleData(DataBind b, int dataType, Object data) {
-
     try {
       switch (dataType) {
         case java.sql.Types.BOOLEAN:
@@ -370,6 +350,15 @@ public class Binder {
           b.setObject(PostgresHelper.asInet(data.toString()));
           break;
 
+        case DbPlatformType.POINT:
+        case DbPlatformType.POLYGON:
+        case DbPlatformType.MULTIPOINT:
+        case DbPlatformType.LINESTRING:
+        case DbPlatformType.MULTILINESTRING:
+        case DbPlatformType.MULTIPOLYGON:
+          geoTypeBinder.bind(b, dataType, data);
+          break;
+
         case java.sql.Types.OTHER:
           b.setObject(data, dataType);
           break;
@@ -393,7 +382,6 @@ public class Binder {
    * Bind String data to a LONGVARCHAR column.
    */
   private void bindLongVarChar(DataBind dataBind, Object data) throws SQLException {
-
     dataBind.setClob((String) data);
   }
 
@@ -401,7 +389,6 @@ public class Binder {
    * Bind byte[] data to a LONGVARBINARY column.
    */
   private void bindLongVarBinary(DataBind dataBind, Object data) throws SQLException {
-
     dataBind.setBlob((byte[]) data);
   }
 
@@ -409,7 +396,6 @@ public class Binder {
    * Bind String data to a CLOB column.
    */
   private void bindClob(DataBind dataBind, Object data) throws SQLException {
-
     dataBind.setClob((String) data);
   }
 
@@ -417,7 +403,6 @@ public class Binder {
    * Bind byte[] data to a BLOB column.
    */
   private void bindBlob(DataBind dataBind, Object data) throws SQLException {
-
     dataBind.setBlob((byte[]) data);
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java

@@ -39,6 +39,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * An object that represents a SqlSelect statement.
@@ -58,6 +59,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   private static final CQueryCollectionAddNoop NOOP_ADD = new CQueryCollectionAddNoop();
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   /**
    * The resultSet rows read.
    */
@@ -288,7 +291,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
   @Override
   public void cancel() {
-    synchronized (this) {
+    lock.lock();
+    try {
       this.cancelled = true;
       if (pstmt != null) {
         try {
@@ -298,6 +302,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
           throw new PersistenceException(msg, e);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -326,8 +332,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   ResultSet prepareResultSet(boolean forwardOnlyHint) throws SQLException {
-
-    synchronized (this) {
+    lock.lock();
+    try {
       if (cancelled || query.isCancelled()) {
         // cancelled before we started
         cancelled = true;
@@ -370,6 +376,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
 
       // executeQuery
       return pstmt.executeQuery();
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -524,8 +532,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   boolean hasNext() throws SQLException {
-
-    synchronized (this) {
+    lock.lock();
+    try {
       if (noMoreRows || cancelled) {
         return false;
       }
@@ -534,6 +542,8 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
       }
       hasNextCache = readNextBean();
       return hasNextCache;
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java

@@ -5,10 +5,13 @@ import io.ebeaninternal.api.SpiQueryBindCapture;
 import io.ebeaninternal.api.SpiQueryPlan;
 import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
+import java.util.concurrent.locks.ReentrantLock;
+
 class CQueryBindCapture implements SpiQueryBindCapture {
 
   private static final double multiplier = 1.3d;
 
+  private final ReentrantLock lock = new ReentrantLock(false);
   private final CQueryPlanManager manager;
   private final SpiQueryPlan queryPlan;
 
@@ -35,13 +38,16 @@ class CQueryBindCapture implements SpiQueryBindCapture {
 
   @Override
   public void setBind(BindCapture bindCapture, long queryTimeMicros, long startNanos) {
-    synchronized (this) {
+    lock.lock();
+    try {
       this.thresholdMicros = Math.round(queryTimeMicros * multiplier);
       this.captureCount++;
       this.bindCapture = bindCapture;
       this.queryTimeMicros = queryTimeMicros;
       lastBindCapture = System.currentTimeMillis();
       manager.notifyBindCapture(this, startNanos);
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java

@@ -1,31 +1,29 @@
 package io.ebeaninternal.server.query;
 
 import io.ebean.PagedList;
-import io.ebeaninternal.api.Monitor;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
 
 import javax.persistence.PersistenceException;
 import java.util.List;
 import java.util.concurrent.Future;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * PagedList implementation based on limit offset types of queries.
- *
- * @param <T> the entity bean type
  */
 public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private final transient SpiEbeanServer server;
 
+  private final transient ReentrantLock lock = new ReentrantLock(false);
+
   private final SpiQuery<T> query;
 
   private final int firstRow;
 
   private final int maxRows;
 
-  private final Monitor monitor = new Monitor();
-
   private int foregroundTotalRowCount = -1;
 
   private Future<Integer> futureRowCount;
@@ -49,21 +47,27 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   @Override
   public Future<Integer> getFutureCount() {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       if (futureRowCount == null) {
         futureRowCount = server.findFutureCount(query, null);
       }
       return futureRowCount;
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public List<T> getList() {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       if (list == null) {
         list = server.findList(query, null);
       }
       return list;
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -77,7 +81,6 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   @Override
   public int getTotalPageCount() {
-
     int rowCount = getTotalCount();
     if (rowCount == 0) {
       return 0;
@@ -88,7 +91,8 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   @Override
   public int getTotalCount() {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       if (futureRowCount != null) {
         try {
           // background query already initiated so get it with a wait
@@ -103,6 +107,8 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
       // just using foreground thread
       foregroundTotalRowCount = server.findCount(query, null);
       return foregroundTotalRowCount;
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -123,11 +129,9 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   @Override
   public String getDisplayXtoYofZ(String to, String of) {
-
     int first = firstRow + 1;
     int last = firstRow + getList().size();
     int total = getTotalCount();
-
     return first + to + last + of + total;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -71,6 +71,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -88,6 +89,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private static final FetchConfig FETCH_LAZY = new FetchConfig().lazy();
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final Class<T> beanType;
 
   private final ExpressionFactory expressionFactory;
@@ -1992,8 +1995,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public void setCancelableQuery(CancelableQuery cancelableQuery) {
-    synchronized (this) {
+    lock.lock();
+    try {
       this.cancelableQuery = cancelableQuery;
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -2026,18 +2032,24 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   public void cancel() {
-    synchronized (this) {
+    lock.lock();
+    try {
       cancelled = true;
       if (cancelableQuery != null) {
         cancelableQuery.cancel();
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public boolean isCancelled() {
-    synchronized (this) {
+    lock.lock();
+    try {
       return cancelled;
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java

@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.transaction;
 
 import io.ebean.bean.PersistenceContext;
-import io.ebeaninternal.api.Monitor;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Default implementation of PersistenceContext.
@@ -32,7 +32,7 @@ public final class DefaultPersistenceContext implements PersistenceContext {
    */
   private final HashMap<Class<?>, ClassContext> typeCache = new HashMap<>();
 
-  private final Monitor monitor = new Monitor();
+  private final ReentrantLock lock = new ReentrantLock(false);
 
   private int putCount;
 
@@ -68,7 +68,8 @@ public final class DefaultPersistenceContext implements PersistenceContext {
   }
 
   public boolean resetLimit() {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       if (putCount < 100) {
         return false;
       }
@@ -80,6 +81,8 @@ public final class DefaultPersistenceContext implements PersistenceContext {
       }
       // checking after another 100 puts
       return false;
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -88,17 +91,23 @@ public final class DefaultPersistenceContext implements PersistenceContext {
    */
   @Override
   public void put(Class<?> rootType, Object id, Object bean) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       putCount++;
       getClassContext(rootType).put(id, bean);
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public Object putIfAbsent(Class<?> rootType, Object id, Object bean) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       putCount++;
       return getClassContext(rootType).putIfAbsent(id, bean);
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -107,15 +116,21 @@ public final class DefaultPersistenceContext implements PersistenceContext {
    */
   @Override
   public Object get(Class<?> rootType, Object id) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       return getClassContext(rootType).get(id);
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public WithOption getWithOption(Class<?> rootType, Object id) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       return getClassContext(rootType).getWithOption(id);
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -124,9 +139,12 @@ public final class DefaultPersistenceContext implements PersistenceContext {
    */
   @Override
   public int size(Class<?> rootType) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       ClassContext classMap = typeCache.get(rootType);
       return classMap == null ? 0 : classMap.size();
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -135,45 +153,60 @@ public final class DefaultPersistenceContext implements PersistenceContext {
    */
   @Override
   public void clear() {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       typeCache.clear();
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public void clear(Class<?> rootType) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       ClassContext classMap = typeCache.get(rootType);
       if (classMap != null) {
         classMap.clear();
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public void deleted(Class<?> rootType, Object id) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       ClassContext classMap = typeCache.get(rootType);
       if (classMap != null && id != null) {
         classMap.deleted(id);
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public void clear(Class<?> rootType, Object id) {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       ClassContext classMap = typeCache.get(rootType);
       if (classMap != null && id != null) {
         classMap.remove(id);
       }
+    } finally {
+      lock.unlock();
     }
   }
 
   @Override
   public String toString() {
-    synchronized (monitor) {
+    lock.lock();
+    try {
       return typeCache.toString();
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java

@@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.HOUR_OF_DAY;
@@ -65,6 +66,8 @@ public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
 
   private final ExecutorService executor;
 
+  private final ReentrantLock lock = new ReentrantLock(false);
+
   private final File dir;
 
   private final long minMicros;
@@ -117,7 +120,8 @@ public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
   }
 
   private void flushCurrentFile() {
-    synchronized (this) {
+    lock.lock();
+    try {
       if (out != null) {
         try {
           out.close();
@@ -126,6 +130,8 @@ public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
           log.error("Failed to flush and close transaction profiling file ", e);
         }
       }
+    } finally {
+      lock.unlock();
     }
   }
 
@@ -133,7 +139,8 @@ public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
    * Move to the next file to write to.
    */
   private void incrementFile() {
-    synchronized (this) {
+    lock.lock();
+    try {
       flushCurrentFile();
       try {
         String now = DTF.format(LocalDateTime.now());
@@ -142,6 +149,8 @@ public class DefaultProfileHandler implements SpiProfileHandler, Plugin {
       } catch (IOException e) {
         log.error("Not expected", e);
       }
+    } finally {
+      lock.unlock();
     }
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java

@@ -19,6 +19,7 @@ import io.ebean.types.Inet;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.ExtraTypeFactory;
 import io.ebeaninternal.api.DbOffline;
+import io.ebeaninternal.api.GeoTypeProvider;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeanservice.docstore.api.mapping.DocPropertyType;
@@ -145,8 +146,6 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final Object objectMapper;
 
-  private final boolean java7Present;
-
   private final boolean objectMapperPresent;
 
   private final boolean postgres;
@@ -180,13 +179,12 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final PlatformArrayTypeFactory arrayTypeListFactory;
   private final PlatformArrayTypeFactory arrayTypeSetFactory;
+  private GeoTypeBinder geoTypeBinder;
 
   /**
    * Create the DefaultTypeManager.
    */
   public DefaultTypeManager(DatabaseConfig config, BootupClasses bootupClasses) {
-
-    this.java7Present = config.getClassLoadConfig().isJava7Present();
     this.jsonDateTime = config.getJsonDateTime();
     this.jsonDate = config.getJsonDate();
     this.typeMap = new ConcurrentHashMap<>();
@@ -211,6 +209,7 @@ public final class DefaultTypeManager implements TypeManager {
     initialiseJacksonTypes(config);
 
     loadTypesFromProviders(config, objectMapper);
+    loadGeoTypeBinder(config);
 
     if (bootupClasses != null) {
       initialiseCustomScalarTypes(bootupClasses);
@@ -219,6 +218,13 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
+  private void loadGeoTypeBinder(DatabaseConfig config) {
+    final GeoTypeProvider provider = config.service(GeoTypeProvider.class);
+    if (provider != null) {
+      geoTypeBinder = provider.createBinder(config);
+    }
+  }
+
   /**
    * Return the factory to use to support DB ARRAY types.
    */
@@ -335,19 +341,17 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private ScalarType<?> checkInterfaceTypes(Class<?> type) {
-    if (java7Present) {
-      return checkJava7InterfaceTypes(type);
-    }
-    return null;
-  }
-
-  private ScalarType<?> checkJava7InterfaceTypes(Class<?> type) {
     if (java.nio.file.Path.class.isAssignableFrom(type)) {
       return typeMap.get(java.nio.file.Path.class);
     }
     return null;
   }
 
+  @Override
+  public GeoTypeBinder getGeoTypeBinder() {
+    return geoTypeBinder;
+  }
+
   @Override
   public ScalarType<?> getDbMapScalarType() {
     return (postgres) ? hstoreType : ScalarTypeJsonMap.typeFor(false, Types.VARCHAR);
@@ -882,33 +886,25 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private void initialiseJavaTimeTypes(DatabaseConfig config) {
-    if (java7Present) {
-      typeMap.put(java.nio.file.Path.class, new ScalarTypePath());
-    }
-    if (config.getClassLoadConfig().isJavaTimePresent()) {
-      logger.debug("Registering java.time data types");
-      addType(java.time.Period.class, new ScalarTypePeriod());
-      addType(java.time.LocalDate.class, new ScalarTypeLocalDate(jsonDate));
-      addType(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(jsonDateTime));
-      addType(OffsetDateTime.class, new ScalarTypeOffsetDateTime(jsonDateTime));
-      addType(ZonedDateTime.class, new ScalarTypeZonedDateTime(jsonDateTime));
-      addType(Instant.class, new ScalarTypeInstant(jsonDateTime));
-
-      addType(DayOfWeek.class, new ScalarTypeDayOfWeek());
-      addType(Month.class, new ScalarTypeMonth());
-      addType(Year.class, new ScalarTypeYear());
-      addType(YearMonth.class, new ScalarTypeYearMonthDate(jsonDate));
-      addType(MonthDay.class, new ScalarTypeMonthDay());
-      addType(OffsetTime.class, new ScalarTypeOffsetTime());
-      addType(ZoneId.class, new ScalarTypeZoneId());
-      addType(ZoneOffset.class, new ScalarTypeZoneOffset());
-
-      boolean localTimeNanos = config.isLocalTimeWithNanos();
-      addType(java.time.LocalTime.class, (localTimeNanos) ? new ScalarTypeLocalTimeWithNanos() : new ScalarTypeLocalTime());
-
-      boolean durationNanos = config.isDurationWithNanos();
-      addType(Duration.class, (durationNanos) ? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration());
-    }
+    typeMap.put(java.nio.file.Path.class, new ScalarTypePath());
+    addType(java.time.Period.class, new ScalarTypePeriod());
+    addType(java.time.LocalDate.class, new ScalarTypeLocalDate(jsonDate));
+    addType(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(jsonDateTime));
+    addType(OffsetDateTime.class, new ScalarTypeOffsetDateTime(jsonDateTime));
+    addType(ZonedDateTime.class, new ScalarTypeZonedDateTime(jsonDateTime));
+    addType(Instant.class, new ScalarTypeInstant(jsonDateTime));
+    addType(DayOfWeek.class, new ScalarTypeDayOfWeek());
+    addType(Month.class, new ScalarTypeMonth());
+    addType(Year.class, new ScalarTypeYear());
+    addType(YearMonth.class, new ScalarTypeYearMonthDate(jsonDate));
+    addType(MonthDay.class, new ScalarTypeMonthDay());
+    addType(OffsetTime.class, new ScalarTypeOffsetTime());
+    addType(ZoneId.class, new ScalarTypeZoneId());
+    addType(ZoneOffset.class, new ScalarTypeZoneOffset());
+    boolean localTimeNanos = config.isLocalTimeWithNanos();
+    addType(java.time.LocalTime.class, (localTimeNanos) ? new ScalarTypeLocalTimeWithNanos() : new ScalarTypeLocalTime());
+    boolean durationNanos = config.isDurationWithNanos();
+    addType(Duration.class, (durationNanos) ? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration());
   }
 
   private void addType(Class<?> clazz, ScalarType<?> scalarType) {

ebean-core/src/main/java/io/ebeaninternal/server/type/GeoTypeBinder.java

@@ -0,0 +1,14 @@
+package io.ebeaninternal.server.type;
+
+import java.sql.SQLException;
+
+/**
+ * Binder for Geometry types.
+ */
+public interface GeoTypeBinder {
+
+  /**
+   * Bind the geometry type.
+   */
+  void bind(DataBind b, int dataType, Object data) throws SQLException;
+}

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java

@@ -18,6 +18,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static java.util.Collections.EMPTY_LIST;
 
@@ -33,6 +34,7 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
 
   static class Factory implements PlatformArrayTypeFactory {
 
+    private final ReentrantLock lock = new ReentrantLock(false);
     private final Map<String, ScalarTypeArrayList> cache = new HashMap<>();
 
     /**
@@ -40,7 +42,8 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
      */
     @Override
     public ScalarTypeArrayList typeFor(Type valueType, boolean nullable) {
-      synchronized (this) {
+      lock.lock();
+      try {
         String key = valueType + ":" + nullable;
         if (valueType.equals(UUID.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "uuid", DocPropertyType.UUID, ArrayElementConverter.UUID));
@@ -58,6 +61,8 @@ public class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements Sc
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING));
         }
         throw new IllegalArgumentException("Type [" + valueType + "] not supported for @DbArray mapping");
+      } finally {
+        lock.unlock();
       }
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static java.util.Collections.EMPTY_LIST;
 
@@ -24,6 +25,7 @@ class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
 
   static class Factory implements PlatformArrayTypeFactory {
 
+    private final ReentrantLock lock = new ReentrantLock(false);
     private final Map<String, ScalarTypeArrayListH2> cache = new HashMap<>();
 
     /**
@@ -31,7 +33,8 @@ class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
      */
     @Override
     public ScalarType<?> typeFor(Type valueType, boolean nullable) {
-      synchronized (this) {
+      lock.lock();
+      try {
         String key = valueType + ":" + nullable;
         if (valueType.equals(UUID.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "uuid", DocPropertyType.UUID, ArrayElementConverter.UUID));
@@ -49,6 +52,8 @@ class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING));
         }
         throw new IllegalArgumentException("Type [" + valueType + "] not supported for @DbArray mapping");
+      } finally {
+        lock.unlock();
       }
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java

@@ -18,6 +18,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static java.util.Collections.EMPTY_SET;
 
@@ -33,6 +34,7 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
 
   static class Factory implements PlatformArrayTypeFactory {
 
+    private final ReentrantLock lock = new ReentrantLock(false);
     private final Map<String, ScalarTypeArraySet> cache = new HashMap<>();
 
     /**
@@ -40,7 +42,8 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
      */
     @Override
     public ScalarType<?> typeFor(Type valueType, boolean nullable) {
-      synchronized (this) {
+      lock.lock();
+      try {
         String key = valueType + ":" + nullable;
         if (valueType.equals(UUID.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArraySet(nullable, "uuid", DocPropertyType.UUID, ArrayElementConverter.UUID));
@@ -58,6 +61,8 @@ public class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements Scal
           return cache.computeIfAbsent(key, s -> new ScalarTypeArraySet(nullable, "varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING));
         }
         throw new IllegalArgumentException("Type [" + valueType + "] not supported for @DbArray mapping");
+      } finally {
+        lock.unlock();
       }
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static java.util.Collections.EMPTY_SET;
 
@@ -24,6 +25,7 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
 
   static class Factory implements PlatformArrayTypeFactory {
 
+    private final ReentrantLock lock = new ReentrantLock(false);
     private final Map<String, ScalarTypeArraySetH2> cache = new HashMap<>();
 
     /**
@@ -31,7 +33,8 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
      */
     @Override
     public ScalarType<?> typeFor(Type valueType, boolean nullable) {
-      synchronized (this) {
+      lock.lock();
+      try {
         String key = valueType + ":" + nullable;
         if (valueType.equals(UUID.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArraySetH2(nullable, "uuid", DocPropertyType.UUID, ArrayElementConverter.UUID));
@@ -49,6 +52,8 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArraySetH2(nullable, "varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING));
         }
         throw new IllegalArgumentException("Type [" + valueType + "] not supported for @DbArray mapping");
+      } finally {
+        lock.unlock();
       }
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java

@@ -69,4 +69,9 @@ public interface TypeManager {
    * Return the ScalarType used to handle HSTORE (Map<String,String>).
    */
   ScalarType<?> getDbMapScalarType();
+
+  /**
+   * Return the Geometry type binder if provided.
+   */
+  GeoTypeBinder getGeoTypeBinder();
 }

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

@@ -1,7 +1,7 @@
 package io.ebean;
 
 import io.ebean.config.CurrentTenantProvider;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.TenantCatalogProvider;
 import io.ebean.config.TenantDataSourceProvider;
 import io.ebean.config.TenantMode;
@@ -29,7 +29,7 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     TenantDataSourceProvider dataSourceProvider = Mockito.mock(TenantDataSourceProvider.class);
     Mockito.doReturn(mockedDataSource).when(dataSourceProvider).dataSource(tenant);
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("multiTenantDb");
     config.loadFromProperties();
     config.setRegister(false);
@@ -45,7 +45,8 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     //config.setDdlRun(false);
     config.setDatabasePlatform(new PostgresPlatform());
 
-    EbeanServerFactory.create(config);
+    final Database database = DatabaseFactory.create(config);
+    database.shutdown();
   }
 
 
@@ -63,9 +64,10 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     TenantSchemaProvider schemaProvider = Mockito.mock(TenantSchemaProvider.class);
     Mockito.doReturn("tenant_schema").when(schemaProvider).schema(tenant);
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2");
     config.loadFromProperties();
+    config.setName("multi-tenancy");
     config.setRegister(false);
     config.setDefaultServer(false);
 
@@ -76,7 +78,8 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     config.setDdlRun(false);
     config.setDatabasePlatform(new MySqlPlatform());
 
-    EbeanServerFactory.create(config);
+    final Database database = DatabaseFactory.create(config);
+    database.shutdown();
   }
 
   /**
@@ -92,9 +95,10 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     TenantCatalogProvider catalogProvider = Mockito.mock(TenantCatalogProvider.class);
     Mockito.doReturn("tenant_catalog").when(catalogProvider).catalog(tenant);
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2");
     config.loadFromProperties();
+    config.setName("multi-tenancy");
     config.setRegister(false);
     config.setDefaultServer(false);
 
@@ -105,6 +109,7 @@ public class EbeanServerFactory_MultiTenancy_Test extends BaseTestCase {
     config.setDdlRun(false);
     config.setDatabasePlatform(new MySqlPlatform());
 
-    EbeanServerFactory.create(config);
+    final Database database = DatabaseFactory.create(config);
+    database.shutdown();
   }
 }

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

@@ -1,7 +1,6 @@
 package io.ebean;
 
 import io.ebean.config.DatabaseConfig;
-import io.ebean.config.ServerConfig;
 import io.ebean.event.ServerConfigStartup;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
@@ -13,7 +12,7 @@ public class EbeanServerFactory_ServerConfigStart_Test {
   @Test
   public void test() throws InterruptedException {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2");
     config.loadFromProperties();
     config.setName("h2other");
@@ -30,17 +29,17 @@ public class EbeanServerFactory_ServerConfigStart_Test {
     OnStartup onStartup = new OnStartup();
     config.addServerConfigStartup(onStartup);
 
-    EbeanServer ebeanServer = EbeanServerFactory.create(config);
+    Database db = DatabaseFactory.create(config);
 
     assertThat(onStartup.calledWithConfig).isSameAs(config);
     assertThat(OnStartupViaClass.calledWithConfig).isSameAs(config);
 
-    assertThat(ebeanServer).isNotNull();
+    assertThat(db).isNotNull();
 
     // test server shutdown and restart using the same ServerConfig
-    ebeanServer.shutdown(true, false);
+    db.shutdown(true, false);
 
-    EbeanServer restartedServer = EbeanServerFactory.create(config);
+    Database restartedServer = DatabaseFactory.create(config);
     restartedServer.shutdown(true, false);
   }
 

ebean-core/src/test/java/io/ebean/config/DbMigrationConfigTest.java

@@ -3,7 +3,7 @@ package io.ebean.config;
 import org.junit.Test;
 
 import java.util.Properties;
-
+import io.ebean.migration.MigrationConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
@@ -13,12 +13,13 @@ public class DbMigrationConfigTest {
   @Test
   public void testLoad() {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2other");
     config.loadFromProperties();
     config.setDefaultServer(false);
 
-    DbMigrationConfig migrationConfig = config.getMigrationConfig();
+    MigrationConfig migrationConfig = new MigrationConfig();
+    migrationConfig.load(config.getProperties());
 
     assertThat(migrationConfig.getMigrationPath()).isEqualTo("dbmigration/myapp");
   }
@@ -27,20 +28,18 @@ public class DbMigrationConfigTest {
   public void loadProperties_migration() {
 
     Properties properties = new Properties();
-    properties.setProperty("ebean.migration.dbusername", "banana");
-    properties.setProperty("ebean.migration.dbpassword", "apple");
+    properties.setProperty("ebean.migration.username", "banana");
+    properties.setProperty("ebean.migration.password", "apple");
     properties.setProperty("ebean.migration.patchInsertOn", "1.3,my_views");
     properties.setProperty("ebean.migration.patchResetChecksumOn", "foo");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties, null);
-
-    DbMigrationConfig migrationConfig = new DbMigrationConfig();
-    migrationConfig.loadSettings(wrapper, "db");
+    MigrationConfig migrationConfig = new MigrationConfig();
+    migrationConfig.load(properties);
 
     assertEquals(migrationConfig.getDbUsername(),"banana");
     assertEquals(migrationConfig.getDbPassword(),"apple");
-    assertEquals(migrationConfig.getPatchInsertOn(),"1.3,my_views");
-    assertEquals(migrationConfig.getPatchResetChecksumOn(),"foo");
+    assertThat(migrationConfig.getPatchInsertOn()).containsOnly("1.3","my_views");
+    assertThat(migrationConfig.getPatchResetChecksumOn()).containsOnly("foo");
   }
 
   @Test
@@ -50,29 +49,12 @@ public class DbMigrationConfigTest {
     properties.setProperty("datasource.db.username", "banana");
     properties.setProperty("datasource.db.password", "apple");
 
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties, null);
-
-    DbMigrationConfig migrationConfig = new DbMigrationConfig();
-    migrationConfig.loadSettings(wrapper, "db");
+    MigrationConfig migrationConfig = new MigrationConfig();
+    migrationConfig.load(properties);
 
     // runnerConfig will fall back itsel to the correct password
     assertEquals(migrationConfig.getDbUsername(),null);
     assertEquals(migrationConfig.getDbPassword(),null);
   }
 
-  @Test
-  public void loadProperties_datasource_adminusername() {
-
-    Properties properties = new Properties();
-    properties.setProperty("datasource.db.adminusername", "banana");
-    properties.setProperty("datasource.db.adminpassword", "apple");
-
-    PropertiesWrapper wrapper = new PropertiesWrapper("ebean", "db", properties, null);
-
-    DbMigrationConfig migrationConfig = new DbMigrationConfig();
-    migrationConfig.loadSettings(wrapper, "db");
-
-    assertEquals(migrationConfig.getDbUsername(),"banana");
-    assertEquals(migrationConfig.getDbPassword(),"apple");
-  }
 }

ebean-core/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java

@@ -1,12 +1,13 @@
 package io.ebean.config;
 
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.Transaction;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DbIdentity;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.h2.H2Platform;
+import org.junit.AfterClass;
 import org.junit.Test;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.draftable.BasicDraftableBean;
@@ -15,7 +16,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class PlatformNoGeneratedKeysTest {
 
-  static EbeanServer server = testH2Server();
+  static Database server = testH2Server();
+
+  @AfterClass
+  public static void shutdown() {
+    server.shutdown();
+  }
 
   @Test
   public void global_serverConfig_setDisableLazyLoading() {
@@ -79,9 +85,9 @@ public class PlatformNoGeneratedKeysTest {
     assertThat(one.isDraft()).isFalse();
   }
 
-  private static EbeanServer testH2Server() {
+  private static Database testH2Server() {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2_noGeneratedKeys");
 
     OtherH2Platform platform = new OtherH2Platform();
@@ -108,7 +114,7 @@ public class PlatformNoGeneratedKeysTest {
     config.getClasses().add(BasicDraftableBean.class);
 
 
-    return EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 
   public static class OtherH2Platform extends H2Platform {

ebean-core/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java

@@ -1,8 +1,8 @@
 package io.ebean.config;
 
 
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import org.junit.Ignore;
@@ -26,7 +26,7 @@ public class ServerConfigSqlServerTest {
     // no explicit databasePlatformName set ..
     //props.setProperty("ebean.some_sqlserver.databasePlatformName", "sqlserver17");
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("some_sqlserver");
     config.loadFromProperties(props);
 
@@ -38,9 +38,10 @@ public class ServerConfigSqlServerTest {
     config.setRegister(false);
     config.getClasses().add(EBasicVer.class);
 
-    EbeanServer sqlServer = EbeanServerFactory.create(config);
+    Database sqlServer = DatabaseFactory.create(config);
 
     assertThat(sqlServer).isNotNull();
+    sqlServer.shutdown();
 
 //    javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via ServerConfig.setDatabasePlatformName. Refer to issue #1340 for details
 //
@@ -61,7 +62,7 @@ public class ServerConfigSqlServerTest {
 
     String name = "testsqlserver17";
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName(name);
 
     Properties props = props(name);
@@ -79,9 +80,10 @@ public class ServerConfigSqlServerTest {
     config.loadFromProperties(props);
     config.getClasses().add(EBasicVer.class);
 
-    EbeanServer sqlServer = EbeanServerFactory.create(config);
+    Database sqlServer = DatabaseFactory.create(config);
 
     assertThat(sqlServer).isNotNull();
+    sqlServer.shutdown();
   }
 
   @Ignore
@@ -93,7 +95,7 @@ public class ServerConfigSqlServerTest {
     Properties props = props(name);
     //props.setProperty("ebean.testsqlserver16.databasePlatformName", "sqlserver16");
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setDefaultServer(false);
     config.setRegister(false);
     config.setDdlGenerate(true);
@@ -104,9 +106,10 @@ public class ServerConfigSqlServerTest {
     config.loadFromProperties(props);
     config.getClasses().add(EBasicVer.class);
 
-    EbeanServer sqlServer = EbeanServerFactory.create(config);
+    Database sqlServer = DatabaseFactory.create(config);
 
     assertThat(sqlServer).isNotNull();
+    sqlServer.shutdown();
   }
 
   private Properties props(String dbName) {

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/ebean/event/BeanFindControllerTest.java

@@ -1,11 +1,11 @@
 package io.ebean.event;
 
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.bean.BeanCollection;
 import io.ebean.common.BeanList;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import org.junit.Test;
 import org.tests.example.ModUuidGenerator;
 import org.tests.model.basic.EBasic;
@@ -23,7 +23,7 @@ public class BeanFindControllerTest extends BaseTestCase {
   @Test
   public void test() {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
 
     config.setName("h2otherfind");
     config.loadFromProperties();
@@ -40,27 +40,27 @@ public class BeanFindControllerTest extends BaseTestCase {
     EBasicFindController findController = new EBasicFindController();
     config.getFindControllers().add(findController);
 
-    EbeanServer ebeanServer = EbeanServerFactory.create(config);
+    Database db = DatabaseFactory.create(config);
 
     assertFalse(findController.calledInterceptFind);
-    ebeanServer.find(EBasic.class, 42);
+    db.find(EBasic.class, 42);
     assertTrue(findController.calledInterceptFind);
 
     findController.findIntercept = true;
-    EBasic eBasic = ebeanServer.find(EBasic.class, 42);
+    EBasic eBasic = db.find(EBasic.class, 42);
 
     assertEquals(Integer.valueOf(47), eBasic.getId());
     assertEquals("47", eBasic.getName());
 
     assertFalse(findController.calledInterceptFindMany);
 
-    List<EBasic> list = ebeanServer.find(EBasic.class).where().eq("name", "AnInvalidNameSoEmpty").findList();
+    List<EBasic> list = db.find(EBasic.class).where().eq("name", "AnInvalidNameSoEmpty").findList();
     assertEquals(0, list.size());
     assertTrue(findController.calledInterceptFindMany);
 
     findController.findManyIntercept = true;
 
-    list = ebeanServer.find(EBasic.class).where().eq("name", "AnInvalidNameSoEmpty").findList();
+    list = db.find(EBasic.class).where().eq("name", "AnInvalidNameSoEmpty").findList();
     assertEquals(1, list.size());
 
     eBasic = list.get(0);
@@ -68,8 +68,9 @@ public class BeanFindControllerTest extends BaseTestCase {
     assertEquals("47", eBasic.getName());
 
     ECustomId bean = new ECustomId("check");
-    ebeanServer.save(bean);
+    db.save(bean);
     assertNotNull(bean.getId());
+    db.shutdown();
   }
 
   static class EBasicFindController implements BeanFindController {

ebean-core/src/test/java/io/ebean/event/BeanPersistControllerTest.java

@@ -1,10 +1,10 @@
 package io.ebean.event;
 
 
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.Transaction;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import org.junit.Test;
 import org.tests.model.basic.EBasicVer;
 import org.tests.model.basic.UTDetail;
@@ -18,22 +18,22 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class BeanPersistControllerTest {
 
-  private PersistAdapter continuePersistingAdapter = new PersistAdapter(true);
+  private final PersistAdapter continuePersistingAdapter = new PersistAdapter(true);
 
-  private PersistAdapter stopPersistingAdapter = new PersistAdapter(false);
+  private final PersistAdapter stopPersistingAdapter = new PersistAdapter(false);
 
   @Test
   public void issue_1341() {
 
-    EbeanServer ebeanServer = getEbeanServer(continuePersistingAdapter);
+    Database db = getDatabase(continuePersistingAdapter);
 
     UTMaster bean0 = new UTMaster("one0");
     UTDetail detail0 = new UTDetail("detail0", 12, 23D);
     bean0.getDetails().add(detail0);
 
-    ebeanServer.save(bean0);
+    db.save(bean0);
 
-    UTMaster master = ebeanServer.find(UTMaster.class)
+    UTMaster master = db.find(UTMaster.class)
       .setId(bean0.getId())
       .fetch("details", "name, version")
       .findOne();
@@ -41,79 +41,82 @@ public class BeanPersistControllerTest {
     UTDetail utDetail = master.getDetails().get(0);
     utDetail.setName("detail0 mod");
 
-    Transaction txn = ebeanServer.beginTransaction();
+    Transaction txn = db.beginTransaction();
     try {
       txn.setBatchMode(true);
-      ebeanServer.save(master);
+      db.save(master);
       txn.commit();
     } finally {
       txn.end();
     }
 
+    db.shutdown();
   }
 
   @Test
   public void testInsertUpdateDelete_given_continuePersistingAdapter() {
 
-    EbeanServer ebeanServer = getEbeanServer(continuePersistingAdapter);
-
+    Database db = getDatabase(continuePersistingAdapter);
 
     EBasicVer bean = new EBasicVer("testController");
 
-    ebeanServer.save(bean);
+    db.save(bean);
     assertThat(continuePersistingAdapter.methodsCalled).hasSize(2);
     assertThat(continuePersistingAdapter.methodsCalled).containsExactly("preInsert", "postInsert");
     continuePersistingAdapter.methodsCalled.clear();
 
     bean.setName("modified");
-    ebeanServer.save(bean);
+    db.save(bean);
     assertThat(continuePersistingAdapter.methodsCalled).hasSize(2);
     assertThat(continuePersistingAdapter.methodsCalled).containsExactly("preUpdate", "postUpdate");
     continuePersistingAdapter.methodsCalled.clear();
 
-    ebeanServer.delete(bean);
+    db.delete(bean);
     assertThat(continuePersistingAdapter.methodsCalled).hasSize(2);
     assertThat(continuePersistingAdapter.methodsCalled).containsExactly("preDelete", "postDelete");
 
+    db.shutdown();
   }
 
   @Test
   public void testInsertUpdateDelete_given_stopPersistingAdapter() {
 
-    EbeanServer ebeanServer = getEbeanServer(stopPersistingAdapter);
+    Database db = getDatabase(stopPersistingAdapter);
 
     EBasicVer bean = new EBasicVer("testController");
 
-    ebeanServer.save(bean);
+    db.save(bean);
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);
     assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preInsert");
     stopPersistingAdapter.methodsCalled.clear();
 
     bean.setName("modified");
-    ebeanServer.update(bean);
+    db.update(bean);
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);
     assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preUpdate");
     stopPersistingAdapter.methodsCalled.clear();
 
-    ebeanServer.delete(bean);
+    db.delete(bean);
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);
     assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preDelete");
     stopPersistingAdapter.methodsCalled.clear();
 
-    ebeanServer.delete(EBasicVer.class, 22);
+    db.delete(EBasicVer.class, 22);
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(1);
     assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preDeleteById");
     stopPersistingAdapter.methodsCalled.clear();
 
-    ebeanServer.deleteAll(EBasicVer.class, Arrays.asList(22,23,24));
+    db.deleteAll(EBasicVer.class, Arrays.asList(22,23,24));
     assertThat(stopPersistingAdapter.methodsCalled).hasSize(3);
     assertThat(stopPersistingAdapter.methodsCalled).containsExactly("preDeleteById", "preDeleteById", "preDeleteById");
     stopPersistingAdapter.methodsCalled.clear();
+
+    db.shutdown();
   }
 
-  private EbeanServer getEbeanServer(PersistAdapter persistAdapter) {
+  private Database getDatabase(PersistAdapter persistAdapter) {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2ebasicver");
     config.loadFromProperties();
     config.setDdlGenerate(true);
@@ -128,7 +131,7 @@ public class BeanPersistControllerTest {
 
     config.add(persistAdapter);
 
-    return EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 
   static class PersistAdapter extends BeanPersistAdapter {

ebean-core/src/test/java/io/ebean/event/BeanPostLoadTest.java

@@ -3,12 +3,12 @@ package io.ebean.event;
 
 import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
-import io.ebean.Ebean;
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
-import io.ebean.config.ServerConfig;
-import org.tests.model.basic.EBasicVer;
+import io.ebean.DB;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.config.DatabaseConfig;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,15 +22,15 @@ public class BeanPostLoadTest extends BaseTestCase {
   @Test
   public void testPostLoad() {
 
-    EbeanServer ebeanServer = getEbeanServer();
+    Database db = createDatabase();
 
     EBasicVer bean = new EBasicVer("testPostLoad");
     bean.setDescription("someDescription");
     bean.setOther("other");
 
-    ebeanServer.save(bean);
+    db.save(bean);
 
-    EBasicVer found = ebeanServer.find(EBasicVer.class)
+    EBasicVer found = db.find(EBasicVer.class)
       .select("name, other")
       .setId(bean.getId())
       .findOne();
@@ -40,13 +40,14 @@ public class BeanPostLoadTest extends BaseTestCase {
     assertThat(postLoad.beanState.getLoadedProps()).containsExactly("id", "name", "other");
     assertThat(postLoad.bean).isSameAs(found);
 
-    ebeanServer.delete(bean);
+    db.delete(bean);
+    db.shutdown();
   }
 
 
-  private EbeanServer getEbeanServer() {
+  private Database createDatabase() {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
 
     config.setName("h2ebasicver");
     config.loadFromProperties();
@@ -60,7 +61,7 @@ public class BeanPostLoadTest extends BaseTestCase {
 
     config.add(postLoad);
 
-    return EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 
   static class PostLoad implements BeanPostLoad {
@@ -90,7 +91,7 @@ public class BeanPostLoadTest extends BaseTestCase {
     public void postLoad(Object bean) {
       this.methodsCalled.add("postLoad");
       this.bean = bean;
-      this.beanState = Ebean.getBeanState(bean);
+      this.beanState = DB.getBeanState(bean);
     }
 
   }

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/deploy/BeanDescriptor_registerTest.java

@@ -26,10 +26,13 @@ public class BeanDescriptor_registerTest {
     config.getClasses().add(EBasic.class);
 
     SpiEbeanServer ebeanServer = (SpiEbeanServer)DatabaseFactory.create(config);
-    BeanDescriptor<EBasic> desc = ebeanServer.getBeanDescriptor(EBasic.class);
-
-    persistListenerRegistrationTests(desc);
-    persistControllerRegistrationTests(desc);
+    try {
+      BeanDescriptor<EBasic> desc = ebeanServer.getBeanDescriptor(EBasic.class);
+      persistListenerRegistrationTests(desc);
+      persistControllerRegistrationTests(desc);
+    } finally {
+      ebeanServer.shutdown();
+    }
   }
 
   private void persistControllerRegistrationTests(BeanDescriptor<EBasic> desc) {

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/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java

@@ -4,7 +4,6 @@ import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
-import io.ebean.Ebean;
 import io.ebean.Transaction;
 import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
@@ -25,7 +24,7 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @ForPlatform({Platform.H2})
   @Test
   public void get() {
-    Ebean.execute(() -> {
+    DB.execute(() -> {
       SpiTransaction txn = getInScopeTransaction();
       assertNotNull(txn);
     });
@@ -38,12 +37,12 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @Test
   public void tryWithResources_expect_scopeCleanup() {
 
-    try (Transaction transaction = Ebean.beginTransaction()) {
+    try (Transaction transaction = DB.beginTransaction()) {
       assertNotNull(transaction);
       SpiTransaction txn = getInScopeTransaction();
       assertSame(txn, transaction);
 
-      try (Transaction nested = Ebean.beginTransaction()) {
+      try (Transaction nested = DB.beginTransaction()) {
         assertNotNull(nested);
         SpiTransaction txnNested = getInScopeTransaction();
         assertSame(txnNested, nested);
@@ -59,7 +58,7 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @Test
   public void afterCommit_expect_scopeCleanup() {
 
-    try (Transaction transaction = Ebean.beginTransaction()) {
+    try (Transaction transaction = DB.beginTransaction()) {
       transaction.commit();
       assertNull(getInScopeTransaction());
     }
@@ -70,7 +69,7 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @Test
   public void afterRollback_expect_scopeCleanup() {
 
-    try (Transaction transaction = Ebean.beginTransaction()) {
+    try (Transaction transaction = DB.beginTransaction()) {
 
       transaction.rollback();
       assertNull(getInScopeTransaction());
@@ -82,8 +81,8 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @Test
   public void end_withoutActiveTransaction_isFine() {
 
-    assertNull(Ebean.currentTransaction());
-    Ebean.endTransaction();
+    assertNull(DB.currentTransaction());
+    DB.endTransaction();
   }
 
   @ForPlatform({Platform.H2})
@@ -106,28 +105,31 @@ public class DefaultTransactionThreadLocalTest extends BaseTestCase {
   @ForPlatform(Platform.H2)
   @Test
   public void usingDatabase() {
-
     // setup
     Database otherDb = createOtherDatabase();
-    EBasicVer bean = new EBasicVer("TestUsingDatabase");
-    otherDb.save(bean);
+    try {
+      EBasicVer bean = new EBasicVer("TestUsingDatabase");
+      otherDb.save(bean);
 
-    // act
-    final EBasicVer foundOtherDb = DB.find(EBasicVer.class)
-      .usingDatabase(otherDb)
-      .where().eq("name", "TestUsingDatabase")
-      .findOne();
+      // act
+      final EBasicVer foundOtherDb = DB.find(EBasicVer.class)
+        .usingDatabase(otherDb)
+        .where().eq("name", "TestUsingDatabase")
+        .findOne();
 
-    assertNotNull(foundOtherDb);
-    assertThat(foundOtherDb.getId()).isEqualTo(bean.getId());
+      assertNotNull(foundOtherDb);
+      assertThat(foundOtherDb.getId()).isEqualTo(bean.getId());
 
-    final EBasicVer foundDefaultDb = DB.find(EBasicVer.class)
-      .where().eq("name", "TestUsingDatabase")
-      .findOne();
+      final EBasicVer foundDefaultDb = DB.find(EBasicVer.class)
+        .where().eq("name", "TestUsingDatabase")
+        .findOne();
 
-    assertNull(foundDefaultDb);
+      assertNull(foundDefaultDb);
 
-    otherDb.delete(bean);
+      otherDb.delete(bean);
+    } finally {
+      otherDb.shutdown();
+    }
   }
 
 

ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java

@@ -32,47 +32,50 @@ public class TransactionManagerTest extends BaseTestCase {
 
     DataSource dataSource = transactionManager.getDataSource();
     Connection connection = dataSource.getConnection();
-
-    SpiTransaction externalTxn = new ExternalJdbcTransaction("external0", true, connection, null);
-
-    // push an externally managed transaction onto scope
-    ScopedTransaction scopedTransaction = transactionManager.externalBeginTransaction(externalTxn, TxScope.required());
-
-    Transaction current = Transaction.current();
-    assertThat(current).as("external transaction is in scope").isSameAs(scopedTransaction);
-
-    Customer.find.byName("In external");
-
-    log.info("inner begin");
-    Transaction inner = Ebean.beginTransaction();
     try {
+      SpiTransaction externalTxn = new ExternalJdbcTransaction("external0", true, connection, null);
+
+      // push an externally managed transaction onto scope
+      ScopedTransaction scopedTransaction = transactionManager.externalBeginTransaction(externalTxn, TxScope.required());
+
+      Transaction current = Transaction.current();
+      assertThat(current).as("external transaction is in scope").isSameAs(scopedTransaction);
+
+      Customer.find.byName("In external");
+
+      log.info("inner begin");
+      Transaction inner = Ebean.beginTransaction();
+      try {
+
+        current = Transaction.current();
+        assertThat(current).as("still using external transaction, nested transaction pushed").isSameAs(scopedTransaction);
+
+        Customer.find.byName("In inner");
+        log.info("inner commit");
+        inner.commit();
+      } finally {
+        log.info("inner end");
+        inner.end();
+      }
 
       current = Transaction.current();
-      assertThat(current).as("still using external transaction, nested transaction pushed").isSameAs(scopedTransaction);
+      assertThat(current).as("external transaction still in scope").isSameAs(scopedTransaction);
 
-      Customer.find.byName("In inner");
-      log.info("inner commit");
-      inner.commit();
+      Customer.find.byName("external still active");
+
+
+      log.info("external transaction ends with commit and remove");
+      connection.commit();
+      // remove externally managed transaction out of scope
+      transactionManager.externalRemoveTransaction();
+
+
+      current = Transaction.current();
+      assertThat(current).as("external transaction out of scope").isNull();
     } finally {
-      log.info("inner end");
-      inner.end();
+      connection.close();
     }
 
-    current = Transaction.current();
-    assertThat(current).as("external transaction still in scope").isSameAs(scopedTransaction);
-
-    Customer.find.byName("external still active");
-
-
-    log.info("external transaction ends with commit and remove");
-    connection.commit();
-    // remove externally managed transaction out of scope
-    transactionManager.externalRemoveTransaction();
-
-
-    current = Transaction.current();
-    assertThat(current).as("external transaction out of scope").isNull();
-
     Customer.find.byNameStatus("New implicit transaction", Customer.Status.ACTIVE);
   }
 }

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/MainMemoryLeak.java

@@ -1,11 +1,11 @@
 package org;
 
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.Transaction;
 import io.ebean.annotation.Cache;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.PlatformNoGeneratedKeysTest;
-import io.ebean.config.ServerConfig;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -40,13 +40,13 @@ public class MainMemoryLeak {
 
     PlatformNoGeneratedKeysTest.OtherH2Platform platform = new PlatformNoGeneratedKeysTest.OtherH2Platform();
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
 
     config.setDatabasePlatform(platform);
     config.addClass(ECachedBean.class);
     config.loadFromProperties();
 
-    EbeanServer server = EbeanServerFactory.create(config);
+    Database server = DatabaseFactory.create(config);
 
     // create a string with 10k chars
     char[] c = new char[10_000];
@@ -70,6 +70,6 @@ public class MainMemoryLeak {
       System.out.println("Success, no mem limit detected");
       txn.commit();
     }
-
+    server.shutdown();
   }
 }

ebean-core/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java

@@ -1,11 +1,12 @@
 package org.multitenant.partition;
 
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
-import io.ebean.config.ServerConfig;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.config.TenantMode;
 import org.ebeantest.LoggedSqlCollector;
+import org.junit.AfterClass;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -16,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class MultiTenantPartitionTest extends BaseTestCase {
 
-  private static String[] names = {"Ace", "Base", "Case", "Dae", "Eva"};
+  private static final String[] names = {"Ace", "Base", "Case", "Dae", "Eva"};
 
   static List<MtTenant> tenants() {
     List<MtTenant> tenants = new ArrayList<>();
@@ -26,12 +27,16 @@ public class MultiTenantPartitionTest extends BaseTestCase {
     return tenants;
   }
 
-  private static EbeanServer server = init();
-
+  private static final Database server = init();
   static {
     server.saveAll(tenants());
   }
 
+  @AfterClass
+  public static void shutdown() {
+    server.shutdown();
+  }
+
   @Test
   public void start() {
 
@@ -103,9 +108,9 @@ public class MultiTenantPartitionTest extends BaseTestCase {
   }
 
 
-  private static EbeanServer init() {
+  private static Database init() {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
 
     config.setName("h2multitenant");
     config.loadFromProperties();
@@ -120,6 +125,6 @@ public class MultiTenantPartitionTest extends BaseTestCase {
     config.getClasses().add(MtTenant.class);
     config.getClasses().add(MtContent.class);
 
-    return EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 }

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/basic/TestQueryUsingDatabase.java

@@ -2,6 +2,7 @@ package org.tests.basic;
 
 import io.ebean.DB;
 import io.ebean.Database;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.tests.model.basic.ESimple;
@@ -22,6 +23,11 @@ public class TestQueryUsingDatabase {
     DB.byName(SOME_OTHER_DB_NAME).insert(RECORD2);
   }
 
+  @After
+  public void shutdown() {
+    DB.byName(SOME_OTHER_DB_NAME).shutdown();
+  }
+
   @Test
   public void usingNonDefaultDatabase() {
     final Database nonDefaultDb = DB.byName(SOME_OTHER_DB_NAME);

ebean-core/src/test/java/org/tests/changelog/TestChangeLog.java

@@ -3,9 +3,10 @@ package org.tests.changelog;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.annotation.ChangeLog;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.event.BeanPersistRequest;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeLogFilter;
@@ -14,7 +15,6 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebean.event.changelog.ChangeType;
-import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,16 +31,16 @@ public class TestChangeLog extends BaseTestCase {
 
   TDChangeLogRegister changeLogRegister = new TDChangeLogRegister();
 
-  SpiEbeanServer server;
+  Database server;
 
   @Before
   public void setup() {
-    server = getServer();
+    server = createServer();
   }
 
   @After
   public void shutdown() {
-    server.shutdown(true, false);
+    server.shutdown();
   }
 
   @Test
@@ -65,7 +65,7 @@ public class TestChangeLog extends BaseTestCase {
 
     assertThat(change.getEvent()).isEqualTo(ChangeType.UPDATE);
     assertThat(change.getOldData()).contains("\"name\":\"logBean\"");
-    assertThat(change.getData())   .contains("\"name\":\"ChangedName\"");
+    assertThat(change.getData()).contains("\"name\":\"ChangedName\"");
 
 
     server.delete(bean);
@@ -120,31 +120,27 @@ public class TestChangeLog extends BaseTestCase {
 
   }
 
+  private Database createServer() {
 
-  private SpiEbeanServer getServer() {
-
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2other");
     config.loadFromProperties();
-
     config.setDdlGenerate(true);
     config.setDdlRun(true);
     config.setDdlExtra(false);
-
     config.setDefaultServer(false);
     config.setRegister(false);
     config.setChangeLogAsync(false);
 
     config.addClass(EBasicChangeLog.class);
-
     config.setChangeLogPrepare(changeLogPrepare);
     config.setChangeLogListener(changeLogListener);
     config.setChangeLogRegister(changeLogRegister);
 
-    return (SpiEbeanServer) EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 
-  class TDChangeLogPrepare implements ChangeLogPrepare {
+  public static class TDChangeLogPrepare implements ChangeLogPrepare {
     @Override
     public boolean prepare(ChangeSet changes) {
       changes.setUserId("appUser1");
@@ -153,14 +149,12 @@ public class TestChangeLog extends BaseTestCase {
     }
   }
 
-  class TDChangeLogListener implements ChangeLogListener {
+  public static class TDChangeLogListener implements ChangeLogListener {
 
     ObjectMapper objectMapper = new ObjectMapper();
 
     ChangeSet changes;
 
-    /**
-     */
     public TDChangeLogListener() {
       objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
     }
@@ -184,7 +178,7 @@ public class TestChangeLog extends BaseTestCase {
 
   }
 
-  class TDChangeLogRegister implements ChangeLogRegister {
+  public static class TDChangeLogRegister implements ChangeLogRegister {
 
     @Override
     public ChangeLogFilter getChangeFilter(Class<?> beanType) {
@@ -198,11 +192,10 @@ public class TestChangeLog extends BaseTestCase {
     }
   }
 
-
   /**
    * Change log filter that includes all the inserts, updates and deletes.
    */
-  class TDFilter implements ChangeLogFilter {
+  public static class TDFilter implements ChangeLogFilter {
 
     /**
      * Returns true including all the inserts.

ebean-core/src/test/java/org/tests/ddl/MainDdlWithSchema.java

@@ -1,27 +0,0 @@
-package org.tests.ddl;
-
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
-import io.ebean.config.ServerConfig;
-import org.tests.model.basic.EBasic;
-
-public class MainDdlWithSchema {
-
-  public static void main(String[] args) {
-
-    ServerConfig cfg = new ServerConfig();
-    cfg.setName("h2");
-    cfg.loadFromProperties();
-    cfg.addClass(EBasic.class);
-
-    // .... other settings ...
-    //UnderscoreNamingConvention naming = new UnderscoreNamingConvention();
-    //naming.setSchema("test");
-    //cfg.setNamingConvention(naming);
-    cfg.setDdlGenerate(true);
-    cfg.setDdlRun(true);
-    EbeanServer ebean = EbeanServerFactory.create(cfg);
-    //ebean.createSqlUpdate("create schema foo").execute();
-    System.out.println(ebean);
-  }
-}

ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java

@@ -30,7 +30,7 @@ public class TestCacheViaComplexNaturalKey extends BaseTestCase {
     return server().getServerCacheManager();
   }
 
-  private static synchronized void insertSome() {
+  private static void insertSome() {
     if (!loadOnce) {
       Ebean.find(OCachedNatKeyBean.class).delete();
       for (String store : Arrays.asList("abc", "def")) {

ebean-core/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java

@@ -28,7 +28,7 @@ public class TestCacheViaComplexNaturalKey3 extends BaseTestCase {
     return server().getServerCacheManager();
   }
 
-  private static synchronized void insertSome() {
+  private static void insertSome() {
     if (!loadOnce) {
       Ebean.find(OCachedNatKeyBean3.class).delete();
 

ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java

@@ -1,16 +1,16 @@
 package org.tests.persistencecontext;
 
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.config.ContainerConfig;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
-import org.tests.model.basic.EBasicVer;
 import org.junit.Test;
+import org.tests.model.basic.EBasicVer;
 
 import java.util.Properties;
 
@@ -20,20 +20,20 @@ public class TestPersistenceContextServerConfig extends BaseTestCase {
 
   @Test
   public void test_config() {
-
     SpiEbeanServer ebeanServer = (SpiEbeanServer) create();
+    try {
+      Query<EBasicVer> query = ebeanServer.find(EBasicVer.class);
+      PersistenceContextScope scope = ebeanServer.getPersistenceContextScope((SpiQuery<?>) query);
 
-    Query<EBasicVer> query = ebeanServer.find(EBasicVer.class);
-
-    PersistenceContextScope scope = ebeanServer.getPersistenceContextScope((SpiQuery<?>) query);
-
-    assertEquals(PersistenceContextScope.QUERY, scope);
+      assertEquals(PersistenceContextScope.QUERY, scope);
+    } finally {
+      ebeanServer.shutdown();
+    }
   }
 
-  static EbeanServer create() {
+  static Database create() {
 
-
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("withPCQuery");
     config.setDdlExtra(false);
 
@@ -49,15 +49,7 @@ public class TestPersistenceContextServerConfig extends BaseTestCase {
     config.setDefaultServer(false);
     config.setRegister(false);
 
-//    DataSourceConfig dataSourceConfig = new DataSourceConfig();
-//    dataSourceConfig.setUsername("sa");
-//    dataSourceConfig.setPassword("");
-//    dataSourceConfig.setUrl("jdbc:h2:mem:withPCQuery;");
-//    dataSourceConfig.setDriver("org.h2.Driver");
-//    config.setDataSourceConfig(dataSourceConfig);
-
     config.addClass(EBasicVer.class);
-
-    return EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 }

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();

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

@@ -5,9 +5,9 @@ import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.annotation.Platform;
 import io.ebean.plugin.SpiServer;
+import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
-import org.junit.Test;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public class TestNativeILikeExpression extends BaseTestCase {
 
     SpiServer pluginApi = server().getPluginApi();
     boolean expressionNativeIlike = pluginApi.getServerConfig().isExpressionNativeIlike();
-    Platform platform = pluginApi.getDatabasePlatform().getPlatform();
+    Platform platform = pluginApi.getPlatform().base();
 
     return expressionNativeIlike && platform == Platform.POSTGRES;
   }

ebean-core/src/test/java/org/tests/readaudit/TestReadAudit.java

@@ -1,22 +1,22 @@
 package org.tests.readaudit;
 
 import io.ebean.BaseTestCase;
-import io.ebean.EbeanServerFactory;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
 import io.ebean.FutureList;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;
-import io.ebean.config.ServerConfig;
+import io.ebean.config.DatabaseConfig;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.event.readaudit.ReadAuditQueryPlan;
 import io.ebean.event.readaudit.ReadEvent;
-import io.ebeaninternal.api.SpiEbeanServer;
-import org.tests.model.basic.Country;
-import org.tests.model.basic.EBasicChangeLog;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.tests.model.basic.Country;
+import org.tests.model.basic.EBasicChangeLog;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -30,18 +30,18 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestReadAudit extends BaseTestCase {
 
-  TDReadAuditPrepare readAuditPrepare = new TDReadAuditPrepare(true);
+  TDReadAuditPrepare readAuditPrepare = new TDReadAuditPrepare();
 
-  TDReadAuditLogger readAuditLogger = new TDReadAuditLogger(true);
+  TDReadAuditLogger readAuditLogger = new TDReadAuditLogger();
 
-  SpiEbeanServer server;
+  Database server;
 
   Long id1;
   Long id2;
 
   @Before
   public void setup() {
-    server = getServer();
+    server = createServer();
 
     EBasicChangeLog bean = new EBasicChangeLog();
     bean.setName("readAudito1");
@@ -63,7 +63,7 @@ public class TestReadAudit extends BaseTestCase {
 
   @After
   public void shutdown() {
-    server.shutdown(true, false);
+    server.shutdown();
   }
 
   @Test
@@ -304,9 +304,9 @@ public class TestReadAudit extends BaseTestCase {
     assertThat(readAuditLogger.many).hasSize(2);
   }
 
-  private SpiEbeanServer getServer() {
+  private Database createServer() {
 
-    ServerConfig config = new ServerConfig();
+    DatabaseConfig config = new DatabaseConfig();
     config.setName("h2other");
     config.loadFromProperties();
 
@@ -323,7 +323,7 @@ public class TestReadAudit extends BaseTestCase {
     config.setReadAuditLogger(readAuditLogger);
     config.setReadAuditPrepare(readAuditPrepare);
 
-    return (SpiEbeanServer) EbeanServerFactory.create(config);
+    return DatabaseFactory.create(config);
   }
 
   private void resetCounters() {
@@ -331,13 +331,10 @@ public class TestReadAudit extends BaseTestCase {
     readAuditPrepare.resetCounters();
   }
 
-  class TDReadAuditPrepare implements ReadAuditPrepare {
+  static class TDReadAuditPrepare implements ReadAuditPrepare {
 
     int count;
 
-    TDReadAuditPrepare(boolean dummy) {
-    }
-
     void resetCounters() {
       count = 0;
     }
@@ -351,15 +348,12 @@ public class TestReadAudit extends BaseTestCase {
     }
   }
 
-  class TDReadAuditLogger implements ReadAuditLogger {
+  static class TDReadAuditLogger implements ReadAuditLogger {
 
     Set<ReadAuditQueryPlan> plans = new HashSet<>();
     List<ReadEvent> beans = new ArrayList<>();
     List<ReadEvent> many = new ArrayList<>();
 
-    TDReadAuditLogger(boolean dummy) {
-    }
-
     void resetCounters() {
       plans.clear();
       beans.clear();

ebean-core/src/test/resources/ebean.properties

@@ -72,15 +72,15 @@ datasource.db.databaseDriver=org.h2.Driver
 
 datasource.h2.username=sa
 datasource.h2.password=
-datasource.h2.url=jdbc:h2:mem:tests
+datasource.h2.url=jdbc:h2:mem:testsMem;DB_CLOSE_ON_EXIT=FALSE
+datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
+#datasource.h2.minConnections=1
+#datasource.h2.maxConnections=25
+#datasource.h2.capturestacktrace=true
+#datasource.h2.maxStackTraceSize=20
 #datasource.h2.driver=org.h2.Driver
-datasource.h2.minConnections=1
-datasource.h2.maxConnections=25
 #datasource.h2.heartbeatsql=select 1
 #datasource.h2.isolationlevel=read_committed
-#datasource.h2.capturestacktrace=true
-datasource.h2.maxStackTraceSize=20
-datasource.h2.poolListener=org.tests.basic.MyTestDataSourcePoolListener
 #datasource.h2.customProperties=IGNORECASE=TRUE;MODE=Oracle;
 
 

ebean-ddl-generator/pom.xml

@@ -1,20 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.1-SNAPSHOT</version>
+    <version>12.6.0</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>ebean-ddlgen</artifactId>
+  <name>ebean ddl generation</name>
+  <description>DDL and DB Migration generation</description>
+  <artifactId>ebean-ddl-generator</artifactId>
+<!--  <version>12.5.2A</version>-->
 
   <dependencies>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-runner</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>12.2.0</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>${project.version}</version>
+      <version>12.6.0</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- needed for java 11+ -->
@@ -33,6 +49,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>

ebean-ddl-generator/src/main/java/io/ebean/dbmigration/DbMigration.java

@@ -22,16 +22,41 @@ import java.util.ServiceLoader;
  *
  * <pre>{@code
  *
- *    // optionally specify the version and name
- *    //System.setProperty("ddl.migration.version", "1.1");
- *    //System.setProperty("ddl.migration.name", "add bars");
+ *    DbMigration migration = DbMigration.create();
  *
- *    // generate a migration using drops from a prior version
- *    //System.setProperty("ddl.migration.pendingDropsFor", "1.2");
+ *    migration.setPlatform(Platform.POSTGRES);
+ *
+ *    // optionally specify the version and name
+ *    migration.setName("add indexes to customer");
+ *
+ *    migration.generateMigration();
+ *
+ * }</pre>
+ *
+ * <p>
+ * Drop column migrations are effectively breaking changes and should
+ * be held back and run in a later migration after the columns deleted
+ * are no longer being used by the application. These changes are called
+ * "pending drops" and we must explicitly specify to include these in
+ * a generated migration.
+ * </p>
+ * <p>
+ * Use <code>setGeneratePendingDrop()</code> to specify a prior migration
+ * that has drop column changes that we want to generate a migration for.
+ * </p>
+ *
+ * <h3>Example: Generate for pending drops</h3>
+ *
+ * <pre>{@code
  *
  *    DbMigration migration = DbMigration.create();
  *
  *    migration.setPlatform(Platform.POSTGRES);
+ *
+ *    // set the migration version that has pending drops
+ *    migration.setGeneratePendingDrop("1.3");
+ *
+ *    // generates the migration with drop column changes
  *    migration.generateMigration();
  *
  * }</pre>
@@ -207,6 +232,23 @@ public interface DbMigration {
    *
    * }</pre>
    * <p>
+   *
+   * <h3>Example: Generate for "pending drops" (drop column changes)</h3>
+   *
+   * <pre>{@code
+   *
+   *    DbMigration migration = DbMigration.create();
+   *
+   *    migration.setPlatform(Platform.POSTGRES);
+   *
+   *    // set the migration version that has pending drops
+   *    migration.setGeneratePendingDrop("1.3");
+   *
+   *    // generates the migration with drop column changes
+   *    migration.generateMigration();
+   *
+   * }</pre>
+   *
    * <h3>Example: Run migration generating DDL for multiple platforms</h3>
    * <pre>{@code
    *