Merge pull request #3583 from ebean-orm/feature/revert-3541-3582

[querybean-generator] #3582 - Revert #3541 "FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload "
ebean-orm · Mar 3, 2025 · 80c3501 · 80c3501
2 parents b4ff574 + 64f01f0
commit 80c3501
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 6 deletions.
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.FilerException;
+import javax.annotation.processing.FilerException;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.SourceVersion;
@@ -20,6 +21,8 @@ public class Processor extends AbstractProcessor implements Constants {
   private static final String KAPT_KOTLIN_GENERATED_OPTION = "kapt.kotlin.generated";
 
   private ProcessingContext processingContext;
+  private SimpleModuleInfoWriter moduleWriter;
+  private boolean initModuleWriter;
 
   public Processor() {
   }
@@ -60,6 +63,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     int count = processEntities(roundEnv);
     processOthers(roundEnv);
     final int loaded = processingContext.complete();
+    initModuleInfoBean();
     if (roundEnv.processingOver()) {
       writeModuleInfoBean();
     }
@@ -96,11 +100,27 @@ private void processOthers(RoundEnvironment roundEnv, TypeElement otherType) {
     }
   }
 
-  private void writeModuleInfoBean() {
+  private void initModuleInfoBean() {
     try {
-      new SimpleModuleInfoWriter(processingContext).write();
+      if (!initModuleWriter) {
+        moduleWriter = new SimpleModuleInfoWriter(processingContext);
+      }
     } catch (FilerException e) {
-      processingContext.logWarn(null, "FilerException trying to write EntityClassRegister: " + e);
+      processingContext.logWarn(null, "FilerException trying to write EntityClassRegister error: " + e);
+    } catch (Throwable e) {
+      processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+    } finally {
+      initModuleWriter = true;
+    }
+  }
+
+  private void writeModuleInfoBean() {
+    try {
+      if (moduleWriter == null) {
+        processingContext.logNote(null, "EntityClassRegister skipped");
+      } else {
+        moduleWriter.write();
+      }
     } catch (Throwable e) {
       processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }

diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
@@ -17,6 +17,8 @@
 public class Processor extends AbstractProcessor implements Constants {
 
   private ProcessingContext processingContext;
+  private SimpleModuleInfoWriter moduleWriter;
+  private boolean initModuleWriter;
 
   public Processor() {
   }
@@ -49,6 +51,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     int count = processEntities(roundEnv);
     processOthers(roundEnv);
     final int loaded = processingContext.complete();
+    initModuleInfoBean();
     if (roundEnv.processingOver()) {
       writeModuleInfoBean();
     }
@@ -85,11 +88,27 @@ private void processOthers(RoundEnvironment roundEnv, TypeElement otherType) {
     }
   }
 
-  private void writeModuleInfoBean() {
+  private void initModuleInfoBean() {
     try {
-      new SimpleModuleInfoWriter(processingContext).write();
+      if (!initModuleWriter) {
+        moduleWriter = new SimpleModuleInfoWriter(processingContext);
+      }
     } catch (FilerException e) {
-      processingContext.logWarn(null, "FilerException trying to write EntityClassRegister: " + e);
+      processingContext.logWarn(null, "FilerException trying to write EntityClassRegister error: " + e);
+    } catch (Throwable e) {
+      processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+    } finally {
+      initModuleWriter = true;
+    }
+  }
+
+  private void writeModuleInfoBean() {
+    try {
+      if (moduleWriter == null) {
+        processingContext.logNote(null, "EntityClassRegister skipped");
+      } else {
+        moduleWriter.write();
+      }
     } catch (Throwable e) {
       processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }