Remove deprecated TopLevelTransaction.getTransaction()

neo4j · Mar 22, 2016 · 6f7f9de · 6f7f9de
1 parent e83cbcb
commit 6f7f9de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TopLevelTransaction.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/coreapi/TopLevelTransaction.java
@@ -113,12 +113,6 @@ public Lock acquireReadLock( PropertyContainer entity )
         return locker.sharedLock(stmt, entity);
     }
 
-    @Deprecated
-    public KernelTransaction getTransaction()
-    {
-        return transaction;
-    }
-
     @Override
     public KernelTransaction.Type transactionType()
     {

diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java
@@ -39,7 +39,7 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.GraphDatabaseDependencies;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.impl.coreapi.TopLevelTransaction;
+import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.factory.CommunityEditionModule;
 import org.neo4j.kernel.impl.factory.CommunityFacadeFactory;
 import org.neo4j.kernel.impl.factory.EditionModule;
@@ -50,6 +50,7 @@
 import org.neo4j.kernel.impl.store.id.IdGenerator;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdType;
+import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.storageengine.api.LabelItem;
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.PropertyItem;
@@ -554,7 +555,7 @@ public void shouldCreateNodeWithLotsOfLabelsAndThenRemoveMostOfThem() throws Exc
     public void shouldAllowManyLabelsAndPropertyCursor()
     {
         // given
-        GraphDatabaseService db = dbRule.getGraphDatabaseAPI();
+        GraphDatabaseAPI db = dbRule.getGraphDatabaseAPI();
         Node node;
         try ( Transaction tx = db.beginTx() )
         {
@@ -571,7 +572,9 @@ public void shouldAllowManyLabelsAndPropertyCursor()
         // when
         try ( Transaction tx = db.beginTx() )
         {
-            try (Statement statement = ((TopLevelTransaction)tx).getTransaction().acquireStatement())
+            ThreadToStatementContextBridge bridge =
+                    db.getDependencyResolver().resolveDependency( ThreadToStatementContextBridge.class );
+            try (Statement statement = bridge.getTopLevelTransactionBoundToThisThread( true ).acquireStatement())
             {
                 try ( Cursor<NodeItem> nodeCursor = statement.readOperations().nodeCursor( node.getId() ) )
                 {