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

DATACMNS-1098 - Polishing.

Browse Source 
Removed obsolete Spring version check. Formatting.
This commit is contained in:
Oliver Gierke
2017-06-26 16:02:51 +02:00
parent 21c32f3502
commit 35217ddce3
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/springframework/data/repository/config/RepositoryComponentProvider.java
View File

@@ -45,8 +45,6 @@ import org.springframework.util.Assert;
*/ */
class RepositoryComponentProvider extends ClassPathScanningCandidateComponentProvider { class RepositoryComponentProvider extends ClassPathScanningCandidateComponentProvider {
private static final String METHOD_NOT_PUBLIC = "AnnotationConfigUtils.processCommonDefinitionAnnotations(…) is not public! Make sure you're using Spring 3.2.5 or better. The class was loaded from %s.";
private boolean considerNestedRepositoryInterfaces; private boolean considerNestedRepositoryInterfaces;
private BeanDefinitionRegistry registry; private BeanDefinitionRegistry registry;
@@ -61,8 +59,6 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro
super(false); super(false);
assertRequiredSpringVersionPresent();
Assert.notNull(includeFilters, "Include filters must not be null!"); Assert.notNull(includeFilters, "Include filters must not be null!");
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!"); Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
@@ -160,20 +156,6 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro
this.considerNestedRepositoryInterfaces = considerNestedRepositoryInterfaces; this.considerNestedRepositoryInterfaces = considerNestedRepositoryInterfaces;
} }
/**
* Makes sure {@link AnnotationConfigUtils#processCommonDefinitionAnnotations(AnnotatedBeanDefinition) is public and
* indicates the offending JAR if not.
*/
private static void assertRequiredSpringVersionPresent() {
try {
AnnotationConfigUtils.class.getMethod("processCommonDefinitionAnnotations", AnnotatedBeanDefinition.class);
} catch (NoSuchMethodException o_O) {
throw new IllegalStateException(String.format(METHOD_NOT_PUBLIC, AnnotationConfigUtils.class
.getProtectionDomain().getCodeSource().getLocation()), o_O);
}
}
/** /**
* {@link org.springframework.core.type.filter.TypeFilter} that only matches interfaces. Thus setting this up makes * {@link org.springframework.core.type.filter.TypeFilter} that only matches interfaces. Thus setting this up makes
* only sense providing an interface type as {@code targetType}. * only sense providing an interface type as {@code targetType}.
@@ -196,7 +178,8 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro
* @see org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory) * @see org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
*/ */
@Override @Override
public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
throws IOException {
return metadataReader.getClassMetadata().isInterface() && super.match(metadataReader, metadataReaderFactory); return metadataReader.getClassMetadata().isInterface() && super.match(metadataReader, metadataReaderFactory);
} }
@@ -226,7 +209,8 @@ class RepositoryComponentProvider extends ClassPathScanningCandidateComponentPro
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory) * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
*/ */
public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException { public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
throws IOException {
for (TypeFilter filter : delegates) { for (TypeFilter filter : delegates) {
if (!filter.match(metadataReader, metadataReaderFactory)) { if (!filter.match(metadataReader, metadataReaderFactory)) {