From fa037610f8406dda28a59de3dbc4d239d9f1cba4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Aug 2017 12:07:59 +0200 Subject: [PATCH] Add missing class check on Neo4jDataAutoConfiguration Neo4jDataAutoConfiguration is meant to kick in when Spring Data Neo4J is on the classpath. Yet, we were only checking for the presence of neo4j itself and the transaction manager provided by spring-tx. This commit makes sure to back off if Spring Data Neo4J is not present. Closes gh-10038 --- .../autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java index 747b525fa21..adf64357237 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java @@ -53,7 +53,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter * @since 1.4.0 */ @Configuration -@ConditionalOnClass({ SessionFactory.class, PlatformTransactionManager.class }) +@ConditionalOnClass({ SessionFactory.class, Neo4jTransactionManager.class, + PlatformTransactionManager.class }) @ConditionalOnMissingBean(SessionFactory.class) @EnableConfigurationProperties(Neo4jProperties.class) @SuppressWarnings("deprecation")