DATACMNS-1497 - Polishing.

RepositoryBeanDefinitionRegistrarSupport now also overrides registerBeanDefinitions(AnnotationMetadata, BeanDefinitionRegistry) so that unit test in downstream modules still work.

Added defaulting of BeanNameGenerator in XmlRepositoryConfigurationSource so that we use an AnnotationBeanNameGenerator if a DefaultBeanNameGenerator is handed in.

Related tickets: spring-projects/spring-framework#22591
This commit is contained in:
Oliver Drotbohm
2019-04-03 11:53:58 +02:00
parent 1150e409ca
commit a5681f637c
3 changed files with 48 additions and 10 deletions

View File

@@ -66,7 +66,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests {
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
registrar.registerBeanDefinitions(metadata, registry, null);
registrar.registerBeanDefinitions(metadata, registry);
assertBeanDefinitionRegisteredFor("myRepository");
assertBeanDefinitionRegisteredFor("composedRepository");
@@ -80,7 +80,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests {
AnnotationMetadata metadata = new StandardAnnotationMetadata(FragmentExclusionConfiguration.class, true);
registrar.registerBeanDefinitions(metadata, registry, null);
registrar.registerBeanDefinitions(metadata, registry);
assertBeanDefinitionRegisteredFor("repositoryWithFragmentExclusion");
assertNoBeanDefinitionRegisteredFor("excludedRepositoryImpl");
@@ -91,7 +91,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests {
AnnotationMetadata metadata = new StandardAnnotationMetadata(LimitsImplementationBasePackages.class, true);
registrar.registerBeanDefinitions(metadata, registry, null);
registrar.registerBeanDefinitions(metadata, registry);
assertBeanDefinitionRegisteredFor("personRepository");
assertNoBeanDefinitionRegisteredFor("fragmentImpl");
@@ -105,7 +105,7 @@ public class RepositoryBeanDefinitionRegistrarSupportUnitTests {
DummyRegistrar registrar = new DummyRegistrar();
registrar.setEnvironment(environment);
registrar.registerBeanDefinitions(metadata, registry, null);
registrar.registerBeanDefinitions(metadata, registry);
assertBeanDefinitionRegisteredFor("myRepository", "profileRepository");
}