From 65025d8dab7635ddc8f7f2ac48f04ef9ad2b71d2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 10 Jan 2017 17:04:19 -0500 Subject: [PATCH] Enable Neo4J's open in view interceptor by default Closes gh-7943 --- .../data/neo4j/Neo4jDataAutoConfiguration.java | 2 +- .../data/neo4j/Neo4jDataAutoConfigurationTests.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 25ba2f8318..ed9b1961cb 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 @@ -120,7 +120,7 @@ public class Neo4jDataAutoConfiguration { @ConditionalOnClass({ WebMvcConfigurerAdapter.class, OpenSessionInViewInterceptor.class }) @ConditionalOnMissingBean(OpenSessionInViewInterceptor.class) - @ConditionalOnProperty(prefix = "spring.data.neo4j", name = "open-in-view", havingValue = "true") + @ConditionalOnProperty(prefix = "spring.data.neo4j", name = "open-in-view", havingValue = "true", matchIfMissing = true) protected static class Neo4jWebConfiguration { @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index c651987d8b..eed110b865 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -78,7 +78,7 @@ public class Neo4jDataAutoConfigurationTests { assertThat(this.context.getBeansOfType(Neo4jOperations.class)).hasSize(1); assertThat(this.context.getBeansOfType(Neo4jTransactionManager.class)).hasSize(1); assertThat(this.context.getBeansOfType(OpenSessionInViewInterceptor.class)) - .isEmpty(); + .hasSize(1); } @Test @@ -131,10 +131,10 @@ public class Neo4jDataAutoConfigurationTests { } @Test - public void openSessionInViewInterceptorCanBeEnabled() { - load(null, "spring.data.neo4j.open-in-view=true"); + public void openSessionInViewInterceptorCanBeDisabled() { + load(null, "spring.data.neo4j.open-in-view:false"); assertThat(this.context.getBeansOfType(OpenSessionInViewInterceptor.class)) - .hasSize(1); + .isEmpty(); } @Test