Skip to content

Commit 8e20317

Browse files
computatecomputate
committed
Split up some of the code
1 parent e685fe7 commit 8e20317

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,16 +1898,16 @@ public void ecrireGenApiServiceImpl2(String classeLangueNom) throws Exception {
18981898
tl(1, "protected static final Logger LOG = LoggerFactory.getLogger(", classeNomSimpleGenApiServiceImpl, ".class);");
18991899

19001900
for(String classeApiMethode : classeApiMethodes) {
1901-
String classePageNomCanoniqueMethode = classeDoc.getString("classePageNomCanonique" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1902-
String classePageNomSimpleMethode = classeDoc.getString("classePageNomSimple" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1903-
String classeApiOperationIdMethode = classeDoc.getString("classeApiOperationId" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1904-
String classeApiUriMethode = classeDoc.getString("classeApiUri" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1905-
String classeApiMethodeMethode = classeDoc.getString("classeApiMethode" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1906-
String classeApiTypeMedia200Methode = classeDoc.getString("classeApiTypeMedia200" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1907-
String classeApiTypeMediaRequeteMethode = classeDoc.getString("classeApiTypeMediaRequete" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1908-
String classePageLangueNom = classeDoc.getString("classePageLangueNom" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1909-
String classePageTemplateMethode = classeDoc.getString("classe" + classeApiMethode + "Template_" + classeLangueNom + "_stored_string");
1910-
Boolean classePageAvecTemplateMethode = classeDoc.getBoolean("classePageAvecTemplate" + classeApiMethode + "_stored_boolean");
1901+
classePageNomCanoniqueMethode = classeDoc.getString("classePageNomCanonique" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1902+
classePageNomSimpleMethode = classeDoc.getString("classePageNomSimple" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1903+
classeApiOperationIdMethode = classeDoc.getString("classeApiOperationId" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1904+
classeApiUriMethode = classeDoc.getString("classeApiUri" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1905+
classeApiMethodeMethode = classeDoc.getString("classeApiMethode" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1906+
classeApiTypeMedia200Methode = classeDoc.getString("classeApiTypeMedia200" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1907+
classeApiTypeMediaRequeteMethode = classeDoc.getString("classeApiTypeMediaRequete" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1908+
classePageLangueNom = classeDoc.getString("classePageLangueNom" + classeApiMethode + "_" + classeLangueNom + "_stored_string");
1909+
classePageTemplateMethode = classeDoc.getString("classe" + classeApiMethode + "Template_" + classeLangueNom + "_stored_string");
1910+
classePageAvecTemplateMethode = classeDoc.getBoolean("classePageAvecTemplate" + classeApiMethode + "_stored_boolean");
19111911

19121912
if(classePageLangueNom == null || classePageLangueNom.equals(classeLangueNom)) {
19131913

@@ -2830,7 +2830,6 @@ else if(classeApiMethode.equals(i18nGlobale.getString(I18n.var_PUTFusion)) || cl
28302830
tl(7, i18nGlobale.getString(I18n.var_requeteApi), ".setId(Optional.ofNullable(", i18nGlobale.getString(I18n.var_liste), classeNomSimple, ".first()).map(o2 -> o2.get", StringUtils.capitalize(classeVarId), "().toString()).orElse(null));");
28312831
if(classeModele)
28322832
tl(7, i18nGlobale.getString(I18n.var_requeteApi), ".set", i18nGlobale.getString(I18n.var_SolrId), "(Optional.ofNullable(", i18nGlobale.getString(I18n.var_liste), classeNomSimple, ".first()).map(o2 -> o2.get", solrIdCapitalise, "()).orElse(null));");
2833-
// tl(7, "eventBus.publish(\"websocket", classeNomSimple, "\", JsonObject.mapFrom(", classeLangueConfig.getString(ConfigCles.var_requeteApi), ").toString());");
28342833
tl(7, classeApiOperationIdMethode, "Future(o).onSuccess(o2 -> {");
28352834
tl(8, i18nGlobale.getString(I18n.var_gestionnaireEvenements), ".handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily()))));");
28362835
tl(7, "}).onFailure(ex -> {");
@@ -2888,7 +2887,6 @@ else if(classeApiMethode.equals(i18nGlobale.getString(I18n.var_PUTFusion)) || cl
28882887
tl(7, i18nGlobale.getString(I18n.var_requeteApi), ".setId(Optional.ofNullable(", i18nGlobale.getString(I18n.var_liste), classeNomSimple, ".first()).map(o2 -> o2.get", StringUtils.capitalize(classeVarId), "().toString()).orElse(null));");
28892888
if(classeModele)
28902889
tl(7, i18nGlobale.getString(I18n.var_requeteApi), ".set", i18nGlobale.getString(I18n.var_SolrId), "(Optional.ofNullable(", i18nGlobale.getString(I18n.var_liste), classeNomSimple, ".first()).map(o2 -> o2.get", solrIdCapitalise, "()).orElse(null));");
2891-
// tl(7, "eventBus.publish(\"websocket", classeNomSimple, "\", JsonObject.mapFrom(", classeLangueConfig.getString(ConfigCles.var_requeteApi), ").toString());");
28922890
tl(7, "JsonObject jsonObject = JsonObject.mapFrom(o);");
28932891
tl(7, classeNomSimple, " o2 = jsonObject.mapTo(", classeNomSimple, ".class);");
28942892
tl(7, "o2.set", i18nGlobale.getString(I18n.var_RequeteSite), "_(", i18nGlobale.getString(I18n.var_requeteSite), ");");
@@ -3088,10 +3086,8 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
30883086
tl(12, "break;");
30893087
tl(11, "}");
30903088
tl(10, "}");
3091-
// tl(10, "if(!match) {");
30923089
tl(10, "vals.clear();");
30933090
tl(10, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
3094-
// tl(10, "}");
30953091
tl(9, "} else {");
30963092
tl(10, "if(vals != null)");
30973093
tl(11, "vals.clear();");
@@ -3890,6 +3886,12 @@ else if(classeApiMethode.equals(i18nGlobale.getString(I18n.var_PUTCopie)))
38903886
tl(1, "public void ", classeApiOperationIdMethode, i18nGlobale.getString(I18n.var_Page), "Init(", classePageNomSimpleMethode, " page, ", classePartsListeRecherche.nomSimple(classeLangueNom), "<", classeApiClasseNomSimple, "> ", i18nGlobale.getString(I18n.var_liste), classeNomSimple, ") {");
38913887
tl(1, "}");
38923888
}
3889+
ecrireGenApiServiceImplReponse(classeLangueNom, classeApiMethode);
3890+
}
3891+
}
3892+
}
3893+
}
3894+
public void ecrireGenApiServiceImplReponse(String classeLangueNom, String classeApiMethode) throws Exception {
38933895

38943896
/////////////////
38953897
// Reponse 200 //
@@ -4005,7 +4007,6 @@ else if(classePageAvecTemplateMethode || classeApiMethode.contains(i18nGlobale.g
40054007
else if(classeApiMethode.contains("GET")) {
40064008
if(classePageNomCanoniqueMethode != null) {
40074009
tl(3, classePageNomSimpleMethode, " page = new ", classePageNomSimpleMethode, "();");
4008-
// tl(3, "page.setPageUrl(\"", siteUrlBase, classeApiUri, "\");");
40094010
tl(3, "SolrDocument page", i18nGlobale.getString(I18n.var_DocumentSolr), " = new SolrDocument();");
40104011
tl(3, classePartsRequeteSite.nomSimple(classeLangueNom), " ", i18nGlobale.getString(I18n.var_requeteSite), " = ", i18nGlobale.getString(I18n.var_liste), classeApiClasseNomSimple, ".get", i18nGlobale.getString(I18n.var_RequeteSite), "_(", classePartsRequeteSite.nomSimple(classeLangueNom), ".class);");
40114012
tl(3, "MultiMap ", i18nGlobale.getString(I18n.var_requeteEnTetes), " = MultiMap.caseInsensitiveMultiMap();");
@@ -4123,9 +4124,6 @@ else if(classeApiMethode.contains(i18nGlobale.getString(I18n.var_Telechargement)
41234124
tl(2, "}");
41244125
tl(1, "}");
41254126
}
4126-
}
4127-
}
4128-
}
41294127
}
41304128

41314129
public void ecrireGenApiServiceImpl3(String classeLangueNom) throws Exception {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,14 @@ public class EcrireGenClasse extends EcrireClasse {
348348
protected Boolean classePage;
349349
protected String classePageNomSimple;
350350
protected String classePageNomSimpleMethode;
351+
protected String classePageNomCanoniqueMethode;
352+
protected String classeApiOperationIdMethode;
353+
protected String classeApiUriMethode;
354+
protected String classeApiMethodeMethode;
355+
protected String classeApiTypeMedia200Methode;
356+
protected String classeApiTypeMediaRequeteMethode;
357+
protected String classePageTemplateMethode;
358+
protected Boolean classePageAvecTemplateMethode;
351359
protected String classePageSuperNomSimple;
352360
protected String classePageSuperNomCanonique;
353361
protected String classeApiClasseNomSimple;

0 commit comments

Comments
 (0)