neo4j
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/InternalPoint2D.java
Copy file name to clipboard
+12-6Lines changed: 12 additions & 6 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/InternalPoint2D.java
Copy file name to clipboard
+12-6Lines changed: 12 additions & 6 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/InternalPoint3D.java
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/InternalPoint3D.java
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV2.java
Copy file name to clipboard
+30-17Lines changed: 30 additions & 17 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV2.java
Copy file name to clipboard
+30-17Lines changed: 30 additions & 17 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/types/InternalTypeSystem.java
Copy file name to clipboard
+4-12Lines changed: 4 additions & 12 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/types/InternalTypeSystem.java
Copy file name to clipboard
+4-12Lines changed: 4 additions & 12 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/types/TypeConstructor.java
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/types/TypeConstructor.java
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/value/Point3DValue.java
Copy file name to clipboard
-43Lines changed: 0 additions & 43 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/value/Point3DValue.java
Copy file name to clipboard
-43Lines changed: 0 additions & 43 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/value/Point2DValue.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/value/PointValue.java
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/value/Point2DValue.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/value/PointValue.java
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java
Copy file name to clipboard
+3-10Lines changed: 3 additions & 10 deletions b/‎driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java
Copy file name to clipboard
+3-10Lines changed: 3 additions & 10 deletions
diff --git a/‎driver/src/main/java/org/neo4j/driver/v1/Value.java
Copy file name to clipboard
+3-10Lines changed: 3 additions & 10 deletions b/‎driver/src/main/java/org/neo4j/driver/v1/Value.java
Copy file name to clipboard
+3-10Lines changed: 3 additions & 10 deletions
@@ -20,23 +20,23 @@
 
 import java.util.Objects;
 
-import org.neo4j.driver.v1.types.Point2D;
+import org.neo4j.driver.v1.types.Point;
 
-public class InternalPoint2D implements Point2D
+public class InternalPoint2D implements Point
 {
-    private final long srid;
+    private final int srid;
     private final double x;
     private final double y;
 
-    public InternalPoint2D( long srid, double x, double y )
+    public InternalPoint2D( int srid, double x, double y )
     {
         this.srid = srid;
         this.x = x;
         this.y = y;
     }
 
     @Override
-    public long srid()
+    public int srid()
     {
         return srid;
     }
@@ -53,6 +53,12 @@ public double y()
         return y;
     }
 
+    @Override
+    public double z()
+    {
+        return Double.NaN;
+    }
+
     @Override
     public boolean equals( Object o )
     {
@@ -79,7 +85,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-        return "Point2D{" +
+        return "Point{" +
                "srid=" + srid +
                ", x=" + x +
                ", y=" + y +
 
@@ -20,16 +20,16 @@
 
 import java.util.Objects;
 
-import org.neo4j.driver.v1.types.Point3D;
+import org.neo4j.driver.v1.types.Point;
 
-public class InternalPoint3D implements Point3D
+public class InternalPoint3D implements Point
 {
-    private final long srid;
+    private final int srid;
     private final double x;
     private final double y;
     private final double z;
 
-    public InternalPoint3D( long srid, double x, double y, double z )
+    public InternalPoint3D( int srid, double x, double y, double z )
     {
         this.srid = srid;
         this.x = x;
@@ -38,7 +38,7 @@ public InternalPoint3D( long srid, double x, double y, double z )
     }
 
     @Override
-    public long srid()
+    public int srid()
     {
         return srid;
     }
@@ -88,11 +88,11 @@ public int hashCode()
     @Override
     public String toString()
     {
-        return "Point3D{" +
+        return "Point({" +
                "srid=" + srid +
                ", x=" + x +
                ", y=" + y +
                ", z=" + z +
-               '}';
+               "})";
     }
 }
@@ -28,19 +28,19 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
+import org.neo4j.driver.internal.InternalPoint2D;
+import org.neo4j.driver.internal.InternalPoint3D;
 import org.neo4j.driver.internal.packstream.PackInput;
 import org.neo4j.driver.internal.packstream.PackOutput;
 import org.neo4j.driver.internal.types.TypeConstructor;
 import org.neo4j.driver.internal.value.InternalValue;
 import org.neo4j.driver.v1.Value;
 import org.neo4j.driver.v1.types.IsoDuration;
-import org.neo4j.driver.v1.types.Point2D;
-import org.neo4j.driver.v1.types.Point3D;
+import org.neo4j.driver.v1.types.Point;
 
 import static java.time.ZoneOffset.UTC;
 import static org.neo4j.driver.v1.Values.isoDuration;
-import static org.neo4j.driver.v1.Values.point2D;
-import static org.neo4j.driver.v1.Values.point3D;
+import static org.neo4j.driver.v1.Values.point;
 import static org.neo4j.driver.v1.Values.value;
 
 public class PackStreamMessageFormatV2 extends PackStreamMessageFormatV1
@@ -117,11 +117,8 @@ void packInternalValue( InternalValue value ) throws IOException
             case DURATION:
                 packDuration( value.asIsoDuration() );
                 break;
-            case POINT_2D:
-                packPoint2D( value.asPoint2D() );
-                break;
-            case POINT_3D:
-                packPoint3D( value.asPoint3D() );
+            case POINT:
+                packPoint( value.asPoint() );
                 break;
             default:
                 super.packInternalValue( value );
@@ -195,15 +192,31 @@ private void packDuration( IsoDuration duration ) throws IOException
             packer.pack( duration.nanoseconds() );
         }
 
