Skip to content
This repository was archived by the owner on Jul 6, 2023. It is now read-only.

Commit b369966

Browse files
committed
Revert "adding point datatype."
This reverts commit 38ff679c9b4013ca3e3bbe83560fd43f5f0cdeb3.
1 parent f7c39ed commit b369966

File tree

2 files changed

+1
-53
lines changed

2 files changed

+1
-53
lines changed

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/OutputFormatter.java

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@
77
import org.neo4j.driver.v1.summary.ResultSummary;
88
import org.neo4j.driver.v1.types.Node;
99
import org.neo4j.driver.v1.types.Path;
10-
import org.neo4j.driver.v1.types.Point;
1110
import org.neo4j.driver.v1.types.Relationship;
1211
import org.neo4j.shell.state.BoltResult;
1312

1413
import javax.annotation.Nonnull;
15-
import java.util.Arrays;
16-
import java.util.ArrayList;
17-
import java.util.LinkedHashMap;
18-
import java.util.List;
19-
import java.util.Map;
14+
import java.util.*;
2015
import java.util.stream.Collectors;
2116

2217
import static java.util.Arrays.asList;
@@ -46,41 +41,18 @@ public interface OutputFormatter {
4641
return relationshipAsString(value.asRelationship());
4742
case PATH:
4843
return pathAsString(value.asPath());
49-
case POINT:
50-
return pointAsString(value.asPoint());
51-
case DURATION:
5244
case ANY:
5345
case BOOLEAN:
54-
case BYTES:
5546
case STRING:
5647
case NUMBER:
5748
case INTEGER:
5849
case FLOAT:
59-
case DATE:
60-
case TIME:
61-
case DATE_TIME:
62-
case LOCAL_TIME:
63-
case LOCAL_DATE_TIME:
6450
case NULL:
6551
default:
6652
return value.toString();
6753
}
6854
}
6955

70-
@Nonnull
71-
default String pointAsString(Point point) {
72-
StringBuilder stringBuilder = new StringBuilder("point({");
73-
stringBuilder.append("srid:" + point.srid() + ",");
74-
stringBuilder.append(" x:" + point.x() + ",");
75-
stringBuilder.append(" y:" + point.y());
76-
Double z = point.z();
77-
if (!Double.isNaN(z)) {
78-
stringBuilder.append(", z:" + z);
79-
}
80-
stringBuilder.append("})");
81-
return stringBuilder.toString();
82-
}
83-
8456
@Nonnull
8557
default String pathAsString(@Nonnull Path path) {
8658
List<String> list = new ArrayList<>(path.length());

cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatterTest.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44
import org.junit.Test;
55
import org.neo4j.driver.internal.InternalNode;
66
import org.neo4j.driver.internal.InternalPath;
7-
import org.neo4j.driver.internal.InternalPoint2D;
8-
import org.neo4j.driver.internal.InternalPoint3D;
97
import org.neo4j.driver.internal.InternalRecord;
108
import org.neo4j.driver.internal.InternalRelationship;
119
import org.neo4j.driver.internal.value.NodeValue;
1210
import org.neo4j.driver.internal.value.PathValue;
13-
import org.neo4j.driver.internal.value.PointValue;
1411
import org.neo4j.driver.internal.value.RelationshipValue;
1512
import org.neo4j.driver.v1.Record;
1613
import org.neo4j.driver.v1.Statement;
@@ -73,27 +70,6 @@ public void prettyPrintPlanInformation() throws Exception {
7370
});
7471
}
7572

76-
@Test
77-
public void prettyPrintPoint() throws Exception {
78-
// given
79-
StatementResult statementResult = mock(StatementResult.class);
80-
List<String> keys = asList("p1", "p2");
81-
82-
when(statementResult.summary()).thenReturn(mock(ResultSummary.class));
83-
when(statementResult.keys()).thenReturn(keys);
84-
85-
Value point2d = new PointValue(new InternalPoint2D(4326, 42.78, 56.7));
86-
Value point3d = new PointValue(new InternalPoint3D(4326, 1.7, 26.79, 34.23));
87-
Record record = new InternalRecord(keys, new Value[]{point2d, point3d});
88-
89-
// when
90-
String actual = verbosePrinter.format(new BoltResult(asList(record), statementResult));
91-
92-
// then
93-
assertThat(actual, containsString("| point({srid:4326, x:42.78, y:56.7}) |"));
94-
assertThat(actual, containsString("| point({srid:4326, x:1.7, y:26.79, z:34.23}) |"));
95-
}
96-
9773
@Test
9874
public void prettyPrintNode() throws Exception {
9975
// given

0 commit comments

Comments
 (0)