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

Commit 174e8cf

Browse files
henriknymanhenriknyman
authored
Merge pull request #179 from pontusmelke/4.0-update-driver
Update driver version 4.0
2 parents 6e2583a + 722f0c1 commit 174e8cf

File tree

11 files changed

+163
-123
lines changed

11 files changed

+163
-123
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ext {
7070
argparse4jVersion = '0.7.0'
7171
junitVersion = '4.12'
7272
evaluatorVersion = '3.5.4'
73-
neo4jJavaDriverVersion = '4.0.0-beta03'
73+
neo4jJavaDriverVersion = '4.0.0-rc1'
7474
findbugsVersion = '3.0.0'
7575
jansiVersion = '1.13'
7676
jlineVersion = '2.14.6'

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
package org.neo4j.shell.prettyprint;
22

3-
import org.neo4j.driver.internal.types.TypeRepresentation;
3+
import java.util.ArrayList;
4+
import java.util.Arrays;
5+
import java.util.LinkedHashMap;
6+
import java.util.List;
7+
import java.util.Map;
8+
import java.util.Set;
9+
import java.util.stream.Collectors;
10+
import javax.annotation.Nonnull;
11+
412
import org.neo4j.driver.Value;
513
import org.neo4j.driver.Values;
14+
import org.neo4j.driver.internal.types.TypeRepresentation;
615
import org.neo4j.driver.summary.Plan;
716
import org.neo4j.driver.summary.ProfiledPlan;
817
import org.neo4j.driver.summary.ResultSummary;
@@ -12,10 +21,6 @@
1221
import org.neo4j.driver.types.Relationship;
1322
import org.neo4j.shell.state.BoltResult;
1423

15-
import javax.annotation.Nonnull;
16-
import java.util.*;
17-
import java.util.stream.Collectors;
18-
1924
import static java.util.Arrays.asList;
2025
import static java.util.concurrent.TimeUnit.MILLISECONDS;
2126
import static org.neo4j.shell.prettyprint.CypherVariablesFormatter.escape;
@@ -197,7 +202,7 @@ static Map<String, Value> info(@Nonnull ResultSummary summary) {
197202

198203
Plan plan = summary.plan();
199204
result.put("Plan", Values.value(summary.hasProfile() ? "PROFILE" : "EXPLAIN"));
200-
result.put("Statement", Values.value(summary.statementType().name()));
205+
result.put("Statement", Values.value(summary.queryType().name()));
201206
Map<String, Value> arguments = plan.arguments();
202207
Value defaultValue = Values.value("");
203208

‎cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,21 @@
99
import javax.annotation.Nonnull;
1010
import javax.annotation.Nullable;
1111

12-
import org.neo4j.driver.*;
12+
import org.neo4j.driver.AccessMode;
13+
import org.neo4j.driver.AuthToken;
14+
import org.neo4j.driver.AuthTokens;
15+
import org.neo4j.driver.Bookmark;
16+
import org.neo4j.driver.Config;
17+
import org.neo4j.driver.Driver;
18+
import org.neo4j.driver.GraphDatabase;
19+
import org.neo4j.driver.Query;
20+
import org.neo4j.driver.Record;
21+
import org.neo4j.driver.Result;
22+
import org.neo4j.driver.Session;
23+
import org.neo4j.driver.SessionConfig;
24+
import org.neo4j.driver.Transaction;
25+
import org.neo4j.driver.Value;
26+
import org.neo4j.driver.Values;
1327
import org.neo4j.driver.exceptions.ClientException;
1428
import org.neo4j.driver.exceptions.SessionExpiredException;
1529
import org.neo4j.driver.summary.DatabaseInfo;
@@ -32,7 +46,7 @@ public class BoltStateHandler implements TransactionHandler, Connector, Database
3246
protected Driver driver;
3347
Session session;
3448
private String version;
35-
private List<Statement> transactionStatements;
49+
private List<Query> transactionStatements;
3650
private String activeDatabaseNameAsSetByUser;
3751
private String actualDatabaseNameAsReportedByServer;
3852
private final boolean isInteractive;
@@ -182,7 +196,7 @@ private void reconnect(boolean keepBookmark) {
182196
String query = activeDatabaseNameAsSetByUser.compareToIgnoreCase(SYSTEM_DB_NAME) == 0 ? "SHOW DEFAULT DATABASE" : "RETURN 1";
183197

184198
resetActualDbName(); // Set this to null first in case run throws an exception
185-
StatementResult run = session.run(query);
199+
Result run = session.run(query);
186200
ResultSummary summary = null;
187201
try {
188202
summary = run.consume();
@@ -220,7 +234,7 @@ public Optional<BoltResult> runCypher(@Nonnull String cypher,
220234
throw new CommandException("Not connected to Neo4j");
221235
}
222236
if (this.transactionStatements != null) {
223-
transactionStatements.add(new Statement(cypher, queryParams));
237+
transactionStatements.add(new Query(cypher, queryParams));
224238
return Optional.empty();
225239
} else {
226240
try {
@@ -272,7 +286,7 @@ public void changePassword(@Nonnull ConnectionConfig connectionConfig) {
272286
parameters = Values.parameters("n", connectionConfig.newPassword());
273287
}
274288

275-
StatementResult run = session.run(command, parameters);
289+
Result run = session.run(command, parameters);
276290
run.consume();
277291

278292
// If successful, use the new password when reconnecting
@@ -298,7 +312,7 @@ public void changePassword(@Nonnull ConnectionConfig connectionConfig) {
298312
*/
299313
@Nonnull
300314
private Optional<BoltResult> getBoltResult(@Nonnull String cypher, @Nonnull Map<String, Object> queryParams) throws SessionExpiredException {
301-
StatementResult statementResult = session.run(new Statement(cypher, queryParams));
315+
Result statementResult = session.run(new Query(cypher, queryParams));
302316

303317
if (statementResult == null) {
304318
return Optional.empty();
@@ -358,7 +372,7 @@ public void disconnect() {
358372
silentDisconnect();
359373
}
360374

361-
List<Statement> getTransactionStatements() {
375+
List<Query> getTransactionStatements() {
362376
return this.transactionStatements;
363377
}
364378

@@ -376,10 +390,10 @@ private Driver getDriver(@Nonnull ConnectionConfig connectionConfig, @Nullable A
376390
return driverProvider.apply(connectionConfig.driverUrl(), authToken, configBuilder.build());
377391
}
378392

379-
private Optional<List<BoltResult>> captureResults(@Nonnull List<Statement> transactionStatements) {
393+
private Optional<List<BoltResult>> captureResults(@Nonnull List<Query> transactionStatements) {
380394
List<BoltResult> results = executeWithRetry(transactionStatements, (statement, transaction) -> {
381395
// calling list() is what actually executes cypher on the server
382-
StatementResult sr = transaction.run(statement);
396+
Result sr = transaction.run(statement);
383397
List<Record> list = sr.list();
384398
List<String> keys = sr.keys();
385399
ResultSummary summary = sr.consume();
@@ -395,7 +409,7 @@ private Optional<List<BoltResult>> captureResults(@Nonnull List<Statement> trans
395409
return Optional.of(results);
396410
}
397411

398-
private List<BoltResult> executeWithRetry(List<Statement> transactionStatements, BiFunction<Statement, Transaction, BoltResult> biFunction) {
412+
private List<BoltResult> executeWithRetry(List<Query> transactionStatements, BiFunction<Query, Transaction, BoltResult> biFunction) {
399413
return session.writeTransaction(tx ->
400414
transactionStatements.stream()
401415
.map(transactionStatement -> biFunction.apply(transactionStatement, tx))

‎cypher-shell/src/main/java/org/neo4j/shell/state/StatementBoltResult.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package org.neo4j.shell.state;
22

3-
import org.neo4j.driver.Record;
4-
import org.neo4j.driver.StatementResult;
5-
import org.neo4j.driver.summary.ResultSummary;
6-
7-
import javax.annotation.Nonnull;
83
import java.util.Iterator;
94
import java.util.List;
5+
import javax.annotation.Nonnull;
6+
7+
import org.neo4j.driver.Record;
8+
import org.neo4j.driver.Result;
9+
import org.neo4j.driver.summary.ResultSummary;
1010

1111
/**
12-
* Wrapper around {@link StatementResult}. Might or might not be materialized.
12+
* Wrapper around {@link Result}. Might or might not be materialized.
1313
*/
1414
public class StatementBoltResult implements BoltResult {
1515

16-
private final StatementResult result;
16+
private final Result result;
1717

18-
public StatementBoltResult(StatementResult result) {
18+
public StatementBoltResult(Result result) {
1919
this.result = result;
2020
}
2121

‎cypher-shell/src/test/java/org/neo4j/shell/prettyprint/OutputFormatterTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
import java.util.HashMap;
77
import java.util.Map;
88

9+
import org.neo4j.driver.Query;
10+
import org.neo4j.driver.Value;
11+
import org.neo4j.driver.Values;
912
import org.neo4j.driver.internal.BoltServerAddress;
1013
import org.neo4j.driver.internal.summary.InternalDatabaseInfo;
1114
import org.neo4j.driver.internal.summary.InternalResultSummary;
1215
import org.neo4j.driver.internal.summary.InternalServerInfo;
1316
import org.neo4j.driver.internal.util.ServerVersion;
1417
import org.neo4j.driver.internal.value.ListValue;
1518
import org.neo4j.driver.internal.value.MapValue;
16-
import org.neo4j.driver.Statement;
17-
import org.neo4j.driver.Value;
18-
import org.neo4j.driver.Values;
1919
import org.neo4j.driver.summary.ProfiledPlan;
20+
import org.neo4j.driver.summary.QueryType;
2021
import org.neo4j.driver.summary.ResultSummary;
21-
import org.neo4j.driver.summary.StatementType;
2222

2323
import static org.hamcrest.CoreMatchers.equalTo;
2424
import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,10 +34,10 @@ public void shouldReportTotalDBHits() {
3434

3535
ProfiledPlan plan = PROFILED_PLAN_FROM_VALUE.apply( planMap );
3636
ResultSummary summary = new InternalResultSummary(
37-
new Statement( "PROFILE MATCH (n:LABEL) WHERE 20 < n.age < 35 return n" ),
37+
new Query( "PROFILE MATCH (n:LABEL) WHERE 20 < n.age < 35 return n" ),
3838
new InternalServerInfo( new BoltServerAddress( "localhost:7687" ), ServerVersion.vInDev ),
3939
new InternalDatabaseInfo("neo4j"),
40-
StatementType.READ_ONLY,
40+
QueryType.READ_ONLY,
4141
null,
4242
plan,
4343
plan,

‎cypher-shell/src/test/java/org/neo4j/shell/prettyprint/PrettyPrinterTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22

33
import org.junit.Test;
44

5-
import org.neo4j.driver.internal.types.InternalTypeSystem;
5+
import java.util.Collections;
6+
import java.util.HashMap;
7+
import java.util.Map;
8+
import java.util.function.Function;
9+
import java.util.stream.Stream;
10+
611
import org.neo4j.driver.Record;
712
import org.neo4j.driver.Value;
813
import org.neo4j.driver.Values;
14+
import org.neo4j.driver.internal.types.InternalTypeSystem;
915
import org.neo4j.driver.summary.ProfiledPlan;
16+
import org.neo4j.driver.summary.QueryType;
1017
import org.neo4j.driver.summary.ResultSummary;
11-
import org.neo4j.driver.summary.StatementType;
1218
import org.neo4j.driver.summary.SummaryCounters;
1319
import org.neo4j.driver.types.Node;
1420
import org.neo4j.driver.types.Path;
@@ -17,12 +23,6 @@
1723
import org.neo4j.shell.state.BoltResult;
1824
import org.neo4j.shell.state.ListBoltResult;
1925

20-
import java.util.Collections;
21-
import java.util.HashMap;
22-
import java.util.Map;
23-
import java.util.function.Function;
24-
import java.util.stream.Stream;
25-
2626
import static java.util.Arrays.asList;
2727
import static java.util.Collections.singletonList;
2828
import static java.util.Collections.unmodifiableMap;
@@ -73,7 +73,7 @@ public void prettyPrintProfileInformation() {
7373
when(resultSummary.profile()).thenReturn(plan);
7474
when(resultSummary.resultAvailableAfter(anyObject())).thenReturn(5L);
7575
when(resultSummary.resultConsumedAfter(anyObject())).thenReturn(7L);
76-
when(resultSummary.statementType()).thenReturn(StatementType.READ_ONLY);
76+
when(resultSummary.queryType()).thenReturn(QueryType.READ_ONLY);
7777
Map<String, Value> argumentMap = Values.parameters("Version", "3.1", "Planner", "COST", "Runtime", "INTERPRETED").asMap(v -> v);
7878
when(plan.arguments()).thenReturn(argumentMap);
7979

@@ -108,7 +108,7 @@ public void prettyPrintExplainInformation() {
108108
when(resultSummary.plan()).thenReturn(plan);
109109
when(resultSummary.resultAvailableAfter(anyObject())).thenReturn(5L);
110110
when(resultSummary.resultConsumedAfter(anyObject())).thenReturn(7L);
111-
when(resultSummary.statementType()).thenReturn(StatementType.READ_ONLY);
111+
when(resultSummary.queryType()).thenReturn(QueryType.READ_ONLY);
112112
Map<String, Value> argumentMap = Values.parameters("Version", "3.1", "Planner", "COST", "Runtime", "INTERPRETED").asMap(v -> v);
113113
when(plan.arguments()).thenReturn(argumentMap);
114114

0 commit comments

Comments
 (0)