Bacporting moving of tx brindge to global scope from more

recent PR since multiple bridges creating mess during context creation
in various places when bridge is resolved from dependency resolver.

community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java

@@ -63,7 +63,7 @@ public GraphDatabaseFacade createDatabase( String name )
         {
             DataSourceModule dataSource = new DataSourceModule( name, platform, edition, procedures, graphDatabaseFacade );
             ClassicCoreSPI spi = new ClassicCoreSPI( platform, dataSource, msgLog, edition.coreAPIAvailabilityGuard );
-            graphDatabaseFacade.init( spi, dataSource.threadToTransactionBridge, platform.config, dataSource.tokenHolders );
+            graphDatabaseFacade.init( spi, platform.threadToTransactionBridge, platform.config, dataSource.tokenHolders );
             platform.dataSourceManager.register( dataSource.neoStoreDataSource );
             database = graphDatabaseFacade;
             return database;

community/neo4j/src/main/java/org/neo4j/graphdb/facade/spi/ClassicCoreSPI.java

@@ -182,8 +182,8 @@ public KernelTransaction beginTransaction( KernelTransaction.Type type, LoginCon
             availability.assertDatabaseAvailable();
             KernelTransaction kernelTx = dataSource.kernelAPI.get().beginTransaction( type, loginContext, timeout );
             kernelTx.registerCloseListener(
-                    txId -> dataSource.threadToTransactionBridge.unbindTransactionFromCurrentThread() );
-            dataSource.threadToTransactionBridge.bindTransactionToCurrentThread( kernelTx );
+                    txId -> platform.threadToTransactionBridge.unbindTransactionFromCurrentThread() );
+            platform.threadToTransactionBridge.bindTransactionToCurrentThread( kernelTx );
             return kernelTx;
         }
         catch ( TransactionFailureException e )

community/neo4j/src/main/java/org/neo4j/graphdb/facade/spi/ProcedureGDBFacadeSPI.java

@@ -36,6 +36,7 @@
 import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
+import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.query.QueryExecutionKernelException;
@@ -51,16 +52,19 @@ public class ProcedureGDBFacadeSPI implements GraphDatabaseFacade.SPI
     private final CoreAPIAvailabilityGuard availability;
     private final ThrowingFunction<URL,URL,URLAccessValidationError> urlValidator;
     private final SecurityContext securityContext;
+    private final ThreadToStatementContextBridge threadToTransactionBridge;
 
     public ProcedureGDBFacadeSPI( DataSourceModule sourceModule, DependencyResolver resolver, CoreAPIAvailabilityGuard availability,
-            ThrowingFunction<URL,URL,URLAccessValidationError> urlValidator, SecurityContext securityContext )
+            ThrowingFunction<URL,URL,URLAccessValidationError> urlValidator, SecurityContext securityContext,
+            ThreadToStatementContextBridge threadToTransactionBridge )
     {
         this.databaseDirectory = sourceModule.neoStoreDataSource.getDatabaseDirectory();
         this.sourceModule = sourceModule;
         this.resolver = resolver;
         this.availability = availability;
         this.urlValidator = urlValidator;
         this.securityContext = securityContext;
+        this.threadToTransactionBridge = threadToTransactionBridge;
     }
 
     @Override
@@ -169,8 +173,8 @@ public KernelTransaction beginTransaction( KernelTransaction.Type type, LoginCon
             availability.assertDatabaseAvailable();
             KernelTransaction kernelTx = sourceModule.kernelAPI.get().beginTransaction( type, this.securityContext, timeout );
             kernelTx.registerCloseListener(
-                    txId -> sourceModule.threadToTransactionBridge.unbindTransactionFromCurrentThread() );
-            sourceModule.threadToTransactionBridge.bindTransactionToCurrentThread( kernelTx );
+                    txId -> threadToTransactionBridge.unbindTransactionFromCurrentThread() );
+            threadToTransactionBridge.bindTransactionToCurrentThread( kernelTx );
             return kernelTx;
         }
         catch ( TransactionFailureException e )

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java

@@ -36,7 +36,6 @@
 import org.neo4j.kernel.impl.api.explicitindex.InternalAutoIndexing;
 import org.neo4j.kernel.impl.api.index.IndexingService;
 import org.neo4j.kernel.impl.core.DatabasePanicEventGenerator;
-import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.core.TokenHolders;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.index.IndexConfigStore;
@@ -61,8 +60,6 @@
  */
 public class DataSourceModule
 {
-    public final ThreadToStatementContextBridge threadToTransactionBridge;
-
     public final NeoStoreDataSource neoStoreDataSource;
 
     public final Supplier<InwardKernel> kernelAPI;
@@ -92,8 +89,6 @@ public DataSourceModule( String databaseName, final PlatformModule platformModul
         DiagnosticsManager diagnosticsManager = platformModule.diagnosticsManager;
         Monitors monitors = new Monitors( platformModule.monitors );
 
-        threadToTransactionBridge = deps.satisfyDependency( new ThreadToStatementContextBridge( platformModule.availabilityGuard ) );
-
         transactionEventHandlers = new TransactionEventHandlers( graphDatabaseFacade );
 
         diagnosticsManager.prependProvider( config );

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/PlatformModule.java

@@ -41,6 +41,7 @@
 import org.neo4j.kernel.extension.UnsatisfiedDependencyStrategies;
 import org.neo4j.kernel.impl.api.LogRotationMonitor;
 import org.neo4j.kernel.impl.context.TransactionVersionContextSupplier;
+import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge;
 import org.neo4j.kernel.impl.factory.DatabaseInfo;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.logging.StoreLogService;
@@ -126,6 +127,8 @@ public class PlatformModule
 
     public final SystemNanoClock clock;
 
+    public final ThreadToStatementContextBridge threadToTransactionBridge;
+
     public final VersionContextSupplier versionContextSupplier;
 
     public final RecoveryCleanupWorkCollector recoveryCleanupWorkCollector;
@@ -207,6 +210,7 @@ public PlatformModule( File providedStoreDir, Config config, DatabaseInfo databa
         dependencies.satisfyDependency( dataSourceManager );
 
         availabilityGuard = dependencies.satisfyDependency( createAvailabilityGuard() );
+        threadToTransactionBridge = dependencies.satisfyDependency( new ThreadToStatementContextBridge( availabilityGuard ) );
 
         transactionMonitor = dependencies.satisfyDependency( createTransactionStats() );
 

community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/ProcedureGDSFactory.java

@@ -69,9 +69,10 @@ public GraphDatabaseService apply( Context context ) throws ProcedureException
                 dataSource.neoStoreDataSource.getDependencyResolver(),
                 availability,
                 urlValidator,
-                securityContext
+                securityContext,
+                platform.threadToTransactionBridge
             ),
-            dataSource.threadToTransactionBridge,
+            platform.threadToTransactionBridge,
             platform.config,
             tokenHolders
         );