fixed https://code.google.com/p/google-gson/issues/detail?id=509 by adding construction for EnumSet
This commit is contained in:
parent
63142f621c
commit
7d53113ebc
|
@ -16,15 +16,13 @@
|
||||||
|
|
||||||
package com.google.gson.internal;
|
package com.google.gson.internal;
|
||||||
|
|
||||||
import com.google.gson.InstanceCreator;
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.ParameterizedType;
|
import java.lang.reflect.ParameterizedType;
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.EnumSet;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
@ -36,6 +34,10 @@ import java.util.SortedSet;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
import com.google.gson.InstanceCreator;
|
||||||
|
import com.google.gson.JsonIOException;
|
||||||
|
import com.google.gson.reflect.TypeToken;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a function that can construct an instance of a requested type.
|
* Returns a function that can construct an instance of a requested type.
|
||||||
*/
|
*/
|
||||||
|
@ -124,7 +126,7 @@ public final class ConstructorConstructor {
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked") // use runtime checks to guarantee that 'T' is what it is
|
@SuppressWarnings("unchecked") // use runtime checks to guarantee that 'T' is what it is
|
||||||
private <T> ObjectConstructor<T> newDefaultImplementationConstructor(
|
private <T> ObjectConstructor<T> newDefaultImplementationConstructor(
|
||||||
Type type, Class<? super T> rawType) {
|
final Type type, Class<? super T> rawType) {
|
||||||
if (Collection.class.isAssignableFrom(rawType)) {
|
if (Collection.class.isAssignableFrom(rawType)) {
|
||||||
if (SortedSet.class.isAssignableFrom(rawType)) {
|
if (SortedSet.class.isAssignableFrom(rawType)) {
|
||||||
return new ObjectConstructor<T>() {
|
return new ObjectConstructor<T>() {
|
||||||
|
@ -132,6 +134,22 @@ public final class ConstructorConstructor {
|
||||||
return (T) new TreeSet<Object>();
|
return (T) new TreeSet<Object>();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
} else if (EnumSet.class.isAssignableFrom(rawType)) {
|
||||||
|
return new ObjectConstructor<T>() {
|
||||||
|
@SuppressWarnings("rawtypes")
|
||||||
|
public T construct() {
|
||||||
|
if (type instanceof ParameterizedType) {
|
||||||
|
Type elementType = ((ParameterizedType) type).getActualTypeArguments()[0];
|
||||||
|
if (elementType instanceof Class) {
|
||||||
|
return (T) EnumSet.noneOf((Class)elementType);
|
||||||
|
} else {
|
||||||
|
throw new JsonIOException("Invalid EnumSet type: " + type.toString());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new JsonIOException("Invalid EnumSet type: " + type.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
} else if (Set.class.isAssignableFrom(rawType)) {
|
} else if (Set.class.isAssignableFrom(rawType)) {
|
||||||
return new ObjectConstructor<T>() {
|
return new ObjectConstructor<T>() {
|
||||||
public T construct() {
|
public T construct() {
|
||||||
|
|
|
@ -16,6 +16,14 @@
|
||||||
|
|
||||||
package com.google.gson.functional;
|
package com.google.gson.functional;
|
||||||
|
|
||||||
|
import java.lang.reflect.Type;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.EnumSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
import com.google.gson.JsonDeserializationContext;
|
import com.google.gson.JsonDeserializationContext;
|
||||||
|
@ -28,12 +36,6 @@ import com.google.gson.JsonSerializer;
|
||||||
import com.google.gson.annotations.SerializedName;
|
import com.google.gson.annotations.SerializedName;
|
||||||
import com.google.gson.common.MoreAsserts;
|
import com.google.gson.common.MoreAsserts;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import java.lang.reflect.Type;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.EnumSet;
|
|
||||||
import java.util.Set;
|
|
||||||
import junit.framework.TestCase;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Functional tests for Java 5.0 enums.
|
* Functional tests for Java 5.0 enums.
|
||||||
|
@ -147,6 +149,17 @@ public class EnumTest extends TestCase {
|
||||||
assertEquals(Gender.MALE, gson.fromJson("\"boy\"", Gender.class));
|
assertEquals(Gender.MALE, gson.fromJson("\"boy\"", Gender.class));
|
||||||
assertEquals("\"boy\"", gson.toJson(Gender.MALE, Gender.class));
|
assertEquals("\"boy\"", gson.toJson(Gender.MALE, Gender.class));
|
||||||
}
|
}
|
||||||
|
enum Color { red, blue, green, yellow, thistle }
|
||||||
|
|
||||||
|
public void testEnumSet() {
|
||||||
|
EnumSet<Roshambo> foo = EnumSet.of(Roshambo.ROCK, Roshambo.PAPER);
|
||||||
|
String json = gson.toJson(foo);
|
||||||
|
Type type = new TypeToken<EnumSet<Roshambo>>() {}.getType();
|
||||||
|
EnumSet<Roshambo> bar = gson.fromJson(json, type);
|
||||||
|
assertTrue(bar.contains(Roshambo.ROCK));
|
||||||
|
assertTrue(bar.contains(Roshambo.PAPER));
|
||||||
|
assertFalse(bar.contains(Roshambo.SCISSORS));
|
||||||
|
}
|
||||||
|
|
||||||
public enum Roshambo {
|
public enum Roshambo {
|
||||||
ROCK {
|
ROCK {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user