DATACMNS-1147 - Do not consider @NoRepositoryBean interfaces as fragment interfaces.
We filter interfaces annotated with @NoRepositoryBean from fragment interface candidates and not longer scan for implementations of these. Extending a base repository usually requires an interface which is used as base interface instead of Repository/CrudRepository in user repositories. If the naming scheme of the extended interface and the implementation fits to fragment interfaces, then we previously registered the class additionally as fragment implementation. The bean registration caused container startup failures because of unsatisfied dependencies or would shadow the base repository implementation. Original pull request #239.
This commit is contained in:
committed by
Oliver Gierke
parent
22b6971318
commit
d657b17e74
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
||||
import org.springframework.beans.factory.support.RootBeanDefinition;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.core.io.ResourceLoader;
|
||||
import org.springframework.core.type.AnnotationMetadata;
|
||||
import org.springframework.core.type.ClassMetadata;
|
||||
import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
|
||||
import org.springframework.core.type.classreading.MetadataReaderFactory;
|
||||
@@ -175,7 +176,8 @@ class RepositoryBeanDefinitionBuilder {
|
||||
|
||||
ClassMetadata classMetadata = getClassMetadata(configuration.getRepositoryInterface());
|
||||
|
||||
return Arrays.stream(classMetadata.getInterfaceNames())
|
||||
return Arrays.stream(classMetadata.getInterfaceNames()) //
|
||||
.filter(this::isFragmentInterfaceCandidate) //
|
||||
.map(it -> detectRepositoryFragmentConfiguration(configuration, it)) //
|
||||
.filter(Optional::isPresent) //
|
||||
.map(Optional::get) //
|
||||
@@ -184,6 +186,13 @@ class RepositoryBeanDefinitionBuilder {
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private boolean isFragmentInterfaceCandidate(String interfaceName) {
|
||||
|
||||
AnnotationMetadata metadata = getAnnotationMetadata(interfaceName);
|
||||
|
||||
return !metadata.hasAnnotation(NoRepositoryBean.class.getName());
|
||||
}
|
||||
|
||||
private Optional<RepositoryFragmentConfiguration> detectRepositoryFragmentConfiguration(
|
||||
RepositoryConfiguration<?> configuration, String fragmentInterfaceName) {
|
||||
|
||||
@@ -253,6 +262,15 @@ class RepositoryBeanDefinitionBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
private AnnotationMetadata getAnnotationMetadata(String className) {
|
||||
|
||||
try {
|
||||
return metadataReaderFactory.getMetadataReader(className).getAnnotationMetadata();
|
||||
} catch (IOException e) {
|
||||
throw new BeanDefinitionStoreException(String.format("Cannot parse %s metadata.", className), e);
|
||||
}
|
||||
}
|
||||
|
||||
private static List<TypeFilter> getExclusions(RepositoryConfiguration<?> configuration) {
|
||||
|
||||
return Stream
|
||||
|
||||
Reference in New Issue
Block a user