From cb7cc3991baa2685825966dc0278685b4bc46d0b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 27 Aug 2013 00:17:41 -0700 Subject: [PATCH] Make data-jpa conditional on DataSource bean --- .../data/JpaRepositoriesAutoConfiguration.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index 053528f3c2..1e62236945 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/JpaRepositoriesAutoConfiguration.java @@ -16,9 +16,14 @@ package org.springframework.boot.autoconfigure.data; +import javax.sql.DataSource; + +import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.JpaRepository; @@ -32,9 +37,11 @@ import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; * @see EnableJpaRepositories */ @Configuration +@ConditionalOnBean(DataSource.class) @ConditionalOnClass(JpaRepository.class) @ConditionalOnMissingBean(JpaRepositoryFactoryBean.class) @Import(JpaRepositoriesAutoConfigureRegistrar.class) +@AutoConfigureAfter(DataSourceAutoConfiguration.class) public class JpaRepositoriesAutoConfiguration { }