From 07fe97a21e2fb2a80190b4ecef0beaa0d4a642ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louise=20S=C3=B6derstr=C3=B6m?= <louise.matematik@gmail.com>
Date: Tue, 27 Feb 2018 17:34:46 +0100
Subject: [PATCH] Review comments

---
 .../main/java/org/neo4j/values/storable/DateTimeValue.java  | 6 ------
 .../src/main/java/org/neo4j/values/storable/DateValue.java  | 6 ------
 .../java/org/neo4j/values/storable/LocalDateTimeValue.java  | 6 ------
 .../main/java/org/neo4j/values/storable/LocalTimeValue.java | 6 ------
 .../main/java/org/neo4j/values/storable/TemporalValue.java  | 6 ++++++
 .../src/main/java/org/neo4j/values/storable/TimeValue.java  | 6 ------
 .../cypher/features/Neo4jExceptionToExecutionFailed.scala   | 2 +-
 7 files changed, 7 insertions(+), 31 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
index f7d4f460b2288..feecd26171da1 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/DateTimeValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/DateTimeValue.java
@@ -390,12 +390,6 @@ public ValueGroup valueGroup()
         return ValueGroup.ZONED_DATE_TIME;
     }
 
-    @Override
-    public String toString()
-    {
-        return prettyPrint();
-    }
-
     @Override
     protected int computeHash()
     {
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
index 0c04097f7b469..92f9f56a26508 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/DateValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/DateValue.java
@@ -193,12 +193,6 @@ public ValueGroup valueGroup()
         return ValueGroup.DATE;
     }
 
-    @Override
-    public String toString()
-    {
-        return prettyPrint();
-    }
-
     @Override
     protected int computeHash()
     {
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
index 6afceef02c3b8..b2ad56b8fd662 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/LocalDateTimeValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/LocalDateTimeValue.java
@@ -309,12 +309,6 @@ public ValueGroup valueGroup()
         return ValueGroup.LOCAL_DATE_TIME;
     }
 
-    @Override
-    public String toString()
-    {
-        return prettyPrint();
-    }
-
     @Override
     protected int computeHash()
     {
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
index e515018d9644e..0e90c08e49e46 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/LocalTimeValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/LocalTimeValue.java
@@ -230,12 +230,6 @@ public ValueGroup valueGroup()
         return ValueGroup.LOCAL_TIME;
     }
 
-    @Override
-    public String toString()
-    {
-        return prettyPrint();
-    }
-
     @Override
     protected int computeHash()
     {
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
index 62f6ad6df224e..73deff96c35df 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/TemporalValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/TemporalValue.java
@@ -206,6 +206,12 @@ public final boolean equals( String x )
         return false;
     }
 
+    @Override
+    public String toString()
+    {
+        return prettyPrint();
+    }
+
     static <VALUE> VALUE parse( Class<VALUE> type, Pattern pattern, Function<Matcher,VALUE> parser, CharSequence text )
     {
         Matcher matcher = pattern.matcher( text );
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
index cd9c878f6603b..ffa277e18c467 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/TimeValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/TimeValue.java
@@ -269,12 +269,6 @@ public ValueGroup valueGroup()
         return ValueGroup.ZONED_TIME;
     }
 
-    @Override
-    public String toString()
-    {
-        return prettyPrint();
-    }
-
     @Override
     protected int computeHash()
     {
diff --git a/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/Neo4jExceptionToExecutionFailed.scala b/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/Neo4jExceptionToExecutionFailed.scala
index 59c1907657fd8..10337aba261db 100644
--- a/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/Neo4jExceptionToExecutionFailed.scala
+++ b/enterprise/cypher/spec-suite-tools/src/test/scala/cypher/features/Neo4jExceptionToExecutionFailed.scala
@@ -32,8 +32,8 @@ object Neo4jExceptionToExecutionFailed {
 
   def convert(phase: String, t: Throwable): ExecutionFailed = {
     val neo4jException = t match {
-      case _ => throw t
       case re: RuntimeException => re
+      case _ => throw t
     }
     val errorType = Status.statusCodeOf(neo4jException)
     val msg = neo4jException.getMessage