From 5aa95677d1dcff367605695913e0cc4cc40dce18 Mon Sep 17 00:00:00 2001
From: Henrik Nyman <henrik.nyman@neotechnology.com>
Date: Mon, 5 Mar 2018 22:31:20 +0100
Subject: [PATCH] Fix review comments

---
 .../java/org/neo4j/csv/reader/Extractors.java |  8 +-
 .../neo4j/kernel/impl/util/ValueUtils.java    |  3 +-
 .../org/neo4j/values/storable/PointValue.java | 84 +++++--------------
 3 files changed, 25 insertions(+), 70 deletions(-)

diff --git a/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java b/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java
index e9e237ec3da09..7348b78ad9709 100644
--- a/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java
+++ b/community/csv/src/main/java/org/neo4j/csv/reader/Extractors.java
@@ -90,7 +90,7 @@ public class Extractors
     private final Extractor<long[]> longArray;
     private final Extractor<float[]> floatArray;
     private final Extractor<double[]> doubleArray;
-    private final PointExtractor point_;
+    private final PointExtractor point;
 
     public Extractors( char arrayDelimiter )
     {
@@ -141,7 +141,7 @@ public Extractors( char arrayDelimiter, boolean emptyStringsAsNull, boolean trim
             add( longArray = new LongArrayExtractor( arrayDelimiter ) );
             add( floatArray = new FloatArrayExtractor( arrayDelimiter ) );
             add( doubleArray = new DoubleArrayExtractor( arrayDelimiter ) );
-            add( point_ = new PointExtractor() );
+            add( point = new PointExtractor() );
         }
         catch ( IllegalAccessException e )
         {
@@ -249,9 +249,9 @@ public Extractor<double[]> doubleArray()
         return doubleArray;
     }
 
-    public PointExtractor point_()
+    public PointExtractor point()
     {
-        return point_;
+        return point;
     }
 
     private abstract static class AbstractExtractor<T> implements Extractor<T>
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java
index b09a42de5c75c..27ec905995a33 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java
@@ -278,7 +278,8 @@ public static RelationshipValue fromRelationshipProxy( Relationship relationship
     /**
      * Creates a {@link Value} from the given object, or if it is already a Value it is returned as it is.
      * <p>
-     * This is different from {@link Values#of} which explicitly fails if given a Value.
+     * This is different from {@link Values#of} which often explicitly fails or creates a new copy
+     * if given a Value.
      */
     public static Value asValue( Object value )
     {
diff --git a/community/values/src/main/java/org/neo4j/values/storable/PointValue.java b/community/values/src/main/java/org/neo4j/values/storable/PointValue.java
index 3476aa7b2308e..8afabecaa08d5 100644
--- a/community/values/src/main/java/org/neo4j/values/storable/PointValue.java
+++ b/community/values/src/main/java/org/neo4j/values/storable/PointValue.java
@@ -264,14 +264,11 @@ public boolean withinRange( PointValue lower, boolean includeLower, PointValue u
 
     public static PointValue fromMap( MapValue map )
     {
-        AnyValue[] fields = new Value[PointValueField.__MAX_VALUE__.ordinal()];
+        AnyValue[] fields = new Value[PointValueField.values().length];
         for ( PointValueField f : PointValueField.values() )
         {
-            if ( f != PointValueField.__MAX_VALUE__ )
-            {
-                AnyValue fieldValue = map.get( f.name().toLowerCase() );
-                fields[f.ordinal()] = fieldValue != Values.NO_VALUE ? fieldValue : null;
-            }
+            AnyValue fieldValue = map.get( f.name().toLowerCase() );
+            fields[f.ordinal()] = fieldValue != Values.NO_VALUE ? fieldValue : null;
         }
         return fromInputFields( fields );
     }
@@ -305,7 +302,7 @@ public static PointValue parse( CharSequence text )
             throw new IllegalArgumentException( errorMessage );
         }
 
-        Value[] fields = new Value[PointValueField.__MAX_VALUE__.ordinal()];
+        Value[] fields = new Value[PointValueField.values().length];
 
         do
         {
@@ -462,67 +459,24 @@ else if ( crs == CoordinateReferenceSystem.WGS84_3D )
 
     private enum PointValueField
     {
-        X
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return NUMBER;
-                    }
-                },
-        Y
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return NUMBER;
-                    }
-                },
-        Z
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return NUMBER;
-                    }
-                },
-        LATITUDE
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return NUMBER;
-                    }
-                },
-        LONGITUDE
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return NUMBER;
-                    }
-                },
-        HEIGHT
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return NUMBER;
-                    }
-                },
-        CRS
-                {
-                    @Override
-                    ValueGroup valueType()
-                    {
-                        return TEXT;
-                    }
-                },
-        __MAX_VALUE__; // This is just used to define array boundaries
+        X( NUMBER ),
+        Y( NUMBER ),
+        Z( NUMBER ),
+        LATITUDE( NUMBER ),
+        LONGITUDE( NUMBER ),
+        HEIGHT( NUMBER ),
+        CRS( TEXT );
+
+        PointValueField( ValueGroup valueType )
+        {
+            this.valueType = valueType;
+        }
 
         ValueGroup valueType()
         {
-            return ValueGroup.NO_VALUE;
+            return valueType;
         }
+
+        private ValueGroup valueType;
     }
 }