Updated c.n.j.JSONCoercibleType to support java.time.temporal.Tempora…

…l and java.time.temporal.TemporalAmount types if the underlying ObjectMapper has supporting modules.

Also now leverages ObjectMapper#treeToValue.

CHANGES.txt

@@ -2,6 +2,9 @@ Cascading Change Log
 
 4.1 [unreleased]
 
+  Updated c.n.j.JSONCoercibleType to support java.time.temporal.Temporal and java.time.temporal.TemporalAmount types
+  if the underlying ObjectMapper has supporting modules. Also now leverages ObjectMapper#treeToValue.
+
   Added c.t.t.CoercionFrom and c.t.t.ToCanonical interfaces to support faster type coercions.
 
   Added local mode support for Apache Kafka, Neo4j, Splunk, and AWS S3 by merging with the cascading-local project.

cascading-nested-json/src/main/java/cascading/nested/json/JSONCoercibleType.java

@@ -22,6 +22,8 @@
 
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAmount;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -215,10 +217,16 @@ public <T> CoercionFrom<JsonNode, T> to( Type to )
       return node -> ifNull( node, n -> n.getNodeType() == JsonNodeType.BOOLEAN ? (T) Boolean.valueOf( n.booleanValue() ) : Coercions.coerce( textOrWrite( n ), to ) );
 
     if( Map.class.isAssignableFrom( actualTo ) )
-      return node -> ifNull( node, n -> (T) convert( n, actualTo ) );
+      return node -> ifNull( node, n -> (T) convertTree( n, actualTo ) );
 
     if( List.class.isAssignableFrom( actualTo ) )
-      return node -> ifNull( node, n -> (T) convert( n, actualTo ) );
+      return node -> ifNull( node, n -> (T) convertTree( n, actualTo ) );
+
+    if( Temporal.class.isAssignableFrom( actualTo ) )
+      return node -> ifNull( node, n -> (T) convertTree( n, actualTo ) );
+
+    if( TemporalAmount.class.isAssignableFrom( actualTo ) )
+      return node -> ifNull( node, n -> (T) convertTree( n, actualTo ) );
 
     if( to instanceof CoercibleType )
       return node -> ifNull( node, n -> (T) ( (CoercibleType<?>) to ).canonical( textOrWrite( n ) ) );
@@ -283,20 +291,33 @@ public <Coerce> Coerce coerce( Object value, Type to )
       return nodeType == JsonNodeType.BOOLEAN ? (Coerce) Boolean.valueOf( node.booleanValue() ) : (Coerce) Coercions.coerce( textOrWrite( node ), to );
 
     if( Map.class.isAssignableFrom( actualTo ) )
-      return (Coerce) convert( value, actualTo );
+      return (Coerce) convertTree( node, actualTo );
 
     if( List.class.isAssignableFrom( actualTo ) )
-      return (Coerce) convert( value, actualTo );
+      return (Coerce) convertTree( node, actualTo );
+
+    if( Temporal.class.isAssignableFrom( actualTo ) )
+      return (Coerce) convertTree( node, actualTo );
+
+    if( TemporalAmount.class.isAssignableFrom( actualTo ) )
+      return (Coerce) convertTree( node, actualTo );
 
     if( to instanceof CoercibleType )
       return (Coerce) ( (CoercibleType<?>) to ).canonical( textOrWrite( node ) );
 
     throw new CascadingException( "unknown type coercion requested, from: " + Util.getTypeName( from ) + " to: " + Util.getTypeName( to ) );
     }
 
-  private Object convert( Object value, Class to )
+  private Object convertTree( JsonNode value, Class<?> to )
     {
-    return mapper.convertValue( value, to );
+    try
+      {
+      return mapper.treeToValue( value, to );
+      }
+    catch( JsonProcessingException exception )
+      {
+      throw new CascadingException( "unable to coerce json node into " + to.getName(), exception );
+      }
     }
 
   private String textOrWrite( JsonNode value )

cascading-nested-json/src/test/java/cascading/nested/json/JSONTypeTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 Chris K Wensel. All Rights Reserved.
+ * Copyright (c) 2016-2021 Chris K Wensel. All Rights Reserved.
  *
  * Project and contact information: http://www.cascading.org/
  *
@@ -121,6 +121,24 @@ public void pojoCoercions()
     assertEquals( "1525456424.337000000", coerce );
     }
 
+  @Test
+  public void pojoCoercionsReversed()
+    {
+    ObjectMapper mapper = new ObjectMapper();
+
+    mapper.registerModule( new JavaTimeModule() );
+
+    JSONCoercibleType type = new JSONCoercibleType( mapper );
+
+    Instant instant = Instant.ofEpochSecond( 1525456424, 337000000 );
+
+    JsonNode canonical = type.canonical( instant );
+
+    Instant coerce = type.coerce( canonical, Instant.class );
+
+    assertEquals( instant, coerce );
+    }
+
   private void testContainerCoercion( String value, JsonNodeType nodeType, Class resultType )
     {
     JsonNode canonical = JSONCoercibleType.TYPE.canonical( value );