Privatize all the arrays!

neo4j · Feb 6, 2018 · dbce5f0 · dbce5f0
1 parent 46ae543
commit dbce5f0
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 24 deletions.
diff --git a/...ity/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/ParameterConverter.java b/...ity/cypher/cypher/src/main/java/org/neo4j/cypher/internal/codegen/ParameterConverter.java
@@ -397,7 +397,7 @@ public void writeDateTime( long epochSecondUTC, int nano, int offsetSeconds ) th
     @Override
     public void writeDateTime( long epochSecondUTC, int nano, String zoneId ) throws RuntimeException
     {
-        writeValue( ZonedDateTime.of( LocalDate.ofEpochDay( epochSecondUTC ), LocalTime.ofNanoOfDay( nano ), ZoneId.of( zoneId ) ) );
+        writeValue( ZonedDateTime.ofInstant( Instant.ofEpochSecond(epochSecondUTC, nano), ZoneId.of( zoneId ) ) );
     }
 
     private interface Writer

diff --git a/...cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/ParameterConverterTest.java b/...cypher/cypher/src/test/java/org/neo4j/cypher/internal/codegen/ParameterConverterTest.java
@@ -26,6 +26,7 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.OffsetTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.List;
@@ -210,7 +211,7 @@ public void shouldHandlePoints()
     }
 
     @Test
-    public void shouldHandleDateTime()
+    public void shouldHandleDateTimeWithZoneOffset()
     {
         // Given
         DateTimeValue dvalue = DateTimeValue.datetime( 1, 2, 3, 4, 5, 6, 7, "+00:00" );
@@ -224,6 +225,21 @@ public void shouldHandleDateTime()
         assertThat( value, equalTo( dvalue.asObjectCopy() ) );
     }
 
