Load language specific template files even if the 'templateDir' property is used (#62)

nakamura-to · web-flow · commit 72e8de36ad0e · 2021-04-25T10:25:17.000+09:00
diff --git a/codegen/src/main/java/org/seasar/doma/gradle/codegen/generator/Generator.java b/codegen/src/main/java/org/seasar/doma/gradle/codegen/generator/Generator.java
@@ -62,11 +62,14 @@ protected TemplateLoader createTemplateLoader(
         throw new CodeGenException(Message.DOMAGEN9001, e, e);
       }
     }
+    TemplateLoader secondary = new ResourceTemplateLoader(languageType.getTemplateDir());
+    TemplateLoader[] loaders;
     if (primary != null) {
-      return new MultiTemplateLoader(new TemplateLoader[] {primary, defaultLoader});
+      loaders = new TemplateLoader[] {primary, secondary, defaultLoader};
+    } else {
+      loaders = new TemplateLoader[] {secondary, defaultLoader};
     }
-    TemplateLoader secondary = new ResourceTemplateLoader(languageType.getTemplateDir());
-    return new MultiTemplateLoader(new TemplateLoader[] {secondary, defaultLoader});
+    return new MultiTemplateLoader(loaders);
   }
 
   public void generate(GenerationContext context) {

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,14 @@ protected TemplateLoader createTemplateLoader(`
`62`	`62`	`throw new CodeGenException(Message.DOMAGEN9001, e, e);`
`63`	`63`	`}`
`64`	`64`	`}`
	`65`	`+ TemplateLoader secondary = new ResourceTemplateLoader(languageType.getTemplateDir());`
	`66`	`+ TemplateLoader[] loaders;`
`65`	`67`	`if (primary != null) {`
`66`		`- return new MultiTemplateLoader(new TemplateLoader[] {primary, defaultLoader});`
	`68`	`+ loaders = new TemplateLoader[] {primary, secondary, defaultLoader};`
	`69`	`+ } else {`
	`70`	`+ loaders = new TemplateLoader[] {secondary, defaultLoader};`
`67`	`71`	`}`
`68`		`- TemplateLoader secondary = new ResourceTemplateLoader(languageType.getTemplateDir());`
`69`		`- return new MultiTemplateLoader(new TemplateLoader[] {secondary, defaultLoader});`
	`72`	`+ return new MultiTemplateLoader(loaders);`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`public void generate(GenerationContext context) {`