Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dk131072
spring-framework
提交
e14c2de1
S
spring-framework
项目概览
dk131072
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
e14c2de1
编写于
1月 13, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ImportStack extends ArrayDeque instead of Stack and relies on standard contains implementation
Issue: SPR-13852
上级
5d4547d3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
21 deletion
+5
-21
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
...ramework/context/annotation/ConfigurationClassParser.java
+5
-21
未找到文件。
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
浏览文件 @
e14c2de1
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -18,10 +18,12 @@ package org.springframework.context.annotation;
import
java.io.FileNotFoundException
;
import
java.io.IOException
;
import
java.util.ArrayDeque
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.Comparator
;
import
java.util.Deque
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.LinkedHashMap
;
...
...
@@ -30,7 +32,6 @@ import java.util.LinkedList;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.Stack
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
...
...
@@ -625,7 +626,7 @@ class ConfigurationClassParser {
@SuppressWarnings
(
"serial"
)
private
static
class
ImportStack
extends
Stack
<
ConfigurationClass
>
implements
ImportRegistry
{
private
static
class
ImportStack
extends
ArrayDeque
<
ConfigurationClass
>
implements
ImportRegistry
{
private
final
MultiValueMap
<
String
,
AnnotationMetadata
>
imports
=
new
LinkedMultiValueMap
<
String
,
AnnotationMetadata
>();
...
...
@@ -650,23 +651,6 @@ class ConfigurationClassParser {
return
(!
CollectionUtils
.
isEmpty
(
list
)
?
list
.
get
(
list
.
size
()
-
1
)
:
null
);
}
/**
* Simplified contains() implementation that tests to see if any {@link ConfigurationClass}
* exists within this stack that has the same name as <var>elem</var>. Elem must be of
* type ConfigurationClass.
*/
@Override
public
boolean
contains
(
Object
elem
)
{
ConfigurationClass
configClass
=
(
ConfigurationClass
)
elem
;
Comparator
<
ConfigurationClass
>
comparator
=
new
Comparator
<
ConfigurationClass
>()
{
@Override
public
int
compare
(
ConfigurationClass
first
,
ConfigurationClass
second
)
{
return
(
first
.
getMetadata
().
getClassName
().
equals
(
second
.
getMetadata
().
getClassName
())
?
0
:
1
);
}
};
return
(
Collections
.
binarySearch
(
this
,
configClass
,
comparator
)
!=
-
1
);
}
/**
* Given a stack containing (in order)
* <ul>
...
...
@@ -886,7 +870,7 @@ class ConfigurationClassParser {
*/
private
static
class
CircularImportProblem
extends
Problem
{
public
CircularImportProblem
(
ConfigurationClass
attemptedImport
,
Stack
<
ConfigurationClass
>
importStack
)
{
public
CircularImportProblem
(
ConfigurationClass
attemptedImport
,
Deque
<
ConfigurationClass
>
importStack
)
{
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
(),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录