Merge branch '2.3.x'

Closes gh-22546
pull/22549/head
Andy Wilkinson 4 years ago
commit 793d266b7e

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -62,6 +62,11 @@ public abstract class AbstractRepositoryConfigurationSourceSupport
delegate.registerRepositoriesIn(registry, getRepositoryConfigurationExtension()); delegate.registerRepositoriesIn(registry, getRepositoryConfigurationExtension());
} }
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
registerBeanDefinitions(importingClassMetadata, registry, null);
}
private AnnotationRepositoryConfigurationSource getConfigurationSource(BeanDefinitionRegistry registry, private AnnotationRepositoryConfigurationSource getConfigurationSource(BeanDefinitionRegistry registry,
BeanNameGenerator importBeanNameGenerator) { BeanNameGenerator importBeanNameGenerator) {
AnnotationMetadata metadata = AnnotationMetadata.introspect(getConfiguration()); AnnotationMetadata metadata = AnnotationMetadata.introspect(getConfiguration());

Loading…
Cancel
Save