Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
22211a01
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,发现更多精彩内容 >>
提交
22211a01
编写于
11月 13, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
32532a88
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
6 deletion
+13
-6
spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
...gframework/beans/factory/support/ConstructorResolver.java
+3
-1
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
...ork/context/event/AnnotationDrivenEventListenerTests.java
+8
-5
spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java
...springframework/core/codec/AbstractDataBufferDecoder.java
+1
-0
spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
...ramework/http/codec/ServerSentEventHttpMessageReader.java
+1
-0
未找到文件。
spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
浏览文件 @
22211a01
...
@@ -486,7 +486,9 @@ class ConstructorResolver {
...
@@ -486,7 +486,9 @@ class ConstructorResolver {
}
}
}
}
candidates
.
sort
(
AutowireUtils
.
EXECUTABLE_COMPARATOR
);
if
(
candidates
.
size
()
>
1
)
{
// explicitly skip immutable singletonList
candidates
.
sort
(
AutowireUtils
.
EXECUTABLE_COMPARATOR
);
}
ConstructorArgumentValues
resolvedValues
=
null
;
ConstructorArgumentValues
resolvedValues
=
null
;
boolean
autowiring
=
(
mbd
.
getResolvedAutowireMode
()
==
AutowireCapableBeanFactory
.
AUTOWIRE_CONSTRUCTOR
);
boolean
autowiring
=
(
mbd
.
getResolvedAutowireMode
()
==
AutowireCapableBeanFactory
.
AUTOWIRE_CONSTRUCTOR
);
...
...
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
浏览文件 @
22211a01
...
@@ -850,9 +850,9 @@ public class AnnotationDrivenEventListenerTests {
...
@@ -850,9 +850,9 @@ public class AnnotationDrivenEventListenerTests {
this
.
eventCollector
.
addEvent
(
this
,
event
);
this
.
eventCollector
.
addEvent
(
this
,
event
);
}
}
@Override
@EventListener
@EventListener
@Async
@Async
@Override
public
void
handleAsync
(
AnotherTestEvent
event
)
{
public
void
handleAsync
(
AnotherTestEvent
event
)
{
assertThat
(
Thread
.
currentThread
().
getName
()).
isNotEqualTo
(
event
.
content
);
assertThat
(
Thread
.
currentThread
().
getName
()).
isNotEqualTo
(
event
.
content
);
this
.
eventCollector
.
addEvent
(
this
,
event
);
this
.
eventCollector
.
addEvent
(
this
,
event
);
...
@@ -877,9 +877,9 @@ public class AnnotationDrivenEventListenerTests {
...
@@ -877,9 +877,9 @@ public class AnnotationDrivenEventListenerTests {
this
.
eventCollector
.
addEvent
(
this
,
event
);
this
.
eventCollector
.
addEvent
(
this
,
event
);
}
}
@Override
@EventListener
@EventListener
@Async
@Async
@Override
public
void
handleAsync
(
AnotherTestEvent
event
)
{
public
void
handleAsync
(
AnotherTestEvent
event
)
{
assertThat
(
Thread
.
currentThread
().
getName
()).
isNotEqualTo
(
event
.
content
);
assertThat
(
Thread
.
currentThread
().
getName
()).
isNotEqualTo
(
event
.
content
);
this
.
eventCollector
.
addEvent
(
this
,
event
);
this
.
eventCollector
.
addEvent
(
this
,
event
);
...
@@ -994,20 +994,20 @@ public class AnnotationDrivenEventListenerTests {
...
@@ -994,20 +994,20 @@ public class AnnotationDrivenEventListenerTests {
super
.
handle
(
event
);
super
.
handle
(
event
);
}
}
@Override
@EventListener
(
condition
=
"#payload.startsWith('OK')"
)
@EventListener
(
condition
=
"#payload.startsWith('OK')"
)
@Override
public
void
handleString
(
String
payload
)
{
public
void
handleString
(
String
payload
)
{
super
.
handleString
(
payload
);
super
.
handleString
(
payload
);
}
}
@Override
@ConditionalEvent
(
"#root.event.timestamp > #p0"
)
@ConditionalEvent
(
"#root.event.timestamp > #p0"
)
@Override
public
void
handleTimestamp
(
Long
timestamp
)
{
public
void
handleTimestamp
(
Long
timestamp
)
{
collectEvent
(
timestamp
);
collectEvent
(
timestamp
);
}
}
@Override
@ConditionalEvent
(
"@conditionEvaluator.valid(#p0)"
)
@ConditionalEvent
(
"@conditionEvaluator.valid(#p0)"
)
@Override
public
void
handleRatio
(
Double
ratio
)
{
public
void
handleRatio
(
Double
ratio
)
{
collectEvent
(
ratio
);
collectEvent
(
ratio
);
}
}
...
@@ -1085,6 +1085,7 @@ public class AnnotationDrivenEventListenerTests {
...
@@ -1085,6 +1085,7 @@ public class AnnotationDrivenEventListenerTests {
}
}
}
}
@Configuration
@Configuration
@Import
(
UseMissingEventListener
.
class
)
@Import
(
UseMissingEventListener
.
class
)
public
static
class
MissingEventListener
{
public
static
class
MissingEventListener
{
...
@@ -1095,6 +1096,7 @@ public class AnnotationDrivenEventListenerTests {
...
@@ -1095,6 +1096,7 @@ public class AnnotationDrivenEventListenerTests {
}
}
}
}
@Component
@Component
public
static
class
MyEventListener
{
public
static
class
MyEventListener
{
...
@@ -1104,6 +1106,7 @@ public class AnnotationDrivenEventListenerTests {
...
@@ -1104,6 +1106,7 @@ public class AnnotationDrivenEventListenerTests {
}
}
}
}
public
static
class
UseMissingEventListener
{
public
static
class
UseMissingEventListener
{
@Inject
@Inject
...
...
spring-core/src/main/java/org/springframework/core/codec/AbstractDataBufferDecoder.java
浏览文件 @
22211a01
...
@@ -102,6 +102,7 @@ public abstract class AbstractDataBufferDecoder<T> extends AbstractDecoder<T> {
...
@@ -102,6 +102,7 @@ public abstract class AbstractDataBufferDecoder<T> extends AbstractDecoder<T> {
* {@link #decode(DataBuffer, ResolvableType, MimeType, Map)} instead
* {@link #decode(DataBuffer, ResolvableType, MimeType, Map)} instead
*/
*/
@Deprecated
@Deprecated
@Nullable
protected
T
decodeDataBuffer
(
DataBuffer
buffer
,
ResolvableType
elementType
,
protected
T
decodeDataBuffer
(
DataBuffer
buffer
,
ResolvableType
elementType
,
@Nullable
MimeType
mimeType
,
@Nullable
Map
<
String
,
Object
>
hints
)
{
@Nullable
MimeType
mimeType
,
@Nullable
Map
<
String
,
Object
>
hints
)
{
...
...
spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
浏览文件 @
22211a01
...
@@ -155,6 +155,7 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
...
@@ -155,6 +155,7 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
}
}
}
}
@Nullable
private
Object
decodeData
(
String
data
,
ResolvableType
dataType
,
Map
<
String
,
Object
>
hints
)
{
private
Object
decodeData
(
String
data
,
ResolvableType
dataType
,
Map
<
String
,
Object
>
hints
)
{
if
(
String
.
class
==
dataType
.
resolve
())
{
if
(
String
.
class
==
dataType
.
resolve
())
{
return
data
.
substring
(
0
,
data
.
length
()
-
1
);
return
data
.
substring
(
0
,
data
.
length
()
-
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录