diff --git a/examples/src/main/java/org/neo4j/docs/driver/HelloWorldExample.java b/examples/src/main/java/org/neo4j/docs/driver/HelloWorldExample.java index b54b1d5c42..cb64fd1a53 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/HelloWorldExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/HelloWorldExample.java @@ -25,8 +25,6 @@ import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.Result; import org.neo4j.driver.Session; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.TransactionWork; import static org.neo4j.driver.Values.parameters; // end::hello-world-import[] @@ -51,18 +49,14 @@ public void printGreeting( final String message ) { try ( Session session = driver.session() ) { - String greeting = session.writeTransaction( new TransactionWork() - { - @Override - public String execute( Transaction tx ) - { - Result result = tx.run( "CREATE (a:Greeting) " + - "SET a.message = $message " + - "RETURN a.message + ', from node ' + id(a)", - parameters( "message", message ) ); - return result.single().get( 0 ).asString(); - } - } ); + String greeting = session.writeTransaction( tx -> + { + Result result = tx.run( "CREATE (a:Greeting) " + + "SET a.message = $message " + + "RETURN a.message + ', from node ' + id(a)", + parameters( "message", message ) ); + return result.single().get( 0 ).asString(); + } ); System.out.println( greeting ); } } diff --git a/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java b/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java index 7d3e393300..e046e37d73 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/PassBookmarkExample.java @@ -19,18 +19,19 @@ package org.neo4j.docs.driver; // tag::pass-bookmarks-import[] + import java.util.ArrayList; import java.util.List; import org.neo4j.driver.AccessMode; +import org.neo4j.driver.Bookmark; import org.neo4j.driver.Record; -import org.neo4j.driver.Session; import org.neo4j.driver.Result; +import org.neo4j.driver.Session; import org.neo4j.driver.Transaction; -import org.neo4j.driver.Bookmark; -import static org.neo4j.driver.Values.parameters; import static org.neo4j.driver.SessionConfig.builder; +import static org.neo4j.driver.Values.parameters; // end::pass-bookmarks-import[] public class PassBookmarkExample extends BaseApplication @@ -93,9 +94,9 @@ public void addEmployAndMakeFriends() // Create the first person and employment relationship. try ( Session session1 = driver.session( builder().withDefaultAccessMode( AccessMode.WRITE ).build() ) ) { - session1.writeTransaction( tx -> addCompany( tx, "Wayne Enterprises" ) ); - session1.writeTransaction( tx -> addPerson( tx, "Alice" ) ); - session1.writeTransaction( tx -> employ( tx, "Alice", "Wayne Enterprises" ) ); + session1.writeTransaction( tx -> addCompany( tx, "Wayne Enterprises" ).consume() ); + session1.writeTransaction( tx -> addPerson( tx, "Alice" ).consume() ); + session1.writeTransaction( tx -> employ( tx, "Alice", "Wayne Enterprises" ).consume() ); savedBookmarks.add( session1.lastBookmark() ); } @@ -103,9 +104,9 @@ public void addEmployAndMakeFriends() // Create the second person and employment relationship. try ( Session session2 = driver.session( builder().withDefaultAccessMode( AccessMode.WRITE ).build() ) ) { - session2.writeTransaction( tx -> addCompany( tx, "LexCorp" ) ); - session2.writeTransaction( tx -> addPerson( tx, "Bob" ) ); - session2.writeTransaction( tx -> employ( tx, "Bob", "LexCorp" ) ); + session2.writeTransaction( tx -> addCompany( tx, "LexCorp" ).consume() ); + session2.writeTransaction( tx -> addPerson( tx, "Bob" ).consume() ); + session2.writeTransaction( tx -> employ( tx, "Bob", "LexCorp" ).consume() ); savedBookmarks.add( session2.lastBookmark() ); } @@ -113,7 +114,7 @@ public void addEmployAndMakeFriends() // Create a friendship between the two people created above. try ( Session session3 = driver.session( builder().withDefaultAccessMode( AccessMode.WRITE ).withBookmarks( savedBookmarks ).build() ) ) { - session3.writeTransaction( tx -> makeFriends( tx, "Alice", "Bob" ) ); + session3.writeTransaction( tx -> makeFriends( tx, "Alice", "Bob" ).consume() ); session3.readTransaction( this::printFriends ); } diff --git a/examples/src/main/java/org/neo4j/docs/driver/ReadWriteTransactionExample.java b/examples/src/main/java/org/neo4j/docs/driver/ReadWriteTransactionExample.java index e96963b8e8..0cc7e5b5b8 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/ReadWriteTransactionExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/ReadWriteTransactionExample.java @@ -20,10 +20,9 @@ // tag::read-write-transaction-import[] -import org.neo4j.driver.Session; import org.neo4j.driver.Result; +import org.neo4j.driver.Session; import org.neo4j.driver.Transaction; -import org.neo4j.driver.TransactionWork; import static org.neo4j.driver.Values.parameters; // end::read-write-transaction-import[] @@ -40,28 +39,14 @@ public long addPerson( final String name ) { try ( Session session = driver.session() ) { - session.writeTransaction( new TransactionWork() - { - @Override - public Void execute( Transaction tx ) - { - return createPersonNode( tx, name ); - } - } ); - return session.readTransaction( new TransactionWork() - { - @Override - public Long execute( Transaction tx ) - { - return matchPersonNode( tx, name ); - } - } ); + session.writeTransaction( tx -> createPersonNode( tx, name ) ); + return session.readTransaction( tx -> matchPersonNode( tx, name ) ); } } private static Void createPersonNode( Transaction tx, String name ) { - tx.run( "CREATE (a:Person {name: $name})", parameters( "name", name ) ); + tx.run( "CREATE (a:Person {name: $name})", parameters( "name", name ) ).consume(); return null; } diff --git a/examples/src/main/java/org/neo4j/docs/driver/ResultRetainExample.java b/examples/src/main/java/org/neo4j/docs/driver/ResultRetainExample.java index 2b7caf861c..63e954f530 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/ResultRetainExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/ResultRetainExample.java @@ -23,6 +23,7 @@ import java.util.List; import org.neo4j.driver.Record; +import org.neo4j.driver.Result; import org.neo4j.driver.Session; import org.neo4j.driver.Transaction; import org.neo4j.driver.TransactionWork; @@ -53,19 +54,16 @@ public List execute( Transaction tx ) } ); for ( final Record person : persons ) { - employees += session.writeTransaction( new TransactionWork() - { - @Override - public Integer execute( Transaction tx ) - { - tx.run( "MATCH (emp:Person {name: $person_name}) " + - "MERGE (com:Company {name: $company_name}) " + - "MERGE (emp)-[:WORKS_FOR]->(com)", - parameters( "person_name", person.get( "name" ).asString(), "company_name", - companyName ) ); - return 1; - } - } ); + employees += session.writeTransaction( tx -> + { + Result result = tx.run( "MATCH (emp:Person {name: $person_name}) " + + "MERGE (com:Company {name: $company_name}) " + + "MERGE (emp)-[:WORKS_FOR]->(com)", + parameters( "person_name", person.get( "name" ).asString(), "company_name", + companyName ) ); + result.consume(); + return 1; + } ); } return employees; } diff --git a/examples/src/main/java/org/neo4j/docs/driver/ServiceUnavailableExample.java b/examples/src/main/java/org/neo4j/docs/driver/ServiceUnavailableExample.java index 86613588b5..5c4205f306 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/ServiceUnavailableExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/ServiceUnavailableExample.java @@ -26,8 +26,6 @@ import org.neo4j.driver.GraphDatabase; import org.neo4j.driver.Logging; import org.neo4j.driver.Session; -import org.neo4j.driver.Transaction; -import org.neo4j.driver.TransactionWork; import org.neo4j.driver.exceptions.ServiceUnavailableException; import static java.util.concurrent.TimeUnit.SECONDS; @@ -58,15 +56,11 @@ public boolean addItem() { try ( Session session = driver.session() ) { - return session.writeTransaction( new TransactionWork() - { - @Override - public Boolean execute( Transaction tx ) - { - tx.run( "CREATE (a:Item)" ); - return true; - } - } ); + return session.writeTransaction( tx -> + { + tx.run( "CREATE (a:Item)" ).consume(); + return true; + } ); } catch ( ServiceUnavailableException ex ) { diff --git a/examples/src/main/java/org/neo4j/docs/driver/TransactionFunctionExample.java b/examples/src/main/java/org/neo4j/docs/driver/TransactionFunctionExample.java index 640a18a7a7..008fb4d0a1 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/TransactionFunctionExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/TransactionFunctionExample.java @@ -38,7 +38,7 @@ public void addPerson( final String name ) try ( Session session = driver.session() ) { session.writeTransaction( tx -> { - tx.run( "CREATE (a:Person {name: $name})", parameters( "name", name ) ); + tx.run( "CREATE (a:Person {name: $name})", parameters( "name", name ) ).consume(); return 1; } ); } diff --git a/examples/src/main/java/org/neo4j/docs/driver/TransactionMetadataConfigExample.java b/examples/src/main/java/org/neo4j/docs/driver/TransactionMetadataConfigExample.java index 1c13f650f3..08bc8c2e98 100644 --- a/examples/src/main/java/org/neo4j/docs/driver/TransactionMetadataConfigExample.java +++ b/examples/src/main/java/org/neo4j/docs/driver/TransactionMetadataConfigExample.java @@ -46,7 +46,7 @@ public void addPerson( final String name ) .withMetadata( transactionMetadata ).build(); session.writeTransaction( tx -> { - tx.run( "CREATE (a:Person {name: $name})", parameters( "name", name ) ); + tx.run( "CREATE (a:Person {name: $name})", parameters( "name", name ) ).consume(); return 1; }, txConfig ); } diff --git a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java index f584a7ff79..ae126544cd 100644 --- a/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java +++ b/examples/src/test/java/org/neo4j/docs/driver/ExamplesIT.java @@ -110,7 +110,7 @@ private void write( final String query, final Value parameters ) { session.writeTransaction( tx -> { - tx.run( query, parameters ); + tx.run( query, parameters ).consume(); return null; } ); }