This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new eff7aedbb5 Deploy documentation staging from
6979ce6c25927a98753dc600362d7855e5b708a7
6979ce6c25927a98753dc600362d7855e5b708a7
eff7aedbb5 is described below
commit eff7aedbb59268e3da5e905dbed755ca87e5e568
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Nov 7 17:52:23 2025 +0000
Deploy documentation staging from 6979ce6c25927a98753dc600362d7855e5b708a7
6979ce6c25927a98753dc600362d7855e5b708a7
---
.../reflect/FieldInfo_AnnotationInfos_Test.html | 24 ++++----
.../juneau/common/reflect/ParamInfoTest.html | 66 +++++++++++-----------
.../org/apache/juneau/reflect/ParamInfoTest.html | 44 +++++++--------
.../juneau/common/reflect/AnnotationProvider.html | 2 +-
.../apache/juneau/common/reflect/FieldInfo.html | 12 ++--
.../juneau/common/reflect/ParameterInfo.html | 22 ++++----
.../juneau/httppart/bean/RequestBeanMeta.html | 2 +-
site/xref/org/apache/juneau/rest/RestContext.html | 22 ++++----
.../org/apache/juneau/rest/arg/FormDataArg.html | 2 +-
.../xref/org/apache/juneau/rest/arg/HeaderArg.html | 2 +-
site/xref/org/apache/juneau/rest/arg/PathArg.html | 4 +-
site/xref/org/apache/juneau/rest/arg/QueryArg.html | 2 +-
12 files changed, 102 insertions(+), 102 deletions(-)
diff --git
a/site/xref-test/org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html
b/site/xref-test/org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html
index 3f24388e16..1b147f217c 100644
---
a/site/xref-test/org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html
+++
b/site/xref-test/org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html
@@ -27,7 +27,7 @@
<a class="jxr_linenumber" name="L19" href="#L19">19</a> <strong
class="jxr_keyword">import</strong> org.junit.jupiter.api.*;
<a class="jxr_linenumber" name="L20" href="#L20">20</a>
<a class="jxr_linenumber" name="L21" href="#L21">21</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L22" href="#L22">22</a> <em
class="jxr_javadoccomment"> * Tests for {@link FieldInfo#getAnnotationInfos()}
methods.</em>
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <em
class="jxr_javadoccomment"> * Tests for {@link
FieldInfo#getDeclaredAnnotationInfos()} methods.</em>
<a class="jxr_linenumber" name="L23" href="#L23">23</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a name="FieldInfo_AnnotationInfos_Test"
href="../../../../../org/apache/juneau/common/reflect/FieldInfo_AnnotationInfos_Test.html#FieldInfo_AnnotationInfos_Test">FieldInfo_AnnotationInfos_Test</a>
{
<a class="jxr_linenumber" name="L25" href="#L25">25</a>
@@ -68,18 +68,18 @@
<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong
class="jxr_keyword">var</strong> field3 = ci.getPublicField(x ->
x.getName().equals(<span class="jxr_string">"field3"</span>));
<a class="jxr_linenumber" name="L61" href="#L61">61</a>
<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em
class="jxr_comment">// field1 has 2 annotations</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">var</strong> annotations1 = field1.getAnnotationInfos();
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">var</strong> annotations1 =
field1.getDeclaredAnnotationInfos();
<a class="jxr_linenumber" name="L64" href="#L64">64</a>
assertEquals(2, annotations1.size());
<a class="jxr_linenumber" name="L65" href="#L65">65</a>
assertTrue(annotations1.stream().anyMatch(a -> a.hasSimpleName(<span
class="jxr_string">"TestAnnotation1"</span>)));
<a class="jxr_linenumber" name="L66" href="#L66">66</a>
assertTrue(annotations1.stream().anyMatch(a -> a.hasSimpleName(<span
class="jxr_string">"TestAnnotation2"</span>)));
<a class="jxr_linenumber" name="L67" href="#L67">67</a>
<a class="jxr_linenumber" name="L68" href="#L68">68</a> <em
class="jxr_comment">// field2 has 1 annotation</em>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">var</strong> annotations2 = field2.getAnnotationInfos();
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">var</strong> annotations2 =
field2.getDeclaredAnnotationInfos();
<a class="jxr_linenumber" name="L70" href="#L70">70</a>
assertEquals(1, annotations2.size());
<a class="jxr_linenumber" name="L71" href="#L71">71</a>
assertTrue(annotations2.stream().anyMatch(a -> a.hasSimpleName(<span
class="jxr_string">"TestAnnotation1"</span>)));
<a class="jxr_linenumber" name="L72" href="#L72">72</a>
<a class="jxr_linenumber" name="L73" href="#L73">73</a> <em
class="jxr_comment">// field3 has no annotations</em>
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong
class="jxr_keyword">var</strong> annotations3 = field3.getAnnotationInfos();
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> <strong
class="jxr_keyword">var</strong> annotations3 =
field3.getDeclaredAnnotationInfos();
<a class="jxr_linenumber" name="L75" href="#L75">75</a>
assertEquals(0, annotations3.size());
<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
<a class="jxr_linenumber" name="L77" href="#L77">77</a>
@@ -90,24 +90,24 @@
<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong
class="jxr_keyword">var</strong> field2 = ci.getPublicField(x ->
x.getName().equals(<span class="jxr_string">"field2"</span>));
<a class="jxr_linenumber" name="L83" href="#L83">83</a>
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em
class="jxr_comment">// Test filtering by type for field1</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong
class="jxr_keyword">var</strong> ann1_type1 =
field1.getAnnotationInfos(TestAnnotation1.<strong
class="jxr_keyword">class</strong>).toList();
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong
class="jxr_keyword">var</strong> ann1_type1 =
field1.getDeclaredAnnotationInfos(TestAnnotation1.<strong
class="jxr_keyword">class</strong>).toList();
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
assertEquals(1, ann1_type1.size());
<a class="jxr_linenumber" name="L87" href="#L87">87</a>
assertEquals(<span class="jxr_string">"test1"</span>,
ann1_type1.get(0).getValue().get());
<a class="jxr_linenumber" name="L88" href="#L88">88</a>
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong
class="jxr_keyword">var</strong> ann1_type2 =
field1.getAnnotationInfos(TestAnnotation2.<strong
class="jxr_keyword">class</strong>).toList();
+<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong
class="jxr_keyword">var</strong> ann1_type2 =
field1.getDeclaredAnnotationInfos(TestAnnotation2.<strong
class="jxr_keyword">class</strong>).toList();
<a class="jxr_linenumber" name="L90" href="#L90">90</a>
assertEquals(1, ann1_type2.size());
<a class="jxr_linenumber" name="L91" href="#L91">91</a>
assertEquals(42, ann1_type2.get(0).getInt(<span
class="jxr_string">"value"</span>).get());
<a class="jxr_linenumber" name="L92" href="#L92">92</a>
<a class="jxr_linenumber" name="L93" href="#L93">93</a> <em
class="jxr_comment">// Test filtering by type that doesn't exist</em>
-<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong
class="jxr_keyword">var</strong> ann1_type3 =
field1.getAnnotationInfos(TestAnnotation3.<strong
class="jxr_keyword">class</strong>).toList();
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> <strong
class="jxr_keyword">var</strong> ann1_type3 =
field1.getDeclaredAnnotationInfos(TestAnnotation3.<strong
class="jxr_keyword">class</strong>).toList();
<a class="jxr_linenumber" name="L95" href="#L95">95</a>
assertEquals(0, ann1_type3.size());
<a class="jxr_linenumber" name="L96" href="#L96">96</a>
<a class="jxr_linenumber" name="L97" href="#L97">97</a> <em
class="jxr_comment">// Test filtering for field2</em>
-<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong
class="jxr_keyword">var</strong> ann2_type1 =
field2.getAnnotationInfos(TestAnnotation1.<strong
class="jxr_keyword">class</strong>).toList();
+<a class="jxr_linenumber" name="L98" href="#L98">98</a> <strong
class="jxr_keyword">var</strong> ann2_type1 =
field2.getDeclaredAnnotationInfos(TestAnnotation1.<strong
class="jxr_keyword">class</strong>).toList();
<a class="jxr_linenumber" name="L99" href="#L99">99</a>
assertEquals(1, ann2_type1.size());
<a class="jxr_linenumber" name="L100" href="#L100">100</a>
assertEquals(<span class="jxr_string">"test2"</span>,
ann2_type1.get(0).getValue().get());
<a class="jxr_linenumber" name="L101" href="#L101">101</a>
-<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">var</strong> ann2_type2 =
field2.getAnnotationInfos(TestAnnotation2.<strong
class="jxr_keyword">class</strong>).toList();
+<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">var</strong> ann2_type2 =
field2.getDeclaredAnnotationInfos(TestAnnotation2.<strong
class="jxr_keyword">class</strong>).toList();
<a class="jxr_linenumber" name="L103" href="#L103">103</a>
assertEquals(0, ann2_type2.size());
<a class="jxr_linenumber" name="L104" href="#L104">104</a> }
<a class="jxr_linenumber" name="L105" href="#L105">105</a>
@@ -116,9 +116,9 @@
<a class="jxr_linenumber" name="L108" href="#L108">108</a> <strong
class="jxr_keyword">var</strong> ci = ClassInfo.of(TestClass.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L109" href="#L109">109</a> <strong
class="jxr_keyword">var</strong> field1 = ci.getPublicField(x ->
x.getName().equals(<span class="jxr_string">"field1"</span>));
<a class="jxr_linenumber" name="L110" href="#L110">110</a>
-<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em
class="jxr_comment">// Calling getAnnotationInfos() multiple times should
return the same list instance</em>
-<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong
class="jxr_keyword">var</strong> annotations1 = field1.getAnnotationInfos();
-<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong
class="jxr_keyword">var</strong> annotations2 = field1.getAnnotationInfos();
+<a class="jxr_linenumber" name="L111" href="#L111">111</a> <em
class="jxr_comment">// Calling getDeclaredAnnotationInfos() multiple times
should return the same list instance</em>
+<a class="jxr_linenumber" name="L112" href="#L112">112</a> <strong
class="jxr_keyword">var</strong> annotations1 =
field1.getDeclaredAnnotationInfos();
+<a class="jxr_linenumber" name="L113" href="#L113">113</a> <strong
class="jxr_keyword">var</strong> annotations2 =
field1.getDeclaredAnnotationInfos();
<a class="jxr_linenumber" name="L114" href="#L114">114</a>
assertSame(annotations1, annotations2);
<a class="jxr_linenumber" name="L115" href="#L115">115</a> }
<a class="jxr_linenumber" name="L116" href="#L116">116</a> }
diff --git a/site/xref-test/org/apache/juneau/common/reflect/ParamInfoTest.html
b/site/xref-test/org/apache/juneau/common/reflect/ParamInfoTest.html
index 260c55aa64..6532d3d503 100644
--- a/site/xref-test/org/apache/juneau/common/reflect/ParamInfoTest.html
+++ b/site/xref-test/org/apache/juneau/common/reflect/ParamInfoTest.html
@@ -267,35 +267,35 @@
<a class="jxr_linenumber" name="L259" href="#L259">259</a>
check(<span class="jxr_string">""</span>, annotations(cc_cc, DA.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L260" href="#L260">260</a> }
<a class="jxr_linenumber" name="L261" href="#L261">261</a>
-<a class="jxr_linenumber" name="L262" href="#L262">262</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo() {
-<a class="jxr_linenumber" name="L263" href="#L263">263</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L264" href="#L264">264</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a2.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L265" href="#L265">265</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cc_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>
check(<span class="jxr_string">"@CA(6)"</span>,
cc_a2.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L262" href="#L262">262</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo() {
+<a class="jxr_linenumber" name="L263" href="#L263">263</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L264" href="#L264">264</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a2.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L265" href="#L265">265</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cc_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>
check(<span class="jxr_string">"@CA(6)"</span>,
cc_a2.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L267" href="#L267">267</a> }
<a class="jxr_linenumber" name="L268" href="#L268">268</a>
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_notFound() {
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">var</strong> ai = cb_a1.findAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_notFound() {
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">var</strong> ai = cb_a1.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L271" href="#L271">271</a>
check(<strong class="jxr_keyword">null</strong>, ai == <strong
class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> :
ai.<strong class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L272" href="#L272">272</a> }
<a class="jxr_linenumber" name="L273" href="#L273">273</a>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_constructor() {
-<a class="jxr_linenumber" name="L275" href="#L275">275</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_constructor() {
+<a class="jxr_linenumber" name="L275" href="#L275">275</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L276" href="#L276">276</a> }
<a class="jxr_linenumber" name="L277" href="#L277">277</a>
-<a class="jxr_linenumber" name="L278" href="#L278">278</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_notFound_constructor() {
-<a class="jxr_linenumber" name="L279" href="#L279">279</a> <strong
class="jxr_keyword">var</strong> ai = cc_cc.findAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L278" href="#L278">278</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_notFound_constructor() {
+<a class="jxr_linenumber" name="L279" href="#L279">279</a> <strong
class="jxr_keyword">var</strong> ai = cc_cc.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L280" href="#L280">280</a>
check(<strong class="jxr_keyword">null</strong>, ai == <strong
class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> :
ai.<strong class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L281" href="#L281">281</a> }
<a class="jxr_linenumber" name="L282" href="#L282">282</a>
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_twice() {
-<a class="jxr_linenumber" name="L284" href="#L284">284</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L285" href="#L285">285</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_twice() {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L285" href="#L285">285</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L286" href="#L286">286</a> }
<a class="jxr_linenumber" name="L287" href="#L287">287</a>
-<a class="jxr_linenumber" name="L288" href="#L288">288</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_twice_constructor() {
-<a class="jxr_linenumber" name="L289" href="#L289">289</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L290" href="#L290">290</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L288" href="#L288">288</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_twice_constructor() {
+<a class="jxr_linenumber" name="L289" href="#L289">289</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L290" href="#L290">290</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L291" href="#L291">291</a> }
<a class="jxr_linenumber" name="L292" href="#L292">292</a>
<a class="jxr_linenumber" name="L293" href="#L293">293</a> @Test <strong
class="jxr_keyword">void</strong> hasAnnotation() {
@@ -346,13 +346,13 @@
<a class="jxr_linenumber" name="L338" href="#L338">338</a>
check(<span class="jxr_string">""</span>, annotations(db_a1, CA.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L339" href="#L339">339</a> }
<a class="jxr_linenumber" name="L340" href="#L340">340</a>
-<a class="jxr_linenumber" name="L341" href="#L341">341</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_inherited() {
-<a class="jxr_linenumber" name="L342" href="#L342">342</a>
check(<span class="jxr_string">"@DA(0)"</span>,
db_a1.findAnnotationInfo(DA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L343" href="#L343">343</a>
check(<span class="jxr_string">"@DA(5)"</span>,
dc_a1.findAnnotationInfo(DA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L341" href="#L341">341</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_inherited() {
+<a class="jxr_linenumber" name="L342" href="#L342">342</a>
check(<span class="jxr_string">"@DA(0)"</span>,
db_a1.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L343" href="#L343">343</a>
check(<span class="jxr_string">"@DA(5)"</span>,
dc_a1.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L344" href="#L344">344</a> }
<a class="jxr_linenumber" name="L345" href="#L345">345</a>
-<a class="jxr_linenumber" name="L346" href="#L346">346</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_inherited_notFound() {
-<a class="jxr_linenumber" name="L347" href="#L347">347</a> <strong
class="jxr_keyword">var</strong> ai = db_a1.findAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L346" href="#L346">346</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_inherited_notFound() {
+<a class="jxr_linenumber" name="L347" href="#L347">347</a> <strong
class="jxr_keyword">var</strong> ai = db_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L348" href="#L348">348</a>
check(<strong class="jxr_keyword">null</strong>, ai == <strong
class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> :
ai.<strong class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L349" href="#L349">349</a> }
<a class="jxr_linenumber" name="L350" href="#L350">350</a>
@@ -660,7 +660,7 @@
<a class="jxr_linenumber" name="L652" href="#L652">652</a> }
<a class="jxr_linenumber" name="L653" href="#L653">653</a>
<a class="jxr_linenumber" name="L654" href="#L654">654</a> <em
class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
-<a class="jxr_linenumber" name="L655" href="#L655">655</a> <em
class="jxr_comment">// findAnnotationInfos() / findAnnotationInfo()</em>
+<a class="jxr_linenumber" name="L655" href="#L655">655</a> <em
class="jxr_comment">// getAllAnnotationInfos() / getAllAnnotationInfo()</em>
<a class="jxr_linenumber" name="L656" href="#L656">656</a> <em
class="jxr_comment">//-----------------------------------------------------------------------------------------------------------------</em>
<a class="jxr_linenumber" name="L657" href="#L657">657</a>
<a class="jxr_linenumber" name="L658" href="#L658">658</a> @Nested
@@ -689,7 +689,7 @@
<a class="jxr_linenumber" name="L681" href="#L681">681</a> @Test
<strong class="jxr_keyword">void</strong> findOnParameter() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L682" href="#L682">682</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F1.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L683" href="#L683">683</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L684" href="#L684">684</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L684" href="#L684">684</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L685" href="#L685">685</a>
assertEquals(1, infos.size());
<a class="jxr_linenumber" name="L686" href="#L686">686</a>
assertEquals(1, infos.get(0).<strong
class="jxr_keyword">inner</strong>().value());
<a class="jxr_linenumber" name="L687" href="#L687">687</a> }
@@ -697,7 +697,7 @@
<a class="jxr_linenumber" name="L689" href="#L689">689</a> @Test
<strong class="jxr_keyword">void</strong> findOnParameter_single() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L690" href="#L690">690</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F1.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L691" href="#L691">691</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L692" href="#L692">692</a>
<strong class="jxr_keyword">var</strong> info =
pi.findAnnotationInfo(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L692" href="#L692">692</a>
<strong class="jxr_keyword">var</strong> info =
pi.getAllAnnotationInfo(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L693" href="#L693">693</a>
assertNotNull(info);
<a class="jxr_linenumber" name="L694" href="#L694">694</a>
assertEquals(1, info.<strong class="jxr_keyword">inner</strong>().value());
<a class="jxr_linenumber" name="L695" href="#L695">695</a> }
@@ -714,7 +714,7 @@
<a class="jxr_linenumber" name="L706" href="#L706">706</a> @Test
<strong class="jxr_keyword">void</strong> findFromMatchingMethod() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L707" href="#L707">707</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F3.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L708" href="#L708">708</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L709" href="#L709">709</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L709" href="#L709">709</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L710" href="#L710">710</a>
assertEquals(1, infos.size());
<a class="jxr_linenumber" name="L711" href="#L711">711</a>
assertEquals(2, infos.get(0).<strong
class="jxr_keyword">inner</strong>().value());
<a class="jxr_linenumber" name="L712" href="#L712">712</a> }
@@ -730,7 +730,7 @@
<a class="jxr_linenumber" name="L722" href="#L722">722</a> @Test
<strong class="jxr_keyword">void</strong> findFromParameterType() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L723" href="#L723">723</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F5.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, F4Type.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L724" href="#L724">724</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L725" href="#L725">725</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L725" href="#L725">725</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L726" href="#L726">726</a>
assertEquals(1, infos.size());
<a class="jxr_linenumber" name="L727" href="#L727">727</a>
assertEquals(3, infos.get(0).<strong
class="jxr_keyword">inner</strong>().value());
<a class="jxr_linenumber" name="L728" href="#L728">728</a> }
@@ -751,7 +751,7 @@
<a class="jxr_linenumber" name="L743" href="#L743">743</a> @Test
<strong class="jxr_keyword">void</strong> findMultipleFromHierarchy() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L744" href="#L744">744</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F8.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L745" href="#L745">745</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L746" href="#L746">746</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L746" href="#L746">746</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L747" href="#L747">747</a>
assertEquals(3, infos.size());
<a class="jxr_linenumber" name="L748" href="#L748">748</a>
assertEquals(6, infos.get(0).<strong
class="jxr_keyword">inner</strong>().value()); <em class="jxr_comment">//
F8</em>
<a class="jxr_linenumber" name="L749" href="#L749">749</a>
assertEquals(4, infos.get(1).<strong
class="jxr_keyword">inner</strong>().value()); <em class="jxr_comment">//
F6</em>
@@ -761,7 +761,7 @@
<a class="jxr_linenumber" name="L753" href="#L753">753</a> @Test
<strong class="jxr_keyword">void</strong> findMultipleFromHierarchy_single()
<strong class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L754" href="#L754">754</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F8.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L755" href="#L755">755</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L756" href="#L756">756</a>
<strong class="jxr_keyword">var</strong> info =
pi.findAnnotationInfo(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L756" href="#L756">756</a>
<strong class="jxr_keyword">var</strong> info =
pi.getAllAnnotationInfo(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L757" href="#L757">757</a>
assertNotNull(info);
<a class="jxr_linenumber" name="L758" href="#L758">758</a>
assertEquals(6, info.<strong class="jxr_keyword">inner</strong>().value()); <em
class="jxr_comment">// Returns first (F8)</em>
<a class="jxr_linenumber" name="L759" href="#L759">759</a> }
@@ -778,7 +778,7 @@
<a class="jxr_linenumber" name="L770" href="#L770">770</a> @Test
<strong class="jxr_keyword">void</strong> findFromMatchingConstructor() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L771" href="#L771">771</a>
<strong class="jxr_keyword">var</strong> ci = ConstructorInfo.of(F10.<strong
class="jxr_keyword">class</strong>.getConstructor(String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L772" href="#L772">772</a>
<strong class="jxr_keyword">var</strong> pi = ci.getParameter(0);
-<a class="jxr_linenumber" name="L773" href="#L773">773</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L773" href="#L773">773</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L774" href="#L774">774</a>
assertEquals(2, infos.size());
<a class="jxr_linenumber" name="L775" href="#L775">775</a>
assertEquals(8, infos.get(0).<strong
class="jxr_keyword">inner</strong>().value()); <em class="jxr_comment">//
F10</em>
<a class="jxr_linenumber" name="L776" href="#L776">776</a>
assertEquals(7, infos.get(1).<strong
class="jxr_keyword">inner</strong>().value()); <em class="jxr_comment">//
F9</em>
@@ -792,14 +792,14 @@
<a class="jxr_linenumber" name="L784" href="#L784">784</a> @Test
<strong class="jxr_keyword">void</strong> notFound() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L785" href="#L785">785</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F11.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L786" href="#L786">786</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L787" href="#L787">787</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L787" href="#L787">787</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L788" href="#L788">788</a>
assertEquals(0, infos.size());
<a class="jxr_linenumber" name="L789" href="#L789">789</a> }
<a class="jxr_linenumber" name="L790" href="#L790">790</a>
<a class="jxr_linenumber" name="L791" href="#L791">791</a> @Test
<strong class="jxr_keyword">void</strong> notFound_single() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L792" href="#L792">792</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F11.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, String.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L793" href="#L793">793</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L794" href="#L794">794</a>
<strong class="jxr_keyword">var</strong> info =
pi.findAnnotationInfo(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L794" href="#L794">794</a>
<strong class="jxr_keyword">var</strong> info =
pi.getAllAnnotationInfo(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L795" href="#L795">795</a>
assertNull(info);
<a class="jxr_linenumber" name="L796" href="#L796">796</a> }
<a class="jxr_linenumber" name="L797" href="#L797">797</a>
@@ -814,7 +814,7 @@
<a class="jxr_linenumber" name="L806" href="#L806">806</a> @Test
<strong class="jxr_keyword">void</strong>
parameterAnnotationBeforeTypeAnnotation() <strong
class="jxr_keyword">throws</strong> Exception {
<a class="jxr_linenumber" name="L807" href="#L807">807</a>
<strong class="jxr_keyword">var</strong> mi = MethodInfo.of(F13.<strong
class="jxr_keyword">class</strong>.getMethod(<span
class="jxr_string">"test"</span>, F12Type.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L808" href="#L808">808</a>
<strong class="jxr_keyword">var</strong> pi = mi.getParameter(0);
-<a class="jxr_linenumber" name="L809" href="#L809">809</a>
<strong class="jxr_keyword">var</strong> infos =
pi.findAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L809" href="#L809">809</a>
<strong class="jxr_keyword">var</strong> infos =
pi.getAllAnnotationInfos(FA1.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L810" href="#L810">810</a>
assertEquals(2, infos.size());
<a class="jxr_linenumber" name="L811" href="#L811">811</a>
assertEquals(10, infos.get(0).<strong
class="jxr_keyword">inner</strong>().value()); <em class="jxr_comment">//
Parameter annotation first</em>
<a class="jxr_linenumber" name="L812" href="#L812">812</a>
assertEquals(9, infos.get(1).<strong
class="jxr_keyword">inner</strong>().value()); <em class="jxr_comment">// Type
annotation second</em>
diff --git a/site/xref-test/org/apache/juneau/reflect/ParamInfoTest.html
b/site/xref-test/org/apache/juneau/reflect/ParamInfoTest.html
index 3d61fdd378..771a37744e 100644
--- a/site/xref-test/org/apache/juneau/reflect/ParamInfoTest.html
+++ b/site/xref-test/org/apache/juneau/reflect/ParamInfoTest.html
@@ -244,35 +244,35 @@
<a class="jxr_linenumber" name="L236" href="#L236">236</a>
check(<span class="jxr_string">""</span>, annotations(cc_cc, DA.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L237" href="#L237">237</a> }
<a class="jxr_linenumber" name="L238" href="#L238">238</a>
-<a class="jxr_linenumber" name="L239" href="#L239">239</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo() {
-<a class="jxr_linenumber" name="L240" href="#L240">240</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L241" href="#L241">241</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a2.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L242" href="#L242">242</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cc_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L243" href="#L243">243</a>
check(<span class="jxr_string">"@CA(6)"</span>,
cc_a2.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L239" href="#L239">239</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo() {
+<a class="jxr_linenumber" name="L240" href="#L240">240</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L241" href="#L241">241</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a2.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L242" href="#L242">242</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cc_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L243" href="#L243">243</a>
check(<span class="jxr_string">"@CA(6)"</span>,
cc_a2.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L244" href="#L244">244</a> }
<a class="jxr_linenumber" name="L245" href="#L245">245</a>
-<a class="jxr_linenumber" name="L246" href="#L246">246</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_notFound() {
-<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong
class="jxr_keyword">var</strong> ai = cb_a1.findAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L246" href="#L246">246</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_notFound() {
+<a class="jxr_linenumber" name="L247" href="#L247">247</a> <strong
class="jxr_keyword">var</strong> ai = cb_a1.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L248" href="#L248">248</a>
check(<strong class="jxr_keyword">null</strong>, ai == <strong
class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> :
ai.<strong class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L249" href="#L249">249</a> }
<a class="jxr_linenumber" name="L250" href="#L250">250</a>
-<a class="jxr_linenumber" name="L251" href="#L251">251</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_constructor() {
-<a class="jxr_linenumber" name="L252" href="#L252">252</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L251" href="#L251">251</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_constructor() {
+<a class="jxr_linenumber" name="L252" href="#L252">252</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L253" href="#L253">253</a> }
<a class="jxr_linenumber" name="L254" href="#L254">254</a>
-<a class="jxr_linenumber" name="L255" href="#L255">255</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_notFound_constructor() {
-<a class="jxr_linenumber" name="L256" href="#L256">256</a> <strong
class="jxr_keyword">var</strong> ai = cc_cc.findAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L255" href="#L255">255</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_notFound_constructor() {
+<a class="jxr_linenumber" name="L256" href="#L256">256</a> <strong
class="jxr_keyword">var</strong> ai = cc_cc.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L257" href="#L257">257</a>
check(<strong class="jxr_keyword">null</strong>, ai == <strong
class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> :
ai.<strong class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L258" href="#L258">258</a> }
<a class="jxr_linenumber" name="L259" href="#L259">259</a>
-<a class="jxr_linenumber" name="L260" href="#L260">260</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_twice() {
-<a class="jxr_linenumber" name="L261" href="#L261">261</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L262" href="#L262">262</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L260" href="#L260">260</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_twice() {
+<a class="jxr_linenumber" name="L261" href="#L261">261</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L262" href="#L262">262</a>
check(<span class="jxr_string">"@CA(5)"</span>,
cb_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L263" href="#L263">263</a> }
<a class="jxr_linenumber" name="L264" href="#L264">264</a>
-<a class="jxr_linenumber" name="L265" href="#L265">265</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_twice_constructor() {
-<a class="jxr_linenumber" name="L266" href="#L266">266</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L267" href="#L267">267</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.findAnnotationInfo(CA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L265" href="#L265">265</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_twice_constructor() {
+<a class="jxr_linenumber" name="L266" href="#L266">266</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L267" href="#L267">267</a>
check(<span class="jxr_string">"@CA(9)"</span>,
cc_cc.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L268" href="#L268">268</a> }
<a class="jxr_linenumber" name="L269" href="#L269">269</a>
<a class="jxr_linenumber" name="L270" href="#L270">270</a> @Test <strong
class="jxr_keyword">void</strong> hasAnnotation() {
@@ -323,13 +323,13 @@
<a class="jxr_linenumber" name="L315" href="#L315">315</a>
check(<span class="jxr_string">""</span>, annotations(db_a1, CA.<strong
class="jxr_keyword">class</strong>));
<a class="jxr_linenumber" name="L316" href="#L316">316</a> }
<a class="jxr_linenumber" name="L317" href="#L317">317</a>
-<a class="jxr_linenumber" name="L318" href="#L318">318</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_inherited() {
-<a class="jxr_linenumber" name="L319" href="#L319">319</a>
check(<span class="jxr_string">"@DA(0)"</span>,
db_a1.findAnnotationInfo(DA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
-<a class="jxr_linenumber" name="L320" href="#L320">320</a>
check(<span class="jxr_string">"@DA(5)"</span>,
dc_a1.findAnnotationInfo(DA.<strong class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L318" href="#L318">318</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_inherited() {
+<a class="jxr_linenumber" name="L319" href="#L319">319</a>
check(<span class="jxr_string">"@DA(0)"</span>,
db_a1.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
+<a class="jxr_linenumber" name="L320" href="#L320">320</a>
check(<span class="jxr_string">"@DA(5)"</span>,
dc_a1.getAllAnnotationInfo(DA.<strong
class="jxr_keyword">class</strong>).<strong
class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L321" href="#L321">321</a> }
<a class="jxr_linenumber" name="L322" href="#L322">322</a>
-<a class="jxr_linenumber" name="L323" href="#L323">323</a> @Test <strong
class="jxr_keyword">void</strong> findAnnotationInfo_inherited_notFound() {
-<a class="jxr_linenumber" name="L324" href="#L324">324</a> <strong
class="jxr_keyword">var</strong> ai = db_a1.findAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="L323" href="#L323">323</a> @Test <strong
class="jxr_keyword">void</strong> getAllAnnotationInfo_inherited_notFound() {
+<a class="jxr_linenumber" name="L324" href="#L324">324</a> <strong
class="jxr_keyword">var</strong> ai = db_a1.getAllAnnotationInfo(CA.<strong
class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="L325" href="#L325">325</a>
check(<strong class="jxr_keyword">null</strong>, ai == <strong
class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> :
ai.<strong class="jxr_keyword">inner</strong>());
<a class="jxr_linenumber" name="L326" href="#L326">326</a> }
<a class="jxr_linenumber" name="L327" href="#L327">327</a>
diff --git a/site/xref/org/apache/juneau/common/reflect/AnnotationProvider.html
b/site/xref/org/apache/juneau/common/reflect/AnnotationProvider.html
index cb126bfda3..57778dfb18 100644
--- a/site/xref/org/apache/juneau/common/reflect/AnnotationProvider.html
+++ b/site/xref/org/apache/juneau/common/reflect/AnnotationProvider.html
@@ -833,7 +833,7 @@
<a class="jxr_linenumber" name="L825" href="#L825">825</a>
<a class="jxr_linenumber" name="L826" href="#L826">826</a>
FieldInfo fi = FieldInfo.of(forField);
<a class="jxr_linenumber" name="L827" href="#L827">827</a>
runtimeAnnotations.findMatching(forField).forEach(a ->
list.add(AnnotationInfo.of(fi, a)));
-<a class="jxr_linenumber" name="L828" href="#L828">828</a>
list.addAll(fi.getAnnotationInfos());
+<a class="jxr_linenumber" name="L828" href="#L828">828</a>
list.addAll(fi.getDeclaredAnnotationInfos());
<a class="jxr_linenumber" name="L829" href="#L829">829</a>
<a class="jxr_linenumber" name="L830" href="#L830">830</a> <strong
class="jxr_keyword">return</strong> u(list);
<a class="jxr_linenumber" name="L831" href="#L831">831</a> }
diff --git a/site/xref/org/apache/juneau/common/reflect/FieldInfo.html
b/site/xref/org/apache/juneau/common/reflect/FieldInfo.html
index ef8d422d7d..b38cd017b6 100644
--- a/site/xref/org/apache/juneau/common/reflect/FieldInfo.html
+++ b/site/xref/org/apache/juneau/common/reflect/FieldInfo.html
@@ -76,7 +76,7 @@
<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Field <strong class="jxr_keyword">inner</strong>;
<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
ClassInfo declaringClass;
<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<ClassInfo> type;
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<List<AnnotationInfo<Annotation>>> annotations; <em
class="jxr_comment">// All annotations on this field.</em>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<List<AnnotationInfo<Annotation>>>
declaredAnnotations; <em class="jxr_comment">// All annotations declared
directly on this field.</em>
<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<String> fullName; <em class="jxr_comment">// Fully qualified
field name (declaring-class.field-name).</em>
<a class="jxr_linenumber" name="L73" href="#L73">73</a>
<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em
class="jxr_javadoccomment">/**</em>
@@ -90,7 +90,7 @@
<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong
class="jxr_keyword">this</strong>.declaringClass = declaringClass;
<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong
class="jxr_keyword">this</strong>.<strong class="jxr_keyword">inner</strong> =
f;
<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong
class="jxr_keyword">this</strong>.type = memoize(() ->
ClassInfo.of(f.getType()));
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong
class="jxr_keyword">this</strong>.annotations = memoize(() -> stream(<strong
class="jxr_keyword">inner</strong>.getAnnotations()).map(a ->
AnnotationInfo.of(<strong class="jxr_keyword">this</strong>, a)).toList());
+<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong
class="jxr_keyword">this</strong>.declaredAnnotations = memoize(() ->
stream(<strong class="jxr_keyword">inner</strong>.getAnnotations()).map(a ->
AnnotationInfo.of(<strong class="jxr_keyword">this</strong>, a)).toList());
<a class="jxr_linenumber" name="L86" href="#L86">86</a> <strong
class="jxr_keyword">this</strong>.fullName = memoize(<strong
class="jxr_keyword">this</strong>::findFullName);
<a class="jxr_linenumber" name="L87" href="#L87">87</a> }
<a class="jxr_linenumber" name="L88" href="#L88">88</a>
@@ -110,8 +110,8 @@
<a class="jxr_linenumber" name="L102" href="#L102">102</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em
class="jxr_javadoccomment"> * @return An unmodifiable list of all
annotations declared on this field.</em>
<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong
class="jxr_keyword">public</strong>
List<AnnotationInfo<Annotation>> getAnnotationInfos() {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">return</strong> annotations.get();
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong
class="jxr_keyword">public</strong>
List<AnnotationInfo<Annotation>> getDeclaredAnnotationInfos() {
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">return</strong> declaredAnnotations.get();
<a class="jxr_linenumber" name="L107" href="#L107">107</a> }
<a class="jxr_linenumber" name="L108" href="#L108">108</a>
<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em
class="jxr_javadoccomment">/**</em>
@@ -122,8 +122,8 @@
<a class="jxr_linenumber" name="L114" href="#L114">114</a> <em
class="jxr_javadoccomment"> * @return A stream of all matching
annotations.</em>
<a class="jxr_linenumber" name="L115" href="#L115">115</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L116" href="#L116">116</a>
@SuppressWarnings(<span class="jxr_string">"unchecked"</span>)
-<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation>
Stream<AnnotationInfo<A>> getAnnotationInfos(Class<A> type) {
-<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong
class="jxr_keyword">return</strong> annotations.get().stream()
+<a class="jxr_linenumber" name="L117" href="#L117">117</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation>
Stream<AnnotationInfo<A>> getDeclaredAnnotationInfos(Class<A>
type) {
+<a class="jxr_linenumber" name="L118" href="#L118">118</a> <strong
class="jxr_keyword">return</strong> declaredAnnotations.get().stream()
<a class="jxr_linenumber" name="L119" href="#L119">119</a>
.filter(x -> type.isInstance(x.<strong class="jxr_keyword">inner</strong>()))
<a class="jxr_linenumber" name="L120" href="#L120">120</a>
.map(x -> (AnnotationInfo<A>)x);
<a class="jxr_linenumber" name="L121" href="#L121">121</a> }
diff --git a/site/xref/org/apache/juneau/common/reflect/ParameterInfo.html
b/site/xref/org/apache/juneau/common/reflect/ParameterInfo.html
index 00e7fda320..fb653cdc54 100644
--- a/site/xref/org/apache/juneau/common/reflect/ParameterInfo.html
+++ b/site/xref/org/apache/juneau/common/reflect/ParameterInfo.html
@@ -67,9 +67,9 @@
<a class="jxr_linenumber" name="L59" href="#L59">59</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
ClassInfo type;
<a class="jxr_linenumber" name="L60" href="#L60">60</a>
<a class="jxr_linenumber" name="L61" href="#L61">61</a>
@SuppressWarnings({<span class="jxr_string">"rawtypes"</span>,<span
class="jxr_string">"unchecked"</span>})
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Cache<Class,List<AnnotationInfo<Annotation>>>
foundAnnotations =
Cache.<Class,List<AnnotationInfo<Annotation>>>create().supplier((k)
-> findAnnotationInfosInternal(k)).build();
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Cache<Class,List<AnnotationInfo<Annotation>>> allAnnotations
=
Cache.<Class,List<AnnotationInfo<Annotation>>>create().supplier((k)
-> findAnnotationInfosInternal(k)).build();
<a class="jxr_linenumber" name="L63" href="#L63">63</a>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<List<AnnotationInfo<Annotation>>> annotations; <em
class="jxr_comment">// All annotations on this parameter.</em>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<List<AnnotationInfo<Annotation>>>
declaredAnnotations; <em class="jxr_comment">// All annotations declared
directly on this parameter.</em>
<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
Supplier<List<ParameterInfo>> matchingParameters; <em
class="jxr_comment">// Matching parameters in parent methods.</em>
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
ResettableSupplier<String> foundName = memoizeResettable(<strong
class="jxr_keyword">this</strong>::findNameInternal);
<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">private</strong> <strong class="jxr_keyword">final</strong>
ResettableSupplier<String> foundQualifier = memoizeResettable(<strong
class="jxr_keyword">this</strong>::findQualifierInternal);
@@ -89,7 +89,7 @@
<a class="jxr_linenumber" name="L81" href="#L81">81</a> <strong
class="jxr_keyword">this</strong>.<strong class="jxr_keyword">inner</strong> =
<strong class="jxr_keyword">inner</strong>;
<a class="jxr_linenumber" name="L82" href="#L82">82</a> <strong
class="jxr_keyword">this</strong>.index = index;
<a class="jxr_linenumber" name="L83" href="#L83">83</a> <strong
class="jxr_keyword">this</strong>.type = type;
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong
class="jxr_keyword">this</strong>.annotations = memoize(() -> stream(<strong
class="jxr_keyword">inner</strong>.getAnnotations()).map(a ->
AnnotationInfo.of(<strong class="jxr_keyword">this</strong>, a)).toList());
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> <strong
class="jxr_keyword">this</strong>.declaredAnnotations = memoize(() ->
stream(<strong class="jxr_keyword">inner</strong>.getAnnotations()).map(a ->
AnnotationInfo.of(<strong class="jxr_keyword">this</strong>, a)).toList());
<a class="jxr_linenumber" name="L85" href="#L85">85</a> <strong
class="jxr_keyword">this</strong>.matchingParameters = memoize(<strong
class="jxr_keyword">this</strong>::findMatchingParameters);
<a class="jxr_linenumber" name="L86" href="#L86">86</a> }
<a class="jxr_linenumber" name="L87" href="#L87">87</a>
@@ -111,7 +111,7 @@
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em
class="jxr_javadoccomment"> * @return An unmodifiable list of annotations
on this parameter, never <jk>null</jk>.</em>
<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong
class="jxr_keyword">public</strong>
List<AnnotationInfo<Annotation>> getAnnotationInfos() {
-<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">return</strong> annotations.get();
+<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">return</strong> declaredAnnotations.get();
<a class="jxr_linenumber" name="L107" href="#L107">107</a> }
<a class="jxr_linenumber" name="L108" href="#L108">108</a>
<a class="jxr_linenumber" name="L109" href="#L109">109</a> <em
class="jxr_javadoccomment">/**</em>
@@ -264,7 +264,7 @@
<a class="jxr_linenumber" name="L256" href="#L256">256</a> }
<a class="jxr_linenumber" name="L257" href="#L257">257</a>
<a class="jxr_linenumber" name="L258" href="#L258">258</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em
class="jxr_javadoccomment"> * Finds all annotation infos of the specified
type defined on this method parameter.</em>
+<a class="jxr_linenumber" name="L259" href="#L259">259</a> <em
class="jxr_javadoccomment"> * Returns all annotation infos of the
specified type defined on this method parameter.</em>
<a class="jxr_linenumber" name="L260" href="#L260">260</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L261" href="#L261">261</a> <em
class="jxr_javadoccomment"> * <p></em>
<a class="jxr_linenumber" name="L262" href="#L262">262</a> <em
class="jxr_javadoccomment"> * Searches through matching parameters in the
hierarchy and the parameter type.</em>
@@ -274,12 +274,12 @@
<a class="jxr_linenumber" name="L266" href="#L266">266</a> <em
class="jxr_javadoccomment"> * @return A list of annotation infos found, or
an empty list if none found.</em>
<a class="jxr_linenumber" name="L267" href="#L267">267</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L268" href="#L268">268</a>
@SuppressWarnings({ <span class="jxr_string">"unchecked"</span>, <span
class="jxr_string">"rawtypes"</span> })
-<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation>
List<AnnotationInfo<A>> findAnnotationInfos(Class<A> type) {
-<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">return</strong> (List)foundAnnotations.get(type);
+<a class="jxr_linenumber" name="L269" href="#L269">269</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation>
List<AnnotationInfo<A>> getAllAnnotationInfos(Class<A> type) {
+<a class="jxr_linenumber" name="L270" href="#L270">270</a> <strong
class="jxr_keyword">return</strong> (List)allAnnotations.get(type);
<a class="jxr_linenumber" name="L271" href="#L271">271</a> }
<a class="jxr_linenumber" name="L272" href="#L272">272</a>
<a class="jxr_linenumber" name="L273" href="#L273">273</a> <em
class="jxr_javadoccomment">/**</em>
-<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em
class="jxr_javadoccomment"> * Finds the first annotation info of the
specified type defined on this method parameter.</em>
+<a class="jxr_linenumber" name="L274" href="#L274">274</a> <em
class="jxr_javadoccomment"> * Returns the first annotation info of the
specified type defined on this method parameter.</em>
<a class="jxr_linenumber" name="L275" href="#L275">275</a> <em
class="jxr_javadoccomment"> *</em>
<a class="jxr_linenumber" name="L276" href="#L276">276</a> <em
class="jxr_javadoccomment"> * <p></em>
<a class="jxr_linenumber" name="L277" href="#L277">277</a> <em
class="jxr_javadoccomment"> * Searches through matching parameters in the
hierarchy and the parameter type.</em>
@@ -288,8 +288,8 @@
<a class="jxr_linenumber" name="L280" href="#L280">280</a> <em
class="jxr_javadoccomment"> * @param type The annotation type to look
for.</em>
<a class="jxr_linenumber" name="L281" href="#L281">281</a> <em
class="jxr_javadoccomment"> * @return The annotation info if found, or
<jk>null</jk> if not.</em>
<a class="jxr_linenumber" name="L282" href="#L282">282</a> <em
class="jxr_javadoccomment"> */</em>
-<a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation> AnnotationInfo<A>
findAnnotationInfo(Class<A> type) {
-<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong
class="jxr_keyword">var</strong> list = findAnnotationInfos(type);
+<a class="jxr_linenumber" name="L283" href="#L283">283</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation> AnnotationInfo<A>
getAllAnnotationInfo(Class<A> type) {
+<a class="jxr_linenumber" name="L284" href="#L284">284</a> <strong
class="jxr_keyword">var</strong> list = getAllAnnotationInfos(type);
<a class="jxr_linenumber" name="L285" href="#L285">285</a> <strong
class="jxr_keyword">return</strong> list.isEmpty() ? <strong
class="jxr_keyword">null</strong> : list.get(0);
<a class="jxr_linenumber" name="L286" href="#L286">286</a> }
<a class="jxr_linenumber" name="L287" href="#L287">287</a>
@@ -452,7 +452,7 @@
<a class="jxr_linenumber" name="L444" href="#L444">444</a> <em
class="jxr_javadoccomment"> * The <jk>true</jk> if
annotation if found.</em>
<a class="jxr_linenumber" name="L445" href="#L445">445</a> <em
class="jxr_javadoccomment"> */</em>
<a class="jxr_linenumber" name="L446" href="#L446">446</a> <strong
class="jxr_keyword">public</strong> <A <strong
class="jxr_keyword">extends</strong> Annotation> <strong
class="jxr_keyword">boolean</strong> hasAnnotation(Class<A> type) {
-<a class="jxr_linenumber" name="L447" href="#L447">447</a> <strong
class="jxr_keyword">return</strong> nn(findAnnotationInfo(type));
+<a class="jxr_linenumber" name="L447" href="#L447">447</a> <strong
class="jxr_keyword">return</strong> nn(getAllAnnotationInfo(type));
<a class="jxr_linenumber" name="L448" href="#L448">448</a> }
<a class="jxr_linenumber" name="L449" href="#L449">449</a>
<a class="jxr_linenumber" name="L450" href="#L450">450</a> <em
class="jxr_javadoccomment">/**</em>
diff --git a/site/xref/org/apache/juneau/httppart/bean/RequestBeanMeta.html
b/site/xref/org/apache/juneau/httppart/bean/RequestBeanMeta.html
index 17c6f63659..f62b418fd9 100644
--- a/site/xref/org/apache/juneau/httppart/bean/RequestBeanMeta.html
+++ b/site/xref/org/apache/juneau/httppart/bean/RequestBeanMeta.html
@@ -89,7 +89,7 @@
<a class="jxr_linenumber" name="L81" href="#L81">81</a> }
<a class="jxr_linenumber" name="L82" href="#L82">82</a>
<a class="jxr_linenumber" name="L83" href="#L83">83</a> Builder
apply(<a name="ParameterInfo"
href="../../../../../org/apache/juneau/common/reflect/ParameterInfo.html#ParameterInfo">ParameterInfo</a>
mpi) {
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>
<strong class="jxr_keyword">return</strong>
apply(mpi.getParameterType().<strong
class="jxr_keyword">inner</strong>()).apply(opt(mpi.findAnnotationInfo(Request.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>));
+<a class="jxr_linenumber" name="L84" href="#L84">84</a>
<strong class="jxr_keyword">return</strong>
apply(mpi.getParameterType().<strong
class="jxr_keyword">inner</strong>()).apply(opt(mpi.getAllAnnotationInfo(Request.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>));
<a class="jxr_linenumber" name="L85" href="#L85">85</a> }
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<a class="jxr_linenumber" name="L87" href="#L87">87</a> Builder
apply(Request a) {
diff --git a/site/xref/org/apache/juneau/rest/RestContext.html
b/site/xref/org/apache/juneau/rest/RestContext.html
index 5788b7998a..1511324c4d 100644
--- a/site/xref/org/apache/juneau/rest/RestContext.html
+++ b/site/xref/org/apache/juneau/rest/RestContext.html
@@ -1773,12 +1773,12 @@
<a class="jxr_linenumber" name="L1765" href="#L1765">1765</a>
.filter(x -> x.hasAnnotation(RestInject.<strong
class="jxr_keyword">class</strong>))
<a class="jxr_linenumber" name="L1766" href="#L1766">1766</a>
.forEach(x -> opt(x.get(resource.get())).ifPresent(
<a class="jxr_linenumber" name="L1767" href="#L1767">1767</a>
y -> beanStore.add(
-<a class="jxr_linenumber" name="L1768" href="#L1768">1768</a>
x.getFieldType().<strong class="jxr_keyword">inner</strong>(),
-<a class="jxr_linenumber" name="L1769" href="#L1769">1769</a>
y,
-<a class="jxr_linenumber" name="L1770" href="#L1770">1770</a>
RestInjectAnnotation.name(x.getAnnotationInfos(RestInject.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>))
-<a class="jxr_linenumber" name="L1771" href="#L1771">1771</a>
)
-<a class="jxr_linenumber" name="L1772" href="#L1772">1772</a>
));
-<a class="jxr_linenumber" name="L1773" href="#L1773">1773</a> <em
class="jxr_comment">// @formatter:on</em>
+<a class="jxr_linenumber" name="L1768" href="#L1768">1768</a>
x.getFieldType().<strong
class="jxr_keyword">inner</strong>(),
+<a class="jxr_linenumber" name="L1769" href="#L1769">1769</a>
y,
+<a class="jxr_linenumber" name="L1770" href="#L1770">1770</a>
RestInjectAnnotation.name(x.getDeclaredAnnotationInfos(RestInject.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>))
+<a class="jxr_linenumber" name="L1771" href="#L1771">1771</a>
)
+<a class="jxr_linenumber" name="L1772" href="#L1772">1772</a>
));
+<a class="jxr_linenumber" name="L1773" href="#L1773">1773</a>
<em class="jxr_comment">// @formatter:on</em>
<a class="jxr_linenumber" name="L1774" href="#L1774">1774</a>
<a class="jxr_linenumber" name="L1775" href="#L1775">1775</a>
rci.getAllMethods().stream().filter(x -> x.hasAnnotation(RestInject.<strong
class="jxr_keyword">class</strong>)).forEach(x -> {
<a class="jxr_linenumber" name="L1776" href="#L1776">1776</a>
<strong class="jxr_keyword">var</strong> rt =
x.getReturnType().<Object><strong class="jxr_keyword">inner</strong>();
@@ -1810,11 +1810,11 @@
<a class="jxr_linenumber" name="L1802" href="#L1802">1802</a>
.filter(x -> x.hasAnnotation(RestInject.<strong
class="jxr_keyword">class</strong>))
<a class="jxr_linenumber" name="L1803" href="#L1803">1803</a>
.forEach(x -> x.setIfNull(
<a class="jxr_linenumber" name="L1804" href="#L1804">1804</a>
resource.get(),
-<a class="jxr_linenumber" name="L1805" href="#L1805">1805</a>
beanStore.getBean(
-<a class="jxr_linenumber" name="L1806" href="#L1806">1806</a>
x.getFieldType().<strong class="jxr_keyword">inner</strong>(),
-<a class="jxr_linenumber" name="L1807" href="#L1807">1807</a>
RestInjectAnnotation.name(x.getAnnotationInfos(RestInject.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>))
-<a class="jxr_linenumber" name="L1808" href="#L1808">1808</a>
).orElse(<strong class="jxr_keyword">null</strong>)
-<a class="jxr_linenumber" name="L1809" href="#L1809">1809</a>
));
+<a class="jxr_linenumber" name="L1805" href="#L1805">1805</a>
beanStore.getBean(
+<a class="jxr_linenumber" name="L1806" href="#L1806">1806</a>
x.getFieldType().<strong class="jxr_keyword">inner</strong>(),
+<a class="jxr_linenumber" name="L1807" href="#L1807">1807</a>
RestInjectAnnotation.name(x.getDeclaredAnnotationInfos(RestInject.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>))
+<a class="jxr_linenumber" name="L1808" href="#L1808">1808</a>
).orElse(<strong class="jxr_keyword">null</strong>)
+<a class="jxr_linenumber" name="L1809" href="#L1809">1809</a>
));
<a class="jxr_linenumber" name="L1810" href="#L1810">1810</a> <em
class="jxr_comment">// @formatter:on</em>
<a class="jxr_linenumber" name="L1811" href="#L1811">1811</a>
<a class="jxr_linenumber" name="L1812" href="#L1812">1812</a>
<strong class="jxr_keyword">return</strong> <strong
class="jxr_keyword">this</strong>;
diff --git a/site/xref/org/apache/juneau/rest/arg/FormDataArg.html
b/site/xref/org/apache/juneau/rest/arg/FormDataArg.html
index ca0902d8ca..f3be68d748 100644
--- a/site/xref/org/apache/juneau/rest/arg/FormDataArg.html
+++ b/site/xref/org/apache/juneau/rest/arg/FormDataArg.html
@@ -110,7 +110,7 @@
<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L103" href="#L103">103</a>
<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em
class="jxr_comment">// Get parameter-level @FormData</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> FormData
paramFormData = opt(pi.findAnnotationInfo(FormData.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> FormData
paramFormData = opt(pi.getAllAnnotationInfo(FormData.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">if</strong> (paramFormData == <strong
class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L107" href="#L107">107</a>
paramFormData = pi.getParameterType().getAnnotationInfos(FormData.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L108" href="#L108">108</a>
diff --git a/site/xref/org/apache/juneau/rest/arg/HeaderArg.html
b/site/xref/org/apache/juneau/rest/arg/HeaderArg.html
index 8df320f343..788f9b5bb4 100644
--- a/site/xref/org/apache/juneau/rest/arg/HeaderArg.html
+++ b/site/xref/org/apache/juneau/rest/arg/HeaderArg.html
@@ -152,7 +152,7 @@
<a class="jxr_linenumber" name="L144" href="#L144">144</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L145" href="#L145">145</a>
<a class="jxr_linenumber" name="L146" href="#L146">146</a> <em
class="jxr_comment">// Get parameter-level @Header</em>
-<a class="jxr_linenumber" name="L147" href="#L147">147</a> Header
paramHeader = opt(pi.findAnnotationInfo(Header.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L147" href="#L147">147</a> Header
paramHeader = opt(pi.getAllAnnotationInfo(Header.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L148" href="#L148">148</a> <strong
class="jxr_keyword">if</strong> (paramHeader == <strong
class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L149" href="#L149">149</a>
paramHeader = pi.getParameterType().getAnnotationInfos(Header.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L150" href="#L150">150</a>
diff --git a/site/xref/org/apache/juneau/rest/arg/PathArg.html
b/site/xref/org/apache/juneau/rest/arg/PathArg.html
index ab390e57bd..6f88ad79a7 100644
--- a/site/xref/org/apache/juneau/rest/arg/PathArg.html
+++ b/site/xref/org/apache/juneau/rest/arg/PathArg.html
@@ -109,7 +109,7 @@
<a class="jxr_linenumber" name="L101" href="#L101">101</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L102" href="#L102">102</a>
<a class="jxr_linenumber" name="L103" href="#L103">103</a> <em
class="jxr_comment">// Get parameter-level @Path</em>
-<a class="jxr_linenumber" name="L104" href="#L104">104</a> Path paramPath
= opt(pi.findAnnotationInfo(Path.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L104" href="#L104">104</a> Path paramPath
= opt(pi.getAllAnnotationInfo(Path.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L105" href="#L105">105</a> <strong
class="jxr_keyword">if</strong> (paramPath == <strong
class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L106" href="#L106">106</a>
paramPath = pi.getParameterType().getAnnotationInfos(Path.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L107" href="#L107">107</a>
@@ -209,7 +209,7 @@
<a class="jxr_linenumber" name="L201" href="#L201">201</a>
MethodInfo mi = pi.getMethod();
<a class="jxr_linenumber" name="L202" href="#L202">202</a>
<a class="jxr_linenumber" name="L203" href="#L203">203</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j =
0; j < i; j++)
-<a class="jxr_linenumber" name="L204" href="#L204">204</a>
<strong class="jxr_keyword">if</strong>
(nn(mi.getParameter(j).findAnnotationInfo(Path.<strong
class="jxr_keyword">class</strong>)))
+<a class="jxr_linenumber" name="L204" href="#L204">204</a>
<strong class="jxr_keyword">if</strong>
(nn(mi.getParameter(j).getAllAnnotationInfo(Path.<strong
class="jxr_keyword">class</strong>)))
<a class="jxr_linenumber" name="L205" href="#L205">205</a>
idx++;
<a class="jxr_linenumber" name="L206" href="#L206">206</a>
<a class="jxr_linenumber" name="L207" href="#L207">207</a>
String[] vars = pathMatcher.getVars();
diff --git a/site/xref/org/apache/juneau/rest/arg/QueryArg.html
b/site/xref/org/apache/juneau/rest/arg/QueryArg.html
index 9c1394a403..0076f1bcef 100644
--- a/site/xref/org/apache/juneau/rest/arg/QueryArg.html
+++ b/site/xref/org/apache/juneau/rest/arg/QueryArg.html
@@ -110,7 +110,7 @@
<a class="jxr_linenumber" name="L102" href="#L102">102</a> <strong
class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="L103" href="#L103">103</a>
<a class="jxr_linenumber" name="L104" href="#L104">104</a> <em
class="jxr_comment">// Get parameter-level @Query</em>
-<a class="jxr_linenumber" name="L105" href="#L105">105</a> Query
paramQuery = opt(pi.findAnnotationInfo(Query.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="L105" href="#L105">105</a> Query
paramQuery = opt(pi.getAllAnnotationInfo(Query.<strong
class="jxr_keyword">class</strong>)).map(x -> x.<strong
class="jxr_keyword">inner</strong>()).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L106" href="#L106">106</a> <strong
class="jxr_keyword">if</strong> (paramQuery == <strong
class="jxr_keyword">null</strong>)
<a class="jxr_linenumber" name="L107" href="#L107">107</a>
paramQuery = pi.getParameterType().getAnnotationInfos(Query.<strong
class="jxr_keyword">class</strong>).findFirst().map(AnnotationInfo::<strong
class="jxr_keyword">inner</strong>).orElse(<strong
class="jxr_keyword">null</strong>);
<a class="jxr_linenumber" name="L108" href="#L108">108</a>