From 88a5a8e8a3a0490e157a957ea2c5b405409bbb75 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 29 Feb 2024 19:41:46 -0300 Subject: [PATCH] rely on auto config for Neo4j TransactionManager --- .../DatabaseConfiguration.java_neo4j.ejs | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs b/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs index 1be1aae131f..fe262e2bec7 100644 --- a/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs +++ b/generators/spring-data-neo4j/templates/src/main/java/_package_/config/DatabaseConfiguration.java_neo4j.ejs @@ -19,24 +19,15 @@ package <%= packageName %>.config; -import org.neo4j.driver.Driver; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; <%_ if (searchEngineElasticsearch) { _%> import org.springframework.context.annotation.ComponentScan.Filter; import org.springframework.context.annotation.FilterType; import org.springframework.data.elasticsearch.repository.config.Enable<% if (reactive) { %>Reactive<% } %>ElasticsearchRepositories; +import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository; <%_ } _%> -import org.springframework.data.neo4j.core.<% if (reactive) { %>Reactive<% } %>DatabaseSelectionProvider; -import org.springframework.data.neo4j.core.transaction.<% if (reactive) { %>Reactive<% } %>Neo4jTransactionManager; import org.springframework.data.neo4j.repository.config.Enable<% if (reactive) { %>Reactive<% } %>Neo4jRepositories; -import org.springframework.data.neo4j.repository.config.<% if (reactive) { %>Reactive<% } %>Neo4jRepositoryConfigurationExtension; - -<%_ if (searchEngineElasticsearch) { _%> -import org.springframework.data.neo4j.repository.<% if (reactive) { %>Reactive<% } %>Neo4jRepository; -<%_ } _%> -import org.springframework.transaction.<% if (reactive) { %>Reactive<% } %>TransactionManager; @Configuration <%_ if (searchEngineElasticsearch) { _%> @@ -47,10 +38,4 @@ import org.springframework.transaction.<% if (reactive) { %>Reactive<% } %>Trans <%_ if (searchEngineElasticsearch) { _%> @Enable<% if (reactive) { %>Reactive<% } %>ElasticsearchRepositories("<%= packageName %>.repository.search") <%_ } _%> -public class DatabaseConfiguration { - - @Bean(<% if (reactive) { %>Reactive<% } %>Neo4jRepositoryConfigurationExtension.DEFAULT_TRANSACTION_MANAGER_BEAN_NAME) - public <% if (reactive) { %>Reactive<% } %>TransactionManager transactionManager(Driver driver, <% if (reactive) { %>Reactive<% } %>DatabaseSelectionProvider databaseNameProvider) { - return new <% if (reactive) { %>Reactive<% } %>Neo4jTransactionManager(driver, databaseNameProvider); - } -} +public class DatabaseConfiguration {}