Merge remote-tracking branch 'origin/master' into 3.1.x

This commit is contained in:
Jeremie Bresson
2018-06-14 13:29:52 +02:00
380 changed files with 9379 additions and 6276 deletions

View File

@@ -64,7 +64,8 @@ public class JSON {
}
})
;
return fireBuilder.createGsonBuilder();
GsonBuilder builder = fireBuilder.createGsonBuilder();
return builder;
}
private static String getDiscriminatorValue(JsonElement readElement, String discriminatorField) {