Commit c1f8950

committed

fix #181 support enum as map key

1 parent b476680 commit c1f8950Copy full SHA for c1f8950

File tree

+50

-2

lines changed

+50

-2

lines changed

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,14 @@ private static Decoder createMapKeyDecoder(Type mapKeyType) {`
`22`	`22`	`if (String.class == mapKeyType) {`
`23`	`23`	`return new StringKeyDecoder();`
`24`	`24`	`}`
	`25`	`+ if (mapKeyType instanceof Class && ((Class) mapKeyType).isEnum()) {`
	`26`	`+ return new EnumKeyDecoder((Class) mapKeyType);`
	`27`	`+ }`
`25`	`28`	`Decoder decoder = CodegenImplNative.NATIVE_DECODERS.get(mapKeyType);`
`26`	`29`	`if (decoder != null) {`
`27`	`30`	`return new NumberKeyDecoder(decoder);`
`28`	`31`	`}`
`29`		`- throw new JsonException("can not encode map key type: " + mapKeyType);`
	`32`	`+ throw new JsonException("can not decode map key type: " + mapKeyType);`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`private static class StringKeyDecoder implements Decoder {`
`@@ -37,6 +40,20 @@ public Object decode(JsonIterator iter) throws IOException {`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`
	`43`	`+ private static class EnumKeyDecoder implements Decoder {`
	`44`	`+`
	`45`	`+ private final Class enumClass;`
	`46`	`+`
	`47`	`+ private EnumKeyDecoder(Class enumClass) {`
	`48`	`+ this.enumClass = enumClass;`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ @Override`
	`52`	`+ public Object decode(JsonIterator iter) throws IOException {`
	`53`	`+ return iter.read(enumClass);`
	`54`	`+ }`
	`55`	`+ }`
	`56`	`+`
`40`	`57`	`private static class NumberKeyDecoder implements Decoder {`
`41`	`58`
`42`	`59`	`private final Decoder decoder;`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ private static Encoder createDefaultEncoder(Type mapKeyType) {`
`29`	`29`	`if (mapKeyType instanceof WildcardType) {`
`30`	`30`	`return new DynamicKeyEncoder();`
`31`	`31`	`}`
	`32`	`+ if (mapKeyType instanceof Class && ((Class) mapKeyType).isEnum()) {`
	`33`	`+ return new StringKeyEncoder();`
	`34`	`+ }`
`32`	`35`	`Encoder.ReflectionEncoder encoder = CodegenImplNative.NATIVE_ENCODERS.get(mapKeyType);`
`33`	`36`	`if (encoder != null) {`
`34`	`37`	`return new NumberKeyEncoder(encoder);`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,18 @@ public void test_integer_key() throws IOException {`
`41`	`41`	`}}, map);`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public static enum EnumKey {`
	`45`	`+ KeyA, KeyB`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ public void test_enum_key() {`
	`49`	`+ Map<EnumKey, Object> map = JsonIterator.deserialize("{\"KeyA\":null}", new TypeLiteral<Map<EnumKey, Object>>() {`
	`50`	`+ });`
	`51`	`+ assertEquals(new HashMap<EnumKey, Object>() {{`
	`52`	`+ put(EnumKey.KeyA, null);`
	`53`	`+ }}, map);`
	`54`	`+ }`
	`55`	`+`
`44`	`56`	`public static class TestObject1 {`
`45`	`57`	`public int Field;`
`46`	`58`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.jsoniter.output;`
`2`	`2`
	`3`	`+import com.jsoniter.JsonIterator;`
`3`	`4`	`import com.jsoniter.spi.Config;`
`4`	`5`	`import com.jsoniter.spi.Encoder;`
`5`	`6`	`import com.jsoniter.spi.JsoniterSpi;`
`@@ -65,6 +66,19 @@ public void test_integer_key() throws IOException {`
`65`	`66`	`assertEquals("{\"100\":null}", baos.toString());`
`66`	`67`	`}`
`67`	`68`
	`69`	`+ public static enum EnumKey {`
	`70`	`+ KeyA, KeyB`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ public void test_enum_key() throws IOException {`
	`74`	`+ HashMap<EnumKey, Object> obj = new HashMap<EnumKey, Object>();`
	`75`	`+ obj.put(EnumKey.KeyA, null);`
	`76`	`+ stream.writeVal(new TypeLiteral<Map<EnumKey, Object>>() {`
	`77`	`+ }, obj);`
	`78`	`+ stream.close();`
	`79`	`+ assertEquals("{\"KeyA\":null}", baos.toString());`
	`80`	`+ }`
	`81`	`+`
`68`	`82`	`public static class TestObject1 {`
`69`	`83`	`public int Field;`
`70`	`84`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import com.jsoniter.TestObject;`
`9`	`9`	`import com.jsoniter.TestString;`
`10`	`10`	`import com.jsoniter.any.TestList;`
	`11`	`+import com.jsoniter.any.TestLong;`
`11`	`12`	`import com.jsoniter.output.*;`
`12`	`13`	`import com.jsoniter.output.TestInteger;`
`13`	`14`	`import org.junit.runner.RunWith;`
`@@ -54,6 +55,7 @@`
`54`	`55`	`TestStreamBuffer.class,`
`55`	`56`	`TestCollection.class,`
`56`	`57`	`TestList.class,`
`57`		`- TestAnnotationJsonObject.class})`
	`58`	`+ TestAnnotationJsonObject.class,`
	`59`	`+ TestLong.class})`
`58`	`60`	`public abstract class AllTestCases {`
`59`	`61`	`}`

Comments

(0)