Fixing SmartDataModel integration

computate-org · Jul 22, 2024 · 9e2b6db · 9e2b6db
1 parent a90c101
commit 9e2b6db
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/main/java/org/computate/frFR/java/IndexerClasse.java b/src/main/java/org/computate/frFR/java/IndexerClasse.java
@@ -5400,8 +5400,7 @@ else if(i18nGlobale.getString(I18n.var_PUTFusion).equals(classeApiMethode))
 						Map<String, Object> map = yaml.load(FileUtils.readFileToString(smartDataModelSpecFile, StandardCharsets.UTF_8));
 						JsonObject spec = new JsonObject(map);
 						JsonObject properties = spec.getJsonObject(classeSmartDataModel).getJsonObject("properties");
-						wSmartDataModel.l();
-						wSmartDataModel.tl(0, "FIWARE SmartDataModel fields:");
+						wSmartDataModel.l("package ", classeNomEnsemble, ";");
 						wSmartDataModel.l();
 						wSmartDataModel.l("import java.math.BigDecimal;");
 						wSmartDataModel.l("import java.util.List;");
@@ -5426,26 +5425,26 @@ else if(i18nGlobale.getString(I18n.var_PUTFusion).equals(classeApiMethode))
 						wSmartDataModel.l(" * SqlOrder: 1");
 						wSmartDataModel.l(" * Api: true");
 						wSmartDataModel.l(" * Page: true");
-						wSmartDataModel.l(" * SuperPage.enUS: BaseModelPage");
+						wSmartDataModel.l(" * SuperPage: BaseModelPage");
 						wSmartDataModel.l(" * Indexed: true");
 						wSmartDataModel.l(" * Order: 1");
 						wSmartDataModel.l(" * Description: ");
-						wSmartDataModel.l(" * ApiTag.enUS: ", classeNomSimple);
-						wSmartDataModel.l(" * ApiUri.enUS: /api/", classeNomSimple);
-						wSmartDataModel.l(" *");
-						wSmartDataModel.l(" * ApiMethod.enUS: Search");
-						wSmartDataModel.l(" * ApiMethod: GET");
-						wSmartDataModel.l(" * ApiMethod: PATCH");
-						wSmartDataModel.l(" * ApiMethod: POST");
-						wSmartDataModel.l(" * ApiMethod: PUTImport");
+						wSmartDataModel.l(" * ApiTag: ", classeNomSimple);
+						wSmartDataModel.l(" * ApiUri: /api/", classeNomSimple);
 						wSmartDataModel.l(" *");
-						wSmartDataModel.l(" * ApiMethod.enUS: SearchPage");
-						wSmartDataModel.l(" * Page.SearchPage.enUS: ", classeNomSimple, "Page");
-						wSmartDataModel.l(" * ApiUri.SearchPage.enUS: /", classeNomSimple);
+						wSmartDataModel.l(" * ApiMethod:");
+						wSmartDataModel.l(" *   Search:");
+						wSmartDataModel.l(" *   GET:");
+						wSmartDataModel.l(" *   PATCH:");
+						wSmartDataModel.l(" *   POST:");
+						wSmartDataModel.l(" *   PUTImport:");
+						wSmartDataModel.l(" *   SearchPage:");
+						wSmartDataModel.l(" *     Page: ", classeNomSimple, "Page");
+						wSmartDataModel.l(" *     ApiUri: /", classeNomSimple);
 						wSmartDataModel.l(" *");
-						wSmartDataModel.l(" * Role.enUS: SiteAdmin");
+						wSmartDataModel.l(" * Role: SiteAdmin");
 						wSmartDataModel.l(" *");
-						wSmartDataModel.l(" * AName.enUS: a ", classeNomSimple);
+						wSmartDataModel.l(" * AName: a ", classeNomSimple);
 						wSmartDataModel.l(" * Color: 2017-shaded-spruce");
 						wSmartDataModel.l(" * IconGroup: duotone");
 						wSmartDataModel.l(" * IconName: map-location-dot");