Fix after review

Author: Zhen Li

examples/src/main/java/org/neo4j/docs/driver/RxAutocommitTransactionExample.java

@@ -19,7 +19,6 @@
 package org.neo4j.docs.driver;
 
 import io.reactivex.Flowable;
-import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 
 import java.util.Collections;
@@ -34,7 +33,7 @@ public RxAutocommitTransactionExample( String uri, String user, String password
         super( uri, user, password );
     }
 
-    public Publisher<String> readProductTitlesReactor()
+    public Flux<String> readProductTitlesReactor()
     {
         // tag::reactor-autocommit-transaction[]
         String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title";
@@ -46,7 +45,7 @@ public Publisher<String> readProductTitlesReactor()
         // end::reactor-autocommit-transaction[]
     }
 
-    public Publisher<String> readProductTitlesRxJava()
+    public Flowable<String> readProductTitlesRxJava()
     {
         // tag::RxJava-autocommit-transaction[]
         String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title";

examples/src/main/java/org/neo4j/docs/driver/RxExplicitTransactionExample.java

@@ -19,9 +19,7 @@
 package org.neo4j.docs.driver;
 
 import io.reactivex.Flowable;
-import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 import java.util.Collections;
 import java.util.Map;
@@ -36,21 +34,23 @@ public RxExplicitTransactionExample( String uri, String user, String password )
         super( uri, user, password );
     }
 
-    public Publisher<String> readSingleProductReactor()
+    public Flux<String> readSingleProductReactor()
     {
         // tag::reactor-explicit-transaction[]
         String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title";
         Map<String,Object> parameters = Collections.singletonMap( "id", 0 );
 
         RxSession session = driver.rxSession();
-        return Mono.usingWhen( session.beginTransaction(),
-                tx -> Flux.from( tx.run( query, parameters ).records() ).single().map( record -> record.get( 0 ).asString() ),
+        // It is recommended to use Flux.usingWhen for explicit transactions and Flux.using for autocommit transactions (session).
+        // This is because an explicit transaction needs to be supplied via a another resource publisher session.beginTransaction.
+        return Flux.usingWhen( session.beginTransaction(),
+                tx -> Flux.from( tx.run( query, parameters ).records() ).map( record -> record.get( 0 ).asString() ),
                 RxTransaction::commit,
                 RxTransaction::rollback );
         // end::reactor-explicit-transaction[]
     }
 
-    public Publisher<String> readSingleProductRxJava()
+    public Flowable<String> readSingleProductRxJava()
     {
         // tag::RxJava-explicit-transaction[]
         String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title";
@@ -59,7 +59,8 @@ public Publisher<String> readSingleProductRxJava()
         RxSession session = driver.rxSession();
         return Flowable.fromPublisher( session.beginTransaction() )
                 .flatMap( tx -> Flowable.fromPublisher( tx.run( query, parameters ).records() ).map( record -> record.get( 0 ).asString() )
-                        .doOnComplete( tx::commit ).doOnError( error -> tx.rollback() ) );
+                        .doOnComplete( tx::commit )
+                        .doOnError( error -> tx.rollback() ) );
         // end::RxJava-explicit-transaction[]
     }
 }

examples/src/main/java/org/neo4j/docs/driver/RxTransactionFunctionExample.java

@@ -19,7 +19,6 @@
 package org.neo4j.docs.driver;
 
 import io.reactivex.Flowable;
-import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -37,7 +36,7 @@ public RxTransactionFunctionExample( String uri, String user, String password )
         super( uri, user, password );
     }
 
-    public Publisher<ResultSummary> printAllProductsReactor()
+    public Flux<ResultSummary> printAllProductsReactor()
     {
         // tag::reactor-transaction-function[]
         String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title";
@@ -53,7 +52,7 @@ public Publisher<ResultSummary> printAllProductsReactor()
         // end::reactor-transaction-function[]
     }
 
-    public Publisher<ResultSummary> printAllProductsRxJava()
+    public Flowable<ResultSummary> printAllProductsRxJava()
     {
         // tag::RxJava-transaction-function[]
         String query = "MATCH (p:Product) WHERE p.id = $id RETURN p.title";