Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
1697932c
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1697932c
编写于
3月 27, 2009
作者:
C
Chris Beams
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
consolidated context.annotation.support -> context.annotation
上级
2c0c523d
变更
37
隐藏空白更改
内联
并排
Showing
37 changed file
with
54 addition
and
115 deletion
+54
-115
org.springframework.context/src/main/java/org/springframework/context/annotation/AbstractConfigurationClassProcessor.java
...ntext/annotation/AbstractConfigurationClassProcessor.java
+1
-3
org.springframework.context/src/main/java/org/springframework/context/annotation/AddAnnotationAdapter.java
...ingframework/context/annotation/AddAnnotationAdapter.java
+1
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationAdapter.java
...springframework/context/annotation/AnnotationAdapter.java
+1
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
...ngframework/context/annotation/AnnotationConfigUtils.java
+0
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/AsmUtils.java
...java/org/springframework/context/annotation/AsmUtils.java
+1
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java
...va/org/springframework/context/annotation/BeanMethod.java
+1
-5
org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethodInterceptor.java
...ngframework/context/annotation/BeanMethodInterceptor.java
+1
-4
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
...pringframework/context/annotation/ConfigurationClass.java
+1
-3
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethodVisitor.java
...k/context/annotation/ConfigurationClassMethodVisitor.java
+2
-4
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
...k/context/annotation/ConfigurationClassPostProcessor.java
+1
-3
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassVisitor.java
...amework/context/annotation/ConfigurationClassVisitor.java
+2
-4
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationEnhancer.java
...ngframework/context/annotation/ConfigurationEnhancer.java
+2
-4
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModel.java
...pringframework/context/annotation/ConfigurationModel.java
+1
-2
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModelBeanDefinitionReader.java
...xt/annotation/ConfigurationModelBeanDefinitionReader.java
+1
-5
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationParser.java
...ringframework/context/annotation/ConfigurationParser.java
+3
-4
org.springframework.context/src/main/java/org/springframework/context/annotation/ImportAnnotationVisitor.java
...framework/context/annotation/ImportAnnotationVisitor.java
+2
-3
org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStack.java
...a/org/springframework/context/annotation/ImportStack.java
+1
-2
org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStackHolder.java
...springframework/context/annotation/ImportStackHolder.java
+1
-2
org.springframework.context/src/main/java/org/springframework/context/annotation/ModelClass.java
...va/org/springframework/context/annotation/ModelClass.java
+1
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotation.java
...springframework/context/annotation/MutableAnnotation.java
+2
-13
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationArrayVisitor.java
...ork/context/annotation/MutableAnnotationArrayVisitor.java
+2
-2
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationInvocationHandler.java
...ontext/annotation/MutableAnnotationInvocationHandler.java
+1
-1
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationVisitor.java
...ramework/context/annotation/MutableAnnotationVisitor.java
+2
-2
org.springframework.context/src/main/java/org/springframework/context/annotation/support/package-info.java
...ingframework/context/annotation/support/package-info.java
+0
-25
org.springframework.context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
...text/annotation/AbstractCircularImportDetectionTests.java
+2
-2
org.springframework.context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
...k/context/annotation/AsmCircularImportDetectionTests.java
+2
-2
org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodTests.java
...g/springframework/context/annotation/BeanMethodTests.java
+5
-2
org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationModelTests.java
...framework/context/annotation/ConfigurationModelTests.java
+3
-3
org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationPostProcessorTests.java
...k/context/annotation/ConfigurationPostProcessorTests.java
+2
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
.../annotation/InvalidConfigurationClassDefinitionTests.java
+2
-2
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
...ration/AbstractBeanDefinitionConfigurationClassTests.java
+1
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
...amework/context/annotation/configuration/AspectTests.java
+1
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
...ramework/context/annotation/configuration/BasicTests.java
+1
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
...amework/context/annotation/configuration/ImportTests.java
+1
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
...notation/configuration/PolymorphicConfigurationTests.java
+1
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
...mework/context/annotation/configuration/ScopingTests.java
+1
-1
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java
...mework/context/annotation/configuration/package-info.java
+1
-1
未找到文件。
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
AbstractConfigurationClassProcessor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/AbstractConfigurationClassProcessor.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
AddAnnotationAdapter.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/AddAnnotationAdapter.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
AnnotationAdapter.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationAdapter.java
浏览文件 @
1697932c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org.springframework.context.annotation
.support
;
package
org.springframework.context.annotation
;
import
org.springframework.asm.AnnotationVisitor
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
AsmUtils.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/AsmUtils.java
浏览文件 @
1697932c
...
...
@@ -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
.*;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
BeanMethod.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethod.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
BeanMethodInterceptor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/BeanMethodInterceptor.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationClass.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationClassMethodVisitor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassMethodVisitor.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationClassPostProcessor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationClassVisitor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassVisitor.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationEnhancer.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationEnhancer.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationModel.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModel.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationModelBeanDefinitionReader.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationModelBeanDefinitionReader.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ConfigurationParser.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationParser.java
浏览文件 @
1697932c
...
...
@@ -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)}
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ImportAnnotationVisitor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ImportAnnotationVisitor.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ImportStack.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStack.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ImportStackHolder.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ImportStackHolder.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
ModelClass.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/ModelClass.java
浏览文件 @
1697932c
...
...
@@ -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
.*;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
MutableAnnotation.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotation.java
浏览文件 @
1697932c
...
...
@@ -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
);
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
MutableAnnotationArrayVisitor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationArrayVisitor.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
MutableAnnotationInvocationHandler.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationInvocationHandler.java
浏览文件 @
1697932c
...
...
@@ -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
.*;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/
support/
MutableAnnotationVisitor.java
→
org.springframework.context/src/main/java/org/springframework/context/annotation/MutableAnnotationVisitor.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/main/java/org/springframework/context/annotation/support/package-info.java
已删除
100644 → 0
浏览文件 @
2c0c523d
/*
* 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
;
\ No newline at end of file
org.springframework.context/src/test/java/org/springframework/context/annotation/
support/
AbstractCircularImportDetectionTests.java
→
org.springframework.context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/
support/
AsmCircularImportDetectionTests.java
→
org.springframework.context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/
support/
BeanMethodTests.java
→
org.springframework.context/src/test/java/org/springframework/context/annotation/BeanMethodTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/
support/
ConfigurationModelTests.java
→
org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationModelTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/
support/
ConfigurationPostProcessorTests.java
→
org.springframework.context/src/test/java/org/springframework/context/annotation/ConfigurationPostProcessorTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/
support/
InvalidConfigurationClassDefinitionTests.java
→
org.springframework.context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
/**
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
浏览文件 @
1697932c
...
...
@@ -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
;
...
...
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java
浏览文件 @
1697932c
...
...
@@ -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
;
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录