Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
c4149916
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c4149916
编写于
1月 08, 2018
作者:
A
asaha
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
8a00c43a
fa2e8ccf
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
138 addition
and
2 deletion
+138
-2
.hgtags
.hgtags
+1
-0
src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java
...ect/generics/reflectiveObjects/ParameterizedTypeImpl.java
+2
-2
test/java/lang/reflect/Generics/TestGenericReturnTypeToString.java
.../lang/reflect/Generics/TestGenericReturnTypeToString.java
+135
-0
未找到文件。
.hgtags
浏览文件 @
c4149916
...
...
@@ -856,5 +856,6 @@ c9254e01820639526f803dbe05080fce0d33db98 jdk8u162-b08
1d2ee5e60df1c3bc889c92154d839bfe73077f66 jdk8u162-b10
95df717479b19f5ea244afc67434827f2f851287 jdk8u162-b11
ddae5cb11d6c04130b8002b852bc7f80e0c8bcd2 jdk8u162-b12
8e40acfcc41a631f5922824712d4336742652eac jdk8u162-b31
b6195815c4bbbf275f1aefd337d805eb66f2b5b8 jdk8u171-b00
f1792a59f1fa20e47fe5d4561754012440564bec jdk8u171-b01
src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java
浏览文件 @
c4149916
...
...
@@ -212,7 +212,7 @@ public class ParameterizedTypeImpl implements ParameterizedType {
else
sb
.
append
(
ownerType
.
toString
());
sb
.
append
(
"
.
"
);
sb
.
append
(
"
$
"
);
if
(
ownerType
instanceof
ParameterizedTypeImpl
)
{
// Find simple name of nested type by removing the
...
...
@@ -220,7 +220,7 @@ public class ParameterizedTypeImpl implements ParameterizedType {
sb
.
append
(
rawType
.
getName
().
replace
(
((
ParameterizedTypeImpl
)
ownerType
).
rawType
.
getName
()
+
"$"
,
""
));
}
else
sb
.
append
(
rawType
.
get
Name
());
sb
.
append
(
rawType
.
getSimple
Name
());
}
else
sb
.
append
(
rawType
.
getName
());
...
...
test/java/lang/reflect/Generics/TestGenericReturnTypeToString.java
0 → 100644
浏览文件 @
c4149916
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8054213
* @summary Check that toString method works properly for generic return type
* obtained via reflection
* @run main TestGenericReturnTypeToString
*/
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.reflect.Method
;
import
java.util.List
;
public
class
TestGenericReturnTypeToString
{
public
static
void
main
(
String
[]
args
)
{
boolean
hasFailures
=
false
;
for
(
Method
method
:
TestGenericReturnTypeToString
.
class
.
getMethods
())
{
if
(
method
.
isAnnotationPresent
(
ExpectedGenericString
.
class
))
{
ExpectedGenericString
es
=
method
.
getAnnotation
(
ExpectedGenericString
.
class
);
String
result
=
method
.
getGenericReturnType
().
toString
();
if
(!
es
.
value
().
equals
(
result
))
{
hasFailures
=
true
;
System
.
err
.
println
(
"Unexpected result of "
+
"getGenericReturnType().toString() "
+
" for "
+
method
.
getName
()
+
" expected: "
+
es
.
value
()
+
" actual: "
+
result
);
}
}
if
(
hasFailures
)
{
throw
new
RuntimeException
(
"Test failed"
);
}
}
}
@ExpectedGenericString
(
"TestGenericReturnTypeToString$"
+
"FirstInnerClassGeneric<Dummy>$SecondInnerClassGeneric<Dummy>"
)
public
FirstInnerClassGeneric
<
Dummy
>.
SecondInnerClassGeneric
<
Dummy
>
foo1
()
{
return
null
;
}
@ExpectedGenericString
(
"TestGenericReturnTypeToString$"
+
"FirstInnerClassGeneric<Dummy>$SecondInnerClass"
)
public
FirstInnerClassGeneric
<
Dummy
>.
SecondInnerClass
foo2
()
{
return
null
;
}
@ExpectedGenericString
(
"TestGenericReturnTypeToString$"
+
"FirstInnerClass$SecondInnerClassGeneric<Dummy>"
)
public
FirstInnerClass
.
SecondInnerClassGeneric
<
Dummy
>
foo3
()
{
return
null
;
}
@ExpectedGenericString
(
"class TestGenericReturnTypeToString$"
+
"FirstInnerClass$SecondInnerClass"
)
public
FirstInnerClass
.
SecondInnerClass
foo4
()
{
return
null
;
}
@ExpectedGenericString
(
"java.util.List<java.lang.String>"
)
public
java
.
util
.
List
<
java
.
lang
.
String
>
foo5
()
{
return
null
;
}
@ExpectedGenericString
(
"interface TestGenericReturnTypeToString$"
+
"FirstInnerClass$Interface"
)
public
FirstInnerClass
.
Interface
foo6
()
{
return
null
;
}
@ExpectedGenericString
(
"TestGenericReturnTypeToString$"
+
"FirstInnerClass$InterfaceGeneric<Dummy>"
)
public
FirstInnerClass
.
InterfaceGeneric
<
Dummy
>
foo7
()
{
return
null
;
}
public
static
class
FirstInnerClass
{
public
class
SecondInnerClassGeneric
<
T
>
{
}
public
class
SecondInnerClass
{
}
interface
Interface
{
}
interface
InterfaceGeneric
<
T
>
{
}
}
public
class
FirstInnerClassGeneric
<
T
>
{
public
class
SecondInnerClassGeneric
<
T
>
{
}
public
class
SecondInnerClass
{
}
}
}
@Retention
(
RetentionPolicy
.
RUNTIME
)
@interface
ExpectedGenericString
{
String
value
();
}
class
Dummy
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录