Skip to content

Commit 830cf94

Browse files
committed
ECWID-140180 - allow to overwrite Iso8601InstantTypeAdapter
1 parent 193f60b commit 830cf94

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

gson/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.code.gson</groupId>
66
<artifactId>gson-parent</artifactId>
7-
<version>2.9.1-ecwid-4</version>
7+
<version>2.9.1-ecwid-5</version>
88
</parent>
99

1010
<artifactId>gson</artifactId>

gson/src/main/java/com/google/gson/Gson.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,13 @@ public Gson() {
281281
factories.add(excluder);
282282

283283
// users' type adapters
284+
factories.addAll(factoriesToBeAdded);
285+
284286
factories.addAll(GLOBAL_ADAPTER_FACTORIES);
285287
for (Map.Entry<Type, TypeAdapter<?>> adapterEntry : GLOBAL_TYPE_ADAPTERS.entrySet()) {
286288
// copy paste from com.google.gson.GsonBuilder.registerTypeAdapter
287289
factories.add(TypeAdapters.newFactory(TypeToken.get(adapterEntry.getKey()), (TypeAdapter) adapterEntry.getValue()));
288290
}
289-
factories.addAll(factoriesToBeAdded);
290291

291292
// type adapters for basic platform types
292293
factories.add(TypeAdapters.STRING_FACTORY);

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>com.google.code.gson</groupId>
1313
<artifactId>gson-parent</artifactId>
14-
<version>2.9.1-ecwid-4</version>
14+
<version>2.9.1-ecwid-5</version>
1515
<packaging>pom</packaging>
1616

1717
<name>Gson Parent</name>

0 commit comments

Comments
 (0)