Error handling of toString

neo4j · Apr 5, 2018 · 5694fcd · 5694fcd
1 parent ecc0079
commit 5694fcd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/community/values/src/main/java/org/neo4j/values/storable/DateTimeValue.java b/community/values/src/main/java/org/neo4j/values/storable/DateTimeValue.java
@@ -532,7 +532,7 @@ private int compareNamedZonesWithMapping( ZoneId thisZone, ZoneId thatZone )
     @Override
     public String prettyPrint()
     {
-        return value.format( DateTimeFormatter.ISO_DATE_TIME );
+        return assertPrintable( () -> value.format( DateTimeFormatter.ISO_DATE_TIME ) );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/storable/DateValue.java b/community/values/src/main/java/org/neo4j/values/storable/DateValue.java
@@ -268,7 +268,7 @@ public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     @Override
     public String prettyPrint()
     {
-        return value.format( DateTimeFormatter.ISO_DATE );
+        return assertPrintable( () -> value.format( DateTimeFormatter.ISO_DATE ) );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/storable/LocalDateTimeValue.java b/community/values/src/main/java/org/neo4j/values/storable/LocalDateTimeValue.java
@@ -350,7 +350,7 @@ public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     @Override
     public String prettyPrint()
     {
-        return value.format( DateTimeFormatter.ISO_LOCAL_DATE_TIME );
+        return assertPrintable( () -> value.format( DateTimeFormatter.ISO_LOCAL_DATE_TIME ) );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/storable/LocalTimeValue.java b/community/values/src/main/java/org/neo4j/values/storable/LocalTimeValue.java
@@ -259,7 +259,7 @@ public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     @Override
     public String prettyPrint()
     {
-        return value.format( DateTimeFormatter.ISO_LOCAL_TIME );
+        return assertPrintable( () -> value.format( DateTimeFormatter.ISO_LOCAL_TIME ) );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/storable/TemporalValue.java b/community/values/src/main/java/org/neo4j/values/storable/TemporalValue.java
@@ -1449,6 +1449,18 @@ static <TEMP extends Temporal> TEMP assertParsable( Supplier<TEMP> func )
         }
     }
 
+    static String assertPrintable( Supplier<String> func )
+    {
+        try
+        {
+            return func.get();
+        }
+        catch ( DateTimeException e )
+        {
+            throw new TemporalParseException( e.getMessage(), e );
+        }
+    }
+
     static <TEMP extends Temporal> TEMP assertValidArithmetic( Supplier<TEMP> func )
     {
         try

diff --git a/community/values/src/main/java/org/neo4j/values/storable/TimeValue.java b/community/values/src/main/java/org/neo4j/values/storable/TimeValue.java
@@ -341,7 +341,7 @@ public <E extends Exception> void writeTo( ValueWriter<E> writer ) throws E
     @Override
     public String prettyPrint()
     {
-        return value.format( DateTimeFormatter.ISO_TIME );
+        return assertPrintable( () -> value.format( DateTimeFormatter.ISO_TIME ) );
     }
 
     @Override