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

DATACMNS-1620 - Polishing.

Browse Source 
Moved off deprecated API for annotation introspection. Move application of primary flag for bean definitions from RepositoryConfigurationDelegate to RepositoryBeanDefinitionBuilder.
This commit is contained in:
Oliver Drotbohm
2019-12-09 17:35:57 +01:00
parent 8fe3b9983a
commit eff3850806
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java
View File

@@ -38,7 +38,6 @@ import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.StandardAnnotationMetadata;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.core.type.filter.AspectJTypeFilter;
import org.springframework.core.type.filter.AssignableTypeFilter;
@@ -124,7 +123,7 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura
}
this.attributes = new AnnotationAttributes(annotationAttributes);
this.enableAnnotationMetadata = new StandardAnnotationMetadata(annotation);
this.enableAnnotationMetadata = AnnotationMetadata.introspect(annotation);
this.configMetadata = metadata;
this.resourceLoader = resourceLoader;
this.hasExplicitFilters = hasExplicitFilters(attributes);

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

@@ -102,6 +102,7 @@ class RepositoryBeanDefinitionBuilder {
builder.addPropertyValue("queryLookupStrategyKey", configuration.getQueryLookupStrategyKey());
builder.addPropertyValue("lazyInit", configuration.isLazyInit());
builder.setLazyInit(configuration.isLazyInit());
builder.setPrimary(configuration.isPrimary());
configuration.getRepositoryBaseClassName()//
.ifPresent(it -> builder.addPropertyValue("repositoryBaseClass", it));

1
src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
View File

@@ -164,7 +164,6 @@ public class RepositoryConfigurationDelegate {
}
AbstractBeanDefinition beanDefinition = definitionBuilder.getBeanDefinition();
beanDefinition.setPrimary(configuration.isPrimary());
beanDefinition.setResourceDescription(configuration.getResourceDescription());
String beanName = configurationSource.generateBeanName(beanDefinition);