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

some updates to error reporting to let errors show up in STS

Browse Source
This commit is contained in:
Christian Dupuis
2009-06-06 07:59:26 +00:00
parent df6ba69bc5
commit 8c65ed9e0b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@@ -132,7 +132,7 @@ class ConfigurationClassParser {
public void processImport(ConfigurationClass configClass, String[] classesToImport) throws IOException {
if (this.importStack.contains(configClass)) {
this.problemReporter.error(new CircularImportProblem(configClass, this.importStack));
this.problemReporter.error(new CircularImportProblem(configClass, this.importStack, configClass.getMetadata()));
}
else {
this.importStack.push(configClass);
@@ -148,7 +148,7 @@ class ConfigurationClassParser {
AnnotationMetadata metadata = reader.getAnnotationMetadata();
if (!metadata.hasAnnotation(Configuration.class.getName())) {
this.problemReporter.error(
new NonAnnotatedConfigurationProblem(metadata.getClassName(), reader.getResource()));
new NonAnnotatedConfigurationProblem(metadata.getClassName(), reader.getResource(), metadata));
}
else {
processConfigurationClass(new ConfigurationClass(reader, null));
@@ -218,10 +218,10 @@ class ConfigurationClassParser {
*/
private static class NonAnnotatedConfigurationProblem extends Problem {
public NonAnnotatedConfigurationProblem(String className, Resource resource) {
public NonAnnotatedConfigurationProblem(String className, Resource resource, AnnotationMetadata metadata) {
super(String.format("%s was imported as a @Configuration class but was not actually annotated " +
"with @Configuration. Annotate the class or do not attempt to process it.", className),
new Location(resource));
new Location(resource, metadata));
}
}
@@ -232,13 +232,13 @@ class ConfigurationClassParser {
*/
private static class CircularImportProblem extends Problem {
public CircularImportProblem(ConfigurationClass attemptedImport, Stack<ConfigurationClass> importStack) {
public CircularImportProblem(ConfigurationClass attemptedImport, Stack<ConfigurationClass> importStack, AnnotationMetadata metadata) {
super(String.format("A circular @Import has been detected: " +
"Illegal attempt by @Configuration class '%s' to import class '%s' as '%s' is " +
"already present in the current import stack [%s]",
importStack.peek().getSimpleName(), attemptedImport.getSimpleName(),
attemptedImport.getSimpleName(), importStack),
new Location(importStack.peek().getResource())
new Location(importStack.peek().getResource(), metadata)
);
}
}