github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#6497] Fixed NPE regression when <generate/> element is absent

Browse Source
This commit is contained in:
Lukas Eder 2019-10-01 09:15:54 +02:00
parent e5db0ffa01
commit 6b174bfbe0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
View File

@ -287,7 +287,9 @@ public class GenerationTool {
if (g == null)
throw new GeneratorException("The <generator/> tag is mandatory. For details, see " + Constants.NS_CODEGEN);
// Some default values for optional elements to avoid NPE's
// [#1394] The <generate/> element and some others should be optional
if (g.getGenerate() == null)
g.setGenerate(new Generate());
if (g.getStrategy() == null)
g.setStrategy(new Strategy());
if (g.getTarget() == null)
@ -628,9 +630,6 @@ public class GenerationTool {
if (g.getTarget().isClean() != null)
generator.setTargetClean(g.getTarget().isClean());
// [#1394] The <generate/> element should be optional
if (g.getGenerate() == null)
g.setGenerate(new Generate());
if (g.getGenerate().isIndexes() != null)
generator.setGenerateIndexes(g.getGenerate().isIndexes());
if (g.getGenerate().isRelations() != null)