WIP converting from handlebars to Jinja

computate-org · Jul 7, 2024 · b5b2d20 · b5b2d20
1 parent 43fbdb9
commit b5b2d20
Show file tree

Hide file tree

Showing 2 changed files with 1,181 additions and 1,281 deletions.
diff --git a/src/main/java/org/computate/frFR/java/EcrireApiClasse.java b/src/main/java/org/computate/frFR/java/EcrireApiClasse.java
@@ -249,7 +249,7 @@ public void ecrireGenApiService(String classeLangueNom) throws Exception {
 			auteurGenApiService.l("import io.vertx.ext.web.api.service.WebApiServiceGen;");
 			auteurGenApiService.l("import io.vertx.ext.web.api.service.ServiceRequest;");
 			auteurGenApiService.l("import io.vertx.ext.web.api.service.ServiceResponse;");
-			auteurGenApiService.l("import io.vertx.ext.web.templ.handlebars.HandlebarsTemplateEngine;");
+			auteurGenApiService.l("import com.hubspot.jinjava.Jinjava;");
 			auteurGenApiService.l("import io.vertx.core.WorkerExecutor;");
 			auteurGenApiService.l("import io.vertx.pgclient.PgPool;");
 			auteurGenApiService.l("import io.vertx.kafka.client.producer.KafkaProducer;");
@@ -373,7 +373,7 @@ public void ecrireApiServiceImpl(String classeLangueNom) throws Exception {
 			auteurApiServiceImpl.l("import io.vertx.pgclient.PgPool;");
 			auteurApiServiceImpl.l("import io.vertx.kafka.client.producer.KafkaProducer;");
 			if(classePage)
-				auteurApiServiceImpl.l("import io.vertx.ext.web.templ.handlebars.HandlebarsTemplateEngine;");
+				auteurApiServiceImpl.l("import com.hubspot.jinjava.Jinjava;");
 //			auteurGenApiService.l("import ", classeNomEnsemble, ".", classeNomSimple, "ApiServiceVertxEBProxy;");
 			auteurApiServiceImpl.l();
 			auteurApiServiceImpl.l("/**");
@@ -3123,7 +3123,7 @@ else if(classeApiMethode.equals(classeLangueConfig.getString(ConfigCles.var_PUTC
 					if(classePageNomCanoniqueMethode != null) {
 						l();
 						tl(1, "public String ", classeLangueConfig.getString(ConfigCles.var_template), classeApiMethode, classeNomSimple, "() {");
-						tl(2, "return Optional.ofNullable(config.getString(", classePartsConfigCles.nomSimple(classeLangueNom), ".TEMPLATE_PATH)).orElse(\"templates\") + \"/", classeLangueNom, "/", classePageNomSimpleMethode, "\";");
+						tl(2, "return \"/", classeLangueNom, "/", classePageNomSimpleMethode, ".htm\";");
 						t(1, "}");
 					}
 					l();
@@ -3167,7 +3167,7 @@ else if(classeApiMethode.contains(classeLangueConfig.getString(ConfigCles.var_Re
 							tl(3, "String pageTemplateUri = ", classeLangueConfig.getString(ConfigCles.var_template), classeApiMethode, classeNomSimple, "();");
 							tl(3, "String siteTemplatePath = config.getString(ComputateConfigKeys.TEMPLATE_PATH);");
 							tl(3, "Path resourceTemplatePath = Path.of(siteTemplatePath, pageTemplateUri);");
-							tl(3, "String template = siteTemplatePath == null ? Files.readString(resourceTemplatePath, Charset.forName(\"UTF-8\")) : Resources.toString(Resources.getResource(resourceTemplatePath.toString()), StandardCharsets.UTF_8);");
+							tl(3, "String template = siteTemplatePath == null ? Resources.toString(Resources.getResource(resourceTemplatePath.toString()), StandardCharsets.UTF_8) : Files.readString(resourceTemplatePath, Charset.forName(\"UTF-8\"));");
 							tl(3, classePageNomSimpleMethode, " page = new ", classePageNomSimpleMethode, "();");
 							tl(3, "MultiMap ", classeLangueConfig.getString(ConfigCles.var_requeteEnTetes), " = MultiMap.caseInsensitiveMultiMap();");
 							tl(3, classeLangueConfig.getString(ConfigCles.var_requeteSite), ".set", classeLangueConfig.getString(ConfigCles.var_RequeteEnTetes), "(", classeLangueConfig.getString(ConfigCles.var_requeteEnTetes), ");");