Skip to content

Move error handling logic to the connection layer #322

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 3 commits into from
Feb 21, 2017
Merged

Move error handling logic to the connection layer #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d694ff
Move error handling logic to the connection layer
lutovich Feb 20, 2017
cfa9327
Null-safe error code checks in connection layer
lutovich Feb 21, 2017
b8d1933
Move couple methods from Connection to PooledConnection
lutovich Feb 21, 2017
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
4 changes: 2 additions & 2 deletions driver/src/main/java/org/neo4j/driver/internal/ExplicitTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import static org.neo4j.driver.v1.Values.ofValue;
import static org.neo4j.driver.v1.Values.value;

class ExplicitTransaction implements Transaction
public class ExplicitTransaction implements Transaction
{
private enum State
{
Expand Down Expand Up @@ -71,7 +71,7 @@ private enum State
private String bookmark = null;
private State state = State.ACTIVE;

ExplicitTransaction( Connection conn, Runnable cleanup )
public ExplicitTransaction( Connection conn, Runnable cleanup )
{
this( conn, cleanup, null );
}
Expand Down
4 changes: 2 additions & 2 deletions driver/src/main/java/org/neo4j/driver/internal/LeakLoggingNetworkSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.neo4j.driver.internal;

import org.neo4j.driver.internal.spi.Connection;
import org.neo4j.driver.internal.spi.PooledConnection;
import org.neo4j.driver.v1.Logger;

import static java.lang.System.lineSeparator;
Expand All @@ -28,7 +28,7 @@ class LeakLoggingNetworkSession extends NetworkSession
private final Logger log;
private final String stackTrace;

LeakLoggingNetworkSession( Connection connection, Logger log )
LeakLoggingNetworkSession( PooledConnection connection, Logger log )
{
super( connection );
this.log = log;
Expand Down
4 changes: 2 additions & 2 deletions driver/src/main/java/org/neo4j/driver/internal/LeakLoggingNetworkSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.neo4j.driver.internal;

import org.neo4j.driver.internal.spi.Connection;
import org.neo4j.driver.internal.spi.PooledConnection;
import org.neo4j.driver.v1.Logger;
import org.neo4j.driver.v1.Logging;
import org.neo4j.driver.v1.Session;
Expand All @@ -35,7 +35,7 @@ class LeakLoggingNetworkSessionFactory implements SessionFactory
}

@Override
public Session newInstance( Connection connection )
public Session newInstance( PooledConnection connection )
{
return new LeakLoggingNetworkSession( connection, logger );
}
Expand Down
5 changes: 3 additions & 2 deletions driver/src/main/java/org/neo4j/driver/internal/NetworkSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import org.neo4j.driver.internal.logging.DevNullLogger;
import org.neo4j.driver.internal.spi.Connection;
import org.neo4j.driver.internal.spi.PooledConnection;
import org.neo4j.driver.internal.types.InternalTypeSystem;
import org.neo4j.driver.v1.Logger;
import org.neo4j.driver.v1.Record;
Expand All @@ -41,7 +42,7 @@

public class NetworkSession implements Session
{
protected Connection connection;
private final PooledConnection connection;
private final String sessionId;
private final Logger logger;

Expand All @@ -67,7 +68,7 @@ public void run()
private ExplicitTransaction currentTransaction;
private AtomicBoolean isOpen = new AtomicBoolean( true );

NetworkSession( Connection connection )
public NetworkSession( PooledConnection connection )
{
this.connection = connection;

Expand Down
4 changes: 2 additions & 2 deletions driver/src/main/java/org/neo4j/driver/internal/NetworkSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
*/
package org.neo4j.driver.internal;

import org.neo4j.driver.internal.spi.Connection;
import org.neo4j.driver.internal.spi.PooledConnection;
import org.neo4j.driver.v1.Session;

class NetworkSessionFactory implements SessionFactory
{
@Override
public Session newInstance( Connection connection )
public Session newInstance( PooledConnection connection )
{
return new NetworkSession( connection );
}
Expand Down
9 changes: 4 additions & 5 deletions driver/src/main/java/org/neo4j/driver/internal/RoutingDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.neo4j.driver.internal.cluster.RoutingSettings;
import org.neo4j.driver.internal.net.BoltServerAddress;
import org.neo4j.driver.internal.security.SecurityPlan;
import org.neo4j.driver.internal.spi.Connection;
import org.neo4j.driver.internal.spi.ConnectionPool;
import org.neo4j.driver.internal.spi.PooledConnection;
import org.neo4j.driver.internal.util.Clock;
import org.neo4j.driver.v1.AccessMode;
import org.neo4j.driver.v1.Logging;
Expand Down Expand Up @@ -62,12 +62,11 @@ public RoutingDriver(
@Override
protected Session newSessionWithMode( AccessMode mode )
{
Connection connection = acquireConnection( mode );
Session networkSession = sessionFactory.newInstance( connection );
return new RoutingNetworkSession( networkSession, mode, connection.boltServerAddress(), loadBalancer );
PooledConnection connection = acquireConnection( mode );
return sessionFactory.newInstance( connection );
}

private Connection acquireConnection( AccessMode role )
private PooledConnection acquireConnection( AccessMode role )
{
switch ( role )
{
Expand Down
198 changes: 0 additions & 198 deletions driver/src/main/java/org/neo4j/driver/internal/RoutingNetworkSession.java
View file
Open in desktop

This file was deleted.

Loading