Skip to content

Commit 5ed268e

Browse files
boggleboggle
committed
Rename Result to ResultCursor
1 parent b016fdf commit 5ed268e

31 files changed

+113
-118
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/InternalRecord.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public boolean equals( Object other )
128128
else if ( other instanceof Record )
129129
{
130130
Record otherRecord = (Record) other;
131-
int size = fieldCount();
131+
int size = size();
132132
if ( ! ( size == otherRecord.size() ) )
133133
{
134134
return false;

‎driver/src/main/java/org/neo4j/driver/internal/InternalRecordAccessor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929

3030
public abstract class InternalRecordAccessor implements RecordAccessor
3131
{
32-
public int fieldCount()
33-
{
34-
return keys().size();
35-
}
36-
3732
@Override
3833
public List<Entry<Value>> fields()
3934
{

‎driver/src/main/java/org/neo4j/driver/internal/InternalResult.java renamed to ‎driver/src/main/java/org/neo4j/driver/internal/InternalResultCursor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.neo4j.driver.v1.Function;
2626
import org.neo4j.driver.v1.Record;
2727
import org.neo4j.driver.v1.RecordAccessor;
28-
import org.neo4j.driver.v1.Result;
28+
import org.neo4j.driver.v1.ResultCursor;
2929
import org.neo4j.driver.v1.ResultSummary;
3030
import org.neo4j.driver.v1.Value;
3131
import org.neo4j.driver.v1.exceptions.ClientException;
@@ -34,7 +34,7 @@
3434

3535
import static org.neo4j.driver.v1.Records.recordAsIs;
3636

37-
public class InternalResult extends InternalRecordAccessor implements Result
37+
public class InternalResultCursor extends InternalRecordAccessor implements ResultCursor
3838
{
3939
private final List<String> keys;
4040
private final Iterator<Record> iter;
@@ -44,7 +44,7 @@ public class InternalResult extends InternalRecordAccessor implements Result
4444
private Record current = null;
4545
private long position = -1;
4646

47-
public InternalResult( List<String> keys, List<Record> body, ResultSummary summary )
47+
public InternalResultCursor( List<String> keys, List<Record> body, ResultSummary summary )
4848
{
4949
this.keys = keys;
5050
this.iter = body.iterator();

‎driver/src/main/java/org/neo4j/driver/internal/InternalSession.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.neo4j.driver.internal.spi.Connection;
2424
import org.neo4j.driver.internal.summary.ResultBuilder;
2525
import org.neo4j.driver.internal.types.InternalTypeSystem;
26-
import org.neo4j.driver.v1.Result;
26+
import org.neo4j.driver.v1.ResultCursor;
2727
import org.neo4j.driver.v1.Session;
2828
import org.neo4j.driver.v1.Statement;
2929
import org.neo4j.driver.v1.Transaction;
@@ -54,7 +54,7 @@ public InternalSession( Connection connection )
5454
}
5555

5656
@Override
57-
public Result run( String statementText, Map<String,Value> statementParameters )
57+
public ResultCursor run( String statementText, Map<String,Value> statementParameters )
5858
{
5959
ensureNoOpenTransaction();
6060
ResultBuilder resultBuilder = new ResultBuilder( statementText, statementParameters );
@@ -66,13 +66,13 @@ public Result run( String statementText, Map<String,Value> statementParameters )
6666
}
6767

6868
@Override
69-
public Result run( String statementTemplate )
69+
public ResultCursor run( String statementTemplate )
7070
{
7171
return run( statementTemplate, ParameterSupport.NO_PARAMETERS );
7272
}
7373

7474
@Override
75-
public Result run( Statement statement )
75+
public ResultCursor run( Statement statement )
7676
{
7777
return run( statement.template(), statement.parameters() );
7878
}

‎driver/src/main/java/org/neo4j/driver/internal/InternalTransaction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.neo4j.driver.internal.spi.Connection;
2525
import org.neo4j.driver.internal.summary.ResultBuilder;
2626
import org.neo4j.driver.internal.types.InternalTypeSystem;
27-
import org.neo4j.driver.v1.Result;
27+
import org.neo4j.driver.v1.ResultCursor;
2828
import org.neo4j.driver.v1.Statement;
2929
import org.neo4j.driver.v1.Transaction;
3030
import org.neo4j.driver.v1.TypeSystem;
@@ -120,7 +120,7 @@ else if ( state == State.MARKED_FAILED || state == State.ACTIVE )
120120

121121
@Override
122122
@SuppressWarnings( "unchecked" )
123-
public Result run( String statementText, Map<String,Value> statementParameters )
123+
public ResultCursor run( String statementText, Map<String,Value> statementParameters )
124124
{
125125
ensureNotFailed();
126126

@@ -140,13 +140,13 @@ public Result run( String statementText, Map<String,Value> statementParameters )
140140
}
141141

142142
@Override
143-
public Result run( String statementTemplate )
143+
public ResultCursor run( String statementTemplate )
144144
{
145145
return run( statementTemplate, ParameterSupport.NO_PARAMETERS );
146146
}
147147

148148
@Override
149-
public Result run( Statement statement )
149+
public ResultCursor run( Statement statement )
150150
{
151151
return run( statement.template(), statement.parameters() );
152152
}

‎driver/src/main/java/org/neo4j/driver/internal/summary/ResultBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import java.util.Map;
2626

2727
import org.neo4j.driver.internal.InternalRecord;
28-
import org.neo4j.driver.internal.InternalResult;
28+
import org.neo4j.driver.internal.InternalResultCursor;
2929
import org.neo4j.driver.internal.spi.StreamCollector;
3030
import org.neo4j.driver.v1.Notification;
3131
import org.neo4j.driver.v1.Plan;
3232
import org.neo4j.driver.v1.ProfiledPlan;
3333
import org.neo4j.driver.v1.Record;
34-
import org.neo4j.driver.v1.Result;
34+
import org.neo4j.driver.v1.ResultCursor;
3535
import org.neo4j.driver.v1.Statement;
3636
import org.neo4j.driver.v1.StatementType;
3737
import org.neo4j.driver.v1.UpdateStatistics;
@@ -124,8 +124,8 @@ public void notifications( List<Notification> notifications )
124124
summaryBuilder.notifications( notifications );
125125
}
126126

127-
public Result build()
127+
public ResultCursor build()
128128
{
129-
return new InternalResult( keys, body, summaryBuilder.build() );
129+
return new InternalResultCursor( keys, body, summaryBuilder.build() );
130130
}
131131
}

‎driver/src/main/java/org/neo4j/driver/v1/Driver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
* }
4949
*
5050
* // Retrieve results
51-
* Result result = session.run( "MATCH (n) RETURN n.name" );
51+
* ResultCursor cursor = session.run( "MATCH (n) RETURN n.name" );
5252
* List<String> names = new LinkedList<>();
53-
* while( result.next() )
53+
* while( cursor.next() )
5454
* {
55-
* names.add( result.value("n.name").asString() );
55+
* names.add( cursor.value("n.name").asString() );
5656
* }
5757
*
5858
* // Sessions are pooled, to avoid the overhead of creating new connections - this means

‎driver/src/main/java/org/neo4j/driver/v1/Record.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
/**
2424
* A record is an immutable copy of an ordered map
2525
*
26-
* @see Result#record()
27-
* @see Result#retain()
26+
* @see ResultCursor#record()
27+
* @see ResultCursor#retain()
2828
*/
2929
@Immutable
3030
public interface Record extends RecordAccessor

‎driver/src/main/java/org/neo4j/driver/v1/Records.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Static utility methods for retaining records
2323
*
24-
* @see Result#retain()
24+
* @see ResultCursor#retain()
2525
*/
2626
public abstract class Records
2727
{

‎driver/src/main/java/org/neo4j/driver/v1/Result.java renamed to ‎driver/src/main/java/org/neo4j/driver/v1/ResultCursor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* To keep a result around while further statements are run, or to use a result outside the scope
3838
* of the current transaction, see {@link #retain()}.
3939
*/
40-
public interface Result extends RecordAccessor, Resource
40+
public interface ResultCursor extends RecordAccessor, Resource
4141
{
4242
/**
4343
* @return an immutable copy of the currently viewed record

‎driver/src/main/java/org/neo4j/driver/v1/Statement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
*
3232
* @see Session
3333
* @see Transaction
34-
* @see Result
35-
* @see Result#summarize()
34+
* @see ResultCursor
35+
* @see ResultCursor#summarize()
3636
* @see ResultSummary
3737
*/
3838
@Immutable

‎driver/src/main/java/org/neo4j/driver/v1/StatementRunner.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,39 +39,39 @@ public interface StatementRunner
3939
* <h2>Example</h2>
4040
* <pre class="doctest:StatementRunnerDocIT#parameterTest">
4141
* {@code
42-
* Result cursor = session.run( "MATCH (n) WHERE n.name = {myNameParam} RETURN (n)",
43-
* Values.parameters( "myNameParam", "Bob" ) );
42+
* ResultCursor cursor = session.run( "MATCH (n) WHERE n.name = {myNameParam} RETURN (n)",
43+
* Values.parameters( "myNameParam", "Bob" ) );
4444
* }
4545
* </pre>
4646
*
4747
* @param statementTemplate template of a Neo4j statement
4848
* @param statementParameters input data for the statement, see {@link Values#parameters(Object...)}
4949
* @return a stream of result values and associated metadata
5050
*/
51-
Result run( String statementTemplate, Map<String, Value> statementParameters );
51+
ResultCursor run( String statementTemplate, Map<String, Value> statementParameters );
5252

5353
/**
5454
* Run a statement and return a result stream.
5555
*
5656
* @param statementTemplate template of a Neo4j statement
5757
* @return a stream of result values and associated metadata
5858
*/
59-
Result run( String statementTemplate );
59+
ResultCursor run( String statementTemplate );
6060

6161
/**
6262
* Run a statement and return a result stream.
6363
* <h2>Example</h2>
6464
* <pre class="doctest:StatementRunnerDocIT#statementObjectTest">
6565
* {@code
6666
* Statement statement = new Statement( "MATCH (n) WHERE n.name={myNameParam} RETURN n.age" );
67-
* Result cursor = session.run( statement.withParameters( Values.parameters( "myNameParam", "Bob" ) ) );
67+
* ResultCursor cursor = session.run( statement.withParameters( Values.parameters( "myNameParam", "Bob" ) ) );
6868
* }
6969
* </pre>
7070
*
7171
* @param statement a Neo4j statement
7272
* @return a stream of result values and associated metadata
7373
*/
74-
Result run( Statement statement );
74+
ResultCursor run( Statement statement );
7575

7676
/**
7777
* @return type system used by this statement runner for classifying values

‎driver/src/test/java/org/neo4j/driver/internal/InternalRecordTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ public void accessingUnknownKeyShouldBeNull()
5353
}
5454

5555
@Test
56-
public void shouldHaveCorrectFieldCount()
56+
public void shouldHaveCorrectSize()
5757
{
5858
InternalRecord record = createRecord();
59-
assertThat( record.fieldCount(), equalTo( 2 ) );
59+
assertThat( record.size(), equalTo( 2 ) );
6060
}
6161

6262
@Test

0 commit comments

Comments
 (0)