Skip to content

Updated session acquisition #229

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.

Sign up for GitHub

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 14 commits into from
Sep 16, 2016
Merged

Updated session acquisition #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e30e01e
Remove retry handling for read sessions
pontusmelke Sep 13, 2016
b7b5888
Properly handle closing session in case of failure
pontusmelke Sep 14, 2016
7ebc171
Moved queue handling out of pool
pontusmelke Sep 15, 2016
d5834ca
Fail when connecting to non-routing server
pontusmelke Sep 15, 2016
3ae16e5
Changed SessionMode -> AccessMode
pontusmelke Sep 15, 2016
08b1f63
Changed +discovery -> +routing
pontusmelke Sep 15, 2016
8a5ab49
Merged procedure calls
pontusmelke Sep 15, 2016
f30acd8
Removed config, minimumKnownClusterSize
pontusmelke Sep 15, 2016
cb8cc72
Refactor: Rename to ConcurrentRoundRobinSet
pontusmelke Sep 15, 2016
a7f1188
Added tests for multiple read/write servers
pontusmelke Sep 15, 2016
48fabc2
Combined error handling in single object
pontusmelke Sep 15, 2016
cbfe80f
Ignored tests not yet runnable on TC
pontusmelke Sep 15, 2016
5b6a7dc
Added remove on Iterator, necessary for Java 7
pontusmelke Sep 15, 2016
f9f7b64
Added unit tests
pontusmelke Sep 15, 2016
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
14 changes: 1 addition & 13 deletions driver/src/main/java/org/neo4j/driver/internal/BaseDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@

package org.neo4j.driver.internal;

import java.util.Set;

import org.neo4j.driver.internal.net.BoltServerAddress;
import org.neo4j.driver.internal.security.SecurityPlan;
import org.neo4j.driver.internal.spi.ConnectionPool;
import org.neo4j.driver.v1.Driver;
import org.neo4j.driver.v1.Logger;
import org.neo4j.driver.v1.Logging;
Expand All @@ -33,12 +29,9 @@ abstract class BaseDriver implements Driver
{
private final SecurityPlan securityPlan;
protected final Logger log;
protected final ConnectionPool connections;

BaseDriver( ConnectionPool connections, BoltServerAddress address, SecurityPlan securityPlan, Logging logging )
BaseDriver( SecurityPlan securityPlan, Logging logging )
{
this.connections = connections;
this.connections.add( address );
this.securityPlan = securityPlan;
this.log = logging.getLog( Session.LOG_NAME );
}
Expand All @@ -49,9 +42,4 @@ public boolean isEncrypted()
return securityPlan.requiresEncryption();
}

//Used for testing
Set<BoltServerAddress> servers()
{
return connections.addresses();
}
}
Loading