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

DATACMNS-1754 - Polishing.

Browse Source 
Revert bean name change so all nested repository interface components (repository bean, fragment bean, legacy custom implementation bean) remain prefixed with their enclosing type name.

Adopt tests. Add test for RepositoryBeanDefinitionRegistrar. Extend documentation.

Original pull request: #460.
This commit is contained in:
Mark Paluch
2020-08-10 16:21:34 +02:00
parent 2a44d2394c
commit e72470993d
8 changed files with 71 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/repository/config/DefaultImplementationLookupConfiguration.java
View File

@@ -56,7 +56,8 @@ class DefaultImplementationLookupConfiguration implements ImplementationLookupCo
this.config = config;
this.interfaceName = interfaceName;
this.beanName = Introspector.decapitalize(getLocalName(interfaceName).concat(config.getImplementationPostfix()));
this.beanName = Introspector
.decapitalize(ClassUtils.getShortName(interfaceName).concat(config.getImplementationPostfix()));
}
/*
@@ -144,7 +145,7 @@ class DefaultImplementationLookupConfiguration implements ImplementationLookupCo
String localName = getLocalName(beanClassName);
return localName.equals(getImplementationClassName()) //
&& getBasePackages().stream().anyMatch(it -> beanPackage.startsWith(it));
&& getBasePackages().stream().anyMatch(beanPackage::startsWith);
}
private String getLocalName(String className) {
@@ -159,7 +160,6 @@ class DefaultImplementationLookupConfiguration implements ImplementationLookupCo
MetadataReader reader = getMetadataReaderFactory().getMetadataReader(beanClassName);
return filters.stream().anyMatch(it -> matches(it, reader));
} catch (IOException o_O) {
return true;
}