|
36 | 36 | import org.springframework.context.annotation.Configuration;
|
37 | 37 | import org.springframework.context.annotation.Import;
|
38 | 38 | import org.springframework.core.task.AsyncTaskExecutor;
|
| 39 | +import org.springframework.data.envers.repository.config.EnableEnversRepositories; |
39 | 40 | import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
|
40 | 41 | import org.springframework.data.jpa.repository.JpaRepository;
|
41 | 42 | import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
42 | 43 | import org.springframework.data.jpa.repository.config.JpaRepositoryConfigExtension;
|
43 | 44 | import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
|
| 45 | +import org.springframework.data.repository.history.RevisionRepository; |
44 | 46 |
|
45 | 47 | /**
|
46 | 48 | * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JPA Repositories.
|
47 | 49 | * <p>
|
48 | 50 | * Activates when there is a bean of type {@link javax.sql.DataSource} configured in the
|
49 |
| - * context, the Spring Data JPA |
50 |
| - * {@link org.springframework.data.jpa.repository.JpaRepository} type is on the classpath, |
51 |
| - * and there is no other, existing |
52 |
| - * {@link org.springframework.data.jpa.repository.JpaRepository} configured. |
| 51 | + * context, the Spring Data JPA {@link JpaRepository} type is on the classpath, |
| 52 | + * and there is no other, existing {@link JpaRepository} configured. |
53 | 53 | * <p>
|
54 | 54 | * Once in effect, the auto-configuration is the equivalent of enabling JPA repositories
|
55 | 55 | * using the {@link EnableJpaRepositories @EnableJpaRepositories} annotation.
|
56 | 56 | * <p>
|
57 |
| - * In case |
58 |
| - * {@link org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean} |
59 |
| - * is on the classpath, it is used instead of |
60 |
| - * {@link org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean} to |
61 |
| - * support {@link org.springframework.data.repository.history.RevisionRepository} with |
62 |
| - * Hibernate Envers. |
| 57 | + * In case {@link EnableEnversRepositories} is on the classpath, |
| 58 | + * {@link EnversRevisionRepositoryFactoryBean} is used instead of {@link JpaRepositoryFactoryBean} |
| 59 | + * to support {@link RevisionRepository} with Hibernate Envers. |
63 | 60 | * <p>
|
64 | 61 | * This configuration class will activate <em>after</em> the Hibernate auto-configuration.
|
65 | 62 | *
|
@@ -118,14 +115,14 @@ static class LazyBootstrapMode {
|
118 | 115 | }
|
119 | 116 |
|
120 | 117 | @Configuration(proxyBeanMethods = false)
|
121 |
| - @ConditionalOnClass(EnversRevisionRepositoryFactoryBean.class) |
| 118 | + @ConditionalOnClass(EnableEnversRepositories.class) |
122 | 119 | @Import(EnversRevisionRepositoriesRegistrar.class)
|
123 | 120 | public static class EnversRevisionRepositoriesRegistrarConfiguration {
|
124 | 121 |
|
125 | 122 | }
|
126 | 123 |
|
127 | 124 | @Configuration(proxyBeanMethods = false)
|
128 |
| - @ConditionalOnMissingClass("org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean") |
| 125 | + @ConditionalOnMissingClass("org.springframework.data.envers.repository.config.EnableEnversRepositories") |
129 | 126 | @Import(JpaRepositoriesRegistrar.class)
|
130 | 127 | public static class JpaRepositoriesRegistrarConfiguration {
|
131 | 128 |
|
|
0 commit comments