Skip to content

Commit

Permalink
Fixed bug with retrieving dates from Solr
Browse files Browse the repository at this point in the history
  • Loading branch information
@computate
computate committed Dec 18, 2023
1 parent ddd74d4 commit 9f7106f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions src/main/java/org/computate/frFR/java/EcrireGenClasse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4421,12 +4421,12 @@ else if(entiteSetUpper)
if(classeContientRequeteSite && entiteNomSimple != null && entiteSolrNomCanonique != null) {
if(entiteNomSimple.equals("Timestamp")) {
tl(1, "public static ", entiteSolrNomSimple, " staticSearch", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(ConfigCles.var_requeteSite), "_, ", entiteNomSimpleComplet, " o) {");
tl(2, "return o == null ? null : Date.from(o.toInstant());");
tl(2, "return o == null ? null : Date.from(o.toInstant()).toString();");
tl(1, "}");
}
else if(entiteNomCanonique.toString().equals(ZonedDateTime.class.getCanonicalName())) {
tl(1, "public static ", entiteSolrNomSimple, " staticSearch", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(ConfigCles.var_requeteSite), "_, ", entiteNomSimpleComplet, " o) {");
tl(2, "return o == null ? null : Date.from(o.toInstant());");
tl(2, "return o == null ? null : Date.from(o.toInstant()).toString();");
tl(1, "}");
}
else if(entiteNomCanonique.toString().equals(LocalTime.class.getCanonicalName())) {
Expand Down Expand Up @@ -4500,23 +4500,23 @@ else if("java.util.Set".equals(entiteNomCanonique) || "java.util.HashSet".equals
if(classeContientRequeteSite && entiteNomSimple != null && entiteSolrNomCanonique != null) {
if(entiteNomSimple.equals("Timestamp")) {
tl(1, "public static String staticSearchStr", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(ConfigCles.var_requeteSite), "_, ", entiteSolrNomSimple, " o) {");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(o.toInstant().atOffset(ZoneOffset.UTC));");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(", entiteNomSimple, ".parse(o, ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER).toInstant().atOffset(ZoneOffset.UTC));");
tl(1, "}");
}
else if(entiteNomCanonique.toString().equals(ZonedDateTime.class.getCanonicalName())) {
tl(1, "public static String staticSearchStr", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(ConfigCles.var_requeteSite), "_, ", entiteSolrNomSimple, " o) {");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(o.toInstant().atOffset(ZoneOffset.UTC));");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(", entiteNomSimple, ".parse(o, ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER).toInstant().atOffset(ZoneOffset.UTC));");
tl(1, "}");
}
else if(entiteNomCanonique.toString().equals(LocalDateTime.class.getCanonicalName())) {
tl(1, "public static String staticSearchStr", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(ConfigCles.var_requeteSite), "_, ", entiteSolrNomSimple, " o) {");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(o.toInstant().atOffset(ZoneOffset.UTC));");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(", entiteNomSimple, ".parse(o, ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER).toInstant().atOffset(ZoneOffset.UTC));");
tl(1, "}");
}
else if(entiteNomSimple.toString().equals("LocalDate")) {
tl(1, "public static String staticSearchStr", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(ConfigCles.var_requeteSite), "_, ", entiteSolrNomSimple, " o) {");
// tl(3, "doc.put(\"", entiteVar, "_suggested", "\", ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(", entiteVar, ".atStartOfDay(ZoneId.of(", langueConfig.getString(ConfigCles.var_requeteSite), "_.get", langueConfig.getString(ConfigCles.var_Config), "().getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(ConfigCles.var_SITE_ZONE), "))).toInstant().atZone(ZoneId.of(\"Z\"))));");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(o.toInstant().atOffset(ZoneOffset.UTC));");
tl(2, "return ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER.format(", entiteNomSimple, ".parse(o, ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER).toInstant().atOffset(ZoneOffset.UTC));");
tl(1, "}");
}
else if(entiteSolrNomCanonique.toString().equals("String")) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/computate/frFR/java/IndexerClasse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3850,7 +3850,7 @@ else if(StringUtils.equalsAny(entiteNomCanonique, VAL_nomCanoniqueLocalTime)) {
entiteSuffixeType = "_string";
}
else if(StringUtils.equalsAny(entiteNomCanonique, VAL_nomCanoniqueTimestamp, VAL_nomCanoniqueLocalDateTime, VAL_nomCanoniqueLocalDate, VAL_nomCanoniqueDate, VAL_nomCanoniqueZonedDateTime)) {
entiteSolrNomCanonique = VAL_nomCanoniqueDate;
entiteSolrNomCanonique = VAL_nomCanoniqueString;
entiteSolrNomSimple = StringUtils.substringAfterLast(entiteSolrNomCanonique, ".");
entiteSuffixeType = "_date";
}
Expand Down Expand Up @@ -3911,13 +3911,13 @@ else if(StringUtils.equalsAny(entiteNomCanonique, VAL_nomCanoniqueList, VAL_nomC
entiteSuffixeType = "_booleans";
}
else if(StringUtils.equalsAny(entiteNomCanoniqueGenerique, VAL_nomCanoniqueLocalTime)) {
entiteSolrNomCanonique = VAL_nomCanoniqueList + "<" + VAL_nomCanoniqueDate + ">";
entiteSolrNomCanonique = VAL_nomCanoniqueList + "<" + VAL_nomCanoniqueString + ">";
entiteSolrNomSimple = "List<" + StringUtils.substringAfterLast(VAL_nomCanoniqueString, ".") + ">";
entiteSuffixeType = "_strings";
}
else if(StringUtils.equalsAny(entiteNomCanoniqueGenerique, VAL_nomCanoniqueTimestamp, VAL_nomCanoniqueLocalDateTime, VAL_nomCanoniqueLocalDate, VAL_nomCanoniqueZonedDateTime)) {
entiteSolrNomCanonique = VAL_nomCanoniqueList + "<" + VAL_nomCanoniqueDate + ">";
entiteSolrNomSimple = "List<" + StringUtils.substringAfterLast(VAL_nomCanoniqueDate, ".") + ">";
entiteSolrNomCanonique = VAL_nomCanoniqueList + "<" + VAL_nomCanoniqueString + ">";
entiteSolrNomSimple = "List<" + StringUtils.substringAfterLast(VAL_nomCanoniqueString, ".") + ">";
entiteSuffixeType = "_dates";
}
else if(StringUtils.equalsAny(entiteNomCanoniqueGenerique, VAL_nomCanoniqueLong)) {
Expand Down

0 comments on commit 9f7106f

Please sign in to comment.