stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8325433: Type annotations on primitive types are not linked

Browse Source 
Reviewed-by: gli, prappo
This commit is contained in:
Chen Liang 2024-03-12 12:12:39 +00:00 committed by Pavel Rappo
parent 5056902e76
commit 2cf35246e6
5 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlLinkFactory.java
View File

@ -96,7 +96,8 @@ public class HtmlLinkFactory {
// handles primitives, no types and error types
@Override
protected Content defaultAction(TypeMirror type, HtmlLinkInfo linkInfo) {
link.add(utils.getTypeName(type, false));
link.add(getTypeAnnotationLinks(linkInfo));
link.add(utils.getTypeSignature(type, false, false));
return link;
}

44
test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2024, 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
@ -24,7 +24,7 @@
/*
* @test
* @bug 8005091 8009686 8025633 8026567 6469562 8071982 8071984 8162363 8175200 8186332 8182765
* 8187288 8241969 8259216
* 8187288 8241969 8259216 8325433
* @summary Make sure that type annotations are displayed correctly
* @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -144,7 +144,17 @@ public class TestTypeAnnotations extends JavadocTester {
le="annotation interface in typeannos">@FldB</a> [] <a href="FldC.html" title="a\
nnotation interface in typeannos">@FldC</a> <a href="FldA.html" title="annotatio\
n interface in typeannos">@FldA</a> []</span>&nbsp;<span class="element-name">ar\
ray2Deep</span></div>""");
ray2Deep</span></div>""",
"""
<div class="member-signature"><span class="return-type"><a href="FldA.html" titl\
e="annotation interface in typeannos">@FldA</a> int</span>&nbsp;<span cl\
ass="element-name">primitive</span></div>""",
"""
<div class="member-signature"><span class="return-type"><a href="FldA.html" titl\
e="annotation interface in typeannos">@FldA</a> int <a href="FldB.h\
tml" title="annotation interface in typeannos">@FldB</a> []</span>&nbsp;<span cl\
ass="element-name">primitiveArray1Deep</span></div>""");
checkOutput("typeannos/ModifiedScoped.html", true,
"""
@ -182,7 +192,18 @@ public class TestTypeAnnotations extends JavadocTester {
"""
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
le="annotation interface in typeannos">@MRtnA</a> java.lang.String[][]</span>&nb\
sp;<span class="element-name">array2</span>()</div>""");
sp;<span class="element-name">array2</span>()</div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
le="annotation interface in typeannos">@MRtnA</a> int</span>&nbsp;\
<span class="element-name">primitive</span>()</div>""",
"""
<div class="member-signature"><span class="return-type"><a href="MRtnA.html" tit\
le="annotation interface in typeannos">@MRtnA</a> int <a href="MRtn\
B.html" title="annotation interface in typeannos">@MRtnB</a> []</span>&nbsp;<spa\
n class="element-name">primitiveArray1Deep</span>()</div>""");
checkOutput("typeannos/MtdModifiedScoped.html", true,
"""
@ -255,7 +276,20 @@ public class TestTypeAnnotations extends JavadocTester {
amA.html" title="annotation interface in typeannos">@ParamA</a> java.lang.String\
<a href="ParamB.html" title="annotation interface in typeannos">@ParamB</a> [] \
<a href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> []&n\
bsp;a)</span></div>""");
bsp;a)</span></div>""",
"""
<div class="member-signature"><span class="return-type">void</span>&nbsp;<span c\
lass="element-name">primitive</span><wbr><span class="parameters">(<a href="Par\
amA.html" title="annotation interface in typeannos">@ParamA</a> int&nbsp;a)</sp\
an></div>""",
"""
<div class="member-signature"><span class="return-type">void</span>&nbsp;<span c\
lass="element-name">primitiveArray1Deep</span><wbr><span class="parameters">(<a \
href="ParamA.html" title="annotation interface in typeannos">@ParamA</a> int <a \
href="ParamB.html" title="annotation interface in typeannos">@ParamB</a> []&nbsp\
;a)</span></div>""");
// Test for type annotations on throws (Throws.java).
checkOutput("typeannos/ThrDefaultUnmodified.html", true,

5
test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Fields.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2024, 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
@ -47,6 +47,9 @@ class DefaultScope {
// Old-style array syntax
String array2FirstOld @FldA [];
String array2SecondOld [] @FldB [];
@FldA int primitive;
@FldA int @FldB [] primitiveArray1Deep;
}
class ModifiedScoped {

5
test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/MethodReturnType.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2024, 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
@ -49,6 +49,9 @@ class MtdDefaultScope {
// Old-style array syntax
String array2FirstOld() @MRtnA [] { return null; }
String array2SecondOld() [] @MRtnB [] { return null; }
@MRtnA int primitive() { return 0; }
@MRtnA int @MRtnB [] primitiveArray1Deep() { return null; }
}
class MtdModifiedScoped {

5
test/langtools/jdk/javadoc/doclet/testTypeAnnotations/typeannos/Parameters.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2024, 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
@ -42,6 +42,9 @@ class Parameters {
void array2Deep(@ParamA String @ParamA [] @ParamB [] a) {}
void array2First(String @ParamA [] [] a) {}
void array2Second(String [] @ParamB [] a) {}
void primitive(@ParamA int a) {}
void primitiveArray1Deep(@ParamA int @ParamB [] a) {}
}
class ParaParameterized<K, V> { }