Use GraphDatabaseAPI interface rather than GraphDatabaseFacade directly

neo4j · Jul 14, 2016 · e49716f · e49716f
1 parent 0d9be8d
commit e49716f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/SessionStateMachine.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/SessionStateMachine.java
@@ -43,10 +43,10 @@
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
 import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker;
-import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContext;
 import org.neo4j.kernel.impl.query.QuerySession;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.udc.UsageData;
 
 import static java.lang.String.format;
@@ -704,12 +704,15 @@ RecordStream run( SessionStateMachine ctx, String statement, Map<String, Object>
         void sessionActivated( Session session );
         void sessionHalted( Session session );
     }
-    public SessionStateMachine( String connectionDescriptor, UsageData usageData, GraphDatabaseFacade db, ThreadToStatementContextBridge txBridge,
-            StatementRunner engine, LogService logging, Authentication authentication, SessionTracker sessionTracker )
+
+    public SessionStateMachine( String connectionDescriptor, UsageData usageData, GraphDatabaseAPI db,
+            ThreadToStatementContextBridge txBridge, StatementRunner engine, LogService logging,
+            Authentication authentication, SessionTracker sessionTracker )
     {
         this( new StandardStateMachineSPI( connectionDescriptor, usageData, db, engine, logging, authentication,
-                txBridge, sessionTracker ));
+                txBridge, sessionTracker ) );
     }
+
     public SessionStateMachine( SPI spi )
     {
         this.spi = spi;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/StandardSessions.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/StandardSessions.java
@@ -29,9 +29,9 @@
 import org.neo4j.kernel.api.security.AuthManager;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
-import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 import org.neo4j.udc.UsageData;
@@ -42,7 +42,7 @@
  */
 public class StandardSessions extends LifecycleAdapter implements Sessions
 {
-    private final GraphDatabaseFacade gds;
+    private final GraphDatabaseAPI gds;
     private final LifeSupport life = new LifeSupport();
     private final UsageData usageData;
     private final LogService logging;
@@ -52,7 +52,7 @@ public class StandardSessions extends LifecycleAdapter implements Sessions
     private CypherStatementRunner statementRunner;
     private ThreadToStatementContextBridge txBridge;
 
-    public StandardSessions( GraphDatabaseFacade gds, UsageData usageData, LogService logging,
+    public StandardSessions( GraphDatabaseAPI gds, UsageData usageData, LogService logging,
             ThreadToStatementContextBridge txBridge, SessionTracker sessionTracker )
     {
         this.gds = gds;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/StandardStateMachineSPI.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/internal/StandardStateMachineSPI.java
@@ -28,14 +28,14 @@
 import org.neo4j.bolt.v1.runtime.spi.RecordStream;
 import org.neo4j.bolt.v1.runtime.spi.StatementRunner;
 import org.neo4j.concurrent.DecayingFlags;
-import org.neo4j.kernel.api.bolt.SessionTracker;
-import org.neo4j.kernel.api.security.AccessMode;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.Statement;
+import org.neo4j.kernel.api.bolt.SessionTracker;
 import org.neo4j.kernel.api.exceptions.KernelException;
+import org.neo4j.kernel.api.security.AccessMode;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
-import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.logging.LogService;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.logging.Log;
 import org.neo4j.udc.UsageData;
 import org.neo4j.udc.UsageDataKeys;
@@ -44,7 +44,7 @@ class StandardStateMachineSPI implements SessionStateMachine.SPI
 {
     private final String connectionDescriptor;
     private final UsageData usageData;
-    private final GraphDatabaseFacade db;
+    private final GraphDatabaseAPI db;
     private final StatementRunner statementRunner;
     private final ErrorReporter errorReporter;
     private final Log log;
@@ -53,7 +53,7 @@ class StandardStateMachineSPI implements SessionStateMachine.SPI
     private final DecayingFlags featureUsage;
     private final SessionTracker sessionTracker;
 
-    StandardStateMachineSPI( String connectionDescriptor, UsageData usageData, GraphDatabaseFacade db, StatementRunner statementRunner,
+    StandardStateMachineSPI( String connectionDescriptor, UsageData usageData, GraphDatabaseAPI db, StatementRunner statementRunner,
             LogService logging, Authentication authentication, ThreadToStatementContextBridge txBridge,
             SessionTracker sessionTracker )
     {

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java
@@ -40,17 +40,17 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.kernel.api.bolt.SessionTracker;
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
-import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.kernel.impl.util.Neo4jJobScheduler;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.udc.UsageData;
 
 class TestSessions implements TestRule, Sessions
 {
-    private GraphDatabaseFacade gdb;
+    private GraphDatabaseAPI gdb;
     private Sessions actual;
     private LinkedList<Session> startedSessions = new LinkedList<>();
     private final LifeSupport life = new LifeSupport();
@@ -66,7 +66,7 @@ public void evaluate() throws Throwable
             {
                 Map<Setting<?>,String> config = new HashMap<>();
                 config.put( GraphDatabaseSettings.auth_enabled, Boolean.toString( authEnabled ) );
-                gdb = (GraphDatabaseFacade) new TestGraphDatabaseFactory().newImpermanentDatabase( config );
+                gdb = (GraphDatabaseAPI) new TestGraphDatabaseFactory().newImpermanentDatabase( config );
                 Neo4jJobScheduler scheduler = life.add( new Neo4jJobScheduler() );
                 DependencyResolver resolver = gdb.getDependencyResolver();
                 StandardSessions sessions = life.add(