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

DATACMNS-844 - Removed LenientAssignableTypeFilter from RepositoryConfigurationDelegate.

Browse Source 
The type was a workaround until an improvement in Spring Framework [0] was fixed. As we now rely on newer versions of the framework, we can remove that type.

[0] https://jira.spring.io/browse/SPR-12042
This commit is contained in:
Oliver Gierke
2016-04-10 13:54:29 +02:00
parent f38b18702c
commit 43a924a0a7
1 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@
*/ */
package org.springframework.data.repository.config; package org.springframework.data.repository.config;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -31,8 +30,6 @@ import org.springframework.core.env.Environment;
import org.springframework.core.env.EnvironmentCapable; import org.springframework.core.env.EnvironmentCapable;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter;
import org.springframework.data.repository.core.support.RepositoryFactorySupport; import org.springframework.data.repository.core.support.RepositoryFactorySupport;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@@ -162,7 +159,7 @@ public class RepositoryConfigurationDelegate {
ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false); ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
scanner.setEnvironment(environment); scanner.setEnvironment(environment);
scanner.setResourceLoader(resourceLoader); scanner.setResourceLoader(resourceLoader);
scanner.addIncludeFilter(new LenientAssignableTypeFilter(RepositoryFactorySupport.class)); scanner.addIncludeFilter(new AssignableTypeFilter(RepositoryFactorySupport.class));
if (scanner.findCandidateComponents(MODULE_DETECTION_PACKAGE).size() > 1) { if (scanner.findCandidateComponents(MODULE_DETECTION_PACKAGE).size() > 1) {
@@ -172,38 +169,4 @@ public class RepositoryConfigurationDelegate {
return false; return false;
} }
/**
* Special {@link AssignableTypeFilter} that generally considers exceptions during type matching indicating a
* non-match. TODO: Remove after upgrade to Spring 4.0.7.
*
* @see https://jira.spring.io/browse/SPR-12042
* @author Oliver Gierke
*/
private static class LenientAssignableTypeFilter extends AssignableTypeFilter {
/**
* Creates a new {@link LenientAssignableTypeFilter} for the given target type.
*
* @param targetType must not be {@literal null}.
*/
public LenientAssignableTypeFilter(Class<?> targetType) {
super(targetType);
}
/*
* (non-Javadoc)
* @see org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
*/
@Override
public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
throws IOException {
try {
return super.match(metadataReader, metadataReaderFactory);
} catch (Exception o_O) {
return false;
}
}
}
} }