Fixed a bug with JsonArray serialization with solr

Author: computate

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

@@ -2873,7 +2873,7 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
 								tl(11, "JsonArray bodyVals = (JsonArray)bodyVal;");
 								tl(11, "Object valsObj = o.", i18nGlobale.getString(I18n.var_obtenir), i18nGlobale.getString(I18n.var_PourClasse), "(f);");
 								tl(11, "Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;");
-								tl(11, "if(bodyVals.size() == vals.size()) {");
+								tl(11, "if(vals != null && bodyVals.size() == vals.size()) {");
 								tl(12, "Boolean match = true;");
 								tl(12, "for(Object val : vals) {");
 								tl(13, "if(val != null) {");
@@ -2889,7 +2889,8 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
 								tl(12, "vals.clear();");
 								tl(12, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
 								tl(11, "} else {");
-								tl(12, "vals.clear();");
+								tl(12, "if(vals != null)");
+								tl(13, "vals.clear();");
 								tl(12, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
 								tl(11, "}");
 								tl(10, "} else {");
@@ -2967,7 +2968,7 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
 								tl(9, "JsonArray bodyVals = (JsonArray)bodyVal;");
 								tl(9, "Object valsObj = o.", i18nGlobale.getString(I18n.var_obtenir), i18nGlobale.getString(I18n.var_PourClasse), "(f);");
 								tl(9, "Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;");
-								tl(9, "if(bodyVals.size() == vals.size()) {");
+								tl(9, "if(vals != null && bodyVals.size() == vals.size()) {");
 								tl(10, "Boolean match = true;");
 								tl(10, "for(Object val : vals) {");
 								tl(11, "if(val != null) {");
@@ -2985,7 +2986,8 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
 								tl(10, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
 //								tl(10, "}");
 								tl(9, "} else {");
-								tl(10, "vals.clear();");
+								tl(10, "if(vals != null)");
+								tl(11, "vals.clear();");
 								tl(10, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
 								tl(9, "}");
 								tl(8, "} else {");

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

@@ -5119,10 +5119,10 @@ else if(entiteNomSimple.toString().equals("Polygon")) {
 						tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", new JsonObject().put(\"type\", \"LineString\").put(\"coordinates\", pointsArray).toString());");
 					}
 					else if(entiteNomSimple.toString().equals("JsonObject")) {
-						tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".toString());");
+						tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".encode());");
 					}
 					else if(entiteNomSimple.toString().equals("JsonArray")) {
-						tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".toString());");
+						tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".encode());");
 					}
 					else if(entiteNomSimple.toString().equals("BigDecimal")) {
 						tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".doubleValue());");