This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 8bc507f JUNEAU-197
8bc507f is described below
commit 8bc507f4513d37a7502ca945fd11a997cee156fd
Author: JamesBognar <[email protected]>
AuthorDate: Sun Mar 8 11:45:09 2020 -0400
JUNEAU-197
@BeanConfig(bpi) does not override @Bean(bpi)
---
.../apache/juneau/BeanConfigAnnotationTest.java | 6 +--
.../juneau/annotation/BeanAnnotationTest.java | 4 +-
.../apache/juneau/csv/CsvConfigAnnotationTest.java | 8 ++--
.../juneau/html/HtmlConfigAnnotationTest.java | 12 +++---
.../juneau/html/HtmlDocConfigAnnotationTest.java | 28 ++++++------
.../juneau/jena/RdfConfigAnnotationTest.java | 12 +++---
.../apache/juneau/jso/JsoConfigAnnotationTest.java | 8 ++--
.../juneau/json/JsonConfigAnnotationTest.java | 12 +++---
.../jsonschema/JsonSchemaConfigAnnotationTest.java | 6 +--
.../msgpack/MsgPackConfigAnnotationTest.java | 12 +++---
.../juneau/oapi/OpenApiConfigAnnotationTest.java | 8 ++--
.../juneau/parser/ParserConfigAnnotationTest.java | 12 +++---
.../plaintext/PlainTextConfigAnnotationTest.java | 8 ++--
.../juneau/reflection/AnnotationInfoTest.java | 4 +-
.../apache/juneau/reflection/ClassInfoTest.java | 16 +++----
.../apache/juneau/reflection/MethodInfoTest.java | 50 +++++++++++-----------
.../apache/juneau/reflection/ParamInfoTest.java | 20 ++++-----
.../serializer/SerializerConfigAnnotationTest.java | 12 +++---
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 6 +--
.../apache/juneau/uon/UonConfigAnnotationTest.java | 12 +++---
.../UrlEncodingConfigAnnotationTest.java | 12 +++---
.../apache/juneau/xml/XmlConfigAnnotationTest.java | 12 +++---
.../java/org/apache/juneau/BeanPropertyMeta.java | 10 ++---
.../src/main/java/org/apache/juneau/ClassMeta.java | 4 +-
.../java/org/apache/juneau/ContextBuilder.java | 4 +-
.../juneau/httppart/HttpPartSchemaBuilder.java | 2 +-
.../httppart/bean/RequestBeanPropertyMeta.java | 2 +-
.../juneau/httppart/bean/ResponseBeanMeta.java | 6 +--
.../java/org/apache/juneau/reflect/ClassInfo.java | 30 ++++++-------
.../java/org/apache/juneau/reflect/MethodInfo.java | 28 ++++++------
.../java/org/apache/juneau/reflect/ParamInfo.java | 14 +++---
.../apache/juneau/remote/RemoteInterfaceMeta.java | 2 +-
.../transform/InterfaceBeanFilterBuilder.java | 2 +-
.../juneau/rest/client/remote/RemoteMeta.java | 6 +--
.../apache/juneau/rest/BasicRestInfoProvider.java | 4 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 6 +--
.../juneau/rest/RestMethodContextBuilder.java | 2 +-
.../org/apache/juneau/rest/RestParamDefaults.java | 16 +++----
.../java/org/apache/juneau/rest/RestServlet.java | 4 +-
.../org/apache/juneau/rest/SwaggerGenerator.java | 22 +++++-----
40 files changed, 222 insertions(+), 222 deletions(-)
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
index 30ef73a..dd9d4c7 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/BeanConfigAnnotationTest.java
@@ -159,7 +159,7 @@ public class BeanConfigAnnotationTest {
@Test
public void basic() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
BeanTraverseSession bc =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("PRIVATE", bc.getBeanClassVisibility());
@@ -214,7 +214,7 @@ public class BeanConfigAnnotationTest {
@Test
public void noValues() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsonSerializer bc =
JsonSerializer.create().applyAnnotations(al, sr).build();
check("PUBLIC", bc.getBeanClassVisibility());
check("PUBLIC", bc.getBeanConstructorVisibility());
@@ -266,7 +266,7 @@ public class BeanConfigAnnotationTest {
@Test
public void noAnnotation() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsonSerializer bc =
JsonSerializer.create().applyAnnotations(al, sr).build();
check("PUBLIC", bc.getBeanClassVisibility());
check("PUBLIC", bc.getBeanConstructorVisibility());
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotationTest.java
index 5487d61..56e0efc 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/annotation/BeanAnnotationTest.java
@@ -61,7 +61,7 @@ public class BeanAnnotationTest {
@Test
public void testBeanAnnotationOverridesPrivate_usingConfig() throws
Exception {
- AnnotationList al = a2ci.getAnnotationListParentFirst();
+ AnnotationList al = a2ci.getAnnotationList();
JsonSerializer js =
JsonSerializer.create().simple().applyAnnotations(al, null).build();
JsonParser jp = JsonParser.create().applyAnnotations(al,
null).build();
@@ -142,7 +142,7 @@ public class BeanAnnotationTest {
@Test
public void testBeanxAnnotationOverridesPrivate_usingConfig() throws
Exception {
- AnnotationList al = b2ci.getAnnotationListParentFirst();
+ AnnotationList al = b2ci.getAnnotationList();
JsonSerializer js =
JsonSerializer.create().simple().applyAnnotations(al, null).build();
JsonParser jp = JsonParser.create().applyAnnotations(al,
null).build();
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
index a276baa..6ffbb43 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/csv/CsvConfigAnnotationTest.java
@@ -31,13 +31,13 @@ public class CsvConfigAnnotationTest {
@Test
public void defaultsSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
CsvSerializer.create().applyAnnotations(al, null).build();
}
@Test
public void defaultsParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
CsvParser.create().applyAnnotations(al, null).build();
}
@@ -50,13 +50,13 @@ public class CsvConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
CsvSerializer.create().applyAnnotations(al, null).build();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
CsvParser.create().applyAnnotations(al, null).build();
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
index bbf1767..21eab19 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotationTest.java
@@ -59,7 +59,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
HtmlSerializerSession x =
HtmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
check("true", x.isAddKeyValueTableHeaders());
@@ -71,7 +71,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
HtmlParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -85,7 +85,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void defaultsSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
HtmlSerializerSession x =
HtmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isAddKeyValueTableHeaders());
@@ -97,7 +97,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void defaultsParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
HtmlParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -110,7 +110,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
HtmlSerializerSession x =
HtmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isAddKeyValueTableHeaders());
@@ -122,7 +122,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
HtmlParser.create().applyAnnotations(al,
sr).build().createSession();
}
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
index 07b199e..9a9f45b 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotationTest.java
@@ -76,7 +76,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void basic() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("foo", x.getAside());
check("foo", x.getFooter());
@@ -102,7 +102,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void defaults() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("", x.getAside());
check("", x.getFooter());
@@ -127,7 +127,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void noAnnotation() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("", x.getAside());
check("", x.getFooter());
@@ -163,7 +163,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void inheritance1() throws Exception {
- AnnotationList al = d1.getAnnotationListParentFirst();
+ AnnotationList al = d1.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("foo2,foo", x.getAside());
check("foo2,foo", x.getFooter());
@@ -192,7 +192,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void inheritance2() throws Exception {
- AnnotationList al = d2.getAnnotationListParentFirst();
+ AnnotationList al = d2.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("foo,foo2", x.getAside());
check("foo,foo2", x.getFooter());
@@ -221,7 +221,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void inheritance3() throws Exception {
- AnnotationList al = d3.getAnnotationListParentFirst();
+ AnnotationList al = d3.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("foo2", x.getAside());
check("foo2", x.getFooter());
@@ -250,7 +250,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void inheritance4() throws Exception {
- AnnotationList al = d4.getAnnotationListParentFirst();
+ AnnotationList al = d4.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("", x.getAside());
check("", x.getFooter());
@@ -305,7 +305,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void widgets_basic() throws Exception {
- AnnotationList al = e.getAnnotationListParentFirst();
+ AnnotationList al = e.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("$W{E}", x.getAside());
check("$W{E}", x.getFooter());
@@ -323,7 +323,7 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void widgets_resolution() throws Exception {
- AnnotationList al = e.getAnnotationListParentFirst();
+ AnnotationList al = e.getAnnotationList();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
String r = x.serialize(null).replaceAll("[\r\n]+", "|");
assertContains(r,
@@ -377,35 +377,35 @@ public class HtmlDocConfigAnnotationTest {
@Test
public void e01_rankedAnnotations_f1() throws Exception {
- AnnotationList al = f1.getAnnotationListParentFirst().sort();
+ AnnotationList al = f1.getAnnotationList().sort();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("f1", x.getAside());
}
@Test
public void e02_rankedAnnotations_f2() throws Exception {
- AnnotationList al = f2.getAnnotationListParentFirst().sort();
+ AnnotationList al = f2.getAnnotationList().sort();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("f1", x.getAside());
}
@Test
public void e03_rankedAnnotations_f3() throws Exception {
- AnnotationList al = f3.getAnnotationListParentFirst().sort();
+ AnnotationList al = f3.getAnnotationList().sort();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("f3", x.getAside());
}
@Test
public void e04_rankedAnnotations_f4() throws Exception {
- AnnotationList al = f4.getAnnotationListParentFirst().sort();
+ AnnotationList al = f4.getAnnotationList().sort();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("f3", x.getAside());
}
@Test
public void e05_rankedAnnotations_f5() throws Exception {
- AnnotationList al = f5.getAnnotationListParentFirst().sort();
+ AnnotationList al = f5.getAnnotationList().sort();
HtmlDocSerializerSession x =
HtmlDocSerializer.create().applyAnnotations(al, sr).build().createSession();
check("f5", x.getAside());
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
index 59ba680..3815f3a 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jena/RdfConfigAnnotationTest.java
@@ -98,7 +98,7 @@ public class RdfConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
RdfSerializerSession x =
RdfSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
check("true", x.isAddLiteralTypes());
@@ -139,7 +139,7 @@ public class RdfConfigAnnotationTest {
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
RdfParserSession x = RdfParser.create().applyAnnotations(al,
sr).build().createSession();
check("SEQ", x.getCollectionFormat());
check("foo:http://foo";, x.getJuneauBpNs());
@@ -183,7 +183,7 @@ public class RdfConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
RdfSerializerSession x =
RdfSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isAddLiteralTypes());
@@ -224,7 +224,7 @@ public class RdfConfigAnnotationTest {
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
RdfParserSession x = RdfParser.create().applyAnnotations(al,
sr).build().createSession();
check("DEFAULT", x.getCollectionFormat());
check("jp:http://www.apache.org/juneaubp/";, x.getJuneauBpNs());
@@ -267,7 +267,7 @@ public class RdfConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
RdfSerializerSession x =
RdfSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isAddLiteralTypes());
@@ -308,7 +308,7 @@ public class RdfConfigAnnotationTest {
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
RdfParserSession x = RdfParser.create().applyAnnotations(al,
sr).build().createSession();
check("DEFAULT", x.getCollectionFormat());
check("jp:http://www.apache.org/juneaubp/";, x.getJuneauBpNs());
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
index d238e21..952a852 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jso/JsoConfigAnnotationTest.java
@@ -31,13 +31,13 @@ public class JsoConfigAnnotationTest {
@Test
public void defaultsSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsoSerializer.create().applyAnnotations(al,
null).build().createSession();
}
@Test
public void defaultsParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsoParser.create().applyAnnotations(al,
null).build().createSession();
}
@@ -50,13 +50,13 @@ public class JsoConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsoSerializer.create().applyAnnotations(al,
null).build().createSession();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsoParser.create().applyAnnotations(al,
null).build().createSession();
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
index abad3fc..80c2e81 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
@@ -55,7 +55,7 @@ public class JsonConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
JsonSerializerSession x =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
check("true", x.isEscapeSolidus());
@@ -64,7 +64,7 @@ public class JsonConfigAnnotationTest {
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
JsonParserSession x = JsonParser.create().applyAnnotations(al,
sr).build().createSession();
check("true", x.isValidateEnd());
}
@@ -79,7 +79,7 @@ public class JsonConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsonSerializerSession x =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isEscapeSolidus());
@@ -88,7 +88,7 @@ public class JsonConfigAnnotationTest {
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsonParserSession x = JsonParser.create().applyAnnotations(al,
sr).build().createSession();
check("false", x.isValidateEnd());
}
@@ -102,7 +102,7 @@ public class JsonConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsonSerializerSession x =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isEscapeSolidus());
@@ -111,7 +111,7 @@ public class JsonConfigAnnotationTest {
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsonParserSession x = JsonParser.create().applyAnnotations(al,
sr).build().createSession();
check("false", x.isValidateEnd());
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
index e364981..431a948 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java
@@ -69,7 +69,7 @@ public class JsonSchemaConfigAnnotationTest {
@Test
public void basic() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
JsonSchemaGeneratorSession x =
JsonSchemaGenerator.create().applyAnnotations(al, sr).build().createSession();
check("BEAN", x.getAddDescriptionsTo());
check("BEAN", x.getAddExamplesTo());
@@ -91,7 +91,7 @@ public class JsonSchemaConfigAnnotationTest {
@Test
public void noValues() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsonSchemaGeneratorSession x =
JsonSchemaGenerator.create().applyAnnotations(al, sr).build().createSession();
check("", x.getAddDescriptionsTo());
check("", x.getAddExamplesTo());
@@ -112,7 +112,7 @@ public class JsonSchemaConfigAnnotationTest {
@Test
public void noAnnotation() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsonSchemaGeneratorSession x =
JsonSchemaGenerator.create().applyAnnotations(al, sr).build().createSession();
check("", x.getAddDescriptionsTo());
check("", x.getAddExamplesTo());
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
index 69c4825..9963c17 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
@@ -52,14 +52,14 @@ public class MsgPackConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
}
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
MsgPackParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -73,14 +73,14 @@ public class MsgPackConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
MsgPackParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -93,14 +93,14 @@ public class MsgPackConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
MsgPackParser.create().applyAnnotations(al,
sr).build().createSession();
}
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
index 6d7b438..ab14fea 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/oapi/OpenApiConfigAnnotationTest.java
@@ -35,13 +35,13 @@ public class OpenApiConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
OpenApiSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
OpenApiParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -54,13 +54,13 @@ public class OpenApiConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
OpenApiSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
OpenApiParser.create().applyAnnotations(al,
sr).build().createSession();
}
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
index ff82f14..df7acb5 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java
@@ -69,7 +69,7 @@ public class ParserConfigAnnotationTest {
@Test
public void basicReaderParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
JsonParserSession x = JsonParser.create().applyAnnotations(al,
sr).build().createSession();
check("true", x.isAutoCloseStreams());
check("1", x.getDebugOutputLines());
@@ -83,7 +83,7 @@ public class ParserConfigAnnotationTest {
@Test
public void basicInputStreamParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
MsgPackParserSession x =
MsgPackParser.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAutoCloseStreams());
check("HEX", x.getBinaryFormat());
@@ -104,7 +104,7 @@ public class ParserConfigAnnotationTest {
@Test
public void noValuesReaderParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsonParserSession x = JsonParser.create().applyAnnotations(al,
sr).build().createSession();
check("false", x.isAutoCloseStreams());
check("5", x.getDebugOutputLines());
@@ -118,7 +118,7 @@ public class ParserConfigAnnotationTest {
@Test
public void noValuesInputStreamParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
MsgPackParserSession x =
MsgPackParser.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAutoCloseStreams());
check("HEX", x.getBinaryFormat());
@@ -138,7 +138,7 @@ public class ParserConfigAnnotationTest {
@Test
public void noAnnotationReaderParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsonParserSession x = JsonParser.create().applyAnnotations(al,
sr).build().createSession();
check("false", x.isAutoCloseStreams());
check("5", x.getDebugOutputLines());
@@ -152,7 +152,7 @@ public class ParserConfigAnnotationTest {
@Test
public void noAnnotationInputStreamParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
MsgPackParserSession x =
MsgPackParser.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAutoCloseStreams());
check("HEX", x.getBinaryFormat());
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
index 326471e..1865e46 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/plaintext/PlainTextConfigAnnotationTest.java
@@ -35,13 +35,13 @@ public class PlainTextConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
PlainTextSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
PlainTextParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -54,13 +54,13 @@ public class PlainTextConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
PlainTextSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
PlainTextParser.create().applyAnnotations(al,
sr).build().createSession();
}
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
index 725d626..3d6bf13 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/AnnotationInfoTest.java
@@ -66,11 +66,11 @@ public class AnnotationInfoTest {
@Test
public void getClassOn() {
- check("B",
b.getAnnotationInfosParentFirst(A.class).get(0).getClassOn());
+ check("B", b.getAnnotationInfos(A.class).get(0).getClassOn());
}
@Test
public void getAnnotation() {
- check("@A(1)",
b.getAnnotationInfosParentFirst(A.class).get(0).getAnnotation());
+ check("@A(1)",
b.getAnnotationInfos(A.class).get(0).getAnnotation());
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
index 8b3a0fc..ed52125 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
@@ -865,7 +865,7 @@ public class ClassInfoTest {
@Test
public void getAnnotationsParentFirst() {
- check("@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotationsParentFirst(A.class));
+ check("@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotations(A.class));
}
@Test
@@ -904,7 +904,7 @@ public class ClassInfoTest {
@Test
public void getAnnotationInfosParentFirst() {
- check("@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotationInfosParentFirst(A.class));
+ check("@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotationInfos(A.class));
}
@Test
@@ -928,9 +928,9 @@ public class ClassInfoTest {
@Test
public void getAnnotationsMapParentFirst() {
- check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotationListParentFirst());
- check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g4.getAnnotationListParentFirst());
- check("@PA(10),@A(3)", g5.getAnnotationListParentFirst());
+ check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g3.getAnnotationList());
+ check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g4.getAnnotationList());
+ check("@PA(10),@A(3)", g5.getAnnotationList());
}
@A(1) @AConfig(1) static interface GBI1 {}
@@ -947,9 +947,9 @@ public class ClassInfoTest {
@Test
public void getConfigAnnotationsMapParentFirst() {
-
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb3.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
-
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb4.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(3)",
gb5.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
+
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb3.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb4.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+ check("@AConfig(3)",
gb5.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
index 35d0fc6..f5a6c8f 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
@@ -205,29 +205,29 @@ public class MethodInfoTest {
@Test
public void getAnnotationsParentFirst() {
- check("@A(C1),@A(C2),@A(C3),@A(a1)",
c_a1.getAnnotationsParentFirst(A.class));
- check("@A(C1),@A(C2),@A(C3),@A(a2a),@A(a2b)",
c_a2.getAnnotationsParentFirst(A.class));
- check("@A(C1),@A(C2),@A(C3),@A(a3)",
c_a3.getAnnotationsParentFirst(A.class));
- check("@A(C1),@A(C2),@A(C3),@A(a4)",
c_a4.getAnnotationsParentFirst(A.class));
- check("@A(C1),@A(C2),@A(C3)",
c_a5.getAnnotationsParentFirst(A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a1)",
c_a1.getAnnotations(A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a2a),@A(a2b)",
c_a2.getAnnotations(A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a3)",
c_a3.getAnnotations(A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a4)",
c_a4.getAnnotations(A.class));
+ check("@A(C1),@A(C2),@A(C3)", c_a5.getAnnotations(A.class));
}
@Test
public void getAnnotationsParentFirst_notExistent() {
- check("", c_a1.getAnnotationsParentFirst(AX.class));
- check("", c_a2.getAnnotationsParentFirst(AX.class));
- check("", c_a3.getAnnotationsParentFirst(AX.class));
- check("", c_a4.getAnnotationsParentFirst(AX.class));
- check("", c_a5.getAnnotationsParentFirst(AX.class));
+ check("", c_a1.getAnnotations(AX.class));
+ check("", c_a2.getAnnotations(AX.class));
+ check("", c_a3.getAnnotations(AX.class));
+ check("", c_a4.getAnnotations(AX.class));
+ check("", c_a5.getAnnotations(AX.class));
}
@Test
public void appendAnnotationsParentFirst() {
- check("@A(C1),@A(C2),@A(C3),@A(a1)",
c_a1.appendAnnotationsParentFirst(new ArrayList<>(), A.class));
- check("@A(C1),@A(C2),@A(C3),@A(a2a),@A(a2b)",
c_a2.appendAnnotationsParentFirst(new ArrayList<>(), A.class));
- check("@A(C1),@A(C2),@A(C3),@A(a3)",
c_a3.appendAnnotationsParentFirst(new ArrayList<>(), A.class));
- check("@A(C1),@A(C2),@A(C3),@A(a4)",
c_a4.appendAnnotationsParentFirst(new ArrayList<>(), A.class));
- check("@A(C1),@A(C2),@A(C3)",
c_a5.appendAnnotationsParentFirst(new ArrayList<>(), A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a1)", c_a1.appendAnnotations(new
ArrayList<>(), A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a2a),@A(a2b)",
c_a2.appendAnnotations(new ArrayList<>(), A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a3)", c_a3.appendAnnotations(new
ArrayList<>(), A.class));
+ check("@A(C1),@A(C2),@A(C3),@A(a4)", c_a4.appendAnnotations(new
ArrayList<>(), A.class));
+ check("@A(C1),@A(C2),@A(C3)", c_a5.appendAnnotations(new
ArrayList<>(), A.class));
}
@Test
@@ -250,11 +250,11 @@ public class MethodInfoTest {
@Test
public void getAnnotationsMapParentFirst() {
- check("@PA(10),@A(C1),@A(a1),@A(C2),@A(C3)",
c_a1.getAnnotationListParentFirst());
- check("@PA(10),@A(C1),@A(a2a),@A(C2),@A(a2b),@A(C3)",
c_a2.getAnnotationListParentFirst());
- check("@PA(10),@A(C1),@A(a3),@A(C2),@A(C3)",
c_a3.getAnnotationListParentFirst());
- check("@PA(10),@A(C1),@A(C2),@A(C3),@A(a4)",
c_a4.getAnnotationListParentFirst());
- check("@PA(10),@A(C1),@A(C2),@A(C3)",
c_a5.getAnnotationListParentFirst());
+ check("@PA(10),@A(C1),@A(a1),@A(C2),@A(C3)",
c_a1.getAnnotationList());
+ check("@PA(10),@A(C1),@A(a2a),@A(C2),@A(a2b),@A(C3)",
c_a2.getAnnotationList());
+ check("@PA(10),@A(C1),@A(a3),@A(C2),@A(C3)",
c_a3.getAnnotationList());
+ check("@PA(10),@A(C1),@A(C2),@A(C3),@A(a4)",
c_a4.getAnnotationList());
+ check("@PA(10),@A(C1),@A(C2),@A(C3)", c_a5.getAnnotationList());
}
@A("C1") @AConfig("C1")
@@ -293,11 +293,11 @@ public class MethodInfoTest {
@Test
public void getConfigAnnotationsMapParentFirst() {
- check("@AConfig(C1),@AConfig(a1),@AConfig(C2),@AConfig(C3)",
cb_a1.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
-
check("@AConfig(C1),@AConfig(a2a),@AConfig(C2),@AConfig(a2b),@AConfig(C3)",
cb_a2.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(C1),@AConfig(a3),@AConfig(C2),@AConfig(C3)",
cb_a3.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(C1),@AConfig(C2),@AConfig(C3),@AConfig(a4)",
cb_a4.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(C1),@AConfig(C2),@AConfig(C3)",
cb_a5.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(a1),@AConfig(C2),@AConfig(C3)",
cb_a1.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+
check("@AConfig(C1),@AConfig(a2a),@AConfig(C2),@AConfig(a2b),@AConfig(C3)",
cb_a2.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(a3),@AConfig(C2),@AConfig(C3)",
cb_a3.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(C2),@AConfig(C3),@AConfig(a4)",
cb_a4.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(C2),@AConfig(C3)",
cb_a5.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
index 54e7590..337d17b 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ParamInfoTest.java
@@ -224,25 +224,25 @@ public class ParamInfoTest {
@Test
public void getAnnotationsParentFirst() throws Exception {
- check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5)",
cb_a1.getAnnotationsParentFirst(CA.class));
- check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5)",
cb_a2.getAnnotationsParentFirst(CA.class));
- check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5)",
cc_a1.getAnnotationsParentFirst(CA.class));
- check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5),@CA(6)",
cc_a2.getAnnotationsParentFirst(CA.class));
+ check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5)",
cb_a1.getAnnotations(CA.class));
+ check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5)",
cb_a2.getAnnotations(CA.class));
+ check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5)",
cc_a1.getAnnotations(CA.class));
+ check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(5),@CA(6)",
cc_a2.getAnnotations(CA.class));
}
@Test
public void getAnnotationsParentFirst_notFound() throws Exception {
- check("", cb_a1.getAnnotationsParentFirst(DA.class));
+ check("", cb_a1.getAnnotations(DA.class));
}
@Test
public void getAnnotationsParentFirst_constructor() throws Exception {
- check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(9)",
cc_cc.getAnnotationsParentFirst(CA.class));
+ check("@CA(4),@CA(3),@CA(2),@CA(1),@CA(9)",
cc_cc.getAnnotations(CA.class));
}
@Test
public void getAnnotationsParentFirst_notFound_constructor() throws
Exception {
- check("", cc_cc.getAnnotationsParentFirst(DA.class));
+ check("", cc_cc.getAnnotations(DA.class));
}
@Test
@@ -323,13 +323,13 @@ public class ParamInfoTest {
@Test
public void getAnnotationsParentFirst_inherited() throws Exception {
- check("@DA(4),@DA(3),@DA(2),@DA(1),@DA(0)",
db_a1.getAnnotationsParentFirst(DA.class));
- check("@DA(4),@DA(3),@DA(2),@DA(1),@DA(0),@DA(5)",
dc_a1.getAnnotationsParentFirst(DA.class));
+ check("@DA(4),@DA(3),@DA(2),@DA(1),@DA(0)",
db_a1.getAnnotations(DA.class));
+ check("@DA(4),@DA(3),@DA(2),@DA(1),@DA(0),@DA(5)",
dc_a1.getAnnotations(DA.class));
}
@Test
public void getAnnotationsParentFirst_inherited_notFound() throws
Exception {
- check("", db_a1.getAnnotationsParentFirst(CA.class));
+ check("", db_a1.getAnnotations(CA.class));
}
@Test
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
index b541108..bb824f4 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java
@@ -75,7 +75,7 @@ public class SerializerConfigAnnotationTest {
@Test
public void basicWriterSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
JsonSerializerSession x =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", ((SerializerSession)x).isAddBeanTypes());
check("true", x.isAddRootType());
@@ -96,7 +96,7 @@ public class SerializerConfigAnnotationTest {
@Test
public void basicOutputStreamSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", ((SerializerSession)x).isAddBeanTypes());
check("true", x.isAddRootType());
@@ -123,7 +123,7 @@ public class SerializerConfigAnnotationTest {
@Test
public void noValuesWriterSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
JsonSerializerSession x =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", ((SerializerSession)x).isAddBeanTypes());
check("false", x.isAddRootType());
@@ -144,7 +144,7 @@ public class SerializerConfigAnnotationTest {
@Test
public void noValuesOutputStreamSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", ((SerializerSession)x).isAddBeanTypes());
check("false", x.isAddRootType());
@@ -170,7 +170,7 @@ public class SerializerConfigAnnotationTest {
@Test
public void noAnnotationWriterSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
JsonSerializerSession x =
JsonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", ((SerializerSession)x).isAddBeanTypes());
check("false", x.isAddRootType());
@@ -191,7 +191,7 @@ public class SerializerConfigAnnotationTest {
@Test
public void noAnnotationOutputStreamSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", ((SerializerSession)x).isAddBeanTypes());
check("false", x.isAddRootType());
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
index 66bda63..7cb6dbb 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
@@ -52,7 +52,7 @@ public class SoapXmlConfigAnnotationTest {
@Test
public void basic() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
SoapXmlSerializerSession x =
SoapXmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("foo", x.getSoapAction());
}
@@ -67,7 +67,7 @@ public class SoapXmlConfigAnnotationTest {
@Test
public void noValues() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
SoapXmlSerializerSession x =
SoapXmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("http://www.w3.org/2003/05/soap-envelope";,
x.getSoapAction());
}
@@ -81,7 +81,7 @@ public class SoapXmlConfigAnnotationTest {
@Test
public void noAnnotation() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
SoapXmlSerializerSession x =
SoapXmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("http://www.w3.org/2003/05/soap-envelope";,
x.getSoapAction());
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
index 077857b..b38ef02 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
@@ -56,7 +56,7 @@ public class UonConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
UonSerializerSession x =
UonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
check("true", x.isEncoding());
@@ -65,7 +65,7 @@ public class UonConfigAnnotationTest {
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
UonParserSession x = UonParser.create().applyAnnotations(al,
sr).build().createSession();
check("true", x.isDecoding());
check("true", x.isValidateEnd());
@@ -81,7 +81,7 @@ public class UonConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
UonSerializerSession x =
UonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isEncoding());
@@ -90,7 +90,7 @@ public class UonConfigAnnotationTest {
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
UonParserSession x = UonParser.create().applyAnnotations(al,
sr).build().createSession();
check("false", x.isDecoding());
check("false", x.isValidateEnd());
@@ -105,7 +105,7 @@ public class UonConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
UonSerializerSession x =
UonSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isEncoding());
@@ -114,7 +114,7 @@ public class UonConfigAnnotationTest {
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
UonParserSession x = UonParser.create().applyAnnotations(al,
sr).build().createSession();
check("false", x.isDecoding());
check("false", x.isValidateEnd());
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
index b212211..a2c0515 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
@@ -52,14 +52,14 @@ public class UrlEncodingConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
UrlEncodingSerializerSession x =
UrlEncodingSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isExpandedParams());
}
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
UrlEncodingParserSession x =
UrlEncodingParser.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isExpandedParams());
}
@@ -74,14 +74,14 @@ public class UrlEncodingConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
UrlEncodingSerializerSession x =
UrlEncodingSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isExpandedParams());
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
UrlEncodingParserSession x =
UrlEncodingParser.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isExpandedParams());
}
@@ -95,14 +95,14 @@ public class UrlEncodingConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
UrlEncodingSerializerSession x =
UrlEncodingSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isExpandedParams());
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
UrlEncodingParserSession x =
UrlEncodingParser.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isExpandedParams());
}
diff --git
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
index 9421523..f5f10b4 100644
---
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
+++
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java
@@ -102,7 +102,7 @@ public class XmlConfigAnnotationTest {
@Test
public void basicSerializer() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
XmlSerializerSession x =
XmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
check("true", x.isAddNamespaceUrisToRoot());
@@ -114,7 +114,7 @@ public class XmlConfigAnnotationTest {
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationListParentFirst();
+ AnnotationList al = a.getAnnotationList();
XmlParserSession x = XmlParser.create().applyAnnotations(al,
sr).build().createSession();
check("AA", x.getEventAllocator());
check("true", x.isPreserveRootElement());
@@ -133,7 +133,7 @@ public class XmlConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
XmlSerializerSession x =
XmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isAddNamespaceUrisToRoot());
@@ -145,7 +145,7 @@ public class XmlConfigAnnotationTest {
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationListParentFirst();
+ AnnotationList al = b.getAnnotationList();
XmlParserSession x = XmlParser.create().applyAnnotations(al,
sr).build().createSession();
check(null, x.getEventAllocator());
check("false", x.isPreserveRootElement());
@@ -163,7 +163,7 @@ public class XmlConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
XmlSerializerSession x =
XmlSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
check("false", x.isAddNamespaceUrisToRoot());
@@ -175,7 +175,7 @@ public class XmlConfigAnnotationTest {
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationListParentFirst();
+ AnnotationList al = c.getAnnotationList();
XmlParserSession x = XmlParser.create().applyAnnotations(al,
sr).build().createSession();
check(null, x.getEventAllocator());
check("false", x.isPreserveRootElement());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 59342c3..ec778fd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -1132,23 +1132,23 @@ public final class BeanPropertyMeta {
BeanContext bc = beanContext;
if (a == null)
return l;
-
getBeanMeta().getClassMeta().getInfo().appendAnnotationsParentFirst(l, a, bc);
+ getBeanMeta().getClassMeta().getInfo().appendAnnotations(l, a,
bc);
if (field != null) {
addIfNotNull(l, bc.getAnnotation(a, field));
-
ClassInfo.of(field.getType()).appendAnnotationsParentFirst(l, a, bc);
+ ClassInfo.of(field.getType()).appendAnnotations(l, a,
bc);
}
if (getter != null) {
addIfNotNull(l, bc.getAnnotation(a, getter));
-
ClassInfo.of(getter.getReturnType()).appendAnnotationsParentFirst(l, a, bc);
+
ClassInfo.of(getter.getReturnType()).appendAnnotations(l, a, bc);
}
if (setter != null) {
addIfNotNull(l, bc.getAnnotation(a, setter));
-
ClassInfo.of(setter.getReturnType()).appendAnnotationsParentFirst(l, a, bc);
+
ClassInfo.of(setter.getReturnType()).appendAnnotations(l, a, bc);
}
if (extraKeys != null) {
addIfNotNull(l, bc.getAnnotation(a, extraKeys));
-
ClassInfo.of(extraKeys.getReturnType()).appendAnnotationsParentFirst(l, a, bc);
+
ClassInfo.of(extraKeys.getReturnType()).appendAnnotations(l, a, bc);
}
return l;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index b911584..e80b720 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -685,7 +685,7 @@ public final class ClassMeta<T> implements Type {
private BeanFilter findBeanFilter(BeanContext bc) {
try {
- List<Bean> ba =
info.getAnnotationsParentFirst(Bean.class, bc);
+ List<Bean> ba = info.getAnnotations(Bean.class,
bc);
if (! ba.isEmpty())
return new
AnnotationBeanFilterBuilder(innerClass, ba).build();
} catch (Exception e) {
@@ -2070,7 +2070,7 @@ public final class ClassMeta<T> implements Type {
* A list of all matching annotations found or an empty list if
none found.
*/
public <A extends Annotation> List<A>
getAnnotationsParentFirst(Class<A> a) {
- return info.getAnnotationsParentFirst(a, beanContext == null ?
BeanContext.DEFAULT : beanContext);
+ return info.getAnnotations(a, beanContext == null ?
BeanContext.DEFAULT : beanContext);
}
@Override /* Object */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
index a1b165a..74afd57 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
@@ -155,7 +155,7 @@ public abstract class ContextBuilder {
*/
public ContextBuilder applyAnnotations(Class<?>...fromClasses) {
for (Class<?> c : fromClasses)
-
applyAnnotations(ClassInfo.of(c).getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
+
applyAnnotations(ClassInfo.of(c).getAnnotationList(ConfigAnnotationFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
return this;
}
@@ -199,7 +199,7 @@ public abstract class ContextBuilder {
*/
public ContextBuilder applyAnnotations(Method...fromMethods) {
for (Method m : fromMethods)
-
applyAnnotations(MethodInfo.of(m).getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
+
applyAnnotations(MethodInfo.of(m).getAnnotationList(ConfigAnnotationFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
index dac8c66..21c75b4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchemaBuilder.java
@@ -82,7 +82,7 @@ public class HttpPartSchemaBuilder {
HttpPartSchemaBuilder apply(Class<? extends Annotation> c,
java.lang.reflect.Type t) {
if (t instanceof Class<?>) {
ClassInfo ci = ClassInfo.of((Class<?>)t);
- for (Annotation a : ci.getAnnotationsParentFirst(c))
+ for (Annotation a : ci.getAnnotations(c))
apply(a);
} else if (Value.isType(t)) {
apply(c, Value.getParameterType(t));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
index c08948b..7b180c4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/RequestBeanPropertyMeta.java
@@ -29,7 +29,7 @@ public class RequestBeanPropertyMeta {
static RequestBeanPropertyMeta.Builder create(HttpPartType partType,
Class<? extends Annotation> c, MethodInfo m) {
HttpPartSchemaBuilder sb =
HttpPartSchema.create().name(m.getPropertyName());
- for (Annotation a : m.getAnnotationsParentFirst(c))
+ for (Annotation a : m.getAnnotations(c))
sb.apply(a);
return new
Builder().partType(partType).schema(sb.build()).getter(m.inner());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
index d941f7f..61cbaac 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/bean/ResponseBeanMeta.java
@@ -52,7 +52,7 @@ public class ResponseBeanMeta {
return null;
Builder b = new Builder(ps);
b.apply(ci.innerType());
- for (Response r : ci.getAnnotationsParentFirst(Response.class))
+ for (Response r : ci.getAnnotations(Response.class))
b.apply(r);
return b.build();
}
@@ -71,7 +71,7 @@ public class ResponseBeanMeta {
return null;
Builder b = new Builder(ps);
b.apply(m.getReturnType().resolved().innerType());
- for (Response r : m.getAnnotationsParentFirst(Response.class))
+ for (Response r : m.getAnnotations(Response.class))
b.apply(r);
return b.build();
}
@@ -90,7 +90,7 @@ public class ResponseBeanMeta {
return null;
Builder b = new Builder(ps);
b.apply(mpi.getParameterType().resolved().innerType());
- for (Response r : mpi.getAnnotationsParentFirst(Response.class))
+ for (Response r : mpi.getAnnotations(Response.class))
b.apply(r);
return b.build();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 94d62cf..f0df106 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -1024,8 +1024,8 @@ public final class ClassInfo {
* @return
* A list of all matching annotations found or an empty list if
none found.
*/
- public <T extends Annotation> List<T>
getAnnotationsParentFirst(Class<T> a) {
- return appendAnnotationsParentFirst(new ArrayList<>(), a);
+ public <T extends Annotation> List<T> getAnnotations(Class<T> a) {
+ return appendAnnotations(new ArrayList<>(), a);
}
/**
@@ -1040,8 +1040,8 @@ public final class ClassInfo {
* @return
* A list of all matching annotations found or an empty list if
none found.
*/
- public <T extends Annotation> List<T>
getAnnotationsParentFirst(Class<T> a, MetaProvider mp) {
- return appendAnnotationsParentFirst(new ArrayList<>(), a, mp);
+ public <T extends Annotation> List<T> getAnnotations(Class<T> a,
MetaProvider mp) {
+ return appendAnnotations(new ArrayList<>(), a, mp);
}
/**
@@ -1054,8 +1054,8 @@ public final class ClassInfo {
* @param a The annotation class type.
* @return The found matches, or an empty list if annotation was not
found.
*/
- public <T extends Annotation> List<AnnotationInfo<T>>
getAnnotationInfosParentFirst(Class<T> a) {
- return appendAnnotationInfosParentFirst(new ArrayList<>(), a);
+ public <T extends Annotation> List<AnnotationInfo<T>>
getAnnotationInfos(Class<T> a) {
+ return appendAnnotationInfos(new ArrayList<>(), a);
}
/**
@@ -1072,8 +1072,8 @@ public final class ClassInfo {
*
* @return A new {@link AnnotationList} object on every call.
*/
- public AnnotationList getAnnotationListParentFirst() {
- return getAnnotationListParentFirst(null);
+ public AnnotationList getAnnotationList() {
+ return getAnnotationList(null);
}
/**
@@ -1093,8 +1093,8 @@ public final class ClassInfo {
* <br>Can be <jk>null</jk> for no filtering.
* @return A new {@link AnnotationList} object on every call.
*/
- public AnnotationList
getAnnotationListParentFirst(Predicate<AnnotationInfo<?>> filter) {
- return appendAnnotationListParentFirst(new
AnnotationList(filter));
+ public AnnotationList getAnnotationList(Predicate<AnnotationInfo<?>>
filter) {
+ return appendAnnotationList(new AnnotationList(filter));
}
/**
@@ -1114,8 +1114,8 @@ public final class ClassInfo {
* @param a The annotation to search for.
* @return The same list.
*/
- public <T extends Annotation> List<T>
appendAnnotationsParentFirst(List<T> l, Class<T> a) {
- return appendAnnotationsParentFirst(l, a, MetaProvider.DEFAULT);
+ public <T extends Annotation> List<T> appendAnnotations(List<T> l,
Class<T> a) {
+ return appendAnnotations(l, a, MetaProvider.DEFAULT);
}
/**
@@ -1136,7 +1136,7 @@ public final class ClassInfo {
* @param mp The meta provider for looking up annotations on reflection
objects (classes, methods, fields, constructors).
* @return The same list.
*/
- public <T extends Annotation> List<T>
appendAnnotationsParentFirst(List<T> l, Class<T> a, MetaProvider mp) {
+ public <T extends Annotation> List<T> appendAnnotations(List<T> l,
Class<T> a, MetaProvider mp) {
addIfNotNull(l, getPackageAnnotation(a));
for (ClassInfo ci : getInterfacesParentFirst())
addIfNotNull(l, mp.getDeclaredAnnotation(a,
ci.inner()));
@@ -1162,7 +1162,7 @@ public final class ClassInfo {
* @param a The annotation to search for.
* @return The same list.
*/
- public <T extends Annotation> List<AnnotationInfo<T>>
appendAnnotationInfosParentFirst(List<AnnotationInfo<T>> l, Class<T> a) {
+ public <T extends Annotation> List<AnnotationInfo<T>>
appendAnnotationInfos(List<AnnotationInfo<T>> l, Class<T> a) {
addIfNotNull(l, getPackageAnnotationInfo(a));
for (ClassInfo ci : getInterfacesParentFirst())
addIfNotNull(l, ci.getDeclaredAnnotationInfo(a));
@@ -1197,7 +1197,7 @@ public final class ClassInfo {
}
- AnnotationList appendAnnotationListParentFirst(AnnotationList m) {
+ AnnotationList appendAnnotationList(AnnotationList m) {
Package p = c.getPackage();
if (p != null)
for (Annotation a : p.getDeclaredAnnotations())
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
index bfefe7f..0672f2e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/MethodInfo.java
@@ -215,8 +215,8 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* @return
* A list of all matching annotations found or an empty list if
none found.
*/
- public <T extends Annotation> List<T>
getAnnotationsParentFirst(Class<T> a) {
- return appendAnnotationsParentFirst(new ArrayList<>(), a);
+ public <T extends Annotation> List<T> getAnnotations(Class<T> a) {
+ return appendAnnotations(new ArrayList<>(), a);
}
/**
@@ -228,13 +228,13 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* @return The same list.
*/
@SuppressWarnings("unchecked")
- public <T extends Annotation> List<T>
appendAnnotationsParentFirst(List<T> l, Class<T> a) {
- declaringClass.appendAnnotationsParentFirst(l, a);
+ public <T extends Annotation> List<T> appendAnnotations(List<T> l,
Class<T> a) {
+ declaringClass.appendAnnotations(l, a);
for (Method m2 : getMatchingParentFirst())
for (Annotation a2 : m2.getDeclaredAnnotations())
if (a.isInstance(a2))
l.add((T)a2);
- getReturnType().resolved().appendAnnotationsParentFirst(l, a);
+ getReturnType().resolved().appendAnnotations(l, a);
return l;
}
@@ -269,8 +269,8 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
*
* @return A new {@link AnnotationList} object on every call.
*/
- public AnnotationList getAnnotationListParentFirst() {
- return getAnnotationListParentFirst(null);
+ public AnnotationList getAnnotationList() {
+ return getAnnotationList(null);
}
/**
@@ -291,20 +291,20 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* <br>Can be <jk>null</jk> for no filtering.
* @return A new {@link AnnotationList} object on every call.
*/
- public AnnotationList
getAnnotationListParentFirst(Predicate<AnnotationInfo<?>> filter) {
- return appendAnnotationListParentFirst(new
AnnotationList(filter));
+ public AnnotationList getAnnotationList(Predicate<AnnotationInfo<?>>
filter) {
+ return appendAnnotationList(new AnnotationList(filter));
}
/**
- * Same as {@link #getAnnotationListParentFirst(Predicate)} except only
returns annotations defined on methods.
+ * Same as {@link #getAnnotationList(Predicate)} except only returns
annotations defined on methods.
*
* @param filter
* Optional filter to apply to limit which annotations are added
to the list.
* <br>Can be <jk>null</jk> for no filtering.
* @return A new {@link AnnotationList} object on every call.
*/
- public AnnotationList
getAnnotationListMethodOnlyParentFirst(Predicate<AnnotationInfo<?>> filter) {
- return appendAnnotationListMethodOnlyParentFirst(new
AnnotationList(filter));
+ public AnnotationList
getAnnotationListMethodOnly(Predicate<AnnotationInfo<?>> filter) {
+ return appendAnnotationListMethodOnly(new
AnnotationList(filter));
}
/**
@@ -320,7 +320,7 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
return false;
}
- AnnotationList appendAnnotationListParentFirst(AnnotationList al) {
+ AnnotationList appendAnnotationList(AnnotationList al) {
ClassInfo c = this.declaringClass;
appendDeclaredAnnotations(al, c.getPackage());
for (ClassInfo ci : c.getInterfacesParentFirst()) {
@@ -334,7 +334,7 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
return al;
}
- AnnotationList appendAnnotationListMethodOnlyParentFirst(AnnotationList
al) {
+ AnnotationList appendAnnotationListMethodOnly(AnnotationList al) {
ClassInfo c = this.declaringClass;
for (ClassInfo ci : c.getInterfacesParentFirst())
appendDeclaredMethodAnnotations(al, ci);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
index 9eff74d..72c351a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ParamInfo.java
@@ -182,17 +182,17 @@ public final class ParamInfo {
* @return
* A list of all matching annotations found or an empty list if
none found.
*/
- public <T extends Annotation> List<T>
getAnnotationsParentFirst(Class<T> a) {
- return appendAnnotationsParentFirst(new ArrayList<>(), a, true);
+ public <T extends Annotation> List<T> getAnnotations(Class<T> a) {
+ return appendAnnotations(new ArrayList<>(), a, true);
}
@SuppressWarnings("unchecked")
- private <T extends Annotation> List<T>
appendAnnotationsParentFirst(List<T> l, Class<T> a, boolean parentFirst) {
+ private <T extends Annotation> List<T> appendAnnotations(List<T> l,
Class<T> a, boolean parentFirst) {
if (eInfo.isConstructor) {
ClassInfo ci = eInfo.getParamType(index).resolved();
Annotation[] annotations =
eInfo.getParameterAnnotations(index);
if (parentFirst) {
- ci.appendAnnotationsParentFirst(l, a);
+ ci.appendAnnotations(l, a);
for (Annotation a2 : annotations)
if (a.isInstance(a2))
l.add((T)a2);
@@ -200,13 +200,13 @@ public final class ParamInfo {
for (Annotation a2 : annotations)
if (a.isInstance(a2))
l.add((T)a2);
- ci.appendAnnotationsParentFirst(l, a);
+ ci.appendAnnotations(l, a);
}
} else {
MethodInfo mi = (MethodInfo)eInfo;
ClassInfo ci = eInfo.getParamType(index).resolved();
if (parentFirst) {
- ci.appendAnnotationsParentFirst(l, a);
+ ci.appendAnnotations(l, a);
for (Method m2 : mi.getMatchingParentFirst())
for (Annotation a2 :
m2.getParameterAnnotations()[index])
if (a.isInstance(a2))
@@ -216,7 +216,7 @@ public final class ParamInfo {
for (Annotation a2 :
m2.getParameterAnnotations()[index])
if (a.isInstance(a2))
l.add((T)a2);
- ci.appendAnnotationsParentFirst(l, a);
+ ci.appendAnnotations(l, a);
}
}
return l;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
index 43fa8e9..766695a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/remote/RemoteInterfaceMeta.java
@@ -50,7 +50,7 @@ public class RemoteInterfaceMeta {
this.c = c;
String path = "";
ClassInfo ci = ClassInfo.of(c);
- List<RemoteInterface> rr =
ci.getAnnotationsParentFirst(RemoteInterface.class);
+ List<RemoteInterface> rr =
ci.getAnnotations(RemoteInterface.class);
for (RemoteInterface r : rr)
if (! r.path().isEmpty())
path = trimSlashes(r.path());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
index 46f997a..3878d09 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/InterfaceBeanFilterBuilder.java
@@ -55,7 +55,7 @@ public class InterfaceBeanFilterBuilder<T> extends
BeanFilterBuilder<T> {
@SuppressWarnings("deprecation")
private void init(Class<?> interfaceClass, BeanContext bc) {
interfaceClass(interfaceClass);
- List<Bean> annotations =
ClassInfo.of(interfaceClass).getAnnotationsParentFirst(Bean.class, bc);
+ List<Bean> annotations =
ClassInfo.of(interfaceClass).getAnnotations(Bean.class, bc);
for (Bean b : annotations) {
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
index ad59ca7..5410eb8 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteMeta.java
@@ -46,13 +46,13 @@ public class RemoteMeta {
String path = "";
ClassInfo ci = ClassInfo.of(c);
- for (RemoteResource r :
ci.getAnnotationsParentFirst(RemoteResource.class))
+ for (RemoteResource r : ci.getAnnotations(RemoteResource.class))
if (! r.path().isEmpty())
path = trimSlashes(r.path());
- for (org.apache.juneau.http.remote.RemoteResource r :
ci.getAnnotationsParentFirst(org.apache.juneau.http.remote.RemoteResource.class))
+ for (org.apache.juneau.http.remote.RemoteResource r :
ci.getAnnotations(org.apache.juneau.http.remote.RemoteResource.class))
if (! r.path().isEmpty())
path = trimSlashes(r.path());
- for (Remote r : ci.getAnnotationsParentFirst(Remote.class))
+ for (Remote r : ci.getAnnotations(Remote.class))
if (! r.path().isEmpty())
path = trimSlashes(r.path());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
index 2d3ba29..0b63f17 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestInfoProvider.java
@@ -68,7 +68,7 @@ public class BasicRestInfoProvider implements
RestInfoProvider {
@SuppressWarnings("deprecation")
Builder(RestContext context) {
ClassInfo ci =
ClassInfo.of(context.getResource()).resolved();
- for (RestResource r :
ci.getAnnotationsParentFirst(RestResource.class)) {
+ for (RestResource r :
ci.getAnnotations(RestResource.class)) {
if (! r.siteName().isEmpty())
siteName = r.siteName();
if (r.title().length > 0)
@@ -76,7 +76,7 @@ public class BasicRestInfoProvider implements
RestInfoProvider {
if (r.description().length > 0)
description = joinnl(r.description());
}
- for (Rest r : ci.getAnnotationsParentFirst(Rest.class))
{
+ for (Rest r : ci.getAnnotations(Rest.class)) {
if (! r.siteName().isEmpty())
siteName = r.siteName();
if (r.title().length > 0)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 0762279..e1f15a8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -138,8 +138,8 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
VarResolver vr = varResolverBuilder.build();
- List<AnnotationInfo<RestResource>>
restResourceAnnotationsParentFirst =
rci.getAnnotationInfosParentFirst(RestResource.class);
- List<AnnotationInfo<Rest>> restAnnotationsParentFirst =
rci.getAnnotationInfosParentFirst(Rest.class);
+ List<AnnotationInfo<RestResource>>
restResourceAnnotationsParentFirst = rci.getAnnotationInfos(RestResource.class);
+ List<AnnotationInfo<Rest>> restAnnotationsParentFirst =
rci.getAnnotationInfos(Rest.class);
// Find our config file. It's the last non-empty
@RestResource(config).
String configPath = "";
@@ -174,7 +174,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
}
}
-
applyAnnotations(rci.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE),
vr.createSession());
+
applyAnnotations(rci.getAnnotationList(ConfigAnnotationFilter.INSTANCE),
vr.createSession());
// Load stuff from parent-to-child order.
// This allows child settings to overwrite parent
settings.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContextBuilder.java
index 9d973be..d155d08 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestMethodContextBuilder.java
@@ -44,7 +44,7 @@ public class RestMethodContextBuilder extends
BeanContextBuilder {
VarResolver vr = context.getVarResolver();
VarResolverSession vrs = vr.createSession();
-
applyAnnotations(mi.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE),
vrs);
+
applyAnnotations(mi.getAnnotationList(ConfigAnnotationFilter.INSTANCE), vrs);
properties = new
RestMethodProperties(context.getProperties());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
index c6354cb..4fe4c9e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
@@ -203,7 +203,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi, UrlPathPattern
pathPattern) {
String p = null;
- for (Path h :
mpi.getAnnotationsParentFirst(Path.class)) {
+ for (Path h : mpi.getAnnotations(Path.class)) {
if (! h.name().isEmpty())
p = h.name();
if (! h.value().isEmpty())
@@ -267,7 +267,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (Header h :
mpi.getAnnotationsParentFirst(Header.class)) {
+ for (Header h : mpi.getAnnotations(Header.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
@@ -292,7 +292,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (Attr h :
mpi.getAnnotationsParentFirst(Attr.class)) {
+ for (Attr h : mpi.getAnnotations(Attr.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
@@ -337,7 +337,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (ResponseHeader h :
mpi.getAnnotationsParentFirst(ResponseHeader.class)) {
+ for (ResponseHeader h :
mpi.getAnnotations(ResponseHeader.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
@@ -450,7 +450,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (FormData h :
mpi.getAnnotationsParentFirst(FormData.class)) {
+ for (FormData h : mpi.getAnnotations(FormData.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
@@ -486,7 +486,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (Query h :
mpi.getAnnotationsParentFirst(Query.class)) {
+ for (Query h : mpi.getAnnotations(Query.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
@@ -515,7 +515,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (HasFormData h :
mpi.getAnnotationsParentFirst(HasFormData.class)) {
+ for (HasFormData h :
mpi.getAnnotations(HasFormData.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
@@ -543,7 +543,7 @@ class RestParamDefaults {
private static String getName(ParamInfo mpi) {
String n = null;
- for (HasQuery h :
mpi.getAnnotationsParentFirst(HasQuery.class)) {
+ for (HasQuery h : mpi.getAnnotations(HasQuery.class)) {
if (! h.name().isEmpty())
n = h.name();
if (! h.value().isEmpty())
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
index d166645..3d75307 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -117,12 +117,12 @@ public abstract class RestServlet extends HttpServlet {
return context.getPath();
ClassInfo ci = ClassInfo.of(getClass());
String path = "";
- for (Rest rr : ci.getAnnotationsParentFirst(Rest.class))
+ for (Rest rr : ci.getAnnotations(Rest.class))
if (! rr.path().isEmpty())
path = trimSlashes(rr.path());
if (! path.isEmpty())
return path;
- for (RestResource rr :
ci.getAnnotationsParentFirst(RestResource.class))
+ for (RestResource rr : ci.getAnnotations(RestResource.class))
if (! rr.path().isEmpty())
path = trimSlashes(rr.path());
return "";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
index d50433b..da81178 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
@@ -114,7 +114,7 @@ final class SwaggerGenerator {
omSwagger = new ObjectMap();
// Combine it with @RestResource(swagger)
- for (RestResource rr :
rci.getAnnotationsParentFirst(RestResource.class)) {
+ for (RestResource rr : rci.getAnnotations(RestResource.class)) {
ObjectMap sInfo = omSwagger.getObjectMap("info", true);
sInfo.appendSkipEmpty("title",
@@ -169,7 +169,7 @@ final class SwaggerGenerator {
}
// Combine it with @Rest(swagger)
- for (Rest rr : rci.getAnnotationsParentFirst(Rest.class)) {
+ for (Rest rr : rci.getAnnotations(Rest.class)) {
ObjectMap sInfo = omSwagger.getObjectMap("info", true);
sInfo.appendSkipEmpty("title",
@@ -392,19 +392,19 @@ final class SwaggerGenerator {
try {
if (mpi != null) {
if (in == BODY) {
- for (Body a :
mpi.getAnnotationsParentFirst(Body.class))
+ for (Body a :
mpi.getAnnotations(Body.class))
merge(param, a);
} else if (in == QUERY)
{
- for (Query a :
mpi.getAnnotationsParentFirst(Query.class))
+ for (Query a :
mpi.getAnnotations(Query.class))
merge(param, a);
} else if (in ==
FORM_DATA) {
- for (FormData a
: mpi.getAnnotationsParentFirst(FormData.class))
+ for (FormData a
: mpi.getAnnotations(FormData.class))
merge(param, a);
} else if (in ==
HEADER) {
- for (Header a :
mpi.getAnnotationsParentFirst(Header.class))
+ for (Header a :
mpi.getAnnotations(Header.class))
merge(param, a);
} else if (in == PATH) {
- for (Path a :
mpi.getAnnotationsParentFirst(Path.class))
+ for (Path a :
mpi.getAnnotations(Path.class))
merge(param, a);
}
}
@@ -433,7 +433,7 @@ final class SwaggerGenerator {
for (ClassInfo eci : mi.getExceptionTypes()) {
if (eci.hasAnnotation(Response.class)) {
- List<Response> la =
eci.getAnnotationsParentFirst(Response.class);
+ List<Response> la =
eci.getAnnotations(Response.class);
Set<Integer> codes = getCodes(la, 500);
for (Response a : la) {
for (Integer code : codes) {
@@ -460,7 +460,7 @@ final class SwaggerGenerator {
}
if (mi.hasAnnotation(Response.class) ||
mi.getResolvedReturnType().hasAnnotation(Response.class)) {
- List<Response> la =
mi.getAnnotationsParentFirst(Response.class);
+ List<Response> la =
mi.getAnnotations(Response.class);
Set<Integer> codes = getCodes(la, 200);
for (Response a : la) {
for (Integer code : codes) {
@@ -498,7 +498,7 @@ final class SwaggerGenerator {
ParamInfo mpi = mp.getMethodParamInfo();
if (in == RESPONSE_HEADER) {
- List<ResponseHeader> la =
mpi.getAnnotationsParentFirst(ResponseHeader.class);
+ List<ResponseHeader> la =
mpi.getAnnotations(ResponseHeader.class);
Set<Integer> codes = getCodes2(la, 200);
for (ResponseHeader a : la) {
for (Integer code : codes) {
@@ -509,7 +509,7 @@ final class SwaggerGenerator {
}
} else if (in == RESPONSE) {
- List<Response> la =
mpi.getAnnotationsParentFirst(Response.class);
+ List<Response> la =
mpi.getAnnotations(Response.class);
Set<Integer> codes = getCodes(la, 200);
for (Response a : la) {
for (Integer code : codes) {