+    @Test
+    public void shouldHandleDateTimeWithZoneId()
+    {
+        // Given
+        DateTimeValue dvalue = DateTimeValue.datetime( 1, 2, 3, 4, 5, 6, 7, ZoneId.of( "Europe/Stockholm" ) );
+
+        // When
+        dvalue.writeTo( converter );
+
+        // Then
+        Object value = converter.value();
+        assertThat( value, instanceOf( ZonedDateTime.class ) );
+        assertThat( value, equalTo( dvalue.asObjectCopy() ) );
+    }
+
     @Test
     public void shouldHandleLocalDateTime()
     {

diff --git a/...ed-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/CastSupport.scala b/...ed-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/CastSupport.scala
@@ -20,6 +20,7 @@
 package org.neo4j.cypher.internal.runtime.interpreted
 
 import java.time._
+import java.time.temporal.TemporalAmount
 
 import org.neo4j.cypher.internal.util.v3_4.CypherTypeException
 import org.neo4j.graphdb.spatial.Point
@@ -140,7 +141,7 @@ object CastSupport {
     case _: Point => Converter(
       transform(new ArrayConverterWriter(classOf[Point], a => Values.pointArray(a.asInstanceOf[Array[Point]]))))
     case _: DurationValue => Converter(
-      transform(new ArrayConverterWriter(classOf[DurationValue], a => Values.durationArray(a.asInstanceOf[Array[DurationValue]]))))
+      transform(new ArrayConverterWriter(classOf[TemporalAmount], a => Values.durationArray(a.asInstanceOf[Array[TemporalAmount]]))))
     case _: DateTimeValue => Converter(
       transform(new ArrayConverterWriter(classOf[ZonedDateTime], a => Values.dateTimeArray(a.asInstanceOf[Array[ZonedDateTime]]))))
     case _: DateValue => Converter(

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/BaseToObjectValueWriter.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/BaseToObjectValueWriter.java
@@ -449,7 +449,7 @@ public void writeDateTime( long epochSecondUTC, int nano, int offsetSeconds ) th
     @Override
     public void writeDateTime( long epochSecondUTC, int nano, String zoneId ) throws RuntimeException
     {
-        writeValue( ZonedDateTime.of( LocalDate.ofEpochDay( epochSecondUTC ), LocalTime.ofNanoOfDay( nano ), ZoneId.of( zoneId ) ) );
+        writeValue( ZonedDateTime.ofInstant( Instant.ofEpochSecond(epochSecondUTC, nano), ZoneId.of( zoneId ) ) );
     }
 
     private interface Writer

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ArrayValue.java b/community/values/src/main/java/org/neo4j/values/storable/ArrayValue.java
@@ -72,11 +72,7 @@ public final boolean eq( Object other )
             return false;
         }
 
-        if ( other instanceof SequenceValue )
+        return other instanceof SequenceValue && this.equals( (SequenceValue) other );
-        {
-            return this.equals( (SequenceValue) other );
-        }
-        return other instanceof Value && equals( (Value) other );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ByteArray.java b/community/values/src/main/java/org/neo4j/values/storable/ByteArray.java
@@ -28,7 +28,7 @@
 
 public class ByteArray extends IntegralArray
 {
-    final byte[] value;
+    private final byte[] value;
 
     ByteArray( byte[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/CharArray.java b/community/values/src/main/java/org/neo4j/values/storable/CharArray.java
@@ -28,7 +28,7 @@
 
 public class CharArray extends TextArray
 {
-    final char[] value;
+    private final char[] value;
 
     CharArray( char[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/DateArray.java b/community/values/src/main/java/org/neo4j/values/storable/DateArray.java
@@ -26,7 +26,7 @@
 
 public class DateArray extends TemporalArray<LocalDate, DateValue>
 {
-    final LocalDate[] value;
+    private final LocalDate[] value;
 
     DateArray( LocalDate[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/DateTimeArray.java b/community/values/src/main/java/org/neo4j/values/storable/DateTimeArray.java
@@ -26,7 +26,7 @@
 
 public class DateTimeArray extends TemporalArray<ZonedDateTime, DateTimeValue>
 {
-    final ZonedDateTime[] value;
+    private final ZonedDateTime[] value;
 
     DateTimeArray( ZonedDateTime[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/DoubleArray.java b/community/values/src/main/java/org/neo4j/values/storable/DoubleArray.java
@@ -28,7 +28,7 @@
 
 public class DoubleArray extends FloatingPointArray
 {
-    final double[] value;
+    private final double[] value;
 
     DoubleArray( double[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/DurationArray.java b/community/values/src/main/java/org/neo4j/values/storable/DurationArray.java
@@ -26,7 +26,7 @@
 
 public class DurationArray extends NonPrimitiveArray<DurationValue>
 {
-    final DurationValue[] value;
+    private final DurationValue[] value;
 
     DurationArray( DurationValue[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/FloatArray.java b/community/values/src/main/java/org/neo4j/values/storable/FloatArray.java
@@ -28,7 +28,7 @@
 
 public class FloatArray extends FloatingPointArray
 {
-    final float[] value;
+    private final float[] value;
 
     FloatArray( float[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/IntArray.java b/community/values/src/main/java/org/neo4j/values/storable/IntArray.java
@@ -28,7 +28,7 @@
 
 public class IntArray extends IntegralArray
 {
-    final int[] value;
+    private final int[] value;
 
     IntArray( int[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/LocalDateTimeArray.java b/community/values/src/main/java/org/neo4j/values/storable/LocalDateTimeArray.java
@@ -26,7 +26,7 @@
 
 public class LocalDateTimeArray extends TemporalArray<LocalDateTime, LocalDateTimeValue>
 {
-    final LocalDateTime[] value;
+    private final LocalDateTime[] value;
 
     LocalDateTimeArray( LocalDateTime[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/LongArray.java b/community/values/src/main/java/org/neo4j/values/storable/LongArray.java
@@ -28,7 +28,7 @@
 
 public class LongArray extends IntegralArray
 {
-    final long[] value;
+    private final long[] value;
 
     LongArray( long[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/PointArray.java b/community/values/src/main/java/org/neo4j/values/storable/PointArray.java
@@ -27,7 +27,7 @@
 
 public class PointArray extends NonPrimitiveArray<PointValue>
 {
-    final PointValue[] value;
+    private final PointValue[] value;
 
     PointArray( PointValue[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/ShortArray.java b/community/values/src/main/java/org/neo4j/values/storable/ShortArray.java
@@ -28,7 +28,7 @@
 
 public class ShortArray extends IntegralArray
 {
-    final short[] value;
+    private final short[] value;
 
     ShortArray( short[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/StringArray.java b/community/values/src/main/java/org/neo4j/values/storable/StringArray.java
@@ -28,7 +28,7 @@
 
 public class StringArray extends TextArray
 {
-    final String[] value;
+    private final String[] value;
 
     StringArray( String[] value )
     {

diff --git a/community/values/src/main/java/org/neo4j/values/storable/TimeArray.java b/community/values/src/main/java/org/neo4j/values/storable/TimeArray.java
@@ -26,7 +26,7 @@
 
 public class TimeArray extends TemporalArray<OffsetTime, TimeValue>
 {
-    final OffsetTime[] value;
+    private final OffsetTime[] value;
 
     TimeArray( OffsetTime[] value )
     {

diff --git a/community/values/src/test/java/org/neo4j/values/storable/LocalTimeValueTest.java b/community/values/src/test/java/org/neo4j/values/storable/LocalTimeValueTest.java
@@ -118,7 +118,7 @@ public void shouldEqualItself()
     }
 
     @Test
-    public void shouldNotEqualSameTimeButDifferentTimezone()
+    public void shouldNotEqualOther()
     {
         assertNotEqual( localTime( 10, 52, 5, 6 ), localTime( 10, 52, 5, 7 ) );
     }