Commit cb7cc399 authored by Phillip Webb's avatar Phillip Webb

Make data-jpa conditional on DataSource bean

parent 4fd7fc01
...@@ -16,9 +16,14 @@ ...@@ -16,9 +16,14 @@
package org.springframework.boot.autoconfigure.data; 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.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; 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.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
...@@ -32,9 +37,11 @@ import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; ...@@ -32,9 +37,11 @@ import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
* @see EnableJpaRepositories * @see EnableJpaRepositories
*/ */
@Configuration @Configuration
@ConditionalOnBean(DataSource.class)
@ConditionalOnClass(JpaRepository.class) @ConditionalOnClass(JpaRepository.class)
@ConditionalOnMissingBean(JpaRepositoryFactoryBean.class) @ConditionalOnMissingBean(JpaRepositoryFactoryBean.class)
@Import(JpaRepositoriesAutoConfigureRegistrar.class) @Import(JpaRepositoriesAutoConfigureRegistrar.class)
@AutoConfigureAfter(DataSourceAutoConfiguration.class)
public class JpaRepositoriesAutoConfiguration { public class JpaRepositoriesAutoConfiguration {
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment