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

Warning instead of error for non-present type filter class

Browse Source 
Issue: SPR-16356
This commit is contained in:
Juergen Hoeller
2018-01-08 13:41:23 +01:00
parent 0d151b0212
commit 4adc820714
3 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2018 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.
@@ -66,10 +66,9 @@ public class CustomProblemReporterTests {
private static class CollatingProblemReporter implements ProblemReporter { private static class CollatingProblemReporter implements ProblemReporter {
private List<Problem> errors = new ArrayList<>(); private final List<Problem> errors = new ArrayList<>();
private List<Problem> warnings = new ArrayList<>();
private final List<Problem> warnings = new ArrayList<>();
@Override @Override
public void fatal(Problem problem) { public void fatal(Problem problem) {

16
spring-context/src/main/java/org/springframework/context/annotation/ComponentScanBeanDefinitionParser.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@@ -25,7 +25,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.parsing.BeanComponentDefinition; import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -216,6 +215,10 @@ public class ComponentScanBeanDefinitionParser implements BeanDefinitionParser {
scanner.addExcludeFilter(typeFilter); scanner.addExcludeFilter(typeFilter);
} }
} }
catch (ClassNotFoundException ex) {
parserContext.getReaderContext().warning(
"Ignoring non-present type filter class: " + ex, parserContext.extractSource(element));
}
catch (Exception ex) { catch (Exception ex) {
parserContext.getReaderContext().error( parserContext.getReaderContext().error(
ex.getMessage(), parserContext.extractSource(element), ex.getCause()); ex.getMessage(), parserContext.extractSource(element), ex.getCause());
@@ -225,13 +228,12 @@ public class ComponentScanBeanDefinitionParser implements BeanDefinitionParser {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected TypeFilter createTypeFilter( protected TypeFilter createTypeFilter(Element element, @Nullable ClassLoader classLoader,
Element element, @Nullable ClassLoader classLoader, ParserContext parserContext) { ParserContext parserContext) throws ClassNotFoundException {
String filterType = element.getAttribute(FILTER_TYPE_ATTRIBUTE); String filterType = element.getAttribute(FILTER_TYPE_ATTRIBUTE);
String expression = element.getAttribute(FILTER_EXPRESSION_ATTRIBUTE); String expression = element.getAttribute(FILTER_EXPRESSION_ATTRIBUTE);
expression = parserContext.getReaderContext().getEnvironment().resolvePlaceholders(expression); expression = parserContext.getReaderContext().getEnvironment().resolvePlaceholders(expression);
try {
if ("annotation".equals(filterType)) { if ("annotation".equals(filterType)) {
return new AnnotationTypeFilter((Class<Annotation>) ClassUtils.forName(expression, classLoader)); return new AnnotationTypeFilter((Class<Annotation>) ClassUtils.forName(expression, classLoader));
} }
@@ -256,10 +258,6 @@ public class ComponentScanBeanDefinitionParser implements BeanDefinitionParser {
throw new IllegalArgumentException("Unsupported filter type: " + filterType); throw new IllegalArgumentException("Unsupported filter type: " + filterType);
} }
} }
catch (ClassNotFoundException ex) {
throw new FatalBeanException("Type filter class not found: " + expression, ex);
}
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private Object instantiateUserDefinedStrategy( private Object instantiateUserDefinedStrategy(

2
spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2018 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.