Fix circular dependency of bookmarkmanagers.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/config/AbstractNeo4jConfig.java

@@ -49,7 +49,7 @@ public abstract class AbstractNeo4jConfig extends Neo4jConfigurationSupport {
 	private ObjectProvider<UserSelectionProvider> userSelectionProviders;
 
 	@Autowired
-	private Neo4jBookmarkManager bookmarkManager;
+	private ObjectProvider<Neo4jBookmarkManager> bookmarkManagerProviders;
 
 	/**
 	 * The driver to be used for interacting with Neo4j.
@@ -70,10 +70,14 @@ public Neo4jClient neo4jClient(Driver driver, DatabaseSelectionProvider database
 		return Neo4jClient.with(driver)
 				.withDatabaseSelectionProvider(databaseSelectionProvider)
 				.withUserSelectionProvider(getUserSelectionProvider())
-				.withNeo4jBookmarkManager(bookmarkManager)
+				.withNeo4jBookmarkManager(getBootBookmarkManager())
 				.build();
 	}
 
+	private Neo4jBookmarkManager getBootBookmarkManager() {
+		return this.bookmarkManagerProviders.getIfAvailable(Neo4jBookmarkManager::create);
+	}
+
 	@Nullable
 	private UserSelectionProvider getUserSelectionProvider() {
 		return this.userSelectionProviders == null ? null : this.userSelectionProviders.getIfUnique();
@@ -99,7 +103,7 @@ public PlatformTransactionManager transactionManager(Driver driver, DatabaseSele
 				.with(driver)
 				.withDatabaseSelectionProvider(databaseSelectionProvider)
 				.withUserSelectionProvider(getUserSelectionProvider())
-				.withBookmarkManager(bookmarkManager)
+				.withBookmarkManager(getBootBookmarkManager())
 				.build();
 	}
 

src/main/java/org/springframework/data/neo4j/config/AbstractReactiveNeo4jConfig.java

@@ -49,7 +49,7 @@ public abstract class AbstractReactiveNeo4jConfig extends Neo4jConfigurationSupp
 	private ObjectProvider<ReactiveUserSelectionProvider> userSelectionProviders;
 
 	@Autowired
-	private Neo4jBookmarkManager bookmarkManager;
+	private ObjectProvider<Neo4jBookmarkManager> bookmarkManagerProviders;
 
 	/**
 	 * The driver to be used for interacting with Neo4j.
@@ -70,10 +70,14 @@ public ReactiveNeo4jClient neo4jClient(Driver driver, ReactiveDatabaseSelectionP
 		return ReactiveNeo4jClient.with(driver)
 				.withDatabaseSelectionProvider(databaseSelectionProvider)
 				.withUserSelectionProvider(getUserSelectionProvider())
-				.withNeo4jBookmarkManager(bookmarkManager)
+				.withNeo4jBookmarkManager(getBootBookmarkManager())
 				.build();
 	}
 
+	private Neo4jBookmarkManager getBootBookmarkManager() {
+		return this.bookmarkManagerProviders.getIfAvailable(Neo4jBookmarkManager::createReactive);
+	}
+
 	@Nullable
 	private ReactiveUserSelectionProvider getUserSelectionProvider() {
 		return this.userSelectionProviders == null ? null : this.userSelectionProviders.getIfUnique();
@@ -99,7 +103,7 @@ public ReactiveTransactionManager reactiveTransactionManager(Driver driver,
 		return ReactiveNeo4jTransactionManager.with(driver)
 				.withDatabaseSelectionProvider(databaseSelectionProvider)
 				.withUserSelectionProvider(getUserSelectionProvider())
-				.withBookmarkManager(bookmarkManager)
+				.withBookmarkManager(getBootBookmarkManager())
 				.build();
 	}