Fix PersistenceException in production

docs/build.sbt

@@ -8,7 +8,7 @@ lazy val docs = project
  resolvers ++= DefaultOptions.resolvers(snapshot = true),
  libraryDependencies += component("play-java-forms"),
  libraryDependencies += component("play-test") % Test,
- libraryDependencies += "com.h2database" % "h2" % "1.4.200" % Test,
+ libraryDependencies += "com.h2database" % "h2" % "2.1.212" % Test,
  PlayDocsKeys.javaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "javaGuide" ** "code").get,
  // No resource directories shuts the ebean agent up about java sources in the classes directory
  Test / unmanagedResourceDirectories := Nil,

play-ebean/src/main/java/play/db/ebean/DefaultEbeanConfig.java

@@ -7,8 +7,7 @@
 import com.typesafe.config.ConfigException;
 import io.ebean.config.DatabaseConfig;
 import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.scanners.TypeAnnotationsScanner;
+import org.reflections.scanners.Scanners;
 import org.reflections.scanners.TypeElementsScanner;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
@@ -75,7 +74,7 @@ public EbeanConfig parse() {
 
  Map<String, DatabaseConfig> serverConfigs = new HashMap<>();
 
- for (Map.Entry<String, List<String>> entry: ebeanConfig.getDatasourceModels().entrySet()) {
+ for (Map.Entry<String, List<String>> entry : ebeanConfig.getDatasourceModels().entrySet()) {
  String key = entry.getKey();
 
  DatabaseConfig serverConfig = new DatabaseConfig();
@@ -100,7 +99,7 @@ public EbeanConfig parse() {
  private void setServerConfigDataSource(String key, DatabaseConfig serverConfig) {
  try {
  serverConfig.setDataSource(new WrappingDatasource(dbApi.getDatabase(key).getDataSource()));
- } catch(Exception e) {
+ } catch (Exception e) {
  throw new ConfigException.BadValue(
  "ebean." + key,
  e.getMessage(),
@@ -110,7 +109,7 @@ private void setServerConfigDataSource(String key, DatabaseConfig serverConfig)
  }
 
  private void addModelClassesToServerConfig(String key, DatabaseConfig serverConfig, Set<String> classes) {
- for (String clazz: classes) {
+ for (String clazz : classes) {
  try {
  serverConfig.addClass(Class.forName(clazz, true, environment.classLoader()));
  } catch (Exception e) {
@@ -128,7 +127,7 @@ private Set<String> getModelClasses(Map.Entry<String, List<String>> entry) {
  entry.getValue().forEach(load -> {
  load = load.trim();
  if (load.endsWith(".*")) {
- classes.addAll(Classpath.getTypes(environment, load.substring(0, load.length()-2)));
+ classes.addAll(Classpath.getTypes(environment, load.substring(0, load.length() - 2)));
  } else {
  classes.add(load);
  }
@@ -216,6 +215,7 @@ private static class Classpath {
  static Set<String> getTypes(Environment env, String packageName) {
  return getReflections(env, packageName).getStore().getOrDefault(TypeElementsScanner.class.getSimpleName(), Collections.emptyMap()).keySet();
  }
+
  private static Reflections getReflections(Environment env, String packageName) {
  // This is not supposed to happen very often, but just when starting the application.
  // So it should be okay to not have a cache.
@@ -232,8 +232,8 @@ private static Reflections getReflections(Environment env, String packageName) {
  private static ConfigurationBuilder getReflectionsConfiguration(String packageName, ClassLoader classLoader) {
  return new ConfigurationBuilder()
  .addUrls(ClasspathHelper.forPackage(packageName, classLoader))
- .filterInputsBy(new FilterBuilder().includePackage((packageName + ".").replace(".","\\.") + ".*"))
- .setScanners(new TypeElementsScanner(), new TypeAnnotationsScanner(), new SubTypesScanner());
+ .filterInputsBy(new FilterBuilder().includePackage(packageName))
+ .setScanners(new TypeElementsScanner(), Scanners.TypesAnnotated, Scanners.SubTypes);
  }
 
  }

sbt-play-ebean/src/main/scala-sbt-1.0/play/ebean/sbt/PlayEbean.scala

@@ -40,15 +40,15 @@ object PlayEbean extends AutoPlugin {
 
  override def trigger = noTrigger
 
- override def projectSettings = inConfig(Compile)(scopedSettings) ++ unscopedSettings
+ override def projectSettings: Seq[Def.Setting[_]] = inConfig(Compile)(scopedSettings) ++ unscopedSettings
 
- def scopedSettings =
+ def scopedSettings: Seq[Def.Setting[_]] =
  Seq(
  playEbeanModels := configuredEbeanModels.value,
  manipulateBytecode := ebeanEnhance.value
  )
 
- def unscopedSettings =
+ def unscopedSettings: Seq[Def.Setting[_]] =
  Seq(
  playEbeanDebugLevel := -1,
  playEbeanAgentArgs := Map("debug" -> playEbeanDebugLevel.value.toString),
@@ -76,15 +76,12 @@ object PlayEbean extends AutoPlugin {
  val originalContextClassLoader = Thread.currentThread.getContextClassLoader
 
  try {
-
- val classpath = deps.map(_.data.toURI.toURL).toArray :+ classes.toURI.toURL
-
- val classLoader = new java.net.URLClassLoader(classpath, null)
+ val classpath = deps.map(_.data.toURI.toURL).toArray :+ classes.toURI.toURL
+ val classLoader = new URLClassLoader(classpath, null)
 
  Thread.currentThread.setContextClassLoader(classLoader)
 
- val transformer = new Transformer(classLoader, agentArgsString)
-
+ val transformer = new Transformer(classLoader, agentArgsString)
  val fileTransform = new OfflineFileTransform(transformer, classLoader, classes.getAbsolutePath)
 
  try {

sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/build.sbt

@@ -4,12 +4,12 @@ lazy val root = project
 
 scalaVersion := "2.12.15"
 
-sourceDirectory in Test := baseDirectory.value / "tests"
+Test / sourceDirectory := baseDirectory.value / "tests"
 
-scalaSource in Test := baseDirectory.value / "tests"
+Test / scalaSource := baseDirectory.value / "tests"
 
-javaSource in Test := baseDirectory.value / "tests"
+Test / javaSource := baseDirectory.value / "tests"
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
-libraryDependencies += "com.h2database" % "h2" % "1.4.200"
+libraryDependencies += "com.h2database" % "h2" % "2.1.212"

sbt-play-ebean/src/sbt-test/sbt-ebean/enhancement/tests/models/TestTask.java

@@ -1,9 +1,12 @@
 package models;
 
 import org.junit.*;
+
 import static org.junit.Assert.*;
+
 import play.test.*;
 import play.Application;
+
 import static play.test.Helpers.*;
 
 public class TestTask extends WithApplication {
@@ -15,12 +18,12 @@ protected Application provideApplication() {
  @Test
  public void saveAndFind() {
  Task task = new Task();
- task.id = 10l;
+ task.id = 10L;
  task.name = "Hello";
  task.done = false;
  task.save();
 
- Task saved = Task.find.byId(10l);
+ Task saved = Task.find.byId(10L);
  assertEquals("Hello", saved.name);
  }
 

sbt-play-ebean/src/sbt-test/sbt-ebean/model-loading/build.sbt

@@ -6,4 +6,4 @@ scalaVersion := "2.12.15"
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
-libraryDependencies += "com.h2database" % "h2" % "1.4.200"
+libraryDependencies += "com.h2database" % "h2" % "2.1.212"