Skip to content

Commit 1e3cc14

Browse files
computatecomputate
committed
Fixing bugs with importing pages
1 parent 443bbad commit 1e3cc14

File tree

1 file changed

+35
-13
lines changed

1 file changed

+35
-13
lines changed

‎src/main/java/org/computate/frFR/java/EcrireApiClasse.java‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -456,17 +456,18 @@ public void ecrireGenApiServiceImpl1(String classeLangueNom) throws Exception {
456456
/////////////////////////
457457

458458
if(classePageAvecTemplate && entiteDefinir) {
459-
// if((
460-
// StringUtils.equals(entiteNomCanonique, ZonedDateTime.class.getCanonicalName())
461-
// || entiteEstListe && StringUtils.equals(entiteNomCanoniqueGenerique, ZonedDateTime.class.getCanonicalName()))) {
462-
// if(classeVarZone != null) {
463-
// wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "), Optional.ofNullable(page.get", StringUtils.capitalize(classeVarZone), "()).map(v -> ZoneId.of(v)).orElse(Optional.ofNullable(", langueConfigGlobale.getString(I18n.var_requeteSite), ").map(r -> r.get", langueConfigGlobale.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfigGlobale.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\")))));");
464-
// } else {
465-
// wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "), Optional.ofNullable(", langueConfigGlobale.getString(I18n.var_requeteSite), ").map(r -> r.get", langueConfigGlobale.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfigGlobale.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"))));");
466-
// }
467-
// } else {
468-
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "));");
469-
// }
459+
if((
460+
StringUtils.equals(entiteNomCanonique, ZonedDateTime.class.getCanonicalName())
461+
|| entiteEstListe && StringUtils.equals(entiteNomCanoniqueGenerique, ZonedDateTime.class.getCanonicalName()))) {
462+
if(classeVarZone != null) {
463+
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "), Optional.ofNullable(page.get", StringUtils.capitalize(classeVarZone), "()).map(v -> ZoneId.of(v)).orElse(Optional.ofNullable(", langueConfigGlobale.getString(I18n.var_requeteSite), ").map(r -> r.get", langueConfigGlobale.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfigGlobale.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\")))));");
464+
} else {
465+
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "), Optional.ofNullable(", langueConfigGlobale.getString(I18n.var_requeteSite), ").map(r -> r.get", langueConfigGlobale.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfigGlobale.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"))));");
466+
}
467+
} else {
468+
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, ")));");
469+
}
470+
470471
}
471472

472473
/////////////////
@@ -5074,10 +5075,31 @@ public void ecrireGenApiServiceImpl4(String classeLangueNom) throws Exception {
50745075
if(classePageAvecTemplate) {
50755076
l();
50765077
tl(1, "@Override");
5077-
tl(1, "public Future<JsonObject> ", i18nGlobale.getString(I18n.var_genererCorpsPage), "(ComputateSiteRequest ", i18nGlobale.getString(I18n.var_requeteSite), ", Object ", i18nGlobale.getString(I18n.var_resultat), ", String ", i18nGlobale.getString(I18n.var_templateChemin), ", String ", i18nGlobale.getString(I18n.var_classeNomSimple), ") {");
5078+
tl(1, "public Future<JsonObject> ", i18nGlobale.getString(I18n.var_genererCorpsPage), "(ComputateSiteRequest ", i18nGlobale.getString(I18n.var_requeteSite), ", Map<String, Object> ctx, String ", i18nGlobale.getString(I18n.var_templateChemin), ", String ", i18nGlobale.getString(I18n.var_classeNomSimple), ") {");
50785079
tl(2, "Promise<JsonObject> promise = Promise.promise();");
50795080
tl(2, "try {");
5080-
tl(3, "promise.complete(JsonObject.mapFrom(", i18nGlobale.getString(I18n.var_resultat), "));");
5081+
tl(3, "Map<String, Object> ", i18nGlobale.getString(I18n.var_resultat), " = (Map<String, Object>)ctx.get(\"", i18nGlobale.getString(I18n.var_resultat), "\");");
5082+
tl(3, classePartsRequeteSite.nomSimple(classeLangueNom), " ", i18nGlobale.getString(I18n.var_requeteSite), "2 = (", classePartsRequeteSite.nomSimple(classeLangueNom), ")", i18nGlobale.getString(I18n.var_requeteSite), ";");
5083+
tl(3, "String siteBaseUrl = config.getString(ComputateConfigKeys.SITE_BASE_URL);");
5084+
tl(3, classeNomSimple, " page = new ", classeNomSimple, "();");
5085+
tl(3, "page.set", i18nGlobale.getString(I18n.var_RequeteSite), "_((", i18nGlobale.getString(I18n.var_RequeteSite), ")", i18nGlobale.getString(I18n.var_requeteSite), ");");
5086+
l();
5087+
s(wPageTemplates);
5088+
l();
5089+
tl(3, "page.promiseDeepForClass((", i18nGlobale.getString(I18n.var_RequeteSite), ")", i18nGlobale.getString(I18n.var_requeteSite), ").onSuccess(o -> {");
5090+
tl(4, "try {");
5091+
tl(5, "JsonObject data = JsonObject.mapFrom(o);");
5092+
tl(5, "ctx.put(\"", i18nGlobale.getString(I18n.var_resultat), "\", data.getMap());");
5093+
// tl(5, "data.put(", classeNomSimple, ".VAR_", classeVarId, ", uri);");
5094+
tl(5, "promise.complete(data);");
5095+
tl(4, "} catch(Exception ex) {");
5096+
tl(5, "LOG.error(String.format(importModelFail, classSimpleName), ex);");
5097+
tl(5, "promise.fail(ex);");
5098+
tl(4, "}");
5099+
tl(3, "}).onFailure(ex -> {");
5100+
tl(4, "LOG.error(String.format(\"", i18nGlobale.getString(I18n.var_genererCorpsPage), " ", i18nGlobale.getString(I18n.str_a_échoué), ". \"), ex);");
5101+
tl(4, "promise.fail(ex);");
5102+
tl(3, "});");
50815103
tl(2, "} catch(Exception ex) {");
50825104
tl(3, "LOG.error(String.format(\"", i18nGlobale.getString(I18n.var_genererCorpsPage), " ", i18nGlobale.getString(I18n.str_a_échoué), ". \"), ex);");
50835105
tl(3, "promise.fail(ex);");

0 commit comments

Comments
 (0)