From 467011c7ab2de2341ee4b11d00f515d1f1ddb36f Mon Sep 17 00:00:00 2001 From: Inderjeet Singh Date: Tue, 20 Sep 2011 00:27:33 +0000 Subject: [PATCH] Allowed users to override default type adapters for various classes. --- gson/src/main/java/com/google/gson/Gson.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java index e3b9a9b4..f86c44bb 100644 --- a/gson/src/main/java/com/google/gson/Gson.java +++ b/gson/src/main/java/com/google/gson/Gson.java @@ -241,13 +241,6 @@ public final class Gson { .factory(TypeAdapters.STRING_FACTORY) .factory(TypeAdapters.STRING_BUILDER_FACTORY) .factory(TypeAdapters.STRING_BUFFER_FACTORY) - .factory(TypeAdapters.URL_FACTORY) - .factory(TypeAdapters.URI_FACTORY) - .factory(TypeAdapters.UUID_FACTORY) - .factory(TypeAdapters.LOCALE_FACTORY) - .factory(TypeAdapters.INET_ADDRESS_FACTORY) - .factory(TypeAdapters.BIT_SET_FACTORY) - .factory(TypeAdapters.CALENDAR_FACTORY) .typeAdapter(BigDecimal.class, new BigDecimalTypeAdapter()) .typeAdapter(BigInteger.class, new BigIntegerTypeAdapter()) .factory(new CollectionTypeAdapterFactory(constructorConstructor)) @@ -255,6 +248,13 @@ public final class Gson { .factory(new GsonToMiniGsonTypeAdapterFactory(serializers, deserializers, new JsonDeserializationContext(this), new JsonSerializationContext(this), serializeNulls )) + .factory(TypeAdapters.URL_FACTORY) + .factory(TypeAdapters.URI_FACTORY) + .factory(TypeAdapters.UUID_FACTORY) + .factory(TypeAdapters.LOCALE_FACTORY) + .factory(TypeAdapters.INET_ADDRESS_FACTORY) + .factory(TypeAdapters.BIT_SET_FACTORY) + .factory(TypeAdapters.CALENDAR_FACTORY) .factory(TypeAdapters.SQL_DATE_FACTORY) .factory(new MapTypeAdapterFactory(constructorConstructor, complexMapKeySerialization)) .factory(ArrayTypeAdapter.FACTORY)