Skip to content

API clean up #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -98,30 +98,30 @@ private Publisher<RxTransaction> beginTransaction( AccessMode mode, TransactionC
}

@Override
public <T> Publisher<T> readTransaction( RxTransactionWork<Publisher<T>> work )
public <T> Publisher<T> readTransaction( RxTransactionWork<? extends Publisher<T>> work )
{
return readTransaction( work, TransactionConfig.empty() );
}

@Override
public <T> Publisher<T> readTransaction( RxTransactionWork<Publisher<T>> work, TransactionConfig config )
public <T> Publisher<T> readTransaction( RxTransactionWork<? extends Publisher<T>> work, TransactionConfig config )
{
return runTransaction( AccessMode.READ, work, config );
}

@Override
public <T> Publisher<T> writeTransaction( RxTransactionWork<Publisher<T>> work )
public <T> Publisher<T> writeTransaction( RxTransactionWork<? extends Publisher<T>> work )
{
return writeTransaction( work, TransactionConfig.empty() );
}

@Override
public <T> Publisher<T> writeTransaction( RxTransactionWork<Publisher<T>> work, TransactionConfig config )
public <T> Publisher<T> writeTransaction( RxTransactionWork<? extends Publisher<T>> work, TransactionConfig config )
{
return runTransaction( AccessMode.WRITE, work, config );
}

private <T> Publisher<T> runTransaction( AccessMode mode, RxTransactionWork<Publisher<T>> work, TransactionConfig config )
private <T> Publisher<T> runTransaction( AccessMode mode, RxTransactionWork<? extends Publisher<T>> work, TransactionConfig config )
{
Flux<T> repeatableWork = Flux.usingWhen( beginTransaction( mode, config ), work::execute,
RxTransaction::commit, ( tx, error ) -> tx.rollback(), null );
Expand Down
8 changes: 4 additions & 4 deletions driver/src/main/java/org/neo4j/driver/reactive/RxSession.java
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public interface RxSession extends RxStatementRunner
* publisher can be completed exceptionally if given work or commit fails.
*
*/
<T> Publisher<T> readTransaction( RxTransactionWork<Publisher<T>> work );
<T> Publisher<T> readTransaction( RxTransactionWork<? extends Publisher<T>> work );

/**
* Execute given unit of reactive work in a {@link AccessMode#READ read} reactive transaction with
Expand All @@ -106,7 +106,7 @@ public interface RxSession extends RxStatementRunner
* publisher can be completed exceptionally if given work or commit fails.
*
*/
<T> Publisher<T> readTransaction( RxTransactionWork<Publisher<T>> work, TransactionConfig config );
<T> Publisher<T> readTransaction( RxTransactionWork<? extends Publisher<T>> work, TransactionConfig config );

/**
* Execute given unit of reactive work in a {@link AccessMode#WRITE write} reactive transaction.
Expand All @@ -127,7 +127,7 @@ public interface RxSession extends RxStatementRunner
* publisher can be completed exceptionally if given work or commit fails.
*
*/
<T> Publisher<T> writeTransaction( RxTransactionWork<Publisher<T>> work );
<T> Publisher<T> writeTransaction( RxTransactionWork<? extends Publisher<T>> work );

/**
* Execute given unit of reactive work in a {@link AccessMode#WRITE write} reactive transaction with
Expand All @@ -150,7 +150,7 @@ public interface RxSession extends RxStatementRunner
* publisher can be completed exceptionally if given work or commit fails.
*
*/
<T> Publisher<T> writeTransaction( RxTransactionWork<Publisher<T>> work, TransactionConfig config );
<T> Publisher<T> writeTransaction( RxTransactionWork<? extends Publisher<T>> work, TransactionConfig config );

/**
* Run a statement with parameters in an auto-commit transaction with specified {@link TransactionConfig} and return a reactive result stream.
Expand Down

This file was deleted.