Skip to content

Commit cf36969

Browse files
committed
Break out collcetor creation (responding to feedback)
1 parent c5bce12 commit cf36969

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

driver/src/main/java/org/neo4j/driver/internal/InternalResultCursor.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545

4646
import static java.lang.String.format;
4747
import static java.util.Collections.emptyList;
48-
import static java.util.Collections.unmodifiableMap;
49-
import static org.neo4j.driver.internal.ParameterSupport.NO_PARAMETERS;
48+
5049
import static org.neo4j.driver.v1.Records.recordAsIs;
5150

5251
public class InternalResultCursor extends InternalRecordAccessor implements ResultCursor
@@ -68,12 +67,13 @@ public class InternalResultCursor extends InternalRecordAccessor implements Resu
6867
public InternalResultCursor( Connection connection, String statement, Map<String, Value> parameters )
6968
{
7069
this.connection = connection;
70+
this.runResponseCollector = newRunResponseCollector();
71+
this.pullAllResponseCollector = newPullAllResponseCollector( new Statement( statement, parameters ) );
72+
}
7173

72-
Map<String, Value> unmodifiableParameters =
73-
(parameters == null) || (parameters.isEmpty()) ? NO_PARAMETERS : unmodifiableMap( parameters );
74-
final SummaryBuilder summaryBuilder = new SummaryBuilder( new Statement( statement, unmodifiableParameters ) );
75-
76-
this.runResponseCollector = new StreamCollector()
74+
private StreamCollector newRunResponseCollector()
75+
{
76+
return new StreamCollector()
7777
{
7878
@Override
7979
public void keys( String[] names )
@@ -108,7 +108,12 @@ public void done()
108108
}
109109
}
110110
};
111-
this.pullAllResponseCollector = new StreamCollector()
111+
}
112+
113+
private StreamCollector newPullAllResponseCollector( Statement statement )
114+
{
115+
final SummaryBuilder summaryBuilder = new SummaryBuilder( statement );
116+
return new StreamCollector()
112117
{
113118
@Override
114119
public void keys( String[] names ) {}

0 commit comments

Comments
 (0)