RESOLVED - issue SPR-5600: Make naming of @Configuration class processing-related artifacts consistent
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user