RESOLVED - issue SPR-5600: Make naming of @Configuration class processing-related artifacts consistent

This commit is contained in:
Chris Beams
2009-03-30 15:26:21 +00:00
parent 24e8dccd44
commit cc713ad524
13 changed files with 31 additions and 32 deletions

View File

@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ConfigurationParser;
import org.springframework.context.annotation.ConfigurationClassParser;
import org.springframework.context.annotation.Import;
import test.beans.TestBean;
@@ -34,7 +34,7 @@ import test.beans.TestBean;
*/
public abstract class AbstractCircularImportDetectionTests {
protected abstract ConfigurationParser newParser();
protected abstract ConfigurationClassParser newParser();
protected abstract String loadAsConfigurationSource(Class<?> clazz) throws Exception;

View File

@@ -16,13 +16,13 @@
package org.springframework.context.annotation;
import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.context.annotation.ConfigurationParser;
import org.springframework.context.annotation.ConfigurationClassParser;
import org.springframework.context.annotation.Import;
import org.springframework.util.ClassUtils;
/**
* Unit test proving that ASM-based {@link ConfigurationParser} correctly detects circular use of
* Unit test proving that ASM-based {@link ConfigurationClassParser} correctly detects circular use of
* the {@link Import @Import} annotation.
*
* <p>While this test is the only subclass of {@link AbstractCircularImportDetectionTests}, the
@@ -33,8 +33,8 @@ import org.springframework.util.ClassUtils;
*/
public class AsmCircularImportDetectionTests extends AbstractCircularImportDetectionTests {
@Override
protected ConfigurationParser newParser() {
return new ConfigurationParser(new FailFastProblemReporter(), ClassUtils.getDefaultClassLoader());
protected ConfigurationClassParser newParser() {
return new ConfigurationClassParser(new FailFastProblemReporter(), ClassUtils.getDefaultClassLoader());
}
@Override