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

Bump ebean-agent to 13.6.1 - #2687
#2691 - Improve logging summary when insert bean with no @Id ...
2024-04-21 10:51:47 +00:00 · 2022-05-16 12:22:25 +12:00 · 2022-05-16 12:05:54 +12:00 · 2022-05-16 11:30:36 +12:00 · 2022-05-13 13:58:13 +12:00 · 2022-05-13 12:13:19 +12:00
123 changed files with 2806 additions and 3178 deletions
@@ -36,6 +36,8 @@ jobs:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
+    - name: Maven version
+      run: mvn --version
    - name: Build with Maven
      run: mvn package

@@ -55,9 +55,38 @@ Post questions or issues to the Ebean google group - https://groups.google.com/f
 ## Documentation
 Goto [https://ebean.io/docs/](https://ebean.io/docs/)

-
 ## Maven central
 [Maven central - io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20)

+## Building Ebean from source
+
+- JDK 11 or higher installed
+- Maven installed
+- `git clone git@github.com:ebean-orm/ebean.git`
+- `mvn clean install`
+
+Ebean 13 uses Java modules with module-info. This means that there are stricter compilation
+rules in place now than when building with classpath pre version 13.
+
+For Maven Surefire testing we use `<surefire.useModulePath>false</surefire.useModulePath>` such
+that tests run using classpath and not module-path. We are doing this until all the tooling
+(Maven, IDE) improves in the area of testing with module-info.
+
+#### Eclipse IDE
+
+Right now we can't use Eclipse IDE to build Ebean and run its tests due to its poor support
+for java modules. See [ebean/issues/2653](https://github.com/ebean-orm/ebean/issues/2653)
+
+The current recommendation is to use IntelliJ IDEA as the IDE to build and hack Ebean.
+
+
+#### IntelliJ IDEA
+
+We want to get IntelliJ to run tests using classpath similar to Maven Surefire. To do this set:
+`JUnit -> modify options -> Do not use module-path option`
+
+To set this option as the global default for IntelliJ use:
+
+`Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`


@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-db2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-h2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-hana</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean api</name>
@@ -20,14 +20,14 @@
    <dependency>
      <groupId>org.slf4j</groupId>
      <artifactId>slf4j-api</artifactId>
-      <version>1.7.30</version>
+      <version>1.7.36</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>1.7</version>
+      <version>2.0</version>
    </dependency>

    <!--
@@ -1,15 +0,0 @@
-package io.ebean;
-
-/**
- * Deprecated - please migrate to <code>io.ebean.Database</code>.
- * Provides the API for fetching and saving beans to a particular Database.
- * <p>
- * Effectively this is an alias for {@link Database} which is now the new
- * and improved name for EbeanServer.
- * <p>
- * The preference is to use DB and Database rather than Ebean and EbeanServer.
- */
-@Deprecated
-public interface EbeanServer extends Database {
-
-}
@@ -1,70 +0,0 @@
-package io.ebean;
-
-import io.ebean.config.ContainerConfig;
-import io.ebean.config.ServerConfig;
-
-/**
- * Deprecated - please migrate to DatabaseFactory.
- * <p>
- * Creates EbeanServer instances.
- * <p>
- * This uses either a ServerConfig or properties in the ebean.properties file to
- * configure and create a EbeanServer instance.
- * </p>
- * <p>
- * The EbeanServer instance can either be registered with the Ebean singleton or
- * not. The Ebean singleton effectively holds a map of EbeanServers by a name.
- * If the EbeanServer is registered with the Ebean singleton you can retrieve it
- * later via {@link Ebean#getServer(String)}.
- * </p>
- * <p>
- * One EbeanServer can be nominated as the 'default/primary' EbeanServer. Many
- * methods on the Ebean singleton such as {@link Ebean#find(Class)} are just a
- * convenient way of using the 'default/primary' EbeanServer.
- * </p>
- */
-@Deprecated
-public class EbeanServerFactory {
-
-  /**
-   * Initialise the container with clustering configuration.
-   * <p>
-   * Call this prior to creating any EbeanServer instances or alternatively set the
-   * ContainerConfig on the ServerConfig when creating the first EbeanServer instance.
-   */
-  public static void initialiseContainer(ContainerConfig containerConfig) {
-    DatabaseFactory.initialiseContainer(containerConfig);
-  }
-
-  /**
-   * Create using ebean.properties to configure the database.
-   */
-  public static EbeanServer create(String name) {
-    return (EbeanServer)DatabaseFactory.create(name);
-  }
-
-  /**
-   * Create using the ServerConfig object to configure the database.
-   */
-  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 EbeanServer createWithContextClassLoader(ServerConfig config, ClassLoader classLoader) {
-    return (EbeanServer)DatabaseFactory.createWithContextClassLoader(config, classLoader);
-  }
-
-  /**
-   * Shutdown gracefully all EbeanServers cleaning up any resources as required.
-   * <p>
-   * This is typically invoked via JVM shutdown hook and not explicitly called.
-   * </p>
-   */
-  public static void shutdown() {
-    DatabaseFactory.shutdown();
-  }
-
-}
@@ -34,6 +34,13 @@ public interface EntityBean extends Serializable, ToStringAware {
    throw new NotEnhancedException();
  }

+  /**
+   * Create and return a new entity bean instance optimised for read only no interception use.
+   */
+  default Object _ebean_newInstanceReadOnly() {
+    throw new NotEnhancedException();
+  }
+
  /**
   * Generated method that sets the loaded state on all the embedded beans on
   * this entity bean by using EntityBeanIntercept.setEmbeddedLoaded(Object o);
@@ -0,0 +1,536 @@
+package io.ebean.bean;
+
+import io.ebean.ValuePair;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+public class InterceptReadOnly implements EntityBeanIntercept {
+
+  private final EntityBean owner;
+
+  public InterceptReadOnly(Object ownerBean) {
+    this.owner = (EntityBean) ownerBean;
+  }
+
+  @Override
+  public EntityBean getOwner() {
+    return owner;
+  }
+
+  @Override
+  public PersistenceContext getPersistenceContext() {
+    return null;
+  }
+
+  @Override
+  public void setPersistenceContext(PersistenceContext persistenceContext) {
+
+  }
+
+  @Override
+  public void setNodeUsageCollector(NodeUsageCollector usageCollector) {
+
+  }
+
+  @Override
+  public Object getOwnerId() {
+    return null;
+  }
+
+  @Override
+  public void setOwnerId(Object ownerId) {
+
+  }
+
+  @Override
+  public Object getEmbeddedOwner() {
+    return null;
+  }
+
+  @Override
+  public int getEmbeddedOwnerIndex() {
+    return 0;
+  }
+
+  @Override
+  public void clearGetterCallback() {
+
+  }
+
+  @Override
+  public void registerGetterCallback(PreGetterCallback getterCallback) {
+
+  }
+
+  @Override
+  public void setEmbeddedOwner(EntityBean parentBean, int embeddedOwnerIndex) {
+
+  }
+
+  @Override
+  public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) {
+
+  }
+
+  @Override
+  public void setBeanLoader(BeanLoader beanLoader) {
+
+  }
+
+  @Override
+  public boolean isFullyLoadedBean() {
+    return false;
+  }
+
+  @Override
+  public void setFullyLoadedBean(boolean fullyLoadedBean) {
+
+  }
+
+  @Override
+  public boolean isPartial() {
+    return false;
+  }
+
+  @Override
+  public boolean isDirty() {
+    return false;
+  }
+
+  @Override
+  public void setEmbeddedDirty(int embeddedProperty) {
+
+  }
+
+  @Override
+  public void setDirty(boolean dirty) {
+
+  }
+
+  @Override
+  public boolean isNew() {
+    return false;
+  }
+
+  @Override
+  public boolean isNewOrDirty() {
+    return false;
+  }
+
+  @Override
+  public boolean hasIdOnly(int idIndex) {
+    return false;
+  }
+
+  @Override
+  public boolean isReference() {
+    return false;
+  }
+
+  @Override
+  public void setReference(int idPos) {
+
+  }
+
+  @Override
+  public void setLoadedFromCache(boolean loadedFromCache) {
+
+  }
+
+  @Override
+  public boolean isLoadedFromCache() {
+    return false;
+  }
+
+  @Override
+  public boolean isReadOnly() {
+    return true;
+  }
+
+  @Override
+  public void setReadOnly(boolean readOnly) {
+
+  }
+
+  @Override
+  public void setForceUpdate(boolean forceUpdate) {
+
+  }
+
+  @Override
+  public boolean isUpdate() {
+    return false;
+  }
+
+  @Override
+  public boolean isLoaded() {
+    return true;
+  }
+
+  @Override
+  public void setNew() {
+
+  }
+
+  @Override
+  public void setLoaded() {
+
+  }
+
+  @Override
+  public void setLoadedLazy() {
+
+  }
+
+  @Override
+  public void setLazyLoadFailure(Object ownerId) {
+
+  }
+
+  @Override
+  public boolean isLazyLoadFailure() {
+    return false;
+  }
+
+  @Override
+  public boolean isDisableLazyLoad() {
+    return false;
+  }
+
+  @Override
+  public void setDisableLazyLoad(boolean disableLazyLoad) {
+
+  }
+
+  @Override
+  public void setEmbeddedLoaded(Object embeddedBean) {
+
+  }
+
+  @Override
+  public boolean isEmbeddedNewOrDirty(Object embeddedBean) {
+    return false;
+  }
+
+  @Override
+  public Object getOrigValue(int propertyIndex) {
+    return null;
+  }
+
+  @Override
+  public int findProperty(String propertyName) {
+    return 0;
+  }
+
+  @Override
+  public String getProperty(int propertyIndex) {
+    return null;
+  }
+
+  @Override
+  public int getPropertyLength() {
+    return 0;
+  }
+
+  @Override
+  public void setPropertyLoaded(String propertyName, boolean loaded) {
+
+  }
+
+  @Override
+  public void setPropertyUnloaded(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setLoadedProperty(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setLoadedPropertyAll() {
+
+  }
+
+  @Override
+  public boolean isLoadedProperty(int propertyIndex) {
+    return false;
+  }
+
+  @Override
+  public boolean isChangedProperty(int propertyIndex) {
+    return false;
+  }
+
+  @Override
+  public boolean isDirtyProperty(int propertyIndex) {
+    return false;
+  }
+
+  @Override
+  public void markPropertyAsChanged(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setChangedProperty(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setChangeLoaded(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setEmbeddedPropertyDirty(int propertyIndex) {
+
+  }
+
+  @Override
+  public void setOriginalValue(int propertyIndex, Object value) {
+
+  }
+
+  @Override
+  public void setOriginalValueForce(int propertyIndex, Object value) {
+
+  }
+
+  @Override
+  public void setNewBeanForUpdate() {
+
+  }
+
+  @Override
+  public Set<String> getLoadedPropertyNames() {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public boolean[] getDirtyProperties() {
+    return new boolean[0];
+  }
+
+  @Override
+  public Set<String> getDirtyPropertyNames() {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public void addDirtyPropertyNames(Set<String> props, String prefix) {
+
+  }
+
+  @Override
+  public boolean hasDirtyProperty(Set<String> propertyNames) {
+    return false;
+  }
+
+  @Override
+  public Map<String, ValuePair> getDirtyValues() {
+    return Collections.emptyMap();
+  }
+
+  @Override
+  public void addDirtyPropertyValues(Map<String, ValuePair> dirtyValues, String prefix) {
+
+  }
+
+  @Override
+  public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
+
+  }
+
+  @Override
+  public StringBuilder getDirtyPropertyKey() {
+    return null;
+  }
+
+  @Override
+  public void addDirtyPropertyKey(StringBuilder sb) {
+
+  }
+
+  @Override
+  public StringBuilder getLoadedPropertyKey() {
+    return null;
+  }
+
+  @Override
+  public boolean[] getLoaded() {
+    return new boolean[0];
+  }
+
+  @Override
+  public int getLazyLoadPropertyIndex() {
+    return 0;
+  }
+
+  @Override
+  public String getLazyLoadProperty() {
+    return null;
+  }
+
+  @Override
+  public void loadBean(int loadProperty) {
+
+  }
+
+  @Override
+  public void loadBeanInternal(int loadProperty, BeanLoader loader) {
+
+  }
+
+  @Override
+  public void initialisedMany(int propertyIndex) {
+
+  }
+
+  @Override
+  public void preGetterCallback(int propertyIndex) {
+
+  }
+
+  @Override
+  public void preGetId() {
+
+  }
+
+  @Override
+  public void preGetter(int propertyIndex) {
+
+  }
+
+  @Override
+  public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
+
+  }
+
+  @Override
+  public void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
+
+  }
+
+  @Override
+  public void setDirtyStatus() {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {
+
+  }
+
+  @Override
+  public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {
+
+  }
+
+  @Override
+  public void setOldValue(int propertyIndex, Object oldValue) {
+
+  }
+
+  @Override
+  public int getSortOrder() {
+    return 0;
+  }
+
+  @Override
+  public void setSortOrder(int sortOrder) {
+
+  }
+
+  @Override
+  public void setDeletedFromCollection(boolean deletedFromCollection) {
+
+  }
+
+  @Override
+  public boolean isOrphanDelete() {
+    return false;
+  }
+
+  @Override
+  public void setLoadError(int propertyIndex, Exception t) {
+
+  }
+
+  @Override
+  public Map<String, Exception> getLoadErrors() {
+    return null;
+  }
+
+  @Override
+  public boolean isChangedProp(int i) {
+    return false;
+  }
+
+  @Override
+  public MutableValueInfo mutableInfo(int propertyIndex) {
+    return null;
+  }
+
+  @Override
+  public void mutableInfo(int propertyIndex, MutableValueInfo info) {
+
+  }
+
+  @Override
+  public void mutableNext(int propertyIndex, MutableValueNext next) {
+
+  }
+
+  @Override
+  public String mutableNext(int propertyIndex) {
+    return null;
+  }
+}
@@ -29,9 +29,10 @@ public final class TenantAwareCache implements ServerCache {
  /**
   * Return the underlying ServerCache that is being delegated to.
   */
+  @SuppressWarnings("unchecked")
  @Override
  public <T> T unwrap(Class<T> cls) {
-    return (T)delegate;
+    return (T) delegate;
  }

  @Override
@@ -1,47 +0,0 @@
-package io.ebean.config;
-
-import io.ebean.DatabaseFactory;
-
-/**
- * Deprecated - please migrate to <code>io.ebean.DatabaseConfig</code>.
- *
- * The configuration used for creating a Database.
- * <p>
- * Used to programmatically construct a Database and optionally register it
- * with the DB singleton.
- * </p>
- * <p>
- * If you just use DB without this programmatic configuration DB will read
- * the application.properties file and take the configuration from there. This usually
- * includes searching the class path and automatically registering any entity
- * classes and listeners etc.
- * </p>
- * <pre>{@code
- *
- * ServerConfig config = new ServerConfig();
- *
- * // read the ebean.properties and load
- * // those settings into this serverConfig object
- * config.loadFromProperties();
- *
- * // explicitly register the entity beans to avoid classpath scanning
- * config.addClass(Customer.class);
- * config.addClass(User.class);
- *
- * Database database = DatabaseFactory.create(config);
- *
- * }</pre>
- *
- * <p>
- * Note that ServerConfigProvider provides a standard Java ServiceLoader mechanism that can
- * be used to apply configuration to the ServerConfig.
- * </p>
- *
- * @author emcgreal
- * @author rbygrave
- * @see DatabaseFactory
- */
-@Deprecated
-public class ServerConfig extends DatabaseConfig {
-
-}
@@ -1,41 +0,0 @@
-package io.ebean.config;
-
-/**
- * Deprecated - migrate to DatabaseConfigProvider.
- * <p>
- * Provides a ServiceLoader based mechanism to configure a ServerConfig.
- * <p>
- * Provide an implementation and register it via the standard Java ServiceLoader mechanism
- * via a file at <code>META-INF/services/io.ebean.config.ServerConfigProvider</code>.
- * <p>
- * If you are using a DI container like Spring or Guice you are unlikely to use this but instead use a
- * spring specific configuration.  When we are not using a DI container we may use this mechanism to
- * explicitly register the entity beans and avoid classpath scanning.
- * </p>
- * <pre>{@code
- *
- * public class EbeanConfigProvider implements ServerConfigProvider {
- *
- *   @Override
- *   public void apply(ServerConfig config) {
- *
- *     // register the entity bean classes explicitly
- *     config.addClass(Customer.class);
- *     config.addClass(User.class);
- *     ...
- *   }
- * }
- *
- * }</pre>
- */
-@Deprecated
-public interface ServerConfigProvider {
-
-  /**
-   * Apply the configuration to the ServerConfig.
-   * <p>
-   * Typically we explicitly register entity bean classes and thus avoid classpath scanning.
-   * </p>
-   */
-  void apply(ServerConfig config);
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>

  <name>ebean autotune</name>
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

@@ -55,7 +55,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean bom</name>
@@ -71,88 +71,88 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.4.1</version>
+        <version>13.6.1</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>

  <dependencies>
@@ -29,7 +29,7 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>classpath-scanner</artifactId>
-      <version>6.2</version>
+      <version>7.1</version>
    </dependency>

    <dependency>
@@ -41,19 +41,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -144,21 +144,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -23,7 +23,7 @@ import java.util.stream.Stream;
 /**
 * Service Provider extension to EbeanServer.
 */
-public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, BeanCollectionLoader {
+public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectionLoader {

  /**
   * Return true if the L2 cache has been disabled.
@@ -55,7 +55,6 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
   * <p>
   * Typically used to identify the origin of queries for AutoTune and object
   * graph costing.
-   * </p>
   */
  CallOrigin createCallOrigin();

@@ -13,6 +13,8 @@ import java.io.Serializable;
 import java.lang.ref.SoftReference;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantLock;

 /**
 * The default cache implementation.
@@ -43,10 +45,13 @@ public class DefaultServerCache implements ServerCache {

  protected final String name;
  protected final String shortName;
-  private final int maxSize;
-  private final int trimFrequency;
-  private final int maxIdleSecs;
-  private final int maxSecsToLive;
+  protected final int maxSize;
+  protected final int trimFrequency;
+  protected final int maxIdleSecs;
+  protected final int maxSecsToLive;
+  protected final long trimOnPut;
+  protected final ReentrantLock lock = new ReentrantLock();
+  protected final AtomicLong mutationCounter = new AtomicLong();

  public DefaultServerCache(DefaultServerCacheConfig config) {
    this.name = config.getName();
@@ -56,6 +61,7 @@ public class DefaultServerCache implements ServerCache {
    this.maxIdleSecs = config.getMaxIdleSecs();
    this.maxSecsToLive = config.getMaxSecsToLive();
    this.trimFrequency = config.determineTrimFrequency();
+    this.trimOnPut = config.determineTrimOnPut();

    MetricFactory factory = MetricFactory.get();
    String prefix = "l2n.";
@@ -187,6 +193,9 @@ public class DefaultServerCache implements ServerCache {
  public void put(Object key, Object value) {
    map.put(key, new SoftReference<>(new CacheEntry(key, value)));
    putCount.increment();
+    if (mutationCounter.incrementAndGet() > trimOnPut) {
+      runEviction();
+    }
  }

  /**
@@ -222,62 +231,72 @@ public class DefaultServerCache implements ServerCache {
   * Run the eviction based on Idle time, Time to live and LRU last access.
   */
  public void runEviction() {
-    long trimForMaxSize;
-    if (maxSize == 0) {
-      trimForMaxSize = 0;
-    } else {
-      trimForMaxSize = size() - maxSize;
-    }
-    if (maxIdleSecs == 0 && maxSecsToLive == 0 && trimForMaxSize < 0) {
-      // nothing to trim on this cache
-      return;
-    }
-    long startNanos = System.nanoTime();
-    long trimmedByIdle = 0;
-    long trimmedByGC = 0;
-    long trimmedByTTL = 0;
-    long trimmedByLRU = 0;
-
-    List<CacheEntry> activeList = new ArrayList<>(map.size());
-    long idleExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxIdleSecs);
-    long ttlExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxSecsToLive);
-    Iterator<SoftReference<CacheEntry>> it = map.values().iterator();
-    while (it.hasNext()) {
-      SoftReference<CacheEntry> ref = it.next();
-      final CacheEntry cacheEntry = ref.get();
-      if (cacheEntry == null) {
-        it.remove();
-        trimmedByGC++;
-      } else if (maxIdleSecs > 0 && idleExpireNano > cacheEntry.getLastAccessTime()) {
-        it.remove();
-        trimmedByIdle++;
-      } else if (maxSecsToLive > 0 && ttlExpireNano > cacheEntry.getCreateTime()) {
-        it.remove();
-        trimmedByTTL++;
-      } else if (trimForMaxSize > 0) {
-        activeList.add(cacheEntry);
+    lock.lock();
+    try {
+      long trimForMaxSize;
+      if (maxSize == 0) {
+        trimForMaxSize = 0;
+      } else {
+        trimForMaxSize = size() - maxSize;
      }
-    }
-    if (trimForMaxSize > 0 && activeList.size() > maxSize) {
-      // sort into last access time ascending
-      activeList.sort(BY_LAST_ACCESS);
-      int trimSize = getTrimSize();
-      for (int i = trimSize; i < activeList.size(); i++) {
-        // remove if still in the cache
-        if (map.remove(activeList.get(i).getKey()) != null) {
-          trimmedByLRU++;
+      if (maxIdleSecs == 0 && maxSecsToLive == 0 && trimForMaxSize < 0) {
+        // nothing to trim on this cache
+        mutationCounter.set(0);
+        return;
+      }
+      long startNanos = System.nanoTime();
+      long trimmedByIdle = 0;
+      long trimmedByGC = 0;
+      long trimmedByTTL = 0;
+      long trimmedByLRU = 0;
+
+      try {
+        List<CacheEntry> activeList = new ArrayList<>(map.size());
+        long idleExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxIdleSecs);
+        long ttlExpireNano = startNanos - TimeUnit.SECONDS.toNanos(maxSecsToLive);
+        Iterator<SoftReference<CacheEntry>> it = map.values().iterator();
+        while (it.hasNext()) {
+          SoftReference<CacheEntry> ref = it.next();
+          final CacheEntry cacheEntry = ref.get();
+          if (cacheEntry == null) {
+            it.remove();
+            trimmedByGC++;
+          } else if (maxIdleSecs > 0 && idleExpireNano > cacheEntry.getLastAccessTime()) {
+            it.remove();
+            trimmedByIdle++;
+          } else if (maxSecsToLive > 0 && ttlExpireNano > cacheEntry.getCreateTime()) {
+            it.remove();
+            trimmedByTTL++;
+          } else if (trimForMaxSize > 0) {
+            activeList.add(cacheEntry.forSort());
+          }
        }
+        if (trimForMaxSize > 0 && activeList.size() > maxSize) {
+          // sort into last access time ascending
+          activeList.sort(BY_LAST_ACCESS);
+          int trimSize = getTrimSize();
+          for (int i = trimSize; i < activeList.size(); i++) {
+            // remove if still in the cache
+            if (map.remove(activeList.get(i).getKey()) != null) {
+              trimmedByLRU++;
+            }
+          }
+        }
+        mutationCounter.set(0);
+        evictCount.add(trimmedByIdle);
+        evictCount.add(trimmedByGC);
+        evictCount.add(trimmedByTTL);
+        evictCount.add(trimmedByLRU);
+        if (logger.isTraceEnabled()) {
+          long exeMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
+          logger.trace("Executed trim of cache {} in [{}]millis idle[{}] timeToLive[{}] accessTime[{}] gc[{}]",
+            name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU, trimmedByGC);
+        }
+      } catch (Throwable e) {
+        logger.warn("Error during trim of DefaultServerCache [" + name + "]. Cache might be bigger than desired.", e);
      }
-    }
-
-    evictCount.add(trimmedByIdle);
-    evictCount.add(trimmedByGC);
-    evictCount.add(trimmedByTTL);
-    evictCount.add(trimmedByLRU);
-    if (logger.isTraceEnabled()) {
-      long exeMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
-      logger.trace("Executed trim of cache {} in [{}]millis idle[{}] timeToLive[{}] accessTime[{}] gc[{}]",
-        name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU, trimmedByGC);
+    } finally {
+      lock.unlock();
    }
  }

@@ -293,7 +312,7 @@ public class DefaultServerCache implements ServerCache {
  }

  /**
-   * Comparator for sorting by last access time.
+   * Comparator for sorting by last access sort, a copy of last access time that should not mutate during trim processing.
   */
  public static final class CompareByLastAccess implements Comparator<CacheEntry>, Serializable {

@@ -301,7 +320,7 @@ public class DefaultServerCache implements ServerCache {

    @Override
    public int compare(CacheEntry e1, CacheEntry e2) {
-      return Long.compare(e1.getLastAccessTime(), e2.getLastAccessTime());
+      return Long.compare(e1.lastAccessSort, e2.lastAccessSort);
    }
  }

@@ -314,6 +333,7 @@ public class DefaultServerCache implements ServerCache {
    private final Object value;
    private final long createTime;
    private long lastAccessTime;
+    private long lastAccessSort;

    public CacheEntry(Object key, Object value) {
      this.key = key;
@@ -322,6 +342,14 @@ public class DefaultServerCache implements ServerCache {
      this.lastAccessTime = createTime;
    }

+    /**
+     * Store a copy of lastAccessTime used for sorting. This value should not change during trim processing.
+     */
+    public CacheEntry forSort() {
+      this.lastAccessSort = lastAccessTime;
+      return this;
+    }
+
    /**
     * Return the entry key.
     */
@@ -76,4 +76,14 @@ public final class DefaultServerCacheConfig {
    }
    return 0;
  }
+
+  /**
+   * Determine the number of mutations/puts required to trigger a runEviction() in the foreground.
+   */
+  public long determineTrimOnPut() {
+    if (maxSize > 0) {
+      return maxSize / 10;
+    }
+    return 1000;
+  }
 }
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.cluster;

-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.config.ContainerConfig;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 import org.slf4j.Logger;
@@ -20,7 +20,7 @@ public class ClusterManager implements ServerLookup {

  private final ReentrantLock lock = new ReentrantLock();

-  private final ConcurrentHashMap<String, EbeanServer> serverMap = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, Database> serverMap = new ConcurrentHashMap<>();

  private final Object monitor = new Object();

@@ -53,7 +53,7 @@ public class ClusterManager implements ServerLookup {
    return factory;
  }

-  public void registerServer(EbeanServer server) {
+  public void registerServer(Database server) {
    lock.lock();
    try {
      serverMap.put(server.name(), server);
@@ -66,7 +66,7 @@ public class ClusterManager implements ServerLookup {
  }

  @Override
-  public EbeanServer getServer(String name) {
+  public Database getServer(String name) {
    lock.lock();
    try {
      return serverMap.get(name);
@@ -1,14 +1,14 @@
 package io.ebeaninternal.server.cluster;

-import io.ebean.EbeanServer;
+import io.ebean.Database;

 /**
- * Returns EbeanServer instances for remote message reading.
+ * Returns Database instances for remote message reading.
 */
 public interface ServerLookup {

  /**
   * Return the EbeanServer instance by name.
   */
-  EbeanServer getServer(String name);
+  Database getServer(String name);
 }
@@ -5,8 +5,6 @@ import io.ebean.config.ContainerConfig;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DatabaseConfigProvider;
 import io.ebean.config.ModuleInfoLoader;
-import io.ebean.config.ServerConfig;
-import io.ebean.config.ServerConfigProvider;
 import io.ebean.config.TenantMode;
 import io.ebean.config.UnderscoreNamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -124,15 +122,8 @@ public final class DefaultContainer implements SpiContainer {

  private void applyConfigServices(DatabaseConfig config) {
    if (config.isDefaultServer()) {
-      boolean appliedConfig = false;
      for (DatabaseConfigProvider configProvider : ServiceLoader.load(DatabaseConfigProvider.class)) {
        configProvider.apply(config);
-        appliedConfig = true;
-      }
-      if (!appliedConfig && config instanceof ServerConfig) {
-        for (ServerConfigProvider configProvider : ServiceLoader.load(ServerConfigProvider.class)) {
-          configProvider.apply((ServerConfig)config);
-        }
      }
    }
    if (config.isAutoLoadModuleInfo()) {
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;

+import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceAlertFactory;
 import io.ebean.datasource.DataSourceConfig;
@@ -97,10 +98,16 @@ final class InitDataSource {
      dsConfig.setReadOnly(true);
      dsConfig.setDefaults(config.getDataSourceConfig());
      dsConfig.setIsolationLevel(config.getDataSourceConfig().getIsolationLevel());
+    } else if (isPostgresAllQuotedIdentifiers()) {
+      dsConfig.addProperty("quoteReturningIdentifiers", false);
    }
    return create(dsConfig, readOnly);
  }

+  boolean isPostgresAllQuotedIdentifiers() {
+    return config.isAllQuotedIdentifiers() && Platform.POSTGRES == config.getDatabasePlatform().getPlatform().base();
+  }
+
  private DataSource create(DataSourceConfig dsConfig, boolean readOnly) {
    String poolName = config.getName() + (readOnly ? "-ro" : "");
    return DataSourceFactory.create(poolName, dsConfig);
@@ -9,25 +9,12 @@ import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanPersistRequest;
 import io.ebean.event.changelog.BeanChange;
-import io.ebeaninternal.api.ConcurrencyMode;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiProfileTransactionEvent;
-import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.api.TransactionEvent;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.cache.CacheChangeSet;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanManager;
-import io.ebeaninternal.server.deploy.BeanProperty;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.*;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.id.ImportedId;
-import io.ebeaninternal.server.persist.BatchControl;
-import io.ebeaninternal.server.persist.BatchedSqlException;
-import io.ebeaninternal.server.persist.DeleteMode;
-import io.ebeaninternal.server.persist.Flags;
-import io.ebeaninternal.server.persist.PersistExecute;
-import io.ebeaninternal.server.persist.SaveMany;
+import io.ebeaninternal.server.persist.*;
 import io.ebeaninternal.server.transaction.BeanPersistIdMap;
 import io.ebeanservice.docstore.api.DocStoreUpdate;
 import io.ebeanservice.docstore.api.DocStoreUpdateContext;
@@ -38,11 +25,7 @@ import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;

 /**
 * PersistRequest for insert update or delete of a bean.
@@ -953,7 +936,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    String name = beanDescriptor.name();
    switch (type) {
      case INSERT:
-        transaction.logSummary("Inserted [" + name + "] [" + idValue + "]" + draft);
+        transaction.logSummary("Inserted [" + name + "] [" + (idValue == null ? "" : idValue) + "]" + draft);
        break;
      case UPDATE:
        transaction.logSummary("Updated [" + name + "] [" + idValue + "]" + draft);
@@ -28,7 +28,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
  }

  @Override
-  public void setLoader(BeanCollectionLoader loader) {
+  public final void setLoader(BeanCollectionLoader loader) {
    this.loader = loader;
  }

@@ -43,7 +43,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {

  @SuppressWarnings("rawtypes")
  @Override
-  public Collection underlying(Object value) {
+  public final Collection underlying(Object value) {
    if (value instanceof BeanCollection) {
      return ((BeanCollection)value).getActualDetails();
    } else {
@@ -51,7 +51,7 @@ abstract class BaseCollectionHelp<T> implements BeanCollectionHelp<T> {
    }
  }

-  void jsonWriteCollection(SpiJsonWriter ctx, String name, Collection<?> list) throws IOException {
+  final void jsonWriteCollection(SpiJsonWriter ctx, String name, Collection<?> list) throws IOException {
    if (!list.isEmpty() || ctx.isIncludeEmpty()) {
      ctx.beginAssocMany(name);
      for (Object bean : list) {
@@ -47,6 +47,11 @@ public interface BeanCollectionHelp<T> extends CQueryCollectionAdd<T> {
   */
  BeanCollection<T> createEmpty(EntityBean bean);

+  /**
+   * Create and return an empty 'vanilla' collection that does not support lazy loading.
+   */
+  Object createEmptyReference();
+
  /**
   * Add a bean to the List Set or Map.
   */
@@ -86,7 +86,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
  private final ConcurrentHashMap<String, ElPropertyDeploy> elDeployCache = new ConcurrentHashMap<>();
  private final ConcurrentHashMap<String, ElComparator<T>> comparatorCache = new ConcurrentHashMap<>();
  private final ConcurrentHashMap<String, STreeProperty> dynamicProperty = new ConcurrentHashMap<>();
-  private final ConcurrentHashMap<String, Map<String,String>> pathMaps = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, Map<String, String>> pathMaps = new ConcurrentHashMap<>();

  private final Map<String, SpiRawSql> namedRawSql;
  private final Map<String, String> namedQuery;
@@ -1765,6 +1765,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    return createEntityBean(false);
  }

+  @Override
+  public EntityBean createEntityBean2(boolean readOnlyNoIntercept) {
+    if (readOnlyNoIntercept) {
+      return (EntityBean) prototypeEntityBean._ebean_newInstanceReadOnly();
+    }
+    return createEntityBean(false);
+  }
+
  /**
   * Create an entity bean for JSON marshalling (which differs for the element collection case).
   */
@@ -2879,7 +2887,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    for (BeanPropertyAssocMany<?> many : propertiesManySave) {
      if (ebi.isLoadedProperty(many.propertyIndex())) {
        final Object value = many.getValue(bean);
-        if (value instanceof BeanCollection && ((BeanCollection<?>)value).hasModifications() || value != null) {
+        if (value instanceof BeanCollection && ((BeanCollection<?>) value).hasModifications() || value != null) {
          return true;
        }
      }
@@ -11,6 +11,7 @@ import io.ebeaninternal.api.json.SpiJsonWriter;

 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;

 /**
@@ -27,8 +28,7 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
-
+  public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
    if (bc instanceof BeanList<?>) {
      BeanList<?> bl = (BeanList<?>) bc;
      if (bl.getActualList() == null) {
@@ -42,12 +42,17 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollection<T> createEmptyNoParent() {
+  public final Object createEmptyReference() {
+    return Collections.EMPTY_LIST;
+  }
+
+  @Override
+  public final BeanCollection<T> createEmptyNoParent() {
    return new BeanList<>();
  }

  @Override
-  public BeanCollection<T> createEmpty(EntityBean parentBean) {
+  public final BeanCollection<T> createEmpty(EntityBean parentBean) {
    BeanList<T> beanList = new BeanList<>(loader, parentBean, propertyName);
    if (many != null) {
      beanList.setModifyListening(many.modifyListenMode());
@@ -56,29 +61,23 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollection<T> createReference(EntityBean parentBean) {
-
+  public final BeanCollection<T> createReference(EntityBean parentBean) {
    BeanList<T> beanList = new BeanList<>(loader, parentBean, propertyName);
    beanList.setModifyListening(many.modifyListenMode());
    return beanList;
  }

  @Override
-  public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
-
+  public final void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
    BeanList<?> newBeanList = (BeanList<?>) server.findList(query, t);
    refresh(newBeanList, parentBean);
  }

  @Override
-  public void refresh(BeanCollection<?> bc, EntityBean parentBean) {
-
+  public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
    BeanList<?> newBeanList = (BeanList<?>) bc;
-
    List<?> currentList = (List<?>) many.getValue(parentBean);
-
    newBeanList.setModifyListening(many.modifyListenMode());
-
    if (currentList == null) {
      // the currentList is null? Not really expecting this...
      many.setValue(parentBean, newBeanList);
@@ -96,8 +95,7 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
-
+  public final void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
    List<?> list;
    if (collection instanceof BeanCollection<?>) {
      BeanList<?> beanList = (BeanList<?>) collection;
@@ -114,7 +112,6 @@ public class BeanListHelp<T> extends BaseCollectionHelp<T> {
    } else {
      list = (List<?>) collection;
    }
-
    jsonWriteCollection(ctx, name, list);
  }

@@ -10,6 +10,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;

 import java.io.IOException;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -36,13 +37,11 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {

  @Override
  @SuppressWarnings("unchecked")
-  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
-
+  public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
    if (mapKey == null) {
      mapKey = many.mapKey();
    }
    BeanProperty beanProp = targetDescriptor.beanProperty(mapKey);
-
    if (bc instanceof BeanMap<?, ?>) {
      BeanMap<Object, Object> bm = (BeanMap<Object, Object>) bc;
      Map<Object, Object> actualMap = bm.getActualMap();
@@ -57,10 +56,9 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
    }
  }

-  static class Adder implements BeanCollectionAdd {
+  static final class Adder implements BeanCollectionAdd {

    private final BeanProperty beanProperty;
-
    private final Map<Object, Object> map;

    Adder(BeanProperty beanProperty, Map<Object, Object> map) {
@@ -76,13 +74,17 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollection<T> createEmptyNoParent() {
+  public final Object createEmptyReference() {
+    return Collections.EMPTY_MAP;
+  }
+
+  @Override
+  public final BeanCollection<T> createEmptyNoParent() {
    return new BeanMap<>();
  }

  @Override
-  public BeanCollection<T> createEmpty(EntityBean ownerBean) {
-
+  public final BeanCollection<T> createEmpty(EntityBean ownerBean) {
    BeanMap<?, T> beanMap = new BeanMap<>(loader, ownerBean, propertyName);
    if (many != null) {
      beanMap.setModifyListening(many.modifyListenMode());
@@ -92,7 +94,6 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {

  @Override
  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
-
    if (bean == null) {
      ((BeanMap<?, ?>) collection).internalPutNull();
    } else {
@@ -104,8 +105,7 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {

  @Override
  @SuppressWarnings({"unchecked", "rawtypes"})
-  public BeanCollection<T> createReference(EntityBean parentBean) {
-
+  public final BeanCollection<T> createReference(EntityBean parentBean) {
    BeanMap beanMap = new BeanMap(loader, parentBean, propertyName);
    if (many != null) {
      beanMap.setModifyListening(many.modifyListenMode());
@@ -114,14 +114,13 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
+  public final void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
    BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) server.findMap(query, t);
    refresh(newBeanMap, parentBean);
  }

  @Override
-  public void refresh(BeanCollection<?> bc, EntityBean parentBean) {
-
+  public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
    BeanMap<?, ?> newBeanMap = (BeanMap<?, ?>) bc;
    Map<?, ?> current = (Map<?, ?>) many.getValue(parentBean);

@@ -143,8 +142,7 @@ public class BeanMapHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
-
+  public final void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
    Map<?, ?> map;
    if (collection instanceof BeanCollection<?>) {
      BeanMap<?, ?> bc = (BeanMap<?, ?>) collection;
@@ -15,7 +15,6 @@ public final class BeanMapHelpElement<T> extends BeanMapHelp<T> {
  public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
    Object key = bean._ebean_getField(0);
    Object val = bean._ebean_getField(1);
-
    BeanMap<?, ?> map = ((BeanMap<?, ?>) collection);
    if (withCheck) {
      map.internalPutWithCheck(key, val);
@@ -601,6 +601,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    return mapKey;
  }

+  @Override
+  public void createEmptyReference(EntityBean localBean) {
+    setValue(localBean, help.createEmptyReference());
+  }
+
  @Override
  public BeanCollection<?> createReference(EntityBean localBean, boolean forceNewReference) {
    return forceNewReference ? createReference(localBean) : createReferenceIfNull(localBean);
@@ -10,6 +10,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonWriter;

 import java.io.IOException;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;

@@ -33,7 +34,7 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
+  public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) {
    if (bc instanceof BeanSet<?>) {
      BeanSet<?> beanSet = (BeanSet<?>) bc;
      if (beanSet.getActualSet() == null) {
@@ -46,12 +47,17 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollection<T> createEmptyNoParent() {
+  public final Object createEmptyReference() {
+    return Collections.EMPTY_SET;
+  }
+
+  @Override
+  public final BeanCollection<T> createEmptyNoParent() {
    return new BeanSet<>();
  }

  @Override
-  public BeanCollection<T> createEmpty(EntityBean ownerBean) {
+  public final BeanCollection<T> createEmpty(EntityBean ownerBean) {
    BeanSet<T> beanSet = new BeanSet<>(loader, ownerBean, propertyName);
    if (many != null) {
      beanSet.setModifyListening(many.modifyListenMode());
@@ -60,20 +66,20 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public BeanCollection<T> createReference(EntityBean parentBean) {
+  public final BeanCollection<T> createReference(EntityBean parentBean) {
    BeanSet<T> beanSet = new BeanSet<>(loader, parentBean, propertyName);
    beanSet.setModifyListening(many.modifyListenMode());
    return beanSet;
  }

  @Override
-  public void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
+  public final void refresh(SpiEbeanServer server, Query<?> query, Transaction t, EntityBean parentBean) {
    BeanSet<?> newBeanSet = (BeanSet<?>) server.findSet(query, t);
    refresh(newBeanSet, parentBean);
  }

  @Override
-  public void refresh(BeanCollection<?> bc, EntityBean parentBean) {
+  public final void refresh(BeanCollection<?> bc, EntityBean parentBean) {
    BeanSet<?> newBeanSet = (BeanSet<?>) bc;
    Set<?> current = (Set<?>) many.getValue(parentBean);
    newBeanSet.setModifyListening(many.modifyListenMode());
@@ -94,7 +100,7 @@ public class BeanSetHelp<T> extends BaseCollectionHelp<T> {
  }

  @Override
-  public void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
+  public final void jsonWrite(SpiJsonWriter ctx, String name, Object collection, boolean explicitInclude) throws IOException {
    Set<?> set;
    if (collection instanceof BeanCollection<?>) {
      BeanSet<?> bc = (BeanSet<?>) collection;
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.deploy;

 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.bean.InterceptReadWrite;

 final class ElementEntityBean implements EntityBean {

@@ -13,7 +14,7 @@ final class ElementEntityBean implements EntityBean {

  ElementEntityBean(String[] properties) {
    this.properties = properties;
-    this.intercept = new EntityBeanIntercept(this);
+    this.intercept = new InterceptReadWrite(this);
  }

  @Override
@@ -24,7 +24,7 @@ import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
 /**
 * Saves the details for a OneToMany or ManyToMany relationship (entity beans).
 */
-public final class SaveManyBeans extends SaveManyBase {
+final class SaveManyBeans extends SaveManyBase {

  private final boolean cascade;
  private final boolean publish;
@@ -34,7 +34,9 @@ public final class SaveManyBeans extends SaveManyBase {
  private final DeleteMode deleteMode;
  private final boolean untouchedBeanCollection;
  private final Collection<?> collection;
+  private final boolean hasOrderColumn;
  private int sortOrder;
+  private boolean insertAllChildren;

  SaveManyBeans(DefaultPersister persister, boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
    super(persister, insertedParent, many, parentBean, request);
@@ -46,6 +48,7 @@ public final class SaveManyBeans extends SaveManyBase {
    this.deleteMode = targetDescriptor.isSoftDelete() ? DeleteMode.SOFT : DeleteMode.HARD;
    this.untouchedBeanCollection = untouchedBeanCollection();
    this.collection = cascade ? BeanCollectionUtil.getActualEntries(value) : null;
+    this.hasOrderColumn = many.hasOrderColumn();
  }

  /**
@@ -73,7 +76,7 @@ public final class SaveManyBeans extends SaveManyBase {
        resetModifyState();
      }
    } else {
-      if (isModifyListenMode() || many.hasOrderColumn()) {
+      if (isModifyListenMode() || hasOrderColumn) {
        // delete any removed beans / orphans
        removeAssocManyOrphans();
      }
@@ -90,6 +93,7 @@ public final class SaveManyBeans extends SaveManyBase {

  private boolean isSaveIntersection() {
    if (!many.isManyToMany()) {
+      // OneToMany JoinTable
      return true;
    }
    return transaction.isSaveAssocManyIntersection(many.intersectionTableJoin().getTable(), many.descriptor().rootName());
@@ -112,26 +116,22 @@ public final class SaveManyBeans extends SaveManyBase {

  private void processDetails() {
    BeanProperty orderColumn = null;
-    boolean hasOrderColumn = many.hasOrderColumn();
    if (hasOrderColumn) {
      if (!insertedParent && canSkipForOrderColumn() && saveRecurseSkippable) {
        return;
      }
      orderColumn = targetDescriptor.orderColumn();
    }
-
    if (insertedParent) {
      // performance optimisation for large collections
      targetDescriptor.preAllocateIds(collection.size());
    }
-
    if (!insertedParent && many.isOrphanRemoval() && request.isForcedUpdate()) {
      // collect the Id's (to exclude from deleteManyDetails)
      List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
      // deleting missing children - children not in our collected detailIds
      persister.deleteManyDetails(transaction, many.descriptor(), parentBean, many, detailIds, deleteMode);
    }
-
    transaction.depth(+1);
    saveAllBeans(orderColumn);
    if (hasOrderColumn) {
@@ -140,17 +140,14 @@ public final class SaveManyBeans extends SaveManyBase {
    transaction.depth(-1);
  }

-  private void saveAllBeans(BeanProperty orderColumn) {
-    // if a map, then we get the key value and
-    // set it to the appropriate property on the
-    // detail bean before we save it
+  private void saveAllBeans(final BeanProperty orderColumn) {
    Object mapKeyValue = null;
    boolean skipSavingThisBean;
-
+    boolean clearedParent = false;
    for (Object detailBean : collection) {
      sortOrder++;
      if (isMap) {
-        // its a map so need the key and value
+        // a map so need the key and value
        Map.Entry<?, ?> entry = (Map.Entry<?, ?>) detailBean;
        mapKeyValue = entry.getKey();
        detailBean = entry.getValue();
@@ -169,25 +166,28 @@ public final class SaveManyBeans extends SaveManyBase {
              ebi.setDirty(true);
            }
          }
-          if (targetDescriptor.isReference(ebi) && originalOrder == 0) {
+          if (originalOrder == 0 && targetDescriptor.isReference(ebi)) {
            // we can skip this one
            skipSavingThisBean = true;
          } else if (ebi.isNewOrDirty()) {
            skipSavingThisBean = false;
            // set the parent bean to detailBean
            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
+          } else if (insertAllChildren) {
+            ebi.setNew();
+            skipSavingThisBean = false;
+            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
          } else {
-            // unmodified so skip depending on prop.isSaveRecurseSkippable();
            skipSavingThisBean = saveRecurseSkippable;
          }
        }
-
        if (!skipSavingThisBean) {
          persister.saveRecurse(detail, transaction, parentBean, request.flags());
-          if (many.hasOrderColumn()) {
-            // Clear the bean from the PersistenceContext (L1 cache), because the order of referenced beans might have changed
+          if (hasOrderColumn && !clearedParent) {
+            // Clear the parent bean from the PersistenceContext (L1 cache), because the order of referenced beans might have changed
            final BeanDescriptor<?> beanDescriptor = many.descriptor();
            beanDescriptor.contextClear(transaction.getPersistenceContext(), beanDescriptor.getId(parentBean));
+            clearedParent = true;
          }
        }
      }
@@ -342,6 +342,7 @@ public final class SaveManyBeans extends SaveManyBase {
    if (!(value instanceof BeanCollection<?>)) {
      if (!insertedParent && cascade && isChangedProperty()) {
        persister.addToFlushQueue(many.deleteByParentId(request.beanId(), null), transaction, 0);
+        insertAllChildren = true;
      }
    } else {
      BeanCollection<?> c = (BeanCollection<?>) value;
@@ -351,7 +352,7 @@ public final class SaveManyBeans extends SaveManyBase {
        c.setModifyListening(many.modifyListenMode());
      }
      // We must not reset when we still have to update other entities in the collection and set their new orderColumn value
-      if (!many.hasOrderColumn()) {
+      if (!hasOrderColumn) {
        c.modifyReset();
      }
      if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
@@ -644,10 +644,12 @@ final class CQueryBuilder {
    }

    private void appendHistoryAsOfPredicate() {
-      if (query.isAsOfBaseTable() && !historySupport.isStandardsBased()) {
-        appendAndOrWhere();
-        sb.append(historySupport.getAsOfPredicate(request.baseTableAlias()));
+      if (query.isAsOfBaseTable()) {
        query.incrementAsOfTableCount();
+        if (!historySupport.isStandardsBased()){
+          appendAndOrWhere();
+          sb.append(historySupport.getAsOfPredicate(request.baseTableAlias()));
+        }
      }
    }

@@ -134,6 +134,9 @@ final class DefaultDbSqlContext implements DbSqlContext {
      String asOfView = historySupport.getAsOfView(table);
      appendTable(table, asOfView);
      if (asOfView != null) {
+        if (historySupport.isStandardsBased()) {
+          asOfTableCount++;
+        }
        addAsOfOnClause = !historySupport.isStandardsBased();
      }
    }
@@ -33,6 +33,11 @@ public interface STreePropertyAssocMany extends STreePropertyAssoc {
   */
  BeanCollection<?> createReference(EntityBean localBean, boolean forceNewReference);

+  /**
+   * Populate the collection for read-only disabled lazy loading (aka Java Collections non mutable empty collection).
+   */
+  void createEmptyReference(EntityBean localBean);
+
  /**
   * Return true if the property has a join table.
   */
@@ -79,6 +79,11 @@ public interface STreeType {
   */
  EntityBean createEntityBean();

+  /**
+   * Create a new entity bean instance with option for read only optimisation.
+   */
+  EntityBean createEntityBean2(boolean readOnlyNoIntercept);
+
  /**
   * Put the entity bean into the persistence context.
   */
@@ -50,6 +50,7 @@ public final class SqlTreeBuilder {
   */
  private final boolean rawNoId;
  private final boolean disableLazyLoad;
+  private final boolean readOnly;
  private final SpiQuery.TemporalMode temporalMode;
  private SqlTreeNode rootNode;
  private boolean sqlDistinct;
@@ -63,6 +64,7 @@ public final class SqlTreeBuilder {
    this.desc = request.descriptor();
    this.rawNoId = rawNoId;
    this.disableLazyLoad = request.query().isDisableLazyLoading();
+    this.readOnly = Boolean.TRUE.equals(request.query().isReadOnly());
    this.query = null;
    this.subQuery = false;
    this.distinctOnPlatform = false;
@@ -88,6 +90,7 @@ public final class SqlTreeBuilder {
    this.query = request.query();
    this.temporalMode = SpiQuery.TemporalMode.of(query);
    this.disableLazyLoad = query.isDisableLazyLoading();
+    this.readOnly = Boolean.TRUE.equals(query.isReadOnly());
    this.subQuery = Type.SQ_EXISTS == query.getType()
        || Type.SQ_IN == query.getType()
        || Type.ID_LIST == query.getType()
@@ -309,13 +312,13 @@ public final class SqlTreeBuilder {
      if (baseTable == null) {
        baseTable = desc.baseTable(temporalMode);
      }
-      return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, sqlDistinct, baseTable);
+      return new SqlTreeNodeRoot(desc, props, myList, withId, includeJoin, lazyLoadMany, temporalMode, disableLazyLoad, readOnly, sqlDistinct, baseTable);

    } else if (prop instanceof STreePropertyAssocMany) {
-      return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, withId(), temporalMode, disableLazyLoad);
+      return new SqlTreeNodeManyRoot(prefix, (STreePropertyAssocMany) prop, props, myList, withId(), temporalMode, disableLazyLoad, readOnly);

    } else {
-      return new SqlTreeNodeBean(prefix, prop, props, myList, withId(), temporalMode, disableLazyLoad);
+      return new SqlTreeNodeBean(prefix, prop, props, myList, withId(), temporalMode, disableLazyLoad, readOnly);
    }
  }

@@ -28,6 +28,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
  final boolean readId;
  private final boolean readIdNormal;
  private final boolean disableLazyLoad;
+  private final boolean readOnlyNoIntercept;
  private final InheritInfo inheritInfo;
  final String prefix;
  private final Map<String, String> pathMap;
@@ -49,6 +50,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
    this.readId = node.readId;
    this.readIdNormal = readId && !temporalVersions;
    this.disableLazyLoad = node.disableLazyLoad;
+    this.readOnlyNoIntercept = disableLazyLoad && node.readOnly;
    this.partialObject = node.partialObject;
    this.properties = node.properties;
    this.pathMap = node.pathMap;
@@ -145,7 +147,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {

    void initBeanType() throws SQLException {
      localDesc = desc;
-      localBean = desc.createEntityBean();
+      localBean = desc.createEntityBean2(readOnlyNoIntercept);
      localIdBinder = idBinder;
    }

@@ -282,14 +284,18 @@ class SqlTreeLoadBean implements SqlTreeLoad {
      boolean forceNewReference = queryMode == Mode.REFRESH_BEAN;
      for (STreePropertyAssocMany many : localDesc.propsMany()) {
        if (many != fetchedMany) {
-          // create a proxy for the many (deferred fetching)
-          BeanCollection<?> ref = many.createReference(localBean, forceNewReference);
-          if (ref != null) {
-            if (disableLazyLoad) {
-              ref.setDisableLazyLoad(true);
-            }
-            if (!ref.isRegisteredWithLoadContext()) {
-              ctx.register(many.asMany(), ref);
+          if (readOnlyNoIntercept) {
+            many.createEmptyReference(localBean);
+          } else {
+            // create a proxy for the many (deferred fetching)
+            BeanCollection<?> ref = many.createReference(localBean, forceNewReference);
+            if (ref != null) {
+              if (disableLazyLoad) {
+                ref.setDisableLazyLoad(true);
+              }
+              if (!ref.isRegisteredWithLoadContext()) {
+                ctx.register(many.asMany(), ref);
+              }
            }
          }
        }
@@ -38,6 +38,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
  final boolean readId;
  final boolean readIdNormal;
  final boolean disableLazyLoad;
+  final boolean readOnly;
  final InheritInfo inheritInfo;
  final String prefix;
  final Map<String, String> pathMap;
@@ -57,16 +58,16 @@ class SqlTreeNodeBean implements SqlTreeNode {
   * Construct for leaf node.
   */
  SqlTreeNodeBean(String prefix, STreePropertyAssoc beanProp, SqlTreeProperties props,
-                  List<SqlTreeNode> myChildren, boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
-    this(prefix, beanProp, beanProp.target(), props, myChildren, withId, null, temporalMode, disableLazyLoad);
+                  List<SqlTreeNode> myChildren, boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean readOnly) {
+    this(prefix, beanProp, beanProp.target(), props, myChildren, withId, null, temporalMode, disableLazyLoad, readOnly);
  }

  /**
   * Construct for root node.
   */
  SqlTreeNodeBean(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId,
-                  STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
-    this(null, null, desc, props, myList, withId, many, temporalMode, disableLazyLoad);
+                  STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean readOnly) {
+    this(null, null, desc, props, myList, withId, many, temporalMode, disableLazyLoad, readOnly);
  }

  /**
@@ -74,7 +75,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
   */
  private SqlTreeNodeBean(String prefix, STreePropertyAssoc beanProp, STreeType desc, SqlTreeProperties props,
                          List<SqlTreeNode> myChildren, boolean withId, STreePropertyAssocMany lazyLoadParent,
-                          SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
+                          SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean readOnly) {
    this.lazyLoadParent = lazyLoadParent;
    this.lazyLoadParentIdBinder = (lazyLoadParent == null) ? null : lazyLoadParent.idBinder();
    this.prefix = prefix;
@@ -91,6 +92,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
    this.readId = !aggregationRoot && withId && desc.hasId();
    this.readIdNormal = readId && !temporalVersions;
    this.disableLazyLoad = disableLazyLoad || !readIdNormal || desc.isRawSqlBased();
+    this.readOnly = readOnly;
    this.partialObject = props.isPartialObject();
    this.properties = props.getProps();
    this.children = myChildren == null ? Collections.emptyList() : myChildren;
@@ -10,8 +10,8 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
  final STreePropertyAssocMany manyProp;

  SqlTreeNodeManyRoot(String prefix, STreePropertyAssocMany prop, SqlTreeProperties props, List<SqlTreeNode> myList,
-                      boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad) {
-    super(prefix, prop, props, myList, withId, temporalMode, disableLazyLoad);
+                      boolean withId, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean readOnly) {
+    super(prefix, prop, props, myList, withId, temporalMode, disableLazyLoad, readOnly);
    this.manyProp = prop;
  }

@@ -20,9 +20,9 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean {
   * Specify for SqlSelect to include an Id property or not.
   */
  SqlTreeNodeRoot(STreeType desc, SqlTreeProperties props, List<SqlTreeNode> myList, boolean withId, TableJoin includeJoin,
-                  STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean sqlDistinct, String baseTable) {
+                  STreePropertyAssocMany many, SpiQuery.TemporalMode temporalMode, boolean disableLazyLoad, boolean readOnly, boolean sqlDistinct, String baseTable) {

-    super(desc, props, myList, withId, many, temporalMode, disableLazyLoad);
+    super(desc, props, myList, withId, many, temporalMode, disableLazyLoad, readOnly);
    this.includeJoin = includeJoin;
    this.sqlDistinct = sqlDistinct;
    this.baseTable = baseTable;
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.querydefn;

-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.Update;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiUpdate;
@@ -14,7 +14,7 @@ public final class DefaultOrmUpdate<T> implements SpiUpdate<T>, Serializable {

  private static final long serialVersionUID = -8791423602246515438L;

-  private transient final EbeanServer server;
+  private transient final Database server;
  private final Class<?> beanType;
  private final String name;
  private String label;
@@ -35,7 +35,7 @@ public final class DefaultOrmUpdate<T> implements SpiUpdate<T>, Serializable {
   * Create with a specific server. This means you can use the
   * UpdateSql.execute() method.
   */
-  public DefaultOrmUpdate(Class<?> beanType, EbeanServer server, String baseTable, String updateStatement) {
+  public DefaultOrmUpdate(Class<?> beanType, Database server, String baseTable, String updateStatement) {
    this.beanType = beanType;
    this.server = server;
    this.baseTable = baseTable;
@@ -4,7 +4,6 @@ module io.ebean.core {
  uses io.ebean.cache.ServerCachePlugin;
  uses io.ebean.cache.ServerCacheNotifyPlugin;
  uses io.ebean.config.DatabaseConfigProvider;
-  uses io.ebean.config.ServerConfigProvider;
  uses io.ebean.config.ModuleInfoLoader;
  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
  uses io.ebean.datasource.DataSourceAlertFactory;
@@ -1 +1 @@
-ebean-version: 133
+ebean-version: 141
@@ -6,8 +6,7 @@ import org.junit.jupiter.api.Test;

 import static org.junit.jupiter.api.Assertions.assertEquals;

-public class DefaultServerCacheConfigTest {
-
+class DefaultServerCacheConfigTest {

  private DefaultServerCacheConfig create(int maxSize, int maxIdleSecs, int maxSecsToLive, int trimFreq) {
    ServerCacheOptions options = new ServerCacheOptions();
@@ -20,33 +19,45 @@ public class DefaultServerCacheConfigTest {
  }

  @Test
-  public void trimFreq_halfIdle() {
-
+  void trimFreq_halfIdle() {
    assertEquals(create(10000,10,20, 0).determineTrimFrequency(), 4);
  }

-
  @Test
-  public void trimFreq_halfIdle_withRounding() {
-
+  void trimFreq_halfIdle_withRounding() {
    assertEquals(create(10000,11,20, 0).determineTrimFrequency(), 4);
  }

  @Test
-  public void trimFreq_halfTTL() {
-
+  void trimFreq_halfTTL() {
    assertEquals(create(10000,0,20, 0).determineTrimFrequency(), 9);
  }

  @Test
-  public void trimFreq_halfTTL_withRounding() {
-
+  void trimFreq_halfTTL_withRounding() {
    assertEquals(create(10000,0,21, 0).determineTrimFrequency(), 9);
  }

  @Test
-  public void trimFreq_explicit() {
-
+  void trimFreq_explicit() {
    assertEquals(create(10000,10,20, 42).determineTrimFrequency(), 42);
  }
+
+  @Test
+  void trimOnPut_default() {
+    assertEquals(create(0,0,0, 0).determineTrimOnPut(), 1_000);
+  }
+
+  @Test
+  void trimOnPut_tenPercent() {
+    assertEquals(create(10_000,0,0, 0).determineTrimOnPut(), 1_000);
+    assertEquals(create(9_000,0,0, 0).determineTrimOnPut(), 900);
+    assertEquals(create(100,0,0, 0).determineTrimOnPut(), 10);
+  }
+
+  @Test
+  void trimOnPut_roundDown() {
+    assertEquals(create(9010,0,0, 0).determineTrimOnPut(), 901);
+    assertEquals(create(9009,0,0, 0).determineTrimOnPut(), 900);
+  }
 }
@@ -10,16 +10,14 @@ import org.junit.jupiter.api.Test;
 import java.util.Random;


-public class DefaultServerCache_RunEvictionTest {
-
+class DefaultServerCache_RunEvictionTest {

  private DefaultServerCache createCache() {
-
    ServerCacheOptions cacheOptions = new ServerCacheOptions();
-    cacheOptions.setMaxSize(10000);
+    cacheOptions.setMaxSize(300);
    cacheOptions.setMaxIdleSecs(1);
    cacheOptions.setMaxSecsToLive(2);
-    cacheOptions.setTrimFrequency(1);
+    cacheOptions.setTrimFrequency(5);

    ServerCacheConfig con = new ServerCacheConfig(ServerCacheType.BEAN, "foo", "foo", cacheOptions, null, null);
    return new DefaultServerCache(new DefaultServerCacheConfig(con));
@@ -35,8 +33,7 @@ public class DefaultServerCache_RunEvictionTest {

  @Disabled("test takes long time")
  @Test
-  public void runEvict() throws InterruptedException {
-
+  void runEvict() throws InterruptedException {
    for (int i = 0; i < 15; i++) {
      doStuff();
      cache.runEviction();
@@ -47,12 +44,10 @@ public class DefaultServerCache_RunEvictionTest {
  }

  private void doStuff() {
-
-    for (int i = 0; i < 500; i++) {
+    for (int i = 0; i < 5000; i++) {
      String key = "" + random.nextInt(20000);
-
      int mode = random.nextInt(10);
-      if (mode < 8) {
+      if (mode < 7) {
        cache.get(key);
      } else {
        cache.put(key, key + "-" + System.currentTimeMillis());
@@ -4,6 +4,9 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceAlert;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourcePool;
+import io.ebean.platform.h2.H2Platform;
+import io.ebean.platform.postgres.Postgres9Platform;
+import io.ebean.platform.postgres.PostgresPlatform;
 import org.junit.jupiter.api.Test;

 import javax.sql.DataSource;
@@ -128,6 +131,41 @@ public class InitDataSourceTest {
    assertEquals("foo", roConfig.getUrl());
  }

+  @Test
+  void isPostgresAllQuotedIdentifiers_true_when_postgres() {
+    DatabaseConfig config = new DatabaseConfig();
+    config.setAllQuotedIdentifiers(true);
+    config.setDatabasePlatform(new PostgresPlatform());
+
+    assertTrue(new InitDataSource(config).isPostgresAllQuotedIdentifiers());
+  }
+
+  @Test
+  void isPostgresAllQuotedIdentifiers_true_when_postgres9() {
+    DatabaseConfig config = new DatabaseConfig();
+    config.setAllQuotedIdentifiers(true);
+    config.setDatabasePlatform(new Postgres9Platform());
+
+    assertTrue(new InitDataSource(config).isPostgresAllQuotedIdentifiers());
+  }
+
+  @Test
+  void isPostgresAllQuotedIdentifiers_false() {
+    DatabaseConfig config = new DatabaseConfig();
+    config.setAllQuotedIdentifiers(false);
+    config.setDatabasePlatform(new PostgresPlatform());
+
+    assertFalse(new InitDataSource(config).isPostgresAllQuotedIdentifiers());
+  }
+
+  @Test
+  void isPostgresAllQuotedIdentifiers_false_when_notPostgres() {
+    DatabaseConfig config = new DatabaseConfig();
+    config.setAllQuotedIdentifiers(true);
+    config.setDatabasePlatform(new H2Platform());
+
+    assertFalse(new InitDataSource(config).isPostgresAllQuotedIdentifiers());
+  }

  @Test
  public void online() {
@@ -0,0 +1 @@
+synthetic: false
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

@@ -58,7 +58,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean external mapping api</name>
@@ -4,12 +4,12 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.4.1</tag>
+    <tag>ebean-parent-13.6.1</tag>
  </scm>

  <name>ebean external mapping xml</name>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -47,7 +47,7 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>classpath-scanner</artifactId>
-      <version>6.2</version>
+      <version>7.1</version>
    </dependency>

    <!-- test dependencies -->
@@ -61,21 +61,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -0,0 +1 @@
+ebean-version: 141
@@ -0,0 +1 @@
+synthetic: false
@@ -6,7 +6,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1-SNAPSHOT</version>
+    <version>13.6.1-SNAPSHOT</version>
  </parent>

  <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1-SNAPSHOT</version>
+      <version>13.6.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -50,7 +50,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.4.1-SNAPSHOT</version>
+      <version>13.6.1-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean postgis</name>
@@ -22,14 +22,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

@@ -73,7 +73,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

@@ -63,21 +63,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.4.1</version>
+    <version>13.6.1</version>
  </parent>

  <name>ebean test</name>
@@ -29,20 +29,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
    </dependency>

    <dependency>
@@ -106,7 +106,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.4.1</version>
+      <version>13.6.1</version>
      <scope>test</scope>
    </dependency>

@@ -176,14 +176,14 @@
    <dependency>
      <groupId>com.microsoft.sqlserver</groupId>
      <artifactId>mssql-jdbc</artifactId>
-      <version>9.4.0.jre8</version>
+      <version>10.2.0.jre8</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>mysql</groupId>
      <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.26</version>
+      <version>8.0.28</version>
      <scope>test</scope>
    </dependency>

@@ -197,7 +197,7 @@
    <dependency>
      <groupId>com.sap.cloud.db.jdbc</groupId>
      <artifactId>ngdbc</artifactId>
-      <version>2.3.48</version>
+      <version>2.12.9</version>
      <scope>test</scope>
    </dependency>

@@ -235,14 +235,14 @@
    <dependency>
      <groupId>ru.yandex.clickhouse</groupId>
      <artifactId>clickhouse-jdbc</artifactId>
-      <version>0.3.1-patch</version>
+      <version>0.3.2</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>ch.qos.logback</groupId>
      <artifactId>logback-classic</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import java.io.File;
+
 import java.util.Properties;

 /**
@@ -18,7 +18,7 @@ class Config {
   * Common optional docker parameters that we just transfer to docker properties.
   */
  private static final String[] DOCKER_TEST_PARAMS = {"fastStartMode", "inMemory", "initSqlFile", "seedSqlFile", "adminUser", "adminPassword", "extraDb", "extraDb.dbName", "extraDb.username", "extraDb.password", "extraDb.initSqlFile", "extraDb.seedSqlFile"};
-  private static final String[] DOCKER_PLATFORM_PARAMS = {"containerName", "image", "internalPort", "startMode", "stopMode", "shutdown", "maxReadyAttempts", "tmpfs", "collation", "characterSet"};
+  private static final String[] DOCKER_PLATFORM_PARAMS = {"containerName", "image", "internalPort", "startMode", "shutdownMode", "maxReadyAttempts", "tmpfs", "collation", "characterSet"};

  private static final String DDL_MODE_OPTIONS = "dropCreate, create, none, migration, createOnly or migrationDropCreate";

@@ -63,7 +63,7 @@ class Config {
  }

  void setDefaultPort(int defaultPort) {
-    String val = getPlatformKey("port", null);
+    String val = getKey("port", null);
    if (val != null) {
      port = Integer.parseInt(val);
    } else {
@@ -225,7 +225,7 @@ class Config {
  }

  void setUrl(String urlPattern) {
-    String val = getPlatformKey("url", urlPattern);
+    String val = getKey("url", urlPattern);
    val = val.replace("${host}", host());
    val = val.replace("${port}", String.valueOf(port));
    val = val.replace("${databaseName}", databaseName);
@@ -245,7 +245,7 @@ class Config {
  }

  void setDriver(String driver) {
-    this.driver = getPlatformKey("driver", driver);
+    this.driver = getKey("driver", driver);
  }

  void setPasswordDefault() {
@@ -259,7 +259,7 @@ class Config {
  private String deriveDbSchema() {
    String dbSchema = properties.getProperty("ebean.dbSchema", config.getDbSchema());
    dbSchema = properties.getProperty("ebean.test.dbSchema", dbSchema);
-    return getPlatformKey("schema", dbSchema);
+    return getKey("schema", dbSchema);
  }

  /**
@@ -267,7 +267,7 @@ class Config {
   */
  void setUsernameDefault() {
    this.schema = first(deriveDbSchema());
-    String defaultValue = schema != null ? schema : getPlatformKey("databaseName", this.databaseName);
+    String defaultValue = schema != null ? schema : getKey("databaseName", this.databaseName);
    this.username = getKey("username", defaultValue);
  }

@@ -308,11 +308,11 @@ class Config {
  }

  void setUsername(String username) {
-    this.username = getPlatformKey("username", username);
+    this.username = getKey("username", username);
  }

  void setDatabaseName(String databaseName) {
-    this.databaseName = getPlatformKey("databaseName", databaseName);
+    this.databaseName = getKey("databaseName", databaseName);
  }

  boolean isUseDocker() {
@@ -321,7 +321,7 @@ class Config {
  }

  void setDockerVersion(String version) {
-    String val = getPlatformKey("version", version);
+    String val = getKey("version", version);
    dockerProperties.setProperty(dockerKey("version"), val);
    if (containerDropCreate) {
      dockerProperties.setProperty(dockerKey("startMode"), "dropCreate");
@@ -334,16 +334,16 @@ class Config {
  }

  void setDockerContainerName(String containerName) {
-    dockerProperties.setProperty(dockerKey("containerName"), getPlatformKey("containerName", containerName));
+    dockerProperties.setProperty(dockerKey("containerName"), getKey("containerName", containerName));
  }

  void setDockerImage(String defaultImage) {
-    dockerProperties.setProperty(dockerKey("image"), getPlatformKey("image", defaultImage));
+    dockerProperties.setProperty(dockerKey("image"), getKey("image", defaultImage));
  }

  void setExtensions(String defaultValue) {
    // ebean.test.postgres.extensions=hstore,pgcrypto
-    String val = getPlatformKey("extensions", defaultValue);
+    String val = getKey("extensions", defaultValue);
    if (val != null) {
      dockerProperties.setProperty(dockerKey("extensions"), trimExtensions(val));
    }
@@ -363,7 +363,7 @@ class Config {
    return properties.getProperty("ebean.test." + platform + "." + key, defaultValue);
  }

-  private String getKey(String key, String defaultValue) {
+  String getKey(String key, String defaultValue) {
    defaultValue = properties.getProperty("ebean.test." + key, defaultValue);
    return properties.getProperty("ebean.test." + platform + "." + key, defaultValue);
  }
@@ -388,11 +388,10 @@ class Config {
  }

  private void setDockerOptionalParameters() {
-
    // check for shutdown mode on all containers
-    String mode = properties.getProperty("ebean.test.shutdown");
-    if (mode != null && !ignoreDockerShutdown()) {
-      dockerProperties.setProperty(dockerKey("shutdown"), mode);
+    String mode = properties.getProperty("ebean.test.shutdownMode");
+    if (mode != null) {
+      dockerProperties.setProperty(dockerKey("shutdownMode"), mode);
    }
    for (String key : DOCKER_TEST_PARAMS) {
      String val = getKey(key, null);
@@ -402,7 +401,7 @@ class Config {
      }
    }
    for (String key : DOCKER_PLATFORM_PARAMS) {
-      String val = getPlatformKey(key, null);
+      String val = getKey(key, null);
      val = properties.getProperty("docker." + platform + "." + key, val);
      if (val != null) {
        dockerProperties.setProperty(dockerKey(key), val);
@@ -410,26 +409,6 @@ class Config {
    }
  }

-  /**
-   * For local development we might want to ignore docker shutdown.
-   * <p>
-   * So we just want the shutdown mode to be used on the CI server.
-   */
-  boolean ignoreDockerShutdown() {
-    String localDev = properties.getProperty("ebean.test.localDevelopment", "~/.ebean/ignore-docker-shutdown");
-    return ignoreDockerShutdown(localDev);
-  }
-
-  boolean ignoreDockerShutdown(String localDev) {
-
-    if (localDev.startsWith("~/")) {
-      File homeDir = new File(System.getProperty("user.home"));
-      return new File(homeDir, localDev.substring(2)).exists();
-    }
-
-    return new File(localDev).exists();
-  }
-
  private String dockerKey(String key) {
    return dockerPlatform + "." + key;
  }
@@ -442,7 +421,7 @@ class Config {
   * Pretty much only for SqlServer as we have the 2 platforms we need to choose from.
   */
  void setDatabasePlatformName() {
-    String databasePlatformName = getPlatformKey("databasePlatformName", null);
+    String databasePlatformName = getKey("databasePlatformName", null);
    if (databasePlatformName != null) {
      setProperty("ebean." + db + ".databasePlatformName", databasePlatformName);
    }
@@ -1,6 +1,5 @@
 package io.ebean.test.config.platform;

-import io.ebean.docker.commands.ElasticConfig;
 import io.ebean.docker.commands.ElasticContainer;

 import java.util.Properties;
@@ -10,7 +9,7 @@ import java.util.Properties;
 */
 class ElasticSearchSetup {

-  private static final String[] DOCKER_PARAMS = {"containerName", "image", "internalPort", "startMode", "shutdown"};
+  private static final String[] DOCKER_PARAMS = {"containerName", "image", "internalPort", "startMode", "shutdownMode"};

  private final Properties config;

@@ -19,30 +18,21 @@ class ElasticSearchSetup {
  }

  void run() {
-    ElasticConfig elasticConfig = readConfig();
-    if (elasticConfig != null) {
-      new ElasticContainer(elasticConfig).start();
-    }
-  }
-
-  ElasticConfig readConfig() {
-
    String version = read("version", null);
-    if (version == null) {
-      // we need an explicit version to run
-      return null;
+    if (version != null) {
+      Properties properties = populateDockerProperties(version);
+      ElasticContainer.builder(version)
+        .properties(properties)
+        .build()
+        .start();
    }
-
-    return new ElasticConfig(version, populateDockerProperties(version));
  }

  private Properties populateDockerProperties(String version) {
-
    PropertiesBuilder properties = new PropertiesBuilder();
-
-    String mode = config.getProperty("ebean.test.shutdown");
+    String mode = config.getProperty("ebean.test.shutdownMode");
    if (mode != null) {
-      properties.set("shutdown", mode);
+      properties.set("shutdownMode", mode);
    }

    properties.set("version", version);
@@ -63,7 +53,7 @@ class ElasticSearchSetup {

  private static class PropertiesBuilder {

-    private Properties dockerProperties = new Properties();
+    private final Properties dockerProperties = new Properties();

    private void set(String key, String val) {
      dockerProperties.setProperty("elastic." + key, val);
@@ -5,13 +5,12 @@ import java.util.Properties;
 /**
 * A variation of Postgres that expected Postgis extension support.
 *
- * Uses mdillon/postgis image by default.
+ * Uses postgis/postgis image by default.
 */
 class PostgisSetup implements PlatformSetup {

  @Override
  public Properties setup(Config config) {
-
    int defaultPort = config.isUseDocker() ? 7432 : 5432;

    config.setDockerPlatform("postgres");
@@ -27,20 +26,17 @@ class PostgisSetup implements PlatformSetup {
      config.urlAppend("?currentSchema=" + schema);
    }
    config.datasourceDefaults();
-
    return dockerProperties(config);
  }

  private Properties dockerProperties(Config config) {
-
    if (!config.isUseDocker()) {
      return new Properties();
    }
-
    config.setExtensions("hstore,pgcrypto,postgis");
-    config.setDockerImage("mdillon/postgis");
-    config.setDockerContainerName("postgis");
-    config.setDockerVersion("10");
+    config.setDockerContainerName("ut_postgis");
+    config.setDockerImage("postgis/postgis");
+    config.setDockerVersion("14");
    return config.getDockerProperties();
  }

@@ -1,6 +1,5 @@
 package io.ebean.test.config.platform;

-import io.ebean.docker.commands.RedisConfig;
 import io.ebean.docker.commands.RedisContainer;

 import java.util.Properties;
@@ -16,9 +15,10 @@ class RedisSetup {
        String host = dockerHost.dockerHost(properties.getProperty("ebean.test.dockerHost"));
        properties.setProperty("redis.host",  host);
      }
-      RedisConfig redisConfig = new RedisConfig(version, properties);
-      RedisContainer container = new RedisContainer(redisConfig);
-      container.start();
+      RedisContainer.builder(version)
+        .properties(properties)
+        .build()
+        .start();
    }
  }
 }
@@ -6,7 +6,6 @@ import io.ebean.datasource.DataSourceConfig;
 import io.ebeaninternal.api.DbOffline;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import java.util.Properties;
@@ -14,22 +13,21 @@ import java.util.Properties;
 import static org.assertj.core.api.Assertions.assertThat;


-public class ConfigTest {
+class ConfigTest {

  @BeforeAll
-  public static void before() {
+  static void before() {
    // so that RunOnceMarker is not set when running these tests
    DbOffline.setPlatform(Platform.H2);
  }

  @AfterAll
-  public static void after() {
+  static void after() {
    DbOffline.reset();
  }

  @Test
-  public void trimExtensions() {
-
+  void trimExtensions() {
    Config config = new Config("db", "db", "db", new DatabaseConfig());

    assertThat(config.trimExtensions("a,b")).isEqualTo("a,b");
@@ -38,8 +36,7 @@ public class ConfigTest {
  }

  @Test
-  public void extraDbProperties_basic() {
-
+  void extraDbProperties_basic() {
    Properties p = new Properties();
    p.setProperty("ebean.test.extraDb", "other");

@@ -61,8 +58,7 @@ public class ConfigTest {
  }

  @Test
-  public void extraDbProperties_basic_extraDb_dbName() {
-
+  void extraDbProperties_basic_extraDb_dbName() {
    Properties p = new Properties();
    p.setProperty("ebean.test.extraDb.dbName", "other");

@@ -84,8 +80,7 @@ public class ConfigTest {
  }

  @Test
-  public void extraDbProperties_withOptions() {
-
+  void extraDbProperties_withOptions() {
    Properties p = new Properties();
    p.setProperty("ebean.test.extraDb", "other1");
    p.setProperty("ebean.test.extraDb.dbName", "other_db_name");
@@ -112,10 +107,8 @@ public class ConfigTest {
    assertThat(p.getProperty("datasource.other_db_name.url")).isEqualTo("other_url");
  }

-
  @Test
-  public void extraDbProperties_withExtraDbOptions() {
-
+  void extraDbProperties_withExtraDbOptions() {
    Properties sourceProperties = new Properties();
    sourceProperties.setProperty("ebean.test.dbName", "main");
    sourceProperties.setProperty("ebean.test.extraDb.dbName", "central");
@@ -144,46 +137,55 @@ public class ConfigTest {

    Properties centralProps = serverConfig.getProperties();
    assertThat(centralProps.getProperty("datasource.central.username")).isEqualTo("central");
-
  }

  @Test
-  public void ignoreDockerShutdown() {
+  void readImage_fromPlatform() {
+    Properties p = new Properties();
+    p.setProperty("ebean.test.postgres.image", "bar/bar");
+    Config config = createConfig(p);

-    Properties sourceProperties = new Properties();
-    DatabaseConfig serverConfig = new DatabaseConfig();
-    serverConfig.loadFromProperties(sourceProperties);
+    String val = config.getPlatformKey("image", "someDefault");
+    assertThat(val).isEqualTo("bar/bar");

-    Config config = new Config("main", "postgres", "main", serverConfig);
-
-    assertThat(config.ignoreDockerShutdown("./src/test/resources/logback-test.xml")).isTrue();
-    assertThat(config.ignoreDockerShutdown("./src/test/resources/file-does-not-exist")).isFalse();
-  }
-
-  @Disabled
-  @Test
-  public void run_local_only_ignoreDockerShutdown() {
-
-    Properties sourceProperties = new Properties();
-    DatabaseConfig serverConfig = new DatabaseConfig();
-    serverConfig.loadFromProperties(sourceProperties);
-
-    Config config = new Config("main", "postgres", "main", serverConfig);
-    assertThat(config.ignoreDockerShutdown("~/.ebean/ignore-docker-shutdown")).isTrue();
-    assertThat(config.ignoreDockerShutdown()).isTrue();
+    val = config.getKey("image", "someDefault");
+    assertThat(val).isEqualTo("bar/bar");
  }

  @Test
-  public void ignoreDockerShutdown_viaProperties() {
+  void readImage_fromTopLevel() {
+    Properties p = new Properties();
+    p.setProperty("ebean.test.image", "bar/bar");
+    p.setProperty("ebean.test.notPlatform.image", "bar/bar");
+    Config config = createConfig(p);

-    Properties sourceProperties = new Properties();
-    sourceProperties.setProperty("ebean.test.localDevelopment", "./src/test/resources/logback-test.xml");
+    String val = config.getPlatformKey("image", "someDefault");
+    assertThat(val).isEqualTo("someDefault");

+    val = config.getKey("image", "someDefault");
+    assertThat(val).isEqualTo("bar/bar");
+  }
+
+  @Test
+  void readImage_expect_platformSpecificWins() {
+    Properties p = new Properties();
+    p.setProperty("ebean.test.image", "foo/foo");
+    p.setProperty("ebean.test.postgres.image", "bar/bar");
+
+    Config config = createConfig(p);
+
+    String val = config.getPlatformKey("image", "someDefault");
+    assertThat(val).isEqualTo("bar/bar");
+
+    val = config.getKey("image", "someDefault");
+    assertThat(val).isEqualTo("bar/bar");
+  }
+
+  private Config createConfig(Properties p) {
    DatabaseConfig serverConfig = new DatabaseConfig();
-    serverConfig.loadFromProperties(sourceProperties);
-
-    Config config = new Config("main", "postgres", "main", serverConfig);
-    assertThat(config.ignoreDockerShutdown()).isTrue();
+    serverConfig.setName("scOther");
+    serverConfig.loadFromProperties(p);
+    return new Config("db_name", "postgres", "db_name", serverConfig);
  }

 }
@@ -1,7 +1,7 @@
 package io.ebean.xtest.internal.server.cluster.binarymessage;

+import io.ebean.Database;
 import io.ebean.xtest.BaseTestCase;
-import io.ebean.EbeanServer;
 import io.ebean.xtest.internal.api.TDSpiEbeanServer;
 import io.ebeaninternal.api.TransactionEventTable;
 import io.ebeaninternal.server.cache.RemoteCacheEvent;
@@ -94,7 +94,7 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {

  class TDServerLookup implements ServerLookup {
    @Override
-    public EbeanServer getServer(String name) {
+    public Database getServer(String name) {
      return mockEbeanServer;
    }
  }
@@ -1,16 +1,13 @@
 package main;

-import io.ebean.docker.commands.CockroachConfig;
 import io.ebean.docker.commands.CockroachContainer;

 public class StartCockroach {

  public static void main(String[] args) {
-
-    CockroachConfig config = new CockroachConfig("v21.2.4");
-    config.setDbName("unit");
-
-    CockroachContainer container = new CockroachContainer(config);
-    container.start();
+    CockroachContainer.builder("v21.2.4")
+      .dbName("unit")
+      .build()
+      .start();
  }
 }
@@ -1,22 +1,18 @@
 package main;

-import io.ebean.docker.commands.Db2Config;
 import io.ebean.docker.commands.Db2Container;

 public class StartDb2 {

  public static void main(String[] args) {
-
-    Db2Config config = new Db2Config("11.5.6.0a");
-    config.setDbName("unit");
-    config.setUser("unit");
-    config.setPassword("unit");
-
-    // to change collation, charset and other parameters like pagesize:
-    config.setCreateOptions("USING CODESET UTF-8 TERRITORY DE COLLATE USING IDENTITY PAGESIZE 32768");
-    config.setConfigOptions("USING STRING_UNITS CODEUNITS32");
-
-    Db2Container container = new Db2Container(config);
-    container.startWithDropCreate();
+    Db2Container.builder("11.5.6.0a")
+      .dbName("unit")
+      .user("unit")
+      .password("unit")
+      // to change collation, charset and other parameters like pagesize:
+      .configOptions("USING CODESET UTF-8 TERRITORY DE COLLATE USING IDENTITY PAGESIZE 32768")
+      .configOptions("USING STRING_UNITS CODEUNITS32")
+      .build()
+      .startWithDropCreate();
  }
 }
@@ -1,18 +1,15 @@
 package main;

-import io.ebean.docker.commands.MariaDBConfig;
 import io.ebean.docker.commands.MariaDBContainer;

 public class StartMariaDb {

  public static void main(String[] args) {
-
-    MariaDBConfig config = new MariaDBConfig("10.5");
-    config.setDbName("unit");
-    config.setUser("unit");
-    config.setPassword("unit");
-
-    MariaDBContainer container = new MariaDBContainer(config);
-    container.startWithDropCreate();
+    MariaDBContainer.builder("10.5")
+      .dbName("unit")
+      .user("unit")
+      .password("unit")
+      .build()
+      .startWithDropCreate();
  }
 }
@@ -1,16 +1,17 @@
 package main;

-import io.ebean.docker.commands.MySqlConfig;
 import io.ebean.docker.commands.MySqlContainer;

 public class StartMySql {

  public static void main(String[] args) {

-    MySqlConfig config = new MySqlConfig("8.0");
-    config.setDbName("unit");
-    config.setUser("unit");
-    config.setPassword("unit");
+    MySqlContainer.builder("8.0")
+      .dbName("unit")
+      .user("unit")
+      .password("unit")
+      .build()
+      .startWithDropCreate();

    // by default this mysql docker collation is case sensitive
    // using utf8mb4_bin
@@ -22,7 +23,5 @@ public class StartMySql {
 //    config.setCollation("utf8mb4_unicode_ci");
 //    config.setCharacterSet("utf8mb4");

-    MySqlContainer container = new MySqlContainer(config);
-    container.startWithDropCreate();
  }
 }
@@ -1,16 +1,14 @@
 package main;

-import io.ebean.docker.commands.NuoDBConfig;
 import io.ebean.docker.commands.NuoDBContainer;

 public class StartNuoDB {

  public static void main(String[] args) {
+    NuoDBContainer container = NuoDBContainer.builder("4.0")
+      .schema("test_user")
+      .build();

-    NuoDBConfig config = new NuoDBConfig();
-    config.setSchema("test_user");
-
-    NuoDBContainer container = new NuoDBContainer(config);
    container.stopRemove();
    container.startWithDropCreate();
  }
@@ -1,16 +1,13 @@
 package main;

-import io.ebean.docker.commands.OracleConfig;
 import io.ebean.docker.commands.OracleContainer;

 public class StartOracle {

  public static void main(String[] args) {
-
-    OracleConfig config = new OracleConfig();
-    config.setUser("test_ebean");
-
-    OracleContainer container = new OracleContainer(config);
-    container.startWithDropCreate();
+    OracleContainer.builder("latest")
+      .user("test_ebean")
+      .build()
+      .startWithDropCreate();
  }
 }
@@ -1,21 +1,18 @@
 package main;

-import io.ebean.docker.commands.PostgresConfig;
 import io.ebean.docker.commands.PostgresContainer;

 public class StartPostgres {

  public static void main(String[] args) {
-
-    PostgresConfig config = new PostgresConfig("13");
-    config.setPort(5432);
-    config.setDbName("unit");
-    config.setUser("unit");
-    config.setPassword("unit");
-    config.setContainerName("pg13x");
-    config.setExtensions("hstore,pgcrypto");
-
-    PostgresContainer container = new PostgresContainer(config);
-    container.startWithDropCreate();
+    PostgresContainer.builder("13")
+      .port(5432)
+      .dbName("unit")
+      .user("unit")
+      .password("unit")
+      .containerName("pg13x")
+      .extensions("hstore,pgcrypto")
+      .build()
+      .startWithDropCreate();
  }
 }
@@ -1,15 +1,15 @@
 package main;

-import io.ebean.docker.commands.SqlServerConfig;
 import io.ebean.docker.commands.SqlServerContainer;

 public class StartSqlServer {

  public static void main(String[] args) {
-
-    SqlServerConfig config = new SqlServerConfig("2019-GA-ubuntu-16.04");
-    config.setDbName("test_ebean");
-    config.setUser("test_ebean");
+    SqlServerContainer.builder("2019-GA-ubuntu-16.04")
+      .dbName("test_ebean")
+      .user("test_ebean")
+      .build()
+      .start();

    // by default this sqlserver docker collation is case sensitive
    // using MSSQL_COLLATION=Latin1_General_100_BIN2
@@ -20,8 +20,5 @@ public class StartSqlServer {

    //config.setCollation("default");
    //config.setCollation("Latin1_General_100_CI");
-
-    SqlServerContainer container = new SqlServerContainer(config);
-    container.start();
  }
 }
@@ -1,20 +1,16 @@
 package main;

-import io.ebean.docker.commands.YugabyteConfig;
 import io.ebean.docker.commands.YugabyteContainer;

 public class StartYugabyte {

  public static void main(String[] args) {
-
-    // Check add extensions ?
-    YugabyteConfig config = new YugabyteConfig("2.11.2.0-b89");
-    config.setDbName("unit");
-    config.setUser("unit");
-    config.setExtensions("pgcrypto");
-
-    YugabyteContainer container = new YugabyteContainer(config);
-    container.startWithDropCreate();
+    YugabyteContainer.builder("2.11.2.0-b89")
+      .dbName("unit")
+      .user("unit")
+      .extensions("pgcrypto")
+      .build()
+      .startWithDropCreate();

 //    Run container ut_yugabyte with host:localhost port:6433 db:unit user:unit/test shutdown:None
 //    docker run -d --name ut_yugabyte -p 6433:5433 -p 7000:7000 -p 9000:9000 -p 9042:9042 yugabytedb/yugabyte:2.11.2.0-b89 bin/yugabyted start --daemon=false
@@ -0,0 +1,51 @@
+package org.tests.cascade;
+
+import io.ebean.DB;
+import io.ebean.xtest.BaseTestCase;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.Objects.requireNonNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class TestOrphanCollectionReplacement extends BaseTestCase {
+
+  @Test
+  void replaceCollection_whenOrphan_expect_forcedInsert() {
+    long parentId;
+    { // setup
+      List<COOneMany> children = new ArrayList<>();
+      children.add(new COOneMany("c0"));
+      children.add(new COOneMany("c1"));
+
+      COOne parent = new COOne("p0");
+      parent.setChildren(children);
+
+      DB.save(parent);
+      parentId = parent.getId();
+    }
+
+    { // act
+      COOne fetchedParent = DB.find(COOne.class, parentId);
+      assert fetchedParent != null;
+
+      COOneMany role = new COOneMany("c2");
+
+      List<COOneMany> filtered = fetchedParent.getChildren().stream().filter(r -> "c0".equals(r.getName())).collect(Collectors.toList());
+
+      List<COOneMany> updatedRoles = new ArrayList<>();
+      updatedRoles.addAll(filtered);
+      updatedRoles.addAll(List.of(role));
+      fetchedParent.setChildren(updatedRoles);
+
+      DB.save(fetchedParent);
+    }
+
+    COOne fetchedUser2 = DB.find(COOne.class, parentId);
+    requireNonNull(fetchedUser2);
+    assertEquals(2, fetchedUser2.getChildren().size());
+  }
+}
@@ -28,7 +28,7 @@ public class TestHistoryInsert extends BaseTestCase {
  public void mariadb_simple_history() {

    Timestamp t0 = new Timestamp(System.currentTimeMillis());
-    littleSleep();
+    littleSleep(50);

    User user = new User();
    user.setName("Jim");
@@ -37,15 +37,16 @@ public class TestHistoryInsert extends BaseTestCase {
    DB.save(user);
    Timestamp t1 = new Timestamp(System.currentTimeMillis());

-    littleSleep();
+    littleSleep(100);
    user.setName("NotJim");
    user.save();
    Timestamp t2 = new Timestamp(System.currentTimeMillis());

-    littleSleep();
+    littleSleep(100);
    user.setName("NotJimV2");
    user.setEmail("two@email.com");
    user.save();
+    littleSleep(50);
    Timestamp t3 = new Timestamp(System.currentTimeMillis());

    List<Version<User>> versions = DB.find(User.class).setId(user.getId()).findVersionsBetween(t0, t3);
@@ -66,9 +67,9 @@ public class TestHistoryInsert extends BaseTestCase {
    assertThat(user0).isNull();
  }

-  private void littleSleep() {
+  private void littleSleep(int millis) {
    try {
-      Thread.sleep(100);
+      Thread.sleep(millis);
    } catch (InterruptedException e) {
      throw new RuntimeException(e);
    }
@@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;

-public class TestInsertNoIdBean extends BaseTestCase {
+class TestInsertNoIdBean extends BaseTestCase {

  @Test
-  public void testInsert() {
+  void testInsert() {
    NoIdBean bean = new NoIdBean();
    bean.setName("Rocky");
    bean.setSubject("Blowing up stuff");
@@ -10,10 +10,10 @@ import java.util.List;

 import static org.assertj.core.api.Assertions.assertThat;

-public class TestOrderColumn extends TransactionalTestCase {
+class TestOrderColumn extends TransactionalTestCase {

  @Test
-  public void testOrderColumnInheritance() {
+  void testOrderColumnInheritance() {
    final OrderMaster master = new OrderMaster();

    for (int i = 0; i < 5; i++) {
@@ -33,7 +33,7 @@ public class TestOrderColumn extends TransactionalTestCase {
  }

  @Test
-  public void testOrderColumnSortChange() {
+  void testOrderColumnSortChange() {
    final OrderMaster master = new OrderMaster();

    for (int i = 0; i < 5; i++) {
@@ -62,7 +62,7 @@ public class TestOrderColumn extends TransactionalTestCase {
  }

  @Test
-  public void testModifyTree() {
+  void testModifyTree() {
    final OrderMaster master = new OrderMaster();

    for (int i = 0; i < 5; i++) {
@@ -108,7 +108,7 @@ public class TestOrderColumn extends TransactionalTestCase {
  }

  @Test
-  public void testRemoveElement() {
+  void testRemoveElement() {
    final OrderMaster master = new OrderMaster();

    for (int i = 0; i < 5; i++) {
@@ -1,15 +1,25 @@
 package org.tests.query;

+import io.ebean.bean.EntityBean;
+import io.ebean.bean.EntityBeanIntercept;
+import io.ebean.bean.InterceptReadOnly;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;

 public class TestQueryOrderById extends BaseTestCase {

  @Test
  public void orderById_default_expectNotOrderById() {
+    ResetBasicData.reset();

    Query<Customer> query = DB.find(Customer.class)
      .select("id,name")
@@ -17,12 +27,20 @@ public class TestQueryOrderById extends BaseTestCase {
      .setFirstRow(1)
      .setMaxRows(5);

-    query.findList();
+    query.setReadOnly(true).setDisableLazyLoading(true);
+    List<Customer> list = query.findList();
    if (isSqlServer() || isDb2()) {
      assertSql(query).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id offset 1 rows fetch next 5 rows only");
    } else if (!isOracle()) {
      assertSql(query).isEqualTo("select t0.id, t0.name from o_customer t0 order by t0.id limit 5 offset 1");
    }
+
+    assertThat(list).isNotEmpty();
+    Customer customer = list.get(0);
+    EntityBeanIntercept intercept = ((EntityBean) customer)._ebean_getIntercept();
+    assertThat(intercept).isInstanceOf(InterceptReadOnly.class);
+    assertThat(customer.getOrders()).isSameAs(Collections.EMPTY_LIST);
+    assertThat(customer.getContacts()).isSameAs(Collections.EMPTY_LIST);
  }

  @Test
@@ -23,7 +23,7 @@ ebean.ddl.run=true
 ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp}
 ebean.packages=org.tests,org.etest
 datasource.default=h2
-#datasource.default=yugabyte
+#datasource.default=sqlserver
 #datasource.h2.capturestacktrace=true

 #ebean.dumpMetricsOnShutdown=true
@@ -177,7 +177,8 @@ ebean.sqlserver.databasePlatformName=sqlserver17
 #ebean.sqlserver.caseSensitiveCollation=false
 datasource.sqlserver.username=test_ebean
 datasource.sqlserver.password=SqlS3rv#r
-datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false
+#datasource.sqlserver.url=jdbc:sqlserver://localhost:1433;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
+datasource.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
 #datasource.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver

 datasource.nuodb.schema=test_user
@@ -75,7 +75,7 @@
  <logger name="org.tests" level="INFO"/>
  <logger name="io.ebean" level="INFO"/>
  <logger name="io.avaje.config" level="TRACE"/>
-  <logger name="io.ebean.docker" level="TRACE"/>
+  <logger name="io.ebean.docker" level="DEBUG"/>
  <logger name="io.ebean.test" level="TRACE"/>

 <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
@@ -4,7 +4,7 @@ ebean.test.sqlserver.version=2017-CU28-ubuntu-16.04
 ebean.test.sqlserver.containerName=local_sqlserver2017
 ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CS_AS_SC
 ebean.test.sqlserver.port=9435
-ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean;sendTimeAsDateTime=false
+ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9435;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true

 datasource.default=sqlserver2017
 ebean.sqlserver2017.databasePlatformName=sqlserver17
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	c863fe7781	[maven-release-plugin] prepare release ebean-parent-13.6.1	2022-05-16 12:22:25 +12:00
Rob Bygrave	8dec17c1f3	Bump ebean-agent to 13.6.1 - #2687	2022-05-16 12:05:54 +12:00
Rob Bygrave	36d589d4f3	#2691 - Improve logging summary when insert bean with no @Id ...	2022-05-16 11:30:36 +12:00
Rob Bygrave	dedafa0b93	Modify GH WF EA builds adding mvn --version ... for info on versions used for build	2022-05-13 13:58:13 +12:00
Rob BygraveandGitHub	7b91b9ec48	Merge pull request #2690 from ebean-orm/bug/orphan-collection-replacement Bug - OneToMany orphanRemoval = true, replace collection adding back …	2022-05-13 12:13:19 +12:00
Rob BygraveandGitHub	c5940dacf1	Merge pull request #2688 from ebean-orm/feature/test-docker-52 Bump to ebean-test-docker 5.3	2022-05-13 11:42:33 +12:00
Rob Bygrave	a4df643d82	#2690 - Refactor internals, tidy SaveManyBeans - Introduce hasOrderColumn field - Add clearedParent flag to only clear the parent bean from persistence context once (not per detail bean)	2022-05-13 11:38:39 +12:00
Rob Bygrave	74174444bb	Bug - OneToMany orphanRemoval = true, replace collection adding back original collection entry - Adding back a bean from the original collection - Expect that bean to exist in the final result but, it's missing Fix here is in SaveManyBeans to add a insertAllChildren and use ebi.setNew(); for beans to force them to insert for this case.	2022-05-12 23:14:26 +12:00
Rob Bygrave	317ad8de9c	Bump to ebean-test-docker 5.3 - Supports random ports - Simplified shutdownMode - Improved logging on shutdown	2022-05-12 18:43:38 +12:00
Rob Bygrave	4b260483ce	Test only - Adjust timing in TestHistoryInsert.mariadb_simple_history()	2022-05-12 17:14:20 +12:00
Rob Bygrave	6a575cb1bf	Change ebean-test postgis image to `postgis/postgis` from `mdillon/postgis` - Also bump default version to 14	2022-05-12 17:05:23 +12:00
Rob Bygrave	a13e1cf074	Bump to ebean-test-docker 5.2 - Supports random ports - Simplified shutdownMode	2022-05-12 16:43:41 +12:00
Rob Bygrave	c59475084a	#2686 - [ebean-test] Allow docker configuration options to be at ebean.test.X as well as ebean.test.<platform>.X	2022-05-05 20:54:07 +12:00
Rob Bygrave	f41704b58c	#2685 - Bump ebean-test-docker to 5.1 with newBuilder() -> builder() with deprecation	2022-05-05 09:17:35 +12:00
Rob Bygrave	5bb9745b3c	Bump to 13.6.1-SNAPSHOT after release	2022-05-03 15:36:03 +12:00
Rob Bygrave	1c072f1d0a	[maven-release-plugin] prepare for next development iteration	2022-05-03 15:13:20 +12:00
Rob Bygrave	bac7eb11bd	[maven-release-plugin] prepare release ebean-parent-13.6.0	2022-05-03 15:13:13 +12:00
Rob Bygrave	a8c2e4db3f	Our release profile is now called "central"	2022-05-03 15:09:34 +12:00
Rob Bygrave	67a4e66b00	[maven-release-plugin] rollback the release of ebean-parent-13.6.0	2022-05-03 15:07:55 +12:00
Rob Bygrave	0d1d212f9f	[maven-release-plugin] prepare for next development iteration	2022-05-03 14:59:36 +12:00
Rob Bygrave	f44c77f5f5	[maven-release-plugin] prepare release ebean-parent-13.6.0	2022-05-03 14:59:29 +12:00
Rob Bygrave	65d07f4af9	Merge branch 'master' of github.com:ebean-orm/ebean	2022-05-03 14:48:52 +12:00
Rob Bygrave	c74de4c221	Bump ebean-agent to 13.6.0	2022-05-03 14:48:38 +12:00
Rob BygraveandGitHub	ebbef86def	Merge pull request #2626 from ebean-orm/wip/EntityBeanIntercept-interface Support EntityBeanIntercept as an interface with InterceptReadWrite and InterceptReadOnly options	2022-05-03 14:15:49 +12:00
Rob Bygrave	3fab465a13	#2649 - Bump avaje-config to 2.0 (uses System.Logger and not slf4j-api)	2022-05-03 13:50:22 +12:00
Rob BygraveandGitHub	ff662bff58	Merge pull request #2683 from ebean-orm/feature/bump-datasource Bump ebean-datasource to 8.0 with use of System.Logger (from slf4j-api)	2022-05-03 13:46:18 +12:00
Rob Bygrave	cc7acd4761	Bump ebean-datasource to 8.0 with use of System.Logger (from slf4j-api)	2022-05-03 13:45:35 +12:00
Rob BygraveandGitHub	1365e39e94	Merge pull request #2681 from ebean-orm/feature/2647 #2647 - When Postgres + isAllQuotedIdentifiers true + using DataSourceConfig THEN `datasourceConfig.addProperty("quoteReturningIdentifiers", false);`	2022-05-03 13:38:10 +12:00
Rob BygraveandGitHub	a73eb1c42f	Merge pull request #2648 from ebean-orm/feature/bump-classpathscanner Bump avaje classpath scanner to 7.1, ignores module-info, uses System.Logger (not slf4j-api)	2022-05-03 13:36:39 +12:00
Rob BygraveandGitHub	3f5a610df1	Merge pull request #2650 from ebean-orm/feature/bump-ddlrunner Bump ebean-ddl-runner (sync version with ebean-migration)	2022-05-03 13:36:29 +12:00
Rob BygraveandGitHub	d96e28991c	Merge pull request #2682 from ebean-orm/feature/ebean-migration-system-logger Bump ebean-migration to 13.6.0 (bumps classpath scanner and ebean-ddl-runner)	2022-05-03 13:36:16 +12:00
Rob Bygrave	e84d12dad8	Bump ebean-migration to 13.6.0 (bumps classpath scanner and ebean-ddl-runner)	2022-05-03 13:30:09 +12:00
Rob Bygrave	1d4f2ad856	#2626 - Add final modifier to methods - For readOnly disableLazyLoad using Collections.EMPTY_LIST etc	2022-05-03 12:23:22 +12:00
Rob Bygrave	84042397b6	#2626 - For readOnly disableLazyLoad using Collections.EMPTY_LIST etc for reference collections	2022-05-03 12:12:47 +12:00
Rob Bygrave	a70461d779	Update InterceptReadWrite with file content diff detection	2022-05-03 10:46:22 +12:00
Rob Bygrave	d1b5400f2c	Merge branch 'master' into wip/EntityBeanIntercept-interface	2022-05-03 10:45:45 +12:00
Rob Bygrave	244f336f54	#2647 - When Postgres + isAllQuotedIdentifiers true + using DataSourceConfig THEN `datasourceConfig.addProperty("quoteReturningIdentifiers", false);` I think there is not a case where we do NOT want to do this. allQuotedIdentifiers + Postgres is almost not usable without this.	2022-05-03 10:15:07 +12:00
Rob Bygrave	f92887b2f0	#2680 - Bump parent to java11-oss 3.8 which moves nexus-staging-maven-plugin and distributionManagement under "central" profile This means that the nexus-staging-maven-plugin should not be used for forks looking to deploy into their own local nexus/archiva maven repo.	2022-05-03 09:06:27 +12:00
Rob Bygrave	f49b93a845	Bump to 13.6.0-SNAPSHOT	2022-05-03 08:55:50 +12:00
Rob Bygrave	a6f3a4f922	Bump to 13.6.0-SNAPSHOT	2022-05-03 08:37:29 +12:00
Rob Bygrave	d6a65e4e66	Bump to 13.6.0-SNAPSHOT	2022-05-02 22:31:32 +12:00
Rob BygraveandGitHub	ea5b4e9271	Merge pull request #2662 from ebean-orm/feature/deprecated-remove-Ebean Remove deprecated Ebean, EbeanServer, EbeanServerFactory, ServerConfig migrate to DB, Database, DatabaseFactory, DatabaseConfig	2022-05-02 22:27:57 +12:00
Rob BygraveandGitHub	ffa50b3176	Merge pull request #2679 from ebean-orm/feature/2677 #2677 - Fix for trim failing on mutation of lastAccessTime	2022-05-02 22:25:13 +12:00
Rob Bygrave	2cf83278ea	#2677 - Change trimOnPut to be 10% of max or 1_000. Can look to provide an explicit option via `@CacheBeanTuning` later.	2022-05-02 22:19:37 +12:00
Rob Bygrave	5c332286b6	#2677 - Add ReentrantLock for DefaultServerCache.runEviction() and trigger runEviction() via mutationCounter If we get a lot of cache mutation (puts) between background trims then also trigger runEviction() in foreground using mutationCounter.	2022-05-02 21:48:58 +12:00
Rob Bygrave	1cd319c495	#2677 - Add try catch around DefaultServerCache.runEviction() If there is an unexpected error we expect it to be temporary and want runEviction() to keep executing.	2022-05-02 20:51:33 +12:00
Rob BygraveandGitHub	cec8a2e482	Merge pull request #2678 from focbenz/patch-1 Fixed typo Junit -> JUnit in README	2022-05-02 20:33:01 +12:00
Rob Bygrave	d036edf7fd	#2677 - Fix for trim failing on mutation of lastAccessTime Currently, lastAccessTime can mutate during cache trim processing. This fixes this issue by taking a copy of the lastAccessTime storing as lastAccessSort and using that for sorting for cache trim.	2022-05-02 20:31:10 +12:00
Michael BenzandGitHub	2fefb5c7ef	Merge branch 'ebean-orm:master' into patch-1	2022-05-02 10:10:34 +02:00
Michael BenzandGitHub	4278aa46f5	Junit -> JUnit Just one more change ... verified in Intellij: Junit -> JUnit	2022-05-02 10:08:46 +02:00
Rob BygraveandGitHub	7873a2b327	Merge pull request #2676 from focbenz/patch-1 Fix grammar in README.md	2022-05-02 20:08:04 +12:00
Rob BygraveandGitHub	9d3a3ddfeb	Merge pull request #2675 from ebean-orm/feature/DefaultOrmQuery-final Modify DefaultOrmQuery to have non-final copy() methods to allow ebean-mocker to be updated	2022-05-02 20:07:40 +12:00
Michael BenzandGitHub	ac0b9aa025	Fix grammar in README.md Just some grammatical fixes and uppercasings in README. No code changes here!	2022-05-02 08:40:34 +02:00
Rob Bygrave	4d4f8e2c4b	Modify DefaultOrmQuery to have non-final copy() methods to allow ebean-mocker to be updated	2022-05-02 18:01:25 +12:00
Rob Bygrave	2b581fb148	Update README with details on building ebean from source	2022-05-02 16:36:59 +12:00
Rob BygraveandGitHub	35bd98c14f	Merge pull request #2674 from ebean-orm/feature/ebean-test-container-5 Bump to ebean-test-docker 5.0-RC1	2022-05-02 16:36:02 +12:00
Rob Bygrave	8db9991ea3	Bump to ebean-test-docker 5.0	2022-05-02 16:04:42 +12:00
Rob Bygrave	fac69f75d0	Bump to ebean-test-docker 5.0-RC2	2022-05-02 15:40:01 +12:00
Rob Bygrave	b18226711b	Bump to ebean-test-docker 5.0-RC1	2022-04-29 16:43:48 +12:00
Rob Bygrave	4bdb48d340	Bump to 13.5.1-SNAPSHOT after release	2022-04-28 17:58:58 +12:00
Rob Bygrave	d2a742fefb	[maven-release-plugin] prepare for next development iteration	2022-04-28 17:42:12 +12:00
Rob Bygrave	22de23ddf4	[maven-release-plugin] prepare release ebean-parent-13.5.0	2022-04-28 17:42:05 +12:00
Rob Bygrave	496d9674d2	#2672 - Bump ebean-agent to 13.5.0 for - ToStringBuilder enhancement does not use toString() of the abstract class	2022-04-28 10:50:34 +12:00
Rob Bygrave	4ece9fe6cc	Bump to 13.5.0-SNAPSHOT	2022-04-28 10:46:14 +12:00
Rob Bygrave	62f162e4fb	Bump to 13.5.0-SNAPSHOT	2022-04-28 10:44:56 +12:00
Rob Bygrave	38803aa7f8	Bump to 13.5.0-SNAPSHOT	2022-04-28 10:33:41 +12:00
Rob Bygrave	f9943f14b7	Adjust test ebean.properties	2022-04-28 10:32:27 +12:00
Rob Bygrave	1b24c888ee	Put back test jdbc driver for MariaDB ... need to look at changes in newer driver wrt forwardOnlyHintOnFindIterate That is, forwardOnlyHintOnFindIterate is a hack to support poor MySql jdbc driver behavior but maybe we can remove this hack in later versions of MariaDB at least	2022-04-27 23:13:28 +12:00
Rob Bygrave	45233e96ab	#2673 - Bug introduced in 13.3.1 via #2652 - incorrect binding of history query with SQL2011 standards based queries	2022-04-27 22:48:02 +12:00
Rob Bygrave	517556bfe3	For sql server tests add jdbc parameters ;integratedSecurity=false;trustServerCertificate=true	2022-04-27 20:02:02 +12:00
Rob Bygrave	07101d1528	#2671 - Bump ebean-test-docker to 4.7	2022-04-27 19:53:52 +12:00
Rob Bygrave	9fa1def22b	Bump test jdbc drivers	2022-04-27 18:43:27 +12:00
Rob Bygrave	dd9d49cfa2	#2671 - Bump ebean-test-docker to 4.7	2022-04-27 18:39:49 +12:00
Rob Bygrave	7680a75ca9	Bump test modules to 13.4.2-SNAPSHOT after release	2022-04-27 09:48:13 +12:00
Rob Bygrave	786286421d	[maven-release-plugin] prepare for next development iteration	2022-04-27 09:13:48 +12:00
Rob Bygrave	d34da06840	Remove deprecated Ebean, EbeanServer, EbeanServerFactory, ServerConfig migrate to DB, Database, DatabaseFactory, DatabaseConfig	2022-04-20 20:46:53 +12:00
Rob Bygrave	8432fa1320	Bump ebean-ddl-runner (sync version with ebean-migration)	2022-04-14 14:48:37 +12:00
Rob Bygrave	6b81dbbaa2	Bump avaje classpath scanner to 7.1, ignores module-info, uses System.Logger (not slf4j-api)	2022-04-14 12:40:49 +12:00
Rob BygraveandGitHub	9862526352	Merge branch 'master' into wip/EntityBeanIntercept-interface	2022-04-13 10:43:13 +12:00
Rob BygraveandGitHub	45003b3d5f	Merge branch 'master' into wip/EntityBeanIntercept-interface	2022-04-12 21:09:58 +12:00
Rob Bygrave	bed4721823	Bump ebean-agent to 13.0.1-RC2 with ASM 9.3 - support for Java 19	2022-04-06 16:28:44 +12:00
Rob Bygrave	307832edae	Fix test modules in terms of enhancement plugins	2022-04-04 14:04:15 +12:00
Rob Bygrave	1f684107b6	Fix test modules in terms of enhancement plugins	2022-04-04 13:52:37 +12:00
Rob Bygrave	5ab02715ef	Support EntityBeanIntercept as an interface with InterceptReadWrite and InterceptReadOnly options With the view that we can optimise the readOnly + disableLazyLoad case by using InterceptReadOnly which doesn't need to support any of the flags used as part of mutation.	2022-04-04 13:30:26 +12:00