Skip to content

Commit

Permalink
Class indexing now loads super class data from dependent projects
Browse files Browse the repository at this point in the history
  • Loading branch information
@computate
computate committed Dec 15, 2023
1 parent e6ec1f3 commit 55f5539
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 65 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/computate/frFR/java/EcrireApiClasse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ public void ecrireGenApiServiceImpl1(String classeLangueNom) throws Exception {
SolrQuery rechercheSolr = new SolrQuery();
rechercheSolr.setQuery("*:*");
rechercheSolr.setRows(1000000);
String fqClassesSuperEtMoi = "(" + classeEntiteClassesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
String fqClassesSuperEtMoi = "(" + classesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
rechercheSolr.addFilterQuery("partEstEntite_indexed_boolean:true");
rechercheSolr.addFilterQuery("classeNomCanonique_" + langueNomActuel + "_indexed_string:" + fqClassesSuperEtMoi);
QueryResponse rechercheReponse = clientSolrComputate.query(rechercheSolr);
Expand Down Expand Up @@ -3266,7 +3266,7 @@ else if(classeApiMethode.contains("DELETE")) {
SolrQuery rechercheSolr = new SolrQuery();
rechercheSolr.setQuery("*:*");
rechercheSolr.setRows(1000000);
String fqClassesSuperEtMoi = "(" + classeEntiteClassesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
String fqClassesSuperEtMoi = "(" + classesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
rechercheSolr.addFilterQuery("partEstEntite_indexed_boolean:true");
rechercheSolr.addFilterQuery("classeNomCanonique_" + langueNomActuel + "_indexed_string:" + fqClassesSuperEtMoi);
QueryResponse rechercheReponse = clientSolrComputate.query(rechercheSolr);
Expand Down
12 changes: 5 additions & 7 deletions src/main/java/org/computate/frFR/java/EcrireGenClasse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,7 @@ public class EcrireGenClasse extends EcrireClasse {
*/
protected List<String> classeSuperParametreTypeNoms;

protected List<String> classeEntiteClassesSuperEtMoiSansGen;

protected List<String> entiteClassesSuperEtMoiSansGen;
protected List<String> classesSuperEtMoiSansGen;

/**
* Var.enUS: classSuperWriteMethods
Expand Down Expand Up @@ -2613,7 +2611,7 @@ public void genCodeMethode(String langueNom, YAMLConfiguration langueConfig) thr
* r.enUS: entityValsValue
* r: entiteValValeur
* r.enUS: entityValValue
* r: entiteClassesSuperEtMoiSansGen
* r: classesSuperEtMoiSansGen
* r.enUS: entitySuperClassesAndMeWithoutGen
* r: entiteVarCapitalise
* r.enUS: entityVarCapitalized
Expand Down Expand Up @@ -3092,7 +3090,7 @@ public void genCodeEntite(String langueNom, YAMLConfiguration langueConfig) thro
entiteDefaut = doc.getString("entiteDefaut_stored_string");
entiteHtml = doc.getBoolean("entiteHtml_stored_boolean");

entiteClassesSuperEtMoiSansGen = Optional.ofNullable(doc.getJsonArray("entiteClassesSuperEtMoiSansGen_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
classesSuperEtMoiSansGen = Optional.ofNullable(doc.getJsonArray("classesSuperEtMoiSansGen_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());

entiteMethodesAvantVisibilite = Optional.ofNullable(doc.getJsonArray("entiteMethodesAvantVisibilite_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
entiteMethodesAvantVar = Optional.ofNullable(doc.getJsonArray("entiteMethodesAvantVar_" + langueNom + "_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
Expand Down Expand Up @@ -5702,8 +5700,8 @@ public void genCodeClasseFin(String langueNom, YAMLConfiguration langueConfig) t

if(classeApi
|| (
classePartsModeleBase != null && classeEntiteClassesSuperEtMoiSansGen.contains(classePartsModeleBase.nomCanonique(langueNomGlobale))
|| classePartsResultatBase != null && classeEntiteClassesSuperEtMoiSansGen.contains(classePartsResultatBase.nomCanonique(langueNomGlobale))
classePartsModeleBase != null && classesSuperEtMoiSansGen.contains(classePartsModeleBase.nomCanonique(langueNomGlobale))
|| classePartsResultatBase != null && classesSuperEtMoiSansGen.contains(classePartsResultatBase.nomCanonique(langueNomGlobale))
)
&& classeInitLoin
&& (classeEtendBase || classeEstBase)
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/org/computate/frFR/java/EcrirePageClasse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ public void pageCodeClasseJava(String langueNom, YAMLConfiguration langueConfig)
SolrQuery rechercheSolr = new SolrQuery();
rechercheSolr.setQuery("*:*");
rechercheSolr.setRows(1000000);
String fqClassesSuperEtMoi = "(" + classeEntiteClassesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
String fqClassesSuperEtMoi = "(" + classesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
rechercheSolr.addFilterQuery("partEstEntite_indexed_boolean:true");
rechercheSolr.addFilterQuery("classeNomCanonique_" + langueNomActuel + "_indexed_string:" + fqClassesSuperEtMoi);
// rechercheSolr.addFilterQuery("entiteHtmLigne_indexed_int:[* TO *]");
Expand Down Expand Up @@ -2186,7 +2186,7 @@ public void pageCodeClasseHbs(String langueNom, YAMLConfiguration langueConfig)
SolrQuery rechercheSolr = new SolrQuery();
rechercheSolr.setQuery("*:*");
rechercheSolr.setRows(1000000);
String fqClassesSuperEtMoi = "(" + classeEntiteClassesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
String fqClassesSuperEtMoi = "(" + classesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
rechercheSolr.addFilterQuery("partEstEntite_indexed_boolean:true");
rechercheSolr.addFilterQuery("classeNomCanonique_" + this.langueNomActuel + "_indexed_string:" + fqClassesSuperEtMoi);
rechercheSolr.addFilterQuery("entiteHtmColonne_indexed_int:[* TO *]");
Expand Down Expand Up @@ -2291,7 +2291,7 @@ public void pageCodeClasseHbs(String langueNom, YAMLConfiguration langueConfig)
SolrQuery rechercheSolr = new SolrQuery();
rechercheSolr.setQuery("*:*");
rechercheSolr.setRows(1000000);
String fqClassesSuperEtMoi = "(" + classeEntiteClassesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
String fqClassesSuperEtMoi = "(" + classesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
rechercheSolr.addFilterQuery("partEstEntite_indexed_boolean:true");
rechercheSolr.addFilterQuery("classeNomCanonique_" + langueNomActuel + "_indexed_string:" + fqClassesSuperEtMoi);
rechercheSolr.addSort("entiteHtmLigne_indexed_int", ORDER.asc);
Expand Down Expand Up @@ -2950,7 +2950,7 @@ else if(methodePATCH || methodeRecherche)
SolrQuery rechercheSolr = new SolrQuery();
rechercheSolr.setQuery("*:*");
rechercheSolr.setRows(1000000);
String fqClassesSuperEtMoi = "(" + classeEntiteClassesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
String fqClassesSuperEtMoi = "(" + classesSuperEtMoiSansGen.stream().map(c -> ClientUtils.escapeQueryChars(c)).collect(Collectors.joining(" OR ")) + ")";
rechercheSolr.addFilterQuery("partEstEntite_indexed_boolean:true");
rechercheSolr.addFilterQuery("classeNomCanonique_" + langueNomActuel + "_indexed_string:" + fqClassesSuperEtMoi);
rechercheSolr.addFilterQuery("(entiteSuggere_indexed_boolean:true OR entiteAttribuer_indexed_boolean:true)");
Expand Down Expand Up @@ -4386,11 +4386,13 @@ else if(langueConfig.getString(ConfigCles.var_PUTCopie).equals(classeApiMethode)
tl(3, "</tr>");
tl(0, "{{/inline}}");
tl(0, "{{#*inline \"tbody1", classePageNomSimple, "\"}}");
tl(0, "<!-- #*inline \"tbody1", classePageNomSimple, "\" -->");
tl(4, "<tbody>");
tl(0, "{{> tbody2", classePageNomSimple, "}}");
tl(4, "</tbody>");
tl(0, "{{/inline}}");
tl(0, "{{#*inline \"tbody2", classePageNomSimple, "\"}}");
tl(0, "<!-- #*inline \"tbody2", classePageNomSimple, "\" -->");
// TODO
// tl(2, "Map<String, Map<String, List<String>>> highlighting = ", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getResponse().getHighlighting();");
tl(2, "{{#each ", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, "}}");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/computate/frFR/java/EcrireToutesClasses.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public void ecrireGenClasse(JsonObject doc, String langueNom) throws Exception {
classeInitLoinExceptions = new ArrayList<String>();
classeParametreTypeNoms = Optional.ofNullable(doc.getJsonArray("classeParametreTypeNoms_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
classeSuperParametreTypeNoms = Optional.ofNullable(doc.getJsonArray("classeSuperParametreTypeNoms_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
classeEntiteClassesSuperEtMoiSansGen = Optional.ofNullable(doc.getJsonArray("entiteClassesSuperEtMoiSansGen_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
classesSuperEtMoiSansGen = Optional.ofNullable(doc.getJsonArray("classesSuperEtMoiSansGen_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
classePromesse = (Boolean)doc.getBoolean("classePromesse_stored_boolean");
classeEtendGen = (Boolean)doc.getBoolean("classeEtendGen_stored_boolean");
classeBaseEtendGen = (Boolean)doc.getBoolean("classeBaseEtendGen_stored_boolean");
Expand Down
Loading

0 comments on commit 55f5539

Please sign in to comment.