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

Added the ability to deserialize a Map "key" object from a String into a complex Java type.

Browse Source
This commit is contained in:
Joel Leitch 2009-01-06 07:09:19 +00:00
parent 970446e997
commit 02decace26
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,11 +485,12 @@ final class DefaultTypeAdapters {
throws JsonParseException { throws JsonParseException {
// Use ObjectConstructor to create instance instead of hard-coding a specific type. // Use ObjectConstructor to create instance instead of hard-coding a specific type.
// This handles cases where users are using their own subclass of Map. // This handles cases where users are using their own subclass of Map.
Map<String, Object> map = constructMapType(typeOfT, context); Map<Object, Object> map = constructMapType(typeOfT, context);
Type childType = new TypeInfoMap(typeOfT).getValueType(); TypeInfoMap mapTypeInfo = new TypeInfoMap(typeOfT);
for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) { for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
Object value = context.deserialize(entry.getValue(), childType); Object key = context.deserialize(new JsonPrimitive(entry.getKey()), mapTypeInfo.getKeyType());
map.put(entry.getKey(), value); Object value = context.deserialize(entry.getValue(), mapTypeInfo.getValueType());
map.put(key, value);
} }
return map; return map;
} }

18
gson/src/test/java/com/google/gson/functional/MapTest.java
View File

@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.gson.functional; package com.google.gson.functional;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@ -125,6 +126,23 @@ public class MapTest extends TestCase {
assertEquals(1, map.size()); assertEquals(1, map.size());
assertNull(map.get(null)); assertNull(map.get(null));
} }
public void testMapSerializationWithIntegerKeys() {
Map<Integer, String> map = new LinkedHashMap<Integer, String>();
map.put(123, "456");
Type typeOfMap = new TypeToken<Map<Integer, String>>() {}.getType();
String json = gson.toJson(map, typeOfMap);
assertEquals("{\"123\":\"456\"}", json);
}
public void testMapDeserializationWithIntegerKeys() {
Type typeOfMap = new TypeToken<Map<Integer, String>>() {}.getType();
Map<Integer, String> map = gson.fromJson("{\"123\":\"456\"}", typeOfMap);
assertEquals(1, map.size());
assertTrue(map.containsKey(123));
assertEquals("456", map.get(123));
}
public void testParameterizedMapSubclassSerialization() { public void testParameterizedMapSubclassSerialization() {
MyParameterizedMap<String, String> map = new MyParameterizedMap<String, String>(); MyParameterizedMap<String, String> map = new MyParameterizedMap<String, String>();