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

The associated ebean-agent has the fix for the kotlin specific #172 issue.

README.md

@@ -36,7 +36,7 @@ Post questions or issues to the Ebean google group - https://groups.google.com/f
 Goto [https://ebean.io/docs/](https://ebean.io/docs/)
 
 
-## Maven cental links:
+## Maven central links:
 [Maven central - ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20AND%20a%3A%22ebean%22 "maven central ebean")
 
 [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean api</name>

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

@@ -16,15 +16,22 @@ public class EbeanVersion {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean");
 
+  /**
+   * Maintain the minimum ebean-agent version manually based on required ebean-agent bug fixes.
+   */
+  private static final int MIN_AGENT_MAJOR_VERSION = 12;
+  private static final int MIN_AGENT_MINOR_VERSION = 12;
   private static String version = "unknown";
   static {
+    readVersion();
+    checkAgentVersion();
+  }
+
+  private static void readVersion() {
     try {
-      Properties prop = new Properties();
-      try (InputStream in = DB.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties")) {
+      try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/maven/io.ebean/ebean-api/pom.properties")) {
         if (in != null) {
-          prop.load(in);
-          in.close();
-          version = prop.getProperty("version");
+          version = readVersion(in);
         }
       }
       log.info("ebean version: {}", version);
@@ -33,6 +40,49 @@ public class EbeanVersion {
     }
   }
 
+  private static void checkAgentVersion() {
+    try {
+      try (InputStream in = ClassLoader.getSystemResourceAsStream("META-INF/maven/io.ebean/ebean-agent/pom.properties")) {
+        // often we only have ebean-agent during development (with build time enhancement), null is expected
+        if (in != null) {
+          String agentVersion = readVersion(in);
+          if (agentVersion != null) {
+            if (checkMinAgentVersion(agentVersion)) {
+              log.error("Expected minimum ebean-agent version {}.{}.0 but we have {}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
+            }
+          }
+        }
+      }
+    } catch (IOException e) {
+      log.warn("Could not check minimum ebean-agent version {}.{}.0 required due to - {}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
+    }
+  }
+
+  /**
+   * Return true if ebean-agent is NOT at our minimum version.
+   */
+  static boolean checkMinAgentVersion(String agentVersion) {
+    String[] versionSegments = agentVersion.split("\\.");
+    if (versionSegments.length != 3) {
+      return true;
+    } else {
+      int major = Integer.parseInt(versionSegments[0]);
+      int minor = Integer.parseInt(versionSegments[1]);
+      if (major < MIN_AGENT_MAJOR_VERSION) {
+        return true;
+      } else {
+        return major == MIN_AGENT_MAJOR_VERSION && minor < MIN_AGENT_MINOR_VERSION;
+      }
+    }
+  }
+
+  private static String readVersion(InputStream in) throws IOException {
+    Properties prop = new Properties();
+    prop.load(in);
+    in.close();
+    return prop.getProperty("version");
+  }
+
   private EbeanVersion() {
     // hide
   }

ebean-api/src/test/java/io/ebean/EbeanVersionTest.java

@@ -0,0 +1,31 @@
+package io.ebean;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class EbeanVersionTest {
+
+  @Test
+  void checkMinAgentVersion_ok() {
+    assertFalse(EbeanVersion.checkMinAgentVersion("12.12.0"));
+    assertFalse(EbeanVersion.checkMinAgentVersion("12.12.99"));
+    assertFalse(EbeanVersion.checkMinAgentVersion("13.1.0"));
+  }
+
+  @Test
+  void checkMinAgentVersion_agentTooOld() {
+    assertTrue(EbeanVersion.checkMinAgentVersion("11.13.0"));
+    assertTrue(EbeanVersion.checkMinAgentVersion("12.11.0"));
+    assertTrue(EbeanVersion.checkMinAgentVersion("12.11.99"));
+  }
+
+  @Test
+  void checkMinAgentVersion_unexpectedAgentVersion() {
+    assertTrue(EbeanVersion.checkMinAgentVersion("13.13"));
+    assertTrue(EbeanVersion.checkMinAgentVersion("13"));
+    assertTrue(EbeanVersion.checkMinAgentVersion(""));
+  }
+
+}

ebean-autotune/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.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-12.12.0</tag>
+    <tag>ebean-parent-12.12.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,88 +71,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.12.0</version>
+        <version>12.12.1</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.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-12.12.0</tag>
+    <tag>ebean-parent-12.12.1</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-externalmapping-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean external mapping api</name>

ebean-externalmapping-xml/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.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-12.12.0</tag>
+    <tag>ebean-parent-12.12.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -57,21 +57,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,14 +29,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>

ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java

@@ -0,0 +1,29 @@
+package org.tests.o2m;
+
+import io.ebean.BaseTestCase;
+import io.ebean.common.BeanList;
+import org.junit.jupiter.api.Test;
+import org.tests.model.json.EBasicJsonMap;
+import org.tests.o2m.lazy.OmlBaz;
+import org.tests.o2m.lazy.OmlFoo;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestOneToManyEnhancement extends BaseTestCase {
+
+  @Test
+  void test_when_constructorAddsEntry() {
+    OmlFoo foo = new OmlFoo(new OmlBaz());
+
+    assertThat(foo.getBazList()).isInstanceOf(BeanList.class);
+    assertThat(foo.getBazList()).isNotEmpty();
+  }
+
+  @Test
+  void test_commonCase() {
+    EBasicJsonMap bean = new EBasicJsonMap();
+
+    assertThat(bean.getDetails()).isInstanceOf(BeanList.class);
+    assertThat(bean.getDetails()).isEmpty();
+  }
+}

ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java

@@ -15,7 +15,12 @@ public class OmlFoo {
   private OmlBar bar;
 
   @OneToMany(mappedBy = "foo", cascade = CascadeType.ALL)
-  private List<OmlBaz> bazList = new ArrayList<OmlBaz>();
+  private List<OmlBaz> bazList = new ArrayList<>();
+
+  public OmlFoo(OmlBaz baz) {
+    bazList.add(baz);
+    baz.setFoo(this);
+  }
 
   public Long getId() {
     return id;

ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java

@@ -13,11 +13,9 @@ public class TestLazyManyViaPath extends BaseTestCase {
 
   @Test
   public void test() {
-
     OmlBar bar = new OmlBar();
     List<OmlFoo> fooList = new ArrayList<>();
     fooList.add(createNewFooWithBar(bar));
-
     bar.setFooList(fooList);
 
     DB.save(bar);
@@ -30,26 +28,24 @@ public class TestLazyManyViaPath extends BaseTestCase {
 
     // This works
     List<OmlFoo> foosList = fooFromDb.getBar().getFooList();
-    assertThat(fooList.size()).isEqualTo(1);
+    assertThat(foosList).hasSize(1);
+    assertThat(fooList).hasSize(1);
 
     OmlBaz bazFromDb = DB
       .find(OmlBaz.class)
       .where()
       .eq("id", bar.getFooList().get(0).getBazList().get(0).getId())
       .findOne();
+    assert bazFromDb != null;
 
     // This does not work and gives the exception
     List<OmlFoo> foosList1 = bazFromDb.getFoo().getBar().getFooList();
     assertThat(foosList1.size()).isEqualTo(1);
-
   }
 
   private static OmlFoo createNewFooWithBar(OmlBar bar) {
-    OmlFoo foo = new OmlFoo();
+    OmlFoo foo = new OmlFoo(new OmlBaz());
     foo.setBar(bar);
-    OmlBaz baz = new OmlBaz();
-    baz.setFoo(foo);
-    foo.getBazList().add(baz);
     return foo;
   }
 

ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>ebean composite</name>
@@ -22,20 +22,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
     </dependency>
 
   </dependencies>

ebean/src/main/java/io/ebean/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.assembly;
+
+/**
+ * Nothing interesting here - look at ebean-api.
+ */
+public class Assembly {
+}

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.12.0</version>
+      <version>12.12.1</version>
       <scope>test</scope>
     </dependency>
 

kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java

@@ -6,6 +6,7 @@ import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
+import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -18,6 +19,7 @@ public class Processor extends AbstractProcessor implements Constants {
   private static final String KAPT_KOTLIN_GENERATED_OPTION = "kapt.kotlin.generated";
 
   private ProcessingContext processingContext;
+  private SimpleModuleInfoWriter moduleWriter;
 
   public Processor() {
   }
@@ -55,11 +57,11 @@ public class Processor extends AbstractProcessor implements Constants {
 
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-
     processingContext.readModuleInfo();
     int count = processEntities(roundEnv);
     processOthers(roundEnv);
     final int loaded = processingContext.complete();
+    initModuleInfoBean();
     if (roundEnv.processingOver()) {
       writeModuleInfoBean();
     }
@@ -96,12 +98,27 @@ public class Processor extends AbstractProcessor implements Constants {
     }
   }
 
+  private void initModuleInfoBean() {
+    try {
+      if (moduleWriter == null) {
+        moduleWriter = new SimpleModuleInfoWriter(processingContext);
+      }
+    } catch (Throwable e) {
+      e.printStackTrace();
+      processingContext.logError(null, "Failed to initialise ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+    }
+  }
+
   private void writeModuleInfoBean() {
     try {
-      SimpleModuleInfoWriter writer = new SimpleModuleInfoWriter(processingContext);
-      writer.write();
+      if (moduleWriter == null) {
+        processingContext.logError(null, "ModuleInfoLoader was not initialised and not written");
+      } else {
+        moduleWriter.write();
+      }
     } catch (Throwable e) {
-      processingContext.logError(null, "Failed to write ModuleInfoLoader " + e.getMessage());
+      e.printStackTrace();
+      processingContext.logError(null, "Failed to write ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }
   }
 

kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java

@@ -18,14 +18,16 @@ class SimpleModuleInfoWriter {
   private final String factoryPackage;
   private final String factoryShortName;
   private final String factoryFullName;
+  private final JavaFileObject javaFileObject;
 
   private Append writer;
 
-  SimpleModuleInfoWriter(ProcessingContext processingContext) {
+  SimpleModuleInfoWriter(ProcessingContext processingContext) throws IOException {
     this.processingContext = processingContext;
     this.factoryPackage = processingContext.getFactoryPackage();
     this.factoryShortName = "_Ebean$ModuleInfo";
     this.factoryFullName = factoryPackage + "." + factoryShortName;
+    this.javaFileObject = processingContext.createWriter(factoryFullName);
   }
 
   void write() throws IOException {
@@ -208,7 +210,6 @@ class SimpleModuleInfoWriter {
   }
 
   private Writer createFileWriter() throws IOException {
-    JavaFileObject jfo = processingContext.createWriter(factoryFullName);
-    return jfo.openWriter();
+    return javaFileObject.openWriter();
   }
 }

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.12.0</version>
+  <version>12.12.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.12.0</tag>
+    <tag>ebean-parent-12.12.1</tag>
   </scm>
 
   <licenses>
@@ -46,7 +46,7 @@
     <ebean-test-docker.version>4.2</ebean-test-docker.version>
     <ebean-datasource.version>7.3</ebean-datasource.version>
     <ebean-agent.version>12.12.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.12.0</ebean-maven-plugin.version>
+    <ebean-maven-plugin.version>12.12.1</ebean-maven-plugin.version>
   </properties>
 
   <dependencies>

querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.12.0</version>
+    <version>12.12.1</version>
   </parent>
 
   <name>querybean generator</name>

querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java

@@ -16,6 +16,7 @@ import java.util.Set;
 public class Processor extends AbstractProcessor implements Constants {
 
   private ProcessingContext processingContext;
+  private SimpleModuleInfoWriter moduleWriter;
 
   public Processor() {
   }
@@ -48,6 +49,7 @@ public class Processor extends AbstractProcessor implements Constants {
     int count = processEntities(roundEnv);
     processOthers(roundEnv);
     final int loaded = processingContext.complete();
+    initModuleInfoBean();
     if (roundEnv.processingOver()) {
       writeModuleInfoBean();
     }
@@ -84,10 +86,24 @@ public class Processor extends AbstractProcessor implements Constants {
     }
   }
 
+  private void initModuleInfoBean() {
+    try {
+      if (moduleWriter == null) {
+        moduleWriter = new SimpleModuleInfoWriter(processingContext);
+      }
+    } catch (Throwable e) {
+      e.printStackTrace();
+      processingContext.logError(null, "Failed to initialise ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+    }
+  }
+
   private void writeModuleInfoBean() {
     try {
-      SimpleModuleInfoWriter writer = new SimpleModuleInfoWriter(processingContext);
-      writer.write();
+      if (moduleWriter == null) {
+        processingContext.logError(null, "ModuleInfoLoader was not initialised and not written");
+      } else {
+        moduleWriter.write();
+      }
     } catch (Throwable e) {
       e.printStackTrace();
       processingContext.logError(null, "Failed to write ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));

querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java

@@ -18,14 +18,16 @@ class SimpleModuleInfoWriter {
   private final String factoryPackage;
   private final String factoryShortName;
   private final String factoryFullName;
+  private final JavaFileObject javaFileObject;
 
   private Append writer;
 
-  SimpleModuleInfoWriter(ProcessingContext processingContext) {
+  SimpleModuleInfoWriter(ProcessingContext processingContext) throws IOException {
     this.processingContext = processingContext;
     this.factoryPackage = processingContext.getFactoryPackage();
     this.factoryShortName = "_Ebean$ModuleInfo";
     this.factoryFullName = factoryPackage + "." + factoryShortName;
+    this.javaFileObject = processingContext.createWriter(factoryFullName);
   }
 
   void write() throws IOException {
@@ -208,7 +210,6 @@ class SimpleModuleInfoWriter {
   }
 
   private Writer createFileWriter() throws IOException {
-    JavaFileObject jfo = processingContext.createWriter(factoryFullName);
-    return jfo.openWriter();
+    return javaFileObject.openWriter();
   }
 }

tests/test-kotlin/pom.xml

@@ -18,7 +18,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
-    <ebean-maven-plugin.version>12.12.0</ebean-maven-plugin.version>
+    <ebean-maven-plugin.version>12.12.1</ebean-maven-plugin.version>
     <kotlin.version>1.5.31</kotlin.version>
     <jackson.version>2.12.1</jackson.version>
   </properties>
@@ -95,7 +95,7 @@
             <id>test</id>
             <phase>process-test-classes</phase>
             <configuration>
-              <transformArgs>debug=1</transformArgs>
+              <transformArgs>debug=5</transformArgs>
             </configuration>
             <goals>
               <goal>testEnhance</goal>

tests/test-kotlin/src/test/kotlin/io/ebean/test/kotlin/OneToManyEnhancementTest.kt

@@ -0,0 +1,18 @@
+package io.ebean.test.kotlin
+
+import io.ebean.common.BeanList
+import org.assertj.core.api.Assertions.assertThat
+import org.example.order.Customer
+import org.example.order.Order
+import org.junit.jupiter.api.Test
+
+class OneToManyEnhancementTest {
+
+  @Test
+  fun `o2m is BeanCollection`() {
+    val customer = Customer("foo")
+    val order = Order(customer)
+
+    assertThat(order.items).isInstanceOf(BeanList::class.java)
+  }
+}