Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
带水的鱼儿
spring-framework
提交
475396b5
S
spring-framework
项目概览
带水的鱼儿
/
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,发现更多精彩内容 >>
提交
475396b5
编写于
7月 12, 2021
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Exclude sealed interfaces from auto-proxying (for JDK 17 compatibility)
Closes gh-27027
上级
f3f0bd22
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
27 deletion
+35
-27
spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
...java/org/springframework/aop/framework/AopProxyUtils.java
+23
-25
spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
.../org/springframework/aop/framework/ProxyFactoryTests.java
+12
-2
未找到文件。
spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
浏览文件 @
475396b5
/*
* Copyright 2002-202
0
the original author or authors.
* Copyright 2002-202
1
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.
...
...
@@ -19,7 +19,9 @@ package org.springframework.aop.framework;
import
java.lang.reflect.Array
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Proxy
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
org.springframework.aop.SpringProxy
;
import
org.springframework.aop.TargetClassAware
;
...
...
@@ -29,7 +31,9 @@ import org.springframework.aop.target.SingletonTargetSource;
import
org.springframework.core.DecoratingProxy
;
import
org.springframework.lang.Nullable
;
import
org.springframework.util.Assert
;
import
org.springframework.util.ClassUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ReflectionUtils
;
/**
* Utility methods for AOP proxy factories.
...
...
@@ -44,6 +48,11 @@ import org.springframework.util.ObjectUtils;
*/
public
abstract
class
AopProxyUtils
{
// JDK 17 Class.isSealed() method available?
@Nullable
private
static
final
Method
isSealedMethod
=
ClassUtils
.
getMethodIfAvailable
(
Class
.
class
,
"isSealed"
);
/**
* Obtain the singleton target object behind the given proxy, if any.
* @param candidate the (potential) proxy to check
...
...
@@ -130,34 +139,23 @@ public abstract class AopProxyUtils {
specifiedInterfaces
=
advised
.
getProxiedInterfaces
();
}
}
boolean
addSpringProxy
=
!
advised
.
isInterfaceProxied
(
SpringProxy
.
class
);
boolean
addAdvised
=
!
advised
.
isOpaque
()
&&
!
advised
.
isInterfaceProxied
(
Advised
.
class
);
boolean
addDecoratingProxy
=
(
decoratingProxy
&&
!
advised
.
isInterfaceProxied
(
DecoratingProxy
.
class
));
int
nonUserIfcCount
=
0
;
if
(
addSpringProxy
)
{
nonUserIfcCount
++;
}
if
(
addAdvised
)
{
nonUserIfcCount
++;
}
if
(
addDecoratingProxy
)
{
nonUserIfcCount
++;
List
<
Class
<?>>
proxiedInterfaces
=
new
ArrayList
<>(
specifiedInterfaces
.
length
+
3
);
for
(
Class
<?>
ifc
:
specifiedInterfaces
)
{
// Only non-sealed interfaces are actually eligible for JDK proxying (on JDK 17)
if
(
isSealedMethod
==
null
||
Boolean
.
FALSE
.
equals
(
ReflectionUtils
.
invokeMethod
(
isSealedMethod
,
ifc
)))
{
proxiedInterfaces
.
add
(
ifc
);
}
}
Class
<?>[]
proxiedInterfaces
=
new
Class
<?>[
specifiedInterfaces
.
length
+
nonUserIfcCount
];
System
.
arraycopy
(
specifiedInterfaces
,
0
,
proxiedInterfaces
,
0
,
specifiedInterfaces
.
length
);
int
index
=
specifiedInterfaces
.
length
;
if
(
addSpringProxy
)
{
proxiedInterfaces
[
index
]
=
SpringProxy
.
class
;
index
++;
if
(!
advised
.
isInterfaceProxied
(
SpringProxy
.
class
))
{
proxiedInterfaces
.
add
(
SpringProxy
.
class
);
}
if
(
addAdvised
)
{
proxiedInterfaces
[
index
]
=
Advised
.
class
;
index
++;
if
(!
advised
.
isOpaque
()
&&
!
advised
.
isInterfaceProxied
(
Advised
.
class
))
{
proxiedInterfaces
.
add
(
Advised
.
class
);
}
if
(
addDecoratingProxy
)
{
proxiedInterfaces
[
index
]
=
DecoratingProxy
.
class
;
if
(
decoratingProxy
&&
!
advised
.
isInterfaceProxied
(
DecoratingProxy
.
class
)
)
{
proxiedInterfaces
.
add
(
DecoratingProxy
.
class
)
;
}
return
proxiedInterfaces
;
return
ClassUtils
.
toClassArray
(
proxiedInterfaces
)
;
}
/**
...
...
spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
浏览文件 @
475396b5
/*
* Copyright 2002-20
19
the original author or authors.
* Copyright 2002-20
21
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.
...
...
@@ -183,7 +183,7 @@ public class ProxyFactoryTests {
}
@Test
public
void
testGetsAllInterfaces
()
throws
Exception
{
public
void
testGetsAllInterfaces
()
{
// Extend to get new interface
class
TestBeanSubclass
extends
TestBean
implements
Comparable
<
Object
>
{
@Override
...
...
@@ -240,6 +240,16 @@ public class ProxyFactoryTests {
assertThat
(
factory
.
countAdvicesOfType
(
NopInterceptor
.
class
)
==
2
).
isTrue
();
}
@Test
public
void
testSealedInterfaceExclusion
()
{
// String implements ConstantDesc on JDK 12+, sealed as of JDK 17
ProxyFactory
factory
=
new
ProxyFactory
(
new
String
());
NopInterceptor
di
=
new
NopInterceptor
();
factory
.
addAdvice
(
0
,
di
);
Object
proxy
=
factory
.
getProxy
();
assertThat
(
proxy
).
isInstanceOf
(
CharSequence
.
class
);
}
/**
* Should see effect immediately on behavior.
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录