Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-867 - Fixed repository base class configuration in RepositoryBeanDefinitionBuilder.

Browse Source 
We erroneously forwarded the factory class from the extension in case of an absent repository base class name in the configuration (which is the default).
This commit is contained in:
Oliver Gierke
2016-10-11 15:45:39 +02:00
parent 49575fd4ce
commit 8d22b3ae7c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java
View File

@@ -89,8 +89,9 @@ class RepositoryBeanDefinitionBuilder {
builder.addConstructorArgValue(configuration.getRepositoryInterface());
builder.addPropertyValue("queryLookupStrategyKey", configuration.getQueryLookupStrategyKey());
builder.addPropertyValue("lazyInit", configuration.isLazyInit());
builder.addPropertyValue("repositoryBaseClass",
configuration.getRepositoryBaseClassName().orElseGet(() -> extension.getRepositoryFactoryClassName()));
configuration.getRepositoryBaseClassName()//
.ifPresent(it -> builder.addPropertyValue("repositoryBaseClass", it));
NamedQueriesBeanDefinitionBuilder definitionBuilder = new NamedQueriesBeanDefinitionBuilder(
extension.getDefaultNamedQueryLocation());
@@ -98,9 +99,7 @@ class RepositoryBeanDefinitionBuilder {
builder.addPropertyValue("namedQueries", definitionBuilder.build(configuration.getSource()));
Optional<String> customImplementationBeanName = registerCustomImplementation(configuration);
customImplementationBeanName.ifPresent(it -> {
registerCustomImplementation(configuration).ifPresent(it -> {
builder.addPropertyReference("customImplementation", it);
builder.addDependsOn(it);
});