-        private void packPoint2D( Point2D point ) throws IOException
+        private void packPoint( Point point ) throws IOException
+        {
+            if ( point instanceof InternalPoint2D )
+            {
+                packPoint2D( point );
+            }
+            else if ( point instanceof InternalPoint3D )
+            {
+                packPoint3D( point );
+            }
+            else
+            {
+                throw new IOException( String.format( "Unknown type: type: %s, value: %s",  point.getClass(), point.toString() ) );
+            }
+        }
+
+        private void packPoint2D ( Point point ) throws IOException
         {
             packer.packStructHeader( POINT_2D_STRUCT_SIZE, POINT_2D_STRUCT_TYPE );
             packer.pack( point.srid() );
             packer.pack( point.x() );
             packer.pack( point.y() );
         }
 
-        private void packPoint3D( Point3D point ) throws IOException
+        private void packPoint3D( Point point ) throws IOException
         {
             packer.packStructHeader( POINT_3D_STRUCT_SIZE, POINT_3D_STRUCT_TYPE );
             packer.pack( point.srid() );
@@ -247,10 +260,10 @@ Value unpackStruct( long size, byte type ) throws IOException
                 ensureCorrectStructSize( TypeConstructor.DURATION, DURATION_TIME_STRUCT_SIZE, size );
                 return unpackDuration();
             case POINT_2D_STRUCT_TYPE:
-                ensureCorrectStructSize( TypeConstructor.POINT_2D, POINT_2D_STRUCT_SIZE, size );
+                ensureCorrectStructSize( TypeConstructor.POINT, POINT_2D_STRUCT_SIZE, size );
                 return unpackPoint2D();
             case POINT_3D_STRUCT_TYPE:
-                ensureCorrectStructSize( TypeConstructor.POINT_3D, POINT_3D_STRUCT_SIZE, size );
+                ensureCorrectStructSize( TypeConstructor.POINT, POINT_3D_STRUCT_SIZE, size );
                 return unpackPoint3D();
             default:
                 return super.unpackStruct( size, type );
@@ -319,19 +332,19 @@ private Value unpackDuration() throws IOException
 
         private Value unpackPoint2D() throws IOException
         {
-            long srid = unpacker.unpackLong();
+            int srid = Math.toIntExact( unpacker.unpackLong() );
             double x = unpacker.unpackDouble();
             double y = unpacker.unpackDouble();
-            return point2D( srid, x, y );
+            return point( srid, x, y );
         }
 
         private Value unpackPoint3D() throws IOException
         {
-            long srid = unpacker.unpackLong();
+            int srid = Math.toIntExact( unpacker.unpackLong() );
             double x = unpacker.unpackDouble();
             double y = unpacker.unpackDouble();
             double z = unpacker.unpackDouble();
-            return point3D( srid, x, y, z );
+            return point( srid, x, y, z );
         }
     }
 }
@@ -38,8 +38,7 @@
 import static org.neo4j.driver.internal.types.TypeConstructor.NULL;
 import static org.neo4j.driver.internal.types.TypeConstructor.NUMBER;
 import static org.neo4j.driver.internal.types.TypeConstructor.PATH;
-import static org.neo4j.driver.internal.types.TypeConstructor.POINT_2D;
-import static org.neo4j.driver.internal.types.TypeConstructor.POINT_3D;
+import static org.neo4j.driver.internal.types.TypeConstructor.POINT;
 import static org.neo4j.driver.internal.types.TypeConstructor.RELATIONSHIP;
 import static org.neo4j.driver.internal.types.TypeConstructor.STRING;
 import static org.neo4j.driver.internal.types.TypeConstructor.TIME;
