Skip to content

Commit 1ad4543

Browse files
zhenlineozhenlineo
authored
Merge pull request #590 from zhenlineo/2.0-rename-rxResult
Renamed `RxResult` to `RxStatementResult`
2 parents 0d7b1f3 + e7a3818 commit 1ad4543

19 files changed

+146
-146
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/reactive/AbstractRxStatementRunner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Map;
2222

23-
import org.neo4j.driver.reactive.RxResult;
23+
import org.neo4j.driver.reactive.RxStatementResult;
2424
import org.neo4j.driver.reactive.RxStatementRunner;
2525
import org.neo4j.driver.Record;
2626
import org.neo4j.driver.Statement;
@@ -31,25 +31,25 @@
3131
public abstract class AbstractRxStatementRunner implements RxStatementRunner
3232
{
3333
@Override
34-
public final RxResult run( String statementTemplate, Value parameters )
34+
public final RxStatementResult run( String statementTemplate, Value parameters )
3535
{
3636
return run( new Statement( statementTemplate, parameters ) );
3737
}
3838

3939
@Override
40-
public final RxResult run( String statementTemplate, Map<String,Object> statementParameters )
40+
public final RxStatementResult run( String statementTemplate, Map<String,Object> statementParameters )
4141
{
4242
return run( statementTemplate, parameters( statementParameters ) );
4343
}
4444

4545
@Override
46-
public final RxResult run( String statementTemplate, Record statementParameters )
46+
public final RxStatementResult run( String statementTemplate, Record statementParameters )
4747
{
4848
return run( statementTemplate, parameters( statementParameters ) );
4949
}
5050

5151
@Override
52-
public final RxResult run( String statementTemplate )
52+
public final RxStatementResult run( String statementTemplate )
5353
{
5454
return run( new Statement( statementTemplate ) );
5555
}

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxSession.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.neo4j.driver.internal.async.NetworkSession;
3131
import org.neo4j.driver.internal.cursor.RxStatementResultCursor;
3232
import org.neo4j.driver.internal.util.Futures;
33-
import org.neo4j.driver.reactive.RxResult;
33+
import org.neo4j.driver.reactive.RxStatementResult;
3434
import org.neo4j.driver.reactive.RxSession;
3535
import org.neo4j.driver.reactive.RxTransaction;
3636
import org.neo4j.driver.reactive.RxTransactionWork;
@@ -126,27 +126,27 @@ private <T> Publisher<T> runTransaction( AccessMode mode, RxTransactionWork<Publ
126126
}
127127

128128
@Override
129-
public RxResult run( String statement, TransactionConfig config )
129+
public RxStatementResult run( String statement, TransactionConfig config )
130130
{
131131
return run( new Statement( statement ), config );
132132
}
133133

134134
@Override
135-
public RxResult run( String statement, Map<String,Object> parameters, TransactionConfig config )
135+
public RxStatementResult run( String statement, Map<String,Object> parameters, TransactionConfig config )
136136
{
137137
return run( new Statement( statement, parameters ), config );
138138
}
139139

140140
@Override
141-
public RxResult run( Statement statement )
141+
public RxStatementResult run( Statement statement )
142142
{
143143
return run( statement, TransactionConfig.empty() );
144144
}
145145

146146
@Override
147-
public RxResult run( Statement statement, TransactionConfig config )
147+
public RxStatementResult run( Statement statement, TransactionConfig config )
148148
{
149-
return new InternalRxResult( () -> {
149+
return new InternalRxStatementResult( () -> {
150150
CompletableFuture<RxStatementResultCursor> resultCursorFuture = new CompletableFuture<>();
151151
session.runRx( statement, config ).whenComplete( ( cursor, completionError ) -> {
152152
if ( cursor != null )

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxResult.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxStatementResult.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727

2828
import org.neo4j.driver.Record;
2929
import org.neo4j.driver.internal.util.Futures;
30-
import org.neo4j.driver.reactive.RxResult;
30+
import org.neo4j.driver.reactive.RxStatementResult;
3131
import org.neo4j.driver.internal.cursor.RxStatementResultCursor;
3232
import org.neo4j.driver.summary.ResultSummary;
3333

34-
public class InternalRxResult implements RxResult
34+
public class InternalRxStatementResult implements RxStatementResult
3535
{
3636
private Supplier<CompletionStage<RxStatementResultCursor>> cursorFutureSupplier;
3737
private volatile CompletionStage<RxStatementResultCursor> cursorFuture;
3838

39-
public InternalRxResult( Supplier<CompletionStage<RxStatementResultCursor>> cursorFuture )
39+
public InternalRxStatementResult( Supplier<CompletionStage<RxStatementResultCursor>> cursorFuture )
4040
{
4141
this.cursorFutureSupplier = cursorFuture;
4242
}

‎driver/src/main/java/org/neo4j/driver/internal/reactive/InternalRxTransaction.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.neo4j.driver.internal.async.ExplicitTransaction;
2727
import org.neo4j.driver.internal.cursor.RxStatementResultCursor;
2828
import org.neo4j.driver.internal.util.Futures;
29-
import org.neo4j.driver.reactive.RxResult;
29+
import org.neo4j.driver.reactive.RxStatementResult;
3030
import org.neo4j.driver.reactive.RxTransaction;
3131

3232
import static org.neo4j.driver.internal.reactive.RxUtils.createEmptyPublisher;
@@ -41,9 +41,9 @@ public InternalRxTransaction( ExplicitTransaction tx )
4141
}
4242

4343
@Override
44-
public RxResult run( Statement statement )
44+
public RxStatementResult run( Statement statement )
4545
{
46-
return new InternalRxResult( () -> {
46+
return new InternalRxStatementResult( () -> {
4747
CompletableFuture<RxStatementResultCursor> cursorFuture = new CompletableFuture<>();
4848
tx.runRx( statement ).whenComplete( ( cursor, completionError ) -> {
4949
if ( cursor != null )

‎driver/src/main/java/org/neo4j/driver/reactive/RxSession.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* A reactive session is the same as {@link Session} except it provides a reactive API.
3434
* @see Session
35-
* @see RxResult
35+
* @see RxStatementResult
3636
* @see RxTransaction
3737
* @see Publisher
3838
* @since 2.0
@@ -158,7 +158,7 @@ public interface RxSession extends RxStatementRunner
158158
* @param config configuration for the new transaction.
159159
* @return a reactive result.
160160
*/
161-
RxResult run( String statement, TransactionConfig config );
161+
RxStatementResult run( String statement, TransactionConfig config );
162162

163163
/**
164164
* Run a statement with parameters in an auto-commit transaction with specified {@link TransactionConfig} and return a reactive result stream.
@@ -196,7 +196,7 @@ public interface RxSession extends RxStatementRunner
196196
* @param config configuration for the new transaction.
197197
* @return a reactive result.
198198
*/
199-
RxResult run( String statement, Map<String,Object> parameters, TransactionConfig config );
199+
RxStatementResult run( String statement, Map<String,Object> parameters, TransactionConfig config );
200200

201201
/**
202202
* Run a statement in an auto-commit transaction with specified {@link TransactionConfig configuration} and return a reactive result stream.
@@ -222,7 +222,7 @@ public interface RxSession extends RxStatementRunner
222222
* @param config configuration for the new transaction.
223223
* @return a reactive result.
224224
*/
225-
RxResult run( Statement statement, TransactionConfig config );
225+
RxStatementResult run( Statement statement, TransactionConfig config );
226226

227227
/**
228228
* Return the bookmark received following the last completed statement within this session.

‎driver/src/main/java/org/neo4j/driver/reactive/RxResult.java renamed to ‎driver/src/main/java/org/neo4j/driver/reactive/RxStatementResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @see Subscription
3939
* @since 2.0
4040
*/
41-
public interface RxResult
41+
public interface RxStatementResult
4242
{
4343
/**
4444
* Returns a cold publisher of keys.

‎driver/src/main/java/org/neo4j/driver/reactive/RxStatementRunner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public interface RxStatementRunner
5454
* @param parameters input parameters, should be a map Value, see {@link Values#parameters(Object...)}.
5555
* @return a reactive result.
5656
*/
57-
RxResult run( String statementTemplate, Value parameters );
57+
RxStatementResult run( String statementTemplate, Value parameters );
5858

5959
/**
6060
* Register running of a statement and return a reactive result stream.
@@ -74,7 +74,7 @@ public interface RxStatementRunner
7474
* @param statementParameters input data for the statement
7575
* @return a reactive result.
7676
*/
77-
RxResult run( String statementTemplate, Map<String,Object> statementParameters );
77+
RxStatementResult run( String statementTemplate, Map<String,Object> statementParameters );
7878

7979
/**
8080
* Register running of a statement and return a reactive result stream.
@@ -93,7 +93,7 @@ public interface RxStatementRunner
9393
* @param statementParameters input data for the statement
9494
* @return a reactive result.
9595
*/
96-
RxResult run( String statementTemplate, Record statementParameters );
96+
RxStatementResult run( String statementTemplate, Record statementParameters );
9797

9898
/**
9999
* Register running of a statement and return a reactive result stream.
@@ -103,7 +103,7 @@ public interface RxStatementRunner
103103
* @param statementTemplate text of a Neo4j statement
104104
* @return a reactive result.
105105
*/
106-
RxResult run( String statementTemplate );
106+
RxStatementResult run( String statementTemplate );
107107

108108
/**
109109
* Register running of a statement and return a reactive result stream.
@@ -113,5 +113,5 @@ public interface RxStatementRunner
113113
* @param statement a Neo4j statement
114114
* @return a reactive result.
115115
*/
116-
RxResult run( Statement statement );
116+
RxStatementResult run( Statement statement );
117117
}

‎driver/src/test/java/org/neo4j/driver/integration/ConnectionHandlingIT.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.neo4j.driver.internal.spi.ConnectionPool;
4848
import org.neo4j.driver.internal.util.Clock;
4949
import org.neo4j.driver.internal.util.EnabledOnNeo4jWith;
50-
import org.neo4j.driver.reactive.RxResult;
50+
import org.neo4j.driver.reactive.RxStatementResult;
5151
import org.neo4j.driver.reactive.RxSession;
5252
import org.neo4j.driver.reactive.RxTransaction;
5353
import org.neo4j.driver.AuthToken;
@@ -313,7 +313,7 @@ void connectionUsedForBeginTxReturnedToThePoolWhenSessionClose()
313313
void sessionCloseShouldReleaseConnectionUsedBySessionRun() throws Throwable
314314
{
315315
RxSession session = driver.rxSession();
316-
RxResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
316+
RxStatementResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
317317

318318
// When we only run but not pull
319319
StepVerifier.create( Flux.from( res.keys() ) ).expectNext( "a" ).verifyComplete();
@@ -332,7 +332,7 @@ void sessionCloseShouldReleaseConnectionUsedBySessionRun() throws Throwable
332332
void resultRecordsShouldReleaseConnectionUsedBySessionRun() throws Throwable
333333
{
334334
RxSession session = driver.rxSession();
335-
RxResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
335+
RxStatementResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
336336
Connection connection1 = connectionPool.lastAcquiredConnectionSpy;
337337
assertNull( connection1 );
338338

@@ -350,7 +350,7 @@ void resultRecordsShouldReleaseConnectionUsedBySessionRun() throws Throwable
350350
void resultSummaryShouldReleaseConnectionUsedBySessionRun() throws Throwable
351351
{
352352
RxSession session = driver.rxSession();
353-
RxResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
353+
RxStatementResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
354354
Connection connection1 = connectionPool.lastAcquiredConnectionSpy;
355355
assertNull( connection1 );
356356

@@ -371,7 +371,7 @@ void txCommitShouldReleaseConnectionUsedByBeginTx() throws Throwable
371371
Connection connection1 = connectionPool.lastAcquiredConnectionSpy;
372372
verify( connection1, never() ).release();
373373

374-
RxResult result = tx.run( "UNWIND [1,2,3,4] AS a RETURN a" );
374+
RxStatementResult result = tx.run( "UNWIND [1,2,3,4] AS a RETURN a" );
375375
StepVerifier.create( Flux.from( result.records() ).map( record -> record.get( "a" ).asInt() ) )
376376
.expectNext( 1, 2, 3, 4 ).verifyComplete();
377377

@@ -393,7 +393,7 @@ void txRollbackShouldReleaseConnectionUsedByBeginTx() throws Throwable
393393
Connection connection1 = connectionPool.lastAcquiredConnectionSpy;
394394
verify( connection1, never() ).release();
395395

396-
RxResult result = tx.run( "UNWIND [1,2,3,4] AS a RETURN a" );
396+
RxStatementResult result = tx.run( "UNWIND [1,2,3,4] AS a RETURN a" );
397397
StepVerifier.create( Flux.from( result.records() ).map( record -> record.get( "a" ).asInt() ) )
398398
.expectNext( 1, 2, 3, 4 ).verifyComplete();
399399

‎driver/src/test/java/org/neo4j/driver/integration/SessionIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import org.neo4j.driver.internal.util.DriverFactoryWithFixedRetryLogic;
6060
import org.neo4j.driver.internal.util.DriverFactoryWithOneEventLoopThread;
6161
import org.neo4j.driver.internal.util.EnabledOnNeo4jWith;
62-
import org.neo4j.driver.reactive.RxResult;
62+
import org.neo4j.driver.reactive.RxStatementResult;
6363
import org.neo4j.driver.reactive.RxSession;
6464
import org.neo4j.driver.summary.ResultSummary;
6565
import org.neo4j.driver.summary.StatementType;
@@ -1209,7 +1209,7 @@ void shouldErrorWhenTryingToUseRxAPIWithoutBoltV4() throws Throwable
12091209
{
12101210
// Given
12111211
RxSession session = neo4j.driver().rxSession();
1212-
RxResult result = session.run( "RETURN 1" );
1212+
RxStatementResult result = session.run( "RETURN 1" );
12131213

12141214
// When trying to run the query on a server that is using a protocol that is lower than V4
12151215
StepVerifier.create( result.records() ).expectErrorSatisfies( error -> {

‎driver/src/test/java/org/neo4j/driver/integration/reactive/RxSessionIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.neo4j.driver.exceptions.SessionExpiredException;
3939
import org.neo4j.driver.exceptions.TransientException;
4040
import org.neo4j.driver.internal.util.EnabledOnNeo4jWith;
41-
import org.neo4j.driver.reactive.RxResult;
41+
import org.neo4j.driver.reactive.RxStatementResult;
4242
import org.neo4j.driver.reactive.RxSession;
4343
import org.neo4j.driver.reactive.RxTransaction;
4444
import org.neo4j.driver.reactive.RxTransactionWork;
@@ -65,7 +65,7 @@ void shouldAllowSessionRun()
6565
{
6666
// When
6767
RxSession session = neo4j.driver().rxSession();
68-
RxResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
68+
RxStatementResult res = session.run( "UNWIND [1,2,3,4] AS a RETURN a" );
6969

7070
// Then I should be able to iterate over the result
7171
StepVerifier.create( Flux.from( res.records() ).map( r -> r.get( "a" ).asInt() ) )
@@ -82,12 +82,12 @@ void shouldBeAbleToReuseSessionAfterFailure()
8282
{
8383
// Given
8484
RxSession session = neo4j.driver().rxSession();
85-
RxResult res1 = session.run( "INVALID" );
85+
RxStatementResult res1 = session.run( "INVALID" );
8686

8787
StepVerifier.create( res1.records() ).expectError( ClientException.class ).verify();
8888

8989
// When
90-
RxResult res2 = session.run( "RETURN 1" );
90+
RxStatementResult res2 = session.run( "RETURN 1" );
9191

9292
// Then
9393
StepVerifier.create( res2.records() ).assertNext( record -> {

0 commit comments

Comments
 (0)