Fixes #272 EnumSet deserialization

Signed-off-by: David Kral <david.k.kral@oracle.com>
eclipse-ee4j · Jul 29, 2019 · c26c86c · c26c86c
1 parent b6947aa
commit c26c86c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/org/eclipse/yasson/internal/serializer/CollectionDeserializer.java b/src/main/java/org/eclipse/yasson/internal/serializer/CollectionDeserializer.java
@@ -56,6 +56,8 @@ private T createInstance(DeserializerBuilder builder) {
         if (rawType.isInterface()) {
             final T x = createInterfaceInstance(rawType);
             if (x != null) return x;
+        } else if (EnumSet.class.isAssignableFrom(rawType)) {
+            return (T) EnumSet.noneOf((Class<Enum>) collectionValueType);
         }
         return builder.getJsonbContext().getInstanceCreator().createInstance(rawType);
     }

diff --git a/src/test/java/org/eclipse/yasson/defaultmapping/collections/CollectionsTest.java b/src/test/java/org/eclipse/yasson/defaultmapping/collections/CollectionsTest.java
@@ -213,6 +213,7 @@ public void testMarshallEnumSet() {
 
         final String result = jsonb.toJson(languageEnumSet);
         assertTrue("[\"Czech\",\"Slovak\"]".equals(result) || "[\"Slovak\",\"Czech\"]".equals(result));
+        assertEquals(languageEnumSet, jsonb.fromJson(result, new TestTypeToken<EnumSet<Language>>() {}.getType()));
     }
 
     @Test