Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing some unnecessary code.

Browse Source
This commit is contained in:
Joel Leitch 2009-01-20 01:00:59 +00:00
parent d34fb916cb
commit 2cec661ff0
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gson/src/main/java/com/google/gson/DefaultTypeAdapters.java
View File

@ -16,8 +16,6 @@
package com.google.gson;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.math.BigDecimal;
@ -165,7 +163,6 @@ final class DefaultTypeAdapters {
private static ParameterizedTypeHandlerMap<InstanceCreator<?>> createDefaultInstanceCreators() {
ParameterizedTypeHandlerMap<InstanceCreator<?>> map =
new ParameterizedTypeHandlerMap<InstanceCreator<?>>();
map.register(Enum.class, ENUM_TYPE_ADAPTER);
map.register(Map.class, MAP_TYPE_ADAPTER);
// Add Collection type instance creators
@ -271,8 +268,8 @@ final class DefaultTypeAdapters {
}
@SuppressWarnings("unchecked")
private static class EnumTypeAdapter<T extends Enum<T>> implements JsonSerializer<T>,
JsonDeserializer<T>, InstanceCreator<Enum<?>> {
private static class EnumTypeAdapter<T extends Enum<T>>
implements JsonSerializer<T>, JsonDeserializer<T> {
public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) {
return new JsonPrimitive(src.name());
}
@ -283,21 +280,6 @@ final class DefaultTypeAdapters {
return (T) Enum.valueOf((Class<T>) classOfT, json.getAsString());
}
public Enum<?> createInstance(Type type) {
Class<Enum<?>> enumClass = (Class<Enum<?>>) type;
try {
Method valuesMethod = enumClass.getMethod("values");
Enum<?>[] enums = (Enum<?>[]) valuesMethod.invoke(null);
return enums[0];
} catch (NoSuchMethodException e) {
throw new RuntimeException(e);
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
throw new RuntimeException(e);
}
}
@Override
public String toString() {
return EnumTypeAdapter.class.getSimpleName();

6
gson/src/main/java/com/google/gson/MappedObjectConstructor.java
View File

@ -46,12 +46,6 @@ final class MappedObjectConstructor implements ObjectConstructor {
InstanceCreator<T> creator = (InstanceCreator<T>) instanceCreatorMap.getHandlerFor(typeOfT);
return creator.createInstance(typeOfT);
}
TypeInfo typeInfo = new TypeInfo(typeOfT);
if (typeInfo.isEnum()) {
InstanceCreator<T> creator =
(InstanceCreator<T>) instanceCreatorMap.getHandlerFor(Enum.class);
return creator.createInstance(typeOfT);
}
return (T) constructWithNoArgConstructor(typeOfT);
}