Skip to content

Commit 9798411

Browse files
committed
DATACMNS-844 - Removed LenientAssignableTypeFilter from RepositoryConfigurationDelegate.
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
1 parent a44049f commit 9798411

File tree

1 file changed

+1
-38
lines changed

1 file changed

+1
-38
lines changed

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.data.repository.config;
1717

18-
import java.io.IOException;
1918
import java.util.ArrayList;
2019
import java.util.List;
2120

@@ -31,8 +30,6 @@
3130
import org.springframework.core.env.EnvironmentCapable;
3231
import org.springframework.core.env.StandardEnvironment;
3332
import org.springframework.core.io.ResourceLoader;
34-
import org.springframework.core.type.classreading.MetadataReader;
35-
import org.springframework.core.type.classreading.MetadataReaderFactory;
3633
import org.springframework.core.type.filter.AssignableTypeFilter;
3734
import org.springframework.data.repository.core.support.RepositoryFactorySupport;
3835
import org.springframework.util.Assert;
@@ -162,7 +159,7 @@ private boolean multipleStoresDetected() {
162159
ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
163160
scanner.setEnvironment(environment);
164161
scanner.setResourceLoader(resourceLoader);
165-
scanner.addIncludeFilter(new LenientAssignableTypeFilter(RepositoryFactorySupport.class));
162+
scanner.addIncludeFilter(new AssignableTypeFilter(RepositoryFactorySupport.class));
166163

167164
if (scanner.findCandidateComponents(MODULE_DETECTION_PACKAGE).size() > 1) {
168165

@@ -172,38 +169,4 @@ private boolean multipleStoresDetected() {
172169

173170
return false;
174171
}
175-
176-
/**
177-
* Special {@link AssignableTypeFilter} that generally considers exceptions during type matching indicating a
178-
* non-match. TODO: Remove after upgrade to Spring 4.0.7.
179-
*
180-
* @see https://jira.spring.io/browse/SPR-12042
181-
* @author Oliver Gierke
182-
*/
183-
private static class LenientAssignableTypeFilter extends AssignableTypeFilter {
184-
185-
/**
186-
* Creates a new {@link LenientAssignableTypeFilter} for the given target type.
187-
*
188-
* @param targetType must not be {@literal null}.
189-
*/
190-
public LenientAssignableTypeFilter(Class<?> targetType) {
191-
super(targetType);
192-
}
193-
194-
/*
195-
* (non-Javadoc)
196-
* @see org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
197-
*/
198-
@Override
199-
public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
200-
throws IOException {
201-
202-
try {
203-
return super.match(metadataReader, metadataReaderFactory);
204-
} catch (Exception o_O) {
205-
return false;
206-
}
207-
}
208-
}
209172
}

0 commit comments

Comments
 (0)