@@ -66,8 +65,7 @@ public class InternalTypeSystem implements TypeSystem
     private final TypeRepresentation nodeType = constructType( NODE );
     private final TypeRepresentation relationshipType = constructType( RELATIONSHIP );
     private final TypeRepresentation pathType = constructType( PATH );
-    private final TypeRepresentation point2dType = constructType( POINT_2D );
-    private final TypeRepresentation point3dType = constructType( POINT_3D );
+    private final TypeRepresentation pointType = constructType( POINT );
     private final TypeRepresentation dateType = constructType( DATE );
     private final TypeRepresentation timeType = constructType( TIME );
     private final TypeRepresentation localTimeType = constructType( LOCAL_TIME );
@@ -153,15 +151,9 @@ public Type PATH()
     }
 
     @Override
-    public Type POINT_2D()
+    public Type POINT()
     {
-        return point2dType;
-    }
-
-    @Override
-    public Type POINT_3D()
-    {
-        return point3dType;
+        return pointType;
     }
 
     @Override
 
@@ -58,8 +58,7 @@ public boolean covers( Value value )
     NODE,
     RELATIONSHIP,
     PATH,
-    POINT_2D,
-    POINT_3D,
+    POINT,
     DATE,
     TIME,
     LOCAL_TIME,
 
@@ -19,25 +19,25 @@
 package org.neo4j.driver.internal.value;
 
 import org.neo4j.driver.internal.types.InternalTypeSystem;
-import org.neo4j.driver.v1.types.Point2D;
+import org.neo4j.driver.v1.types.Point;
 import org.neo4j.driver.v1.types.Type;
 
-public class Point2DValue extends ObjectValueAdapter<Point2D>
+public class PointValue extends ObjectValueAdapter<Point>
 {
-    public Point2DValue( Point2D point )
+    public PointValue( Point point )
     {
         super( point );
     }
 
     @Override
-    public Point2D asPoint2D()
+    public Point asPoint()
     {
         return asObject();
     }
 
     @Override
     public Type type()
     {
-        return InternalTypeSystem.TYPE_SYSTEM.POINT_2D();
+        return InternalTypeSystem.TYPE_SYSTEM.POINT();
     }
 }
@@ -37,8 +37,7 @@
 import org.neo4j.driver.v1.types.IsoDuration;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
-import org.neo4j.driver.v1.types.Point2D;
-import org.neo4j.driver.v1.types.Point3D;
+import org.neo4j.driver.v1.types.Point;
 import org.neo4j.driver.v1.types.Relationship;
 import org.neo4j.driver.v1.types.Type;
 import org.neo4j.driver.v1.util.Function;
@@ -224,15 +223,9 @@ public IsoDuration asIsoDuration()
     }
 
     @Override
-    public Point2D asPoint2D()
+    public Point asPoint()
     {
-        throw new Uncoercible( type().name(), "Point2D" );
-    }
-
-    @Override
-    public Point3D asPoint3D()
-    {
-        throw new Uncoercible( type().name(), "Point3D" );
+        throw new Uncoercible( type().name(), "Point" );
     }
 
     @Override
 
@@ -35,8 +35,7 @@
 import org.neo4j.driver.v1.types.MapAccessorWithDefaultValue;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
-import org.neo4j.driver.v1.types.Point2D;
-import org.neo4j.driver.v1.types.Point3D;
+import org.neo4j.driver.v1.types.Point;
 import org.neo4j.driver.v1.types.Relationship;
 import org.neo4j.driver.v1.types.Type;
 import org.neo4j.driver.v1.types.TypeSystem;
@@ -334,16 +333,10 @@ public interface Value extends MapAccessor, MapAccessorWithDefaultValue
     IsoDuration asIsoDuration();
 
     /**
-     * @return the value as a {@link Point2D}, if possible.
+     * @return the value as a {@link Point}, if possible.
      * @throws Uncoercible if value types are incompatible.
      */
-    Point2D asPoint2D();
-
-    /**
-     * @return the value as a {@link Point3D}, if possible.
-     * @throws Uncoercible if value types are incompatible.
-     */
-    Point3D asPoint3D();
+    Point asPoint();
 
     @Override
     boolean equals( Object other );
Original file line number	Diff line number	Diff line change
`@@ -20,23 +20,23 @@`
`20`	`20`
`21`	`21`	`import java.util.Objects;`
`22`	`22`
`23`		`-import org.neo4j.driver.v1.types.Point2D;`
	`23`	`+import org.neo4j.driver.v1.types.Point;`
`24`	`24`
`25`		`-public class InternalPoint2D implements Point2D`
	`25`	`+public class InternalPoint2D implements Point`
`26`	`26`	`{`
`27`		`- private final long srid;`
	`27`	`+ private final int srid;`
`28`	`28`	`private final double x;`
`29`	`29`	`private final double y;`
`30`	`30`
`31`		`- public InternalPoint2D( long srid, double x, double y )`
	`31`	`+ public InternalPoint2D( int srid, double x, double y )`
`32`	`32`	`{`
`33`	`33`	`this.srid = srid;`
`34`	`34`	`this.x = x;`
`35`	`35`	`this.y = y;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public long srid()`
	`39`	`+ public int srid()`
`40`	`40`	`{`
`41`	`41`	`return srid;`
`42`	`42`	`}`
`@@ -53,6 +53,12 @@ public double y()`
`53`	`53`	`return y;`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ @Override`
	`57`	`+ public double z()`
	`58`	`+ {`
	`59`	`+ return Double.NaN;`
	`60`	`+ }`
	`61`	`+`
`56`	`62`	`@Override`
`57`	`63`	`public boolean equals( Object o )`
`58`	`64`	`{`
`@@ -79,7 +85,7 @@ public int hashCode()`
`79`	`85`	`@Override`
`80`	`86`	`public String toString()`
`81`	`87`	`{`
`82`		`- return "Point2D{" +`
	`88`	`+ return "Point{" +`
`83`	`89`	`"srid=" + srid +`
`84`	`90`	`", x=" + x +`
`85`	`91`	`", y=" + y +`
Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,16 @@`
`20`	`20`
`21`	`21`	`import java.util.Objects;`
`22`	`22`
`23`		`-import org.neo4j.driver.v1.types.Point3D;`
	`23`	`+import org.neo4j.driver.v1.types.Point;`
`24`	`24`
`25`		`-public class InternalPoint3D implements Point3D`
	`25`	`+public class InternalPoint3D implements Point`
`26`	`26`	`{`
`27`		`- private final long srid;`
	`27`	`+ private final int srid;`
`28`	`28`	`private final double x;`
`29`	`29`	`private final double y;`
`30`	`30`	`private final double z;`
`31`	`31`
`32`		`- public InternalPoint3D( long srid, double x, double y, double z )`
	`32`	`+ public InternalPoint3D( int srid, double x, double y, double z )`
`33`	`33`	`{`
`34`	`34`	`this.srid = srid;`
`35`	`35`	`this.x = x;`
`@@ -38,7 +38,7 @@ public InternalPoint3D( long srid, double x, double y, double z )`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public long srid()`
	`41`	`+ public int srid()`
`42`	`42`	`{`
`43`	`43`	`return srid;`
`44`	`44`	`}`
`@@ -88,11 +88,11 @@ public int hashCode()`
`88`	`88`	`@Override`
`89`	`89`	`public String toString()`
`90`	`90`	`{`
`91`		`- return "Point3D{" +`
	`91`	`+ return "Point({" +`
`92`	`92`	`"srid=" + srid +`
`93`	`93`	`", x=" + x +`
`94`	`94`	`", y=" + y +`
`95`	`95`	`", z=" + z +`
`96`		`- '}';`
	`96`	`+ "})";`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,25 +19,25 @@`
`19`	`19`	`package org.neo4j.driver.internal.value;`
`20`	`20`
`21`	`21`	`import org.neo4j.driver.internal.types.InternalTypeSystem;`
`22`		`-import org.neo4j.driver.v1.types.Point2D;`
	`22`	`+import org.neo4j.driver.v1.types.Point;`
`23`	`23`	`import org.neo4j.driver.v1.types.Type;`
`24`	`24`
`25`		`-public class Point2DValue extends ObjectValueAdapter<Point2D>`
	`25`	`+public class PointValue extends ObjectValueAdapter<Point>`
`26`	`26`	`{`
`27`		`- public Point2DValue( Point2D point )`
	`27`	`+ public PointValue( Point point )`
`28`	`28`	`{`
`29`	`29`	`super( point );`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`33`		`- public Point2D asPoint2D()`
	`33`	`+ public Point asPoint()`
`34`	`34`	`{`
`35`	`35`	`return asObject();`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`	`39`	`public Type type()`
`40`	`40`	`{`
`41`		`- return InternalTypeSystem.TYPE_SYSTEM.POINT_2D();`
	`41`	`+ return InternalTypeSystem.TYPE_SYSTEM.POINT();`
`42`	`42`	`}`
`43`	`43`	`}`