Skip to content

Commit 43fbdb9

Browse files
committed
Adding Jinja template support
1 parent 93b412c commit 43fbdb9

File tree

6 files changed

+102
-74
lines changed

6 files changed

+102
-74
lines changed

src/main/java/org/computate/frFR/java/ConfigCles.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,18 @@ public class ConfigCles {
8181
public static final String var_ajouterErreur = "var_ajouterErreur";
8282
public static final String var_ajouterLueur = "var_ajouterLueur";
8383
public static final String var_Api = "var_Api";
84+
public static final String var_ApiDescription = "var_ApiDescription";
85+
public static final String var_ApiInterne = "var_ApiInterne";
86+
public static final String var_ApiOperationId = "var_ApiOperationId";
87+
public static final String var_ApiOperationIdRequete = "var_ApiOperationIdRequete";
88+
public static final String var_ApiOperationIdReponse = "var_ApiOperationIdReponse";
8489
public static final String var_ApiClasse = "var_ApiClasse";
8590
public static final String var_apiMethode = "var_apiMethode";
8691
public static final String var_ApiMethode = "var_ApiMethode";
92+
public static final String var_ApiMotCle = "var_ApiMotCle";
8793
public static final String var_ApiTag = "var_ApiTag";
94+
public static final String var_ApiTypeMedia = "var_ApiTypeMedia";
95+
public static final String var_ApiTypeMediaRequete = "var_ApiTypeMediaRequete";
8896
public static final String var_ApiUri = "var_ApiUri";
8997
public static final String var_apres = "var_apres";
9098
public static final String var_Apres = "var_Apres";

src/main/java/org/computate/frFR/java/ConfigSite.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,10 +1009,22 @@ public String regex(String motif, String texte, String valeurDefaut) {
10091009
return o;
10101010
}
10111011

1012-
public String regexYaml(String champ, String texte) {
1012+
public JsonObject regexYamlObject(String champ, String texte) {
1013+
Yaml yaml = new Yaml();
1014+
Map<String, Object> map = yaml.load(regexYamlString(champ, texte));
1015+
return new JsonObject(map);
1016+
}
1017+
1018+
public JsonArray regexYamlArray(String champ, String texte) {
1019+
Yaml yaml = new Yaml();
1020+
List<Object> map = yaml.load(regexYamlString(champ, texte));
1021+
return new JsonArray(map);
1022+
}
1023+
1024+
public String regexYamlString(String champ, String texte) {
10131025
String o = null;
10141026
if (champ != null && texte != null) {
1015-
String motif = "^" + champ + ": ([>|-]{0,2}(\\d*)\\n)?([\\s\\S]*?)(^\\w|\\Z)";
1027+
String motif = "^" + champ + ": ?([>|-]{0,2}(\\d*)\\n)?([\\s\\S]*?)(^\\w|\\Z)";
10161028
Matcher m = Pattern.compile(motif, Pattern.MULTILINE).matcher(texte);
10171029
boolean trouve = m.find();
10181030
if (trouve) {

0 commit comments

Comments
 (0)