Skip to content

Commit f83da15

Browse files
rbygraverbygrave
authored
Merge pull request #3542 from ebean-orm/feature/3542-quarkus
[querybean-generator] FilerException trying to write EntityClassRegister with Quarkus dev mode / hot reload #3541
2 parents 723a12f + 52729d9 commit f83da15

File tree

6 files changed

+18
-48
lines changed

6 files changed

+18
-48
lines changed

‎kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,10 @@ void logError(Element e, String msg, Object... args) {
415415
messager.printMessage(Diagnostic.Kind.ERROR, String.format(msg, args), e);
416416
}
417417

418-
/**
419-
* Log a info message.
420-
*/
418+
void logWarn(String msg, Object... args) {
419+
messager.printMessage(Diagnostic.Kind.WARNING, String.format(msg, args));
420+
}
421+
421422
void logNote(String msg, Object... args) {
422423
messager.printMessage(Diagnostic.Kind.NOTE, String.format(msg, args));
423424
}
@@ -559,7 +560,6 @@ String loadMetaInfServices() {
559560
} catch (FilerException e) {
560561
logNote(null, "FilerException reading services file: " + e.getMessage());
561562
} catch (Exception e) {
562-
e.printStackTrace();
563563
logError(null, "Error reading services file: " + e.getMessage());
564564
}
565565
return null;

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.ebean.querybean.generator;
22

33
import javax.annotation.processing.AbstractProcessor;
4+
import javax.annotation.processing.FilerException;
45
import javax.annotation.processing.ProcessingEnvironment;
56
import javax.annotation.processing.RoundEnvironment;
67
import javax.lang.model.SourceVersion;
@@ -19,14 +20,12 @@ public class Processor extends AbstractProcessor implements Constants {
1920
private static final String KAPT_KOTLIN_GENERATED_OPTION = "kapt.kotlin.generated";
2021

2122
private ProcessingContext processingContext;
22-
private SimpleModuleInfoWriter moduleWriter;
2323

2424
public Processor() {
2525
}
2626

2727
@Override
2828
public Set<String> getSupportedOptions() {
29-
3029
Set<String> options = new LinkedHashSet<>();
3130
options.add(KAPT_KOTLIN_GENERATED_OPTION);
3231
options.add(GENERATE_KOTLIN_CODE_OPTION);
@@ -61,7 +60,6 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
6160
int count = processEntities(roundEnv);
6261
processOthers(roundEnv);
6362
final int loaded = processingContext.complete();
64-
initModuleInfoBean();
6563
if (roundEnv.processingOver()) {
6664
writeModuleInfoBean();
6765
}
@@ -98,26 +96,12 @@ private void processOthers(RoundEnvironment roundEnv, TypeElement otherType) {
9896
}
9997
}
10098

101-
private void initModuleInfoBean() {
102-
try {
103-
if (moduleWriter == null) {
104-
moduleWriter = new SimpleModuleInfoWriter(processingContext);
105-
}
106-
} catch (Throwable e) {
107-
e.printStackTrace();
108-
processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
109-
}
110-
}
111-
11299
private void writeModuleInfoBean() {
113100
try {
114-
if (moduleWriter == null) {
115-
processingContext.logError(null, "EntityClassRegister was not initialised and not written");
116-
} else {
117-
moduleWriter.write();
118-
}
101+
new SimpleModuleInfoWriter(processingContext).write();
102+
} catch (FilerException e) {
103+
processingContext.logWarn(null, "FilerException trying to write EntityClassRegister: " + e);
119104
} catch (Throwable e) {
120-
e.printStackTrace();
121105
processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
122106
}
123107
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ private void writeServicesFile() {
5050
}
5151

5252
} catch (IOException e) {
53-
e.printStackTrace();
5453
processingContext.logError(null, "Failed to write services file " + e.getMessage());
5554
}
5655
}
@@ -70,7 +69,6 @@ private void writeManifestFile() {
7069
}
7170

7271
} catch (IOException e) {
73-
e.printStackTrace();
7472
processingContext.logError(null, "Failed to write services file " + e.getMessage());
7573
}
7674
}

‎querybean-generator/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<version>14.8.1</version>
88
</parent>
99

10+
<version>14.8.2-RC2</version>
1011
<name>querybean generator</name>
11-
<description>Querybean generator</description>
1212
<artifactId>querybean-generator</artifactId>
13+
<description>Querybean generator</description>
1314

1415
<build>
1516
<plugins>

‎querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ void logError(Element e, String msg, Object... args) {
403403
messager.printMessage(Diagnostic.Kind.ERROR, String.format(msg, args), e);
404404
}
405405

406+
void logWarn(String msg, Object... args) {
407+
messager.printMessage(Diagnostic.Kind.WARNING, String.format(msg, args));
408+
}
409+
406410
void logNote(String msg, Object... args) {
407411
messager.printMessage(Diagnostic.Kind.NOTE, String.format(msg, args));
408412
}
@@ -549,7 +553,6 @@ String loadMetaInfServices() {
549553
} catch (FilerException e) {
550554
logNote(null, "FilerException reading services file: " + e.getMessage());
551555
} catch (Exception e) {
552-
e.printStackTrace();
553556
logError(null, "Error reading services file: " + e.getMessage());
554557
}
555558
return null;

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.ebean.querybean.generator;
22

33
import javax.annotation.processing.AbstractProcessor;
4+
import javax.annotation.processing.FilerException;
45
import javax.annotation.processing.ProcessingEnvironment;
56
import javax.annotation.processing.RoundEnvironment;
67
import javax.lang.model.SourceVersion;
@@ -16,7 +17,6 @@
1617
public class Processor extends AbstractProcessor implements Constants {
1718

1819
private ProcessingContext processingContext;
19-
private SimpleModuleInfoWriter moduleWriter;
2020

2121
public Processor() {
2222
}
@@ -49,7 +49,6 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
4949
int count = processEntities(roundEnv);
5050
processOthers(roundEnv);
5151
final int loaded = processingContext.complete();
52-
initModuleInfoBean();
5352
if (roundEnv.processingOver()) {
5453
writeModuleInfoBean();
5554
}
@@ -86,26 +85,12 @@ private void processOthers(RoundEnvironment roundEnv, TypeElement otherType) {
8685
}
8786
}
8887

89-
private void initModuleInfoBean() {
90-
try {
91-
if (moduleWriter == null) {
92-
moduleWriter = new SimpleModuleInfoWriter(processingContext);
93-
}
94-
} catch (Throwable e) {
95-
e.printStackTrace();
96-
processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
97-
}
98-
}
99-
10088
private void writeModuleInfoBean() {
10189
try {
102-
if (moduleWriter == null) {
103-
processingContext.logError(null, "EntityClassRegister was not initialised and not written");
104-
} else {
105-
moduleWriter.write();
106-
}
90+
new SimpleModuleInfoWriter(processingContext).write();
91+
} catch (FilerException e) {
92+
processingContext.logWarn(null, "FilerException trying to write EntityClassRegister: " + e);
10793
} catch (Throwable e) {
108-
e.printStackTrace();
10994
processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
11095
}
11196
}
@@ -115,7 +100,6 @@ private void generateQueryBeans(Element element) {
115100
SimpleQueryBeanWriter beanWriter = new SimpleQueryBeanWriter((TypeElement) element, processingContext);
116101
beanWriter.writeRootBean();
117102
} catch (Throwable e) {
118-
e.printStackTrace();
119103
processingContext.logError(element, "Error generating query beans: " + e);
120104
}
121105
}

0 commit comments

Comments
 (0)