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 0a3fbd8 JUNEAU-197
0a3fbd8 is described below
commit 0a3fbd89dae1e3288d2e0e3fbe38160377555cd6
Author: JamesBognar <[email protected]>
AuthorDate: Sun Mar 8 10:47:45 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 +++----
.../apache/juneau/reflection/ClassInfoTest.java | 6 ++---
.../apache/juneau/reflection/MethodInfoTest.java | 10 ++++----
.../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/reflect/ClassInfo.java | 13 ++++------
.../java/org/apache/juneau/reflect/MethodInfo.java | 19 +++++++++++++++
22 files changed, 127 insertions(+), 111 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 f79272a..30ef73a 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 197d1e1..5487d61 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.getAnnotationList(null);
+ AnnotationList al = a2ci.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b2ci.getAnnotationListParentFirst();
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 6466ad0..a276baa 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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
CsvSerializer.create().applyAnnotations(al, null).build();
}
@Test
public void defaultsParser() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
CsvParser.create().applyAnnotations(al, null).build();
}
@@ -50,13 +50,13 @@ public class CsvConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
CsvSerializer.create().applyAnnotations(al, null).build();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 9a14ea8..bbf1767 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
HtmlParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -85,7 +85,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void defaultsSerializer() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
HtmlParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -110,7 +110,7 @@ public class HtmlConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 8fd217b..07b199e 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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(null);
+ AnnotationList al = d1.getAnnotationListParentFirst();
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(null);
+ AnnotationList al = d2.getAnnotationListParentFirst();
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(null);
+ AnnotationList al = d3.getAnnotationListParentFirst();
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(null);
+ AnnotationList al = d4.getAnnotationListParentFirst();
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(null);
+ AnnotationList al = e.getAnnotationListParentFirst();
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(null);
+ AnnotationList al = e.getAnnotationListParentFirst();
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(null).sort();
+ AnnotationList al = f1.getAnnotationListParentFirst().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(null).sort();
+ AnnotationList al = f2.getAnnotationListParentFirst().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(null).sort();
+ AnnotationList al = f3.getAnnotationListParentFirst().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(null).sort();
+ AnnotationList al = f4.getAnnotationListParentFirst().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(null).sort();
+ AnnotationList al = f5.getAnnotationListParentFirst().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 07c07de..59ba680 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 5fccbb9..d238e21 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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
JsoSerializer.create().applyAnnotations(al,
null).build().createSession();
}
@Test
public void defaultsParser() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
JsoParser.create().applyAnnotations(al,
null).build().createSession();
}
@@ -50,13 +50,13 @@ public class JsoConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
JsoSerializer.create().applyAnnotations(al,
null).build().createSession();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 393a47f..abad3fc 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 acc94b8..e364981 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 7408f59..69c4825 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isAddBeanTypes());
}
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
MsgPackParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -73,14 +73,14 @@ public class MsgPackConfigAnnotationTest {
@Test
public void noValuesSerializer() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
MsgPackParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -93,14 +93,14 @@ public class MsgPackConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
MsgPackSerializerSession x =
MsgPackSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isAddBeanTypes());
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 1d9f054..6d7b438 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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
OpenApiSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
OpenApiParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -54,13 +54,13 @@ public class OpenApiConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
OpenApiSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 7f5ae38..ff82f14 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 a06cd03..326471e 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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
PlainTextSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
PlainTextParser.create().applyAnnotations(al,
sr).build().createSession();
}
@@ -54,13 +54,13 @@ public class PlainTextConfigAnnotationTest {
@Test
public void noAnnotationSerializer() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
PlainTextSerializer.create().applyAnnotations(al,
sr).build().createSession();
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
PlainTextParser.create().applyAnnotations(al,
sr).build().createSession();
}
}
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 bf2a8f3..8b3a0fc 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
@@ -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(null));
- check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)",
g4.getAnnotationListParentFirst(null));
- check("@PA(10),@A(3)", g5.getAnnotationListParentFirst(null));
+ 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());
}
@A(1) @AConfig(1) static interface GBI1 {}
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 2c117ed..3fa7c26 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
@@ -277,11 +277,11 @@ public class MethodInfoTest {
@Test
public void getAnnotationsMapParentFirst() {
- check("@PA(10),@A(C1),@A(a1),@A(C2),@A(C3)",
c_a1.getAnnotationListParentFirst(null));
- check("@PA(10),@A(C1),@A(a2a),@A(C2),@A(a2b),@A(C3)",
c_a2.getAnnotationListParentFirst(null));
- check("@PA(10),@A(C1),@A(a3),@A(C2),@A(C3)",
c_a3.getAnnotationListParentFirst(null));
- check("@PA(10),@A(C1),@A(C2),@A(C3),@A(a4)",
c_a4.getAnnotationListParentFirst(null));
- check("@PA(10),@A(C1),@A(C2),@A(C3)",
c_a5.getAnnotationListParentFirst(null));
+ 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());
}
@A("C1") @AConfig("C1")
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 f06e910..b541108 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 596edcb..66bda63 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 a79093d..077857b 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 af1c0bd..b212211 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
UrlEncodingSerializerSession x =
UrlEncodingSerializer.create().applyAnnotations(al, sr).build().createSession();
check("true", x.isExpandedParams());
}
@Test
public void basicParser() throws Exception {
- AnnotationList al = a.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
UrlEncodingSerializerSession x =
UrlEncodingSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isExpandedParams());
}
@Test
public void noValuesParser() throws Exception {
- AnnotationList al = b.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
UrlEncodingSerializerSession x =
UrlEncodingSerializer.create().applyAnnotations(al, sr).build().createSession();
check("false", x.isExpandedParams());
}
@Test
public void noAnnotationParser() throws Exception {
- AnnotationList al = c.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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 faf6d19..9421523 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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = a.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = b.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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.getAnnotationList(null);
+ AnnotationList al = c.getAnnotationListParentFirst();
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/reflect/ClassInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 76d320a..3d1b95f 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
@@ -1064,19 +1064,16 @@ public final class ClassInfo {
* <p>
* Annotations are appended in the following orders:
* <ol>
- * <li>On this class.
- * <li>On parent classes ordered child-to-parent.
- * <li>On interfaces ordered child-to-parent.
* <li>On the package of this class.
+ * <li>On interfaces ordered parent-to-child.
+ * <li>On parent classes ordered parent-to-child.
+ * <li>On this class.
* </ol>
*
- * @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 getAnnotationList(Predicate<AnnotationInfo<?>>
filter) {
- return getAnnotationListParentFirst(filter);
+ public AnnotationList getAnnotationListParentFirst() {
+ return getAnnotationListParentFirst(null);
}
/**
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 3bbbe6e..4460015 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
@@ -322,6 +322,25 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
* <li>On this method and matching methods ordered parent-to-child.
* </ol>
*
+ * @return A new {@link AnnotationList} object on every call.
+ */
+ public AnnotationList getAnnotationListParentFirst() {
+ return getAnnotationListParentFirst(null);
+ }
+
+ /**
+ * Constructs an {@link AnnotationList} of all annotations found on
this method.
+ *
+ * <p>
+ * Annotations are appended in the following orders:
+ * <ol>
+ * <li>On the package of this class.
+ * <li>On interfaces ordered parent-to-child.
+ * <li>On parent classes ordered parent-to-child.
+ * <li>On this class.
+ * <li>On this method and matching methods ordered parent-to-child.
+ * </ol>
+ *
* @param filter
* Optional filter to apply to limit which annotations are added
to the list.
* <br>Can be <jk>null</jk> for no filtering.
