Merge pull request #5 from ruslansennov/iss4

interfaces binding -- fixes #4

Author: ruslansennov

.gitignore

@@ -1,4 +1,5 @@
 build
+out
 .gradle
 .idea
 *.iml

src/main/java/io/vavr/gson/VavrGson.java

@@ -60,6 +60,8 @@ public static GsonBuilder registerOption(GsonBuilder builder) {
      */
     public static GsonBuilder registerAllMultimaps(GsonBuilder builder) {
         checkBuilder(builder);
+        registerMultimap(builder);
+        registerSortedMultimap(builder);
         registerHashMultimap(builder);
         registerLinkedHashMultimap(builder);
         registerTreeMultimap(builder);
@@ -75,6 +77,24 @@ public static GsonBuilder registerHashMultimap(GsonBuilder builder) {
         return checkBuilder(builder).registerTypeAdapter(HashMultimap.class, new MultimapConverter<>(t -> HashMultimap.withSeq().ofEntries(t)));
     }
 
+    /**
+     * Registers the {@link Multimap} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerMultimap(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(Multimap.class, new MultimapConverter<>(t -> HashMultimap.withSeq().ofEntries(t)));
+    }
+
+    /**
+     * Registers the {@link SortedMultimap} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerSortedMultimap(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(SortedMultimap.class, new MultimapConverter<>(t -> TreeMultimap.withSeq().ofEntries(t)));
+    }
+
     /**
      * Registers the {@link LinkedHashMultimap} converter.
      * @param builder The GSON builder to register the converters with.
@@ -100,6 +120,8 @@ public static GsonBuilder registerTreeMultimap(GsonBuilder builder) {
      */
     public static GsonBuilder registerAllMaps(GsonBuilder builder) {
         checkBuilder(builder);
+        registerMap(builder);
+        registerSortedMap(builder);
         registerHashMap(builder);
         registerLinkedHashMap(builder);
         registerTreeMap(builder);
@@ -115,6 +137,24 @@ public static GsonBuilder registerHashMap(GsonBuilder builder) {
         return checkBuilder(builder).registerTypeAdapter(HashMap.class, new MapConverter<>(HashMap::ofEntries));
     }
 
+    /**
+     * Registers the {@link Map} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerMap(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(Map.class, new MapConverter<>(HashMap::ofEntries));
+    }
+
+    /**
+     * Registers the {@link SortedMap} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerSortedMap(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(SortedMap.class, new MapConverter<>(TreeMap::ofEntries));
+    }
+
     /**
      * Registers the {@link LinkedHashMap} converter.
      * @param builder The GSON builder to register the converters with.
@@ -150,10 +190,15 @@ public static GsonBuilder registerTuples(GsonBuilder builder) {
     public static GsonBuilder registerAllCollections(GsonBuilder builder)  {
         checkBuilder(builder);
         registerArray(builder);
+        registerSeq(builder);
+        registerIndexedSeq(builder);
+        registerLinearSeq(builder);
         registerList(builder);
         registerQueue(builder);
         registerStream(builder);
         registerVector(builder);
+        registerSet(builder);
+        registerSortedSet(builder);
         registerHashSet(builder);
         registerLinkedHashSet(builder);
         registerTreeSet(builder);
@@ -180,6 +225,25 @@ public static GsonBuilder registerHashSet(GsonBuilder builder) {
         return checkBuilder(builder).registerTypeAdapter(HashSet.class, new TraversableConverter<>(HashSet::ofAll));
     }
 
+    /**
+     * Registers the {@link Set} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerSet(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(Set.class, new TraversableConverter<>(HashSet::ofAll));
+    }
+
+    /**
+     * Registers the {@link SortedSet} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    @SuppressWarnings("unchecked")
+    public static GsonBuilder registerSortedSet(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(SortedSet.class, new TraversableConverter<>(it -> TreeSet.ofAll((o1, o2) -> ((Comparable) o1).compareTo(o2), it)));
+    }
+
     /**
      * Registers the {@link LinkedHashSet} converter.
      * @param builder The GSON builder to register the converters with.
@@ -208,6 +272,33 @@ public static GsonBuilder registerArray(GsonBuilder builder) {
         return checkBuilder(builder).registerTypeAdapter(Array.class, new TraversableConverter<>(Array::ofAll));
     }
 
+    /**
+     * Registers the {@link Seq} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerSeq(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(Seq.class, new TraversableConverter<>(List::ofAll));
+    }
+
+    /**
+     * Registers the {@link IndexedSeq} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerIndexedSeq(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(IndexedSeq.class, new TraversableConverter<>(Vector::ofAll));
+    }
+
+    /**
+     * Registers the {@link LinearSeq} converter.
+     * @param builder The GSON builder to register the converters with.
+     * @return A reference to {@code builder}.
+     */
+    public static GsonBuilder registerLinearSeq(GsonBuilder builder) {
+        return checkBuilder(builder).registerTypeAdapter(LinearSeq.class, new TraversableConverter<>(List::ofAll));
+    }
+
     /**
      * Registers the {@link List} converter.
      * @param builder The GSON builder to register the converters with.

src/test/java/io/vavr/gson/collection/IndexedSeqTest.java

@@ -0,0 +1,31 @@
+package io.vavr.gson.collection;
+
+import com.google.gson.reflect.TypeToken;
+import io.vavr.collection.IndexedSeq;
+import io.vavr.collection.Vector;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class IndexedSeqTest extends CollectionTest<IndexedSeq<?>> {
+
+    @Override
+    IndexedSeq<?> of(Object... arr) {
+        return Vector.ofAll(Arrays.asList(arr));
+    }
+
+    @Override
+    Class<?> clz() {
+        return IndexedSeq.class;
+    }
+
+    @Override
+    Type type() {
+        return new TypeToken<IndexedSeq<Integer>>(){}.getType();
+    }
+
+    @Override
+    Type typeWithNestedType() {
+        return new TypeToken<IndexedSeq<IndexedSeq<Integer>>>(){}.getType();
+    }
+}

src/test/java/io/vavr/gson/collection/LinearSeqTest.java

@@ -0,0 +1,31 @@
+package io.vavr.gson.collection;
+
+import com.google.gson.reflect.TypeToken;
+import io.vavr.collection.LinearSeq;
+import io.vavr.collection.List;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class LinearSeqTest extends CollectionTest<LinearSeq<?>> {
+
+    @Override
+    LinearSeq<?> of(Object... arr) {
+        return List.ofAll(Arrays.asList(arr));
+    }
+
+    @Override
+    Class<?> clz() {
+        return LinearSeq.class;
+    }
+
+    @Override
+    Type type() {
+        return new TypeToken<LinearSeq<Integer>>(){}.getType();
+    }
+
+    @Override
+    Type typeWithNestedType() {
+        return new TypeToken<LinearSeq<LinearSeq<Integer>>>(){}.getType();
+    }
+}

src/test/java/io/vavr/gson/collection/SeqTest.java

@@ -0,0 +1,31 @@
+package io.vavr.gson.collection;
+
+import com.google.gson.reflect.TypeToken;
+import io.vavr.collection.List;
+import io.vavr.collection.Seq;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class SeqTest extends CollectionTest<Seq<?>> {
+
+    @Override
+    Seq<?> of(Object... arr) {
+        return List.ofAll(Arrays.asList(arr));
+    }
+
+    @Override
+    Class<?> clz() {
+        return Seq.class;
+    }
+
+    @Override
+    Type type() {
+        return new TypeToken<Seq<Integer>>(){}.getType();
+    }
+
+    @Override
+    Type typeWithNestedType() {
+        return new TypeToken<Seq<Seq<Integer>>>(){}.getType();
+    }
+}

src/test/java/io/vavr/gson/collection/SetTest.java

@@ -0,0 +1,31 @@
+package io.vavr.gson.collection;
+
+import com.google.gson.reflect.TypeToken;
+import io.vavr.collection.HashSet;
+import io.vavr.collection.Set;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class SetTest extends CollectionTest<Set<?>> {
+
+    @Override
+    Set<?> of(Object... arr) {
+        return HashSet.ofAll(Arrays.asList(arr));
+    }
+
+    @Override
+    Class<?> clz() {
+        return Set.class;
+    }
+
+    @Override
+    Type type() {
+        return new TypeToken<Set<Integer>>(){}.getType();
+    }
+
+    @Override
+    Type typeWithNestedType() {
+        return new TypeToken<Set<Set<Integer>>>(){}.getType();
+    }
+}

src/test/java/io/vavr/gson/collection/SortedSetTest.java

@@ -0,0 +1,45 @@
+package io.vavr.gson.collection;
+
+import com.google.gson.reflect.TypeToken;
+import io.vavr.collection.SortedSet;
+import io.vavr.collection.TreeSet;
+import org.junit.Test;
+
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+public class SortedSetTest extends CollectionTest<SortedSet<?>> {
+
+    @Override
+    @SuppressWarnings("unchecked")
+    SortedSet<?> of(Object... arr) {
+        return TreeSet.ofAll((o1, o2) -> ((Comparable) o1).compareTo(o2), Arrays.asList(arr));
+    }
+
+    @Override
+    Class<?> clz() {
+        return SortedSet.class;
+    }
+
+    @Override
+    Type type() {
+        return new TypeToken<SortedSet<Integer>>(){}.getType();
+    }
+
+    @Override
+    Type typeWithNestedType() {
+        return new TypeToken<SortedSet<SortedSet<Integer>>>(){}.getType();
+    }
+
+    @Test
+    @Override
+    public void deserializeSimpleType() {
+        // ignore
+    }
+
+    @Test
+    @Override
+    public void deserializeNested() {
+        // ignore
+    }
+}

src/test/java/io/vavr/gson/map/HashMapTest.java

@@ -5,7 +5,7 @@
 
 import java.lang.reflect.Type;
 
-public class HashMapTest extends MapTest<HashMap<?,?>> {
+public class HashMapTest extends MapLikeTest<HashMap<?,?>> {
     @Override
     HashMap<?, ?> of(Object key, Object value) {
         return HashMap.of(key, value);

src/test/java/io/vavr/gson/map/LinkedHashMapTest.java

@@ -5,7 +5,7 @@
 
 import java.lang.reflect.Type;
 
-public class LinkedHashMapTest extends MapTest<LinkedHashMap<?,?>> {
+public class LinkedHashMapTest extends MapLikeTest<LinkedHashMap<?,?>> {
     @Override
     LinkedHashMap<?, ?> of(Object key, Object value) {
         return LinkedHashMap.of(key, value);

src/test/java/io/vavr/gson/map/MapLikeTest.java

@@ -0,0 +1,57 @@
+package io.vavr.gson.map;
+
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import io.vavr.collection.Map;
+import io.vavr.gson.AbstractTest;
+import org.junit.Test;
+
+import java.lang.reflect.Type;
+
+public abstract class MapLikeTest<T extends Map<?,?>> extends AbstractTest {
+
+    abstract T of(Object key, Object value);
+    abstract Class<?> clz();
+    abstract Type type();
+    abstract Type typeWithNestedType();
+
+    @Test(expected = JsonParseException.class)
+    public void badJson() {
+        gson.fromJson("1", type());
+    }
+
+    @Test
+    public void serialize() {
+        assert gson.toJson(of(1, 2)).equals("{\"1\":2}");
+    }
+
+    @Test
+    public void deserializeSimpleType() {
+        Object obj = gson.fromJson("{\"1\":2}", clz());
+        assert clz().isAssignableFrom(obj.getClass());
+        Map<?, ?> map = (Map<?, ?>) obj;
+        assert map.head()._2 instanceof JsonPrimitive;
+        assert ((JsonPrimitive) map.head()._2).getAsInt() == 2;
+    }
+
+    @Test
+    public void deserialize() {
+        Map<String, Integer> map = gson.fromJson("{\"1\":2}", type());
+        assert clz().isAssignableFrom(map.getClass());
+        assert map.get("1").get() == 2;
+    }
+
+    @Test
+    public void deserializeWithCast() {
+        Map<String, Integer> map = gson.fromJson("{\"1\":\"2\"}", type());
+        assert clz().isAssignableFrom(map.getClass());
+        assert map.get("1").get() == 2;
+    }
+
+    @Test
+    public void deserializeNested() {
+        Map<String, Map<String, Integer>> map = gson.fromJson("{\"1\":{\"2\":3}}", typeWithNestedType());
+        assert clz().isAssignableFrom(map.get("1").get().getClass());
+        assert map.get("1").get().get("2").get() == 3;
+    }
+}