consolidated context.annotation.support -> context.annotation

This commit is contained in:
Chris Beams 2009-03-27 04:57:13 +00:00
parent 2c0c523d70
commit 1697932c57
37 changed files with 54 additions and 115 deletions

View File

@ -14,14 +14,12 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import net.sf.cglib.asm.Constants;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import org.springframework.asm.AnnotationVisitor;

View File

@ -25,7 +25,6 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.util.ClassUtils;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.util.ClassUtils.*;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.context.annotation.StandardScopes.*;
@ -27,10 +27,6 @@ import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.factory.parsing.Location;
import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.util.Assert;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
@ -27,9 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.core.annotation.AnnotationUtils;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
@ -24,8 +24,6 @@ import java.util.Set;
import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.Assert;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.util.ClassUtils.*;
import java.lang.annotation.Annotation;
@ -28,8 +28,6 @@ import org.springframework.asm.Label;
import org.springframework.asm.MethodAdapter;
import org.springframework.asm.MethodVisitor;
import org.springframework.asm.Opcodes;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
@ -28,8 +28,6 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.ClassMetadata;

View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.util.ClassUtils.*;
import java.util.HashMap;
@ -32,8 +32,6 @@ import org.springframework.asm.Opcodes;
import org.springframework.beans.factory.parsing.Location;
import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ClassPathResource;

View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@ -35,8 +35,6 @@ import org.springframework.asm.ClassAdapter;
import org.springframework.asm.ClassReader;
import org.springframework.asm.ClassWriter;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.util.Assert;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
@ -22,7 +22,6 @@ import java.util.LinkedHashSet;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Configuration;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.util.StringUtils.*;
@ -36,10 +36,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.core.io.Resource;
import org.springframework.util.Assert;

View File

@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import org.springframework.asm.ClassReader;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ClassUtils;
@ -39,7 +38,7 @@ import org.springframework.util.ClassUtils;
* @see ConfigurationModel
* @see ConfigurationModelBeanDefinitionReader
*/
public class ConfigurationParser {
class ConfigurationParser {
/**
* Model to be populated during calls to {@link #parse(Object, String)}

View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.util.ClassUtils.*;
import java.util.ArrayList;
@ -26,7 +26,6 @@ import org.springframework.asm.AnnotationVisitor;
import org.springframework.asm.ClassReader;
import org.springframework.asm.Type;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Import;
import org.springframework.util.Assert;

View File

@ -14,14 +14,13 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.Stack;
import org.springframework.context.annotation.Import;
import org.springframework.util.Assert;

View File

@ -14,9 +14,8 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import org.springframework.context.annotation.Import;
/**

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.springframework.util.ClassUtils.*;

View File

@ -14,9 +14,8 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import org.springframework.context.annotation.Configuration;
/**
* Interface used when dynamically creating mutable instances of annotations associated
@ -29,22 +28,12 @@ import org.springframework.context.annotation.Configuration;
* model representations of all annotations and attributes. It is better to simply attach
* annotation instances and read them as needed.
*
* <p>Note: the visibility of this interface would be reduced to package-private save for an
* obscure restriction of JDK dynamic proxies.
* {@link AsmUtils#createMutableAnnotation} creates a proxy based on
* two interfaces: this one, and whatever annotation is currently being parsed. The
* restriction is that both interfaces may not be package-private if they are in separate
* packages. In order to avoid unnecessarily restricting the visibility options for
* user-defined annotations, this interface becomes public. Developers should take caution
* not to use this annotation outside this package.
*
* @author Chris Beams
* @since 3.0
* @see MutableAnnotationVisitor
* @see MutableAnnotationInvocationHandler
* @see AsmUtils#createMutableAnnotation
*/
public interface MutableAnnotation {
interface MutableAnnotation {
void setAttributeValue(String attribName, Object attribValue);

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.springframework.core.annotation.AnnotationUtils.*;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.springframework.context.annotation.support.AsmUtils.*;
import static org.springframework.context.annotation.AsmUtils.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;

View File

@ -1,25 +0,0 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Supporting infrastructure for
* {@link org.springframework.context.annotation.Configuration} class processing.
*
* @author Chris Beams
* @see ConfigurationClassPostProcessor
* @see ConfigurationParser
*/
package org.springframework.context.annotation.support;

View File

@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
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.Import;
import org.springframework.context.annotation.support.ConfigurationParser;
import test.beans.TestBean;

View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.context.annotation.ConfigurationParser;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.support.ConfigurationParser;
import org.springframework.util.ClassUtils;

View File

@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.context.annotation.AsmUtils.*;
import static org.springframework.context.annotation.ScopedProxyMode.*;
import static org.springframework.context.annotation.StandardScopes.*;
import static org.springframework.context.annotation.support.AsmUtils.*;
import java.lang.reflect.Modifier;
@ -29,6 +29,9 @@ import org.springframework.beans.factory.parsing.FailFastProblemReporter;
import org.springframework.beans.factory.parsing.Location;
import org.springframework.beans.factory.parsing.ProblemReporter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.BeanMethod;
import org.springframework.context.annotation.ConfigurationClass;
import org.springframework.context.annotation.ModelClass;
import org.springframework.context.annotation.Scope;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;

View File

@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static java.lang.String.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.context.annotation.support.ConfigurationClass;
import org.springframework.context.annotation.support.ConfigurationModel;
import org.springframework.context.annotation.ConfigurationClass;
import org.springframework.context.annotation.ConfigurationModel;
/**

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
@ -27,6 +27,7 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.util.ClassUtils;

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation.support;
package org.springframework.context.annotation;
import static org.junit.Assert.*;
import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
@ -23,7 +23,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
/**

View File

@ -24,7 +24,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
/**

View File

@ -10,7 +10,7 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.io.ClassPathResource;

View File

@ -13,9 +13,9 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.StandardScopes;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import test.beans.ITestBean;
import test.beans.TestBean;

View File

@ -24,8 +24,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import test.beans.ITestBean;
import test.beans.TestBean;

View File

@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import test.beans.TestBean;

View File

@ -31,10 +31,10 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.context.annotation.StandardScopes;
import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
import org.springframework.context.support.GenericApplicationContext;
import test.beans.ITestBean;

View File

@ -21,6 +21,6 @@
* @author Chris Beams
* @see org.springframework.context.annotation.Configuration
* @see org.springframework.context.annotation.Bean
* @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor
* @see org.springframework.context.annotation.ConfigurationClassPostProcessor
*/
package org.springframework.context.annotation.configuration;