Implement deserialization for triple classes [Adds #85]

Author: yawkat

eclipse-collections/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections</artifactId>
-            <version>9.1.0</version>
+            <version>10.4.0</version>
         </dependency>
     </dependencies>
 

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/EclipseCollectionsModule.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.datatype.eclipsecollections.deser.pair.PairInstantiators;
+import com.fasterxml.jackson.datatype.eclipsecollections.deser.pair.TripleInstantiators;
 
 /**
  * Basic Jackson {@link Module} that adds support for eclipse-collections types.
@@ -30,6 +31,11 @@ public void setupModule(SetupContext context) {
         context.addSerializers(new EclipseCollectionsSerializers());
 
         context.addValueInstantiators(new PairInstantiators());
+        try {
+            context.addValueInstantiators(new TripleInstantiators());
+        } catch (NoClassDefFoundError ignored) {
+            // triples were added in EC 10
+        }
 
         context.addTypeModifier(new EclipseCollectionsTypeModifier());
     }

eclipse-collections/src/main/java/com/fasterxml/jackson/datatype/eclipsecollections/deser/pair/TripleInstantiators.java

@@ -0,0 +1,97 @@
+package com.fasterxml.jackson.datatype.eclipsecollections.deser.pair;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.deser.CreatorProperty;
+import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
+import com.fasterxml.jackson.databind.deser.ValueInstantiator;
+import com.fasterxml.jackson.databind.deser.ValueInstantiators;
+import com.fasterxml.jackson.databind.introspect.AnnotationCollector;
+import org.eclipse.collections.api.tuple.Triple;
+import org.eclipse.collections.api.tuple.Triplet;
+import org.eclipse.collections.impl.tuple.Tuples;
+
+public class TripleInstantiators extends ValueInstantiators.Base {
+    {
+        // fail early if class does not exist
+        Triple.class.getName();
+    }
+
+    @Override
+    public ValueInstantiator findValueInstantiator(
+            DeserializationConfig config,
+            BeanDescription beanDesc,
+            ValueInstantiator defaultInstantiator
+    ) {
+        if (beanDesc.getBeanClass() == Triple.class) {
+            JavaType beanType = beanDesc.getType();
+            return new TripleInstantiator(
+                    beanType,
+                    beanType.containedType(0),
+                    beanType.containedType(1),
+                    beanType.containedType(2));
+        }
+        if (beanDesc.getBeanClass() == Triplet.class) {
+            JavaType beanType = beanDesc.getType();
+            JavaType singleType = beanType.containedType(0);
+            return new TripleInstantiator(beanType, singleType, singleType, singleType);
+        }
+        return super.findValueInstantiator(config, beanDesc, defaultInstantiator);
+    }
+
+    private static class TripleInstantiator extends ValueInstantiator.Base {
+        private final JavaType oneType;
+        private final JavaType twoType;
+        private final JavaType threeType;
+
+        private TripleInstantiator(JavaType beanType, JavaType oneType, JavaType twoType, JavaType threeType) {
+            super(beanType);
+            this.oneType = oneType;
+            this.twoType = twoType;
+            this.threeType = threeType;
+        }
+
+        @Override
+        public boolean canCreateFromObjectWith() {
+            return true;
+        }
+
+        @Override
+        public SettableBeanProperty[] getFromObjectArguments(DeserializationConfig config) {
+            try {
+                return new SettableBeanProperty[]{
+                        CreatorProperty.construct(
+                                PropertyName.construct("one"),
+                                oneType,
+                                null,
+                                config.findTypeDeserializer(oneType),
+                                AnnotationCollector.emptyAnnotations(),
+                                null, 0, null, PropertyMetadata.STD_REQUIRED
+                        ),
+                        CreatorProperty.construct(
+                                PropertyName.construct("two"),
+                                twoType,
+                                null,
+                                config.findTypeDeserializer(twoType),
+                                AnnotationCollector.emptyAnnotations(),
+                                null, 1, null, PropertyMetadata.STD_REQUIRED
+                        ),
+                        CreatorProperty.construct(
+                                PropertyName.construct("three"),
+                                threeType,
+                                null,
+                                config.findTypeDeserializer(threeType),
+                                AnnotationCollector.emptyAnnotations(),
+                                null, 2, null, PropertyMetadata.STD_REQUIRED
+                        )
+                };
+            } catch (JsonMappingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public Object createFromObjectWith(DeserializationContext ctxt, Object[] args) {
+            return Tuples.triple(args[0], args[1], args[2]);
+        }
+    }
+}

eclipse-collections/src/test/java/com/fasterxml/jackson/datatype/eclipsecollections/DeserializerTest.java

@@ -131,6 +131,8 @@
 import org.eclipse.collections.api.set.primitive.MutableShortSet;
 import org.eclipse.collections.api.set.primitive.ShortSet;
 import org.eclipse.collections.api.tuple.Pair;
+import org.eclipse.collections.api.tuple.Triple;
+import org.eclipse.collections.api.tuple.Triplet;
 import org.eclipse.collections.api.tuple.Twin;
 import org.eclipse.collections.api.tuple.primitive.ObjectIntPair;
 import org.eclipse.collections.impl.factory.Bags;
@@ -694,4 +696,32 @@ public void nestedMap() throws Exception {
         Assert.assertEquals(json, mapperWithModule().writerFor(type).writeValueAsString(pair));
         Assert.assertEquals(pair, mapperWithModule().readValue(json, type));
     }
+
+    @Test
+    public void triple() throws Exception {
+        final ObjectMapper mapper = mapperWithModule();
+        Triple<String, Integer, Boolean> triple = Tuples.triple("a", 2, false);
+        String actJson = mapper.writerFor(new TypeReference<Triple<String, Integer, Boolean>>() {})
+                .writeValueAsString(triple);
+        String expJson = "{\"one\":\"a\",\"two\":2,\"three\":false}";
+        Assert.assertEquals(mapper.readTree(expJson), mapper.readTree(actJson));
+        Assert.assertEquals(
+                triple,
+                mapper.readValue(actJson, new TypeReference<Triple<String, Integer, Boolean>>() {})
+        );
+    }
+
+    @Test
+    public void triplet() throws Exception {
+        final ObjectMapper mapper = mapperWithModule();
+        Triplet<String> triple = Tuples.triplet("a", "b", "c");
+        String actJson = mapper.writerFor(new TypeReference<Triplet<String>>() {})
+                .writeValueAsString(triple);
+        String expJson = "{\"one\":\"a\",\"two\":\"b\",\"three\":\"c\"}";
+        Assert.assertEquals(mapper.readTree(expJson), mapper.readTree(actJson));
+        Assert.assertEquals(
+                triple,
+                mapper.readValue(actJson, new TypeReference<Triplet<String>>() {})
+        );
+    }
 }