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 8a72434 Clean up builders.
8a72434 is described below
commit 8a72434d080e646a6cdc6bbac30eb6688c445bc4
Author: JamesBognar <[email protected]>
AuthorDate: Sun Aug 8 09:13:16 2021 -0400
Clean up builders.
---
.../apache/juneau/jena/annotation/RdfAnnotation.java | 2 +-
.../juneau/jena/annotation/RdfConfigAnnotation.java | 2 +-
.../{ContextApplier.java => AnnotationApplier.java} | 6 +++---
.../main/java/org/apache/juneau/ContextBuilder.java | 2 +-
.../org/apache/juneau/annotation/BeanAnnotation.java | 2 +-
.../apache/juneau/annotation/BeanConfigAnnotation.java | 2 +-
.../apache/juneau/annotation/BeanIgnoreAnnotation.java | 2 +-
.../org/apache/juneau/annotation/BeancAnnotation.java | 2 +-
.../org/apache/juneau/annotation/BeanpAnnotation.java | 2 +-
.../org/apache/juneau/annotation/ContextApply.java | 2 +-
.../apache/juneau/annotation/ExampleAnnotation.java | 2 +-
.../apache/juneau/annotation/MarshalledAnnotation.java | 2 +-
.../juneau/annotation/NamePropertyAnnotation.java | 2 +-
.../juneau/annotation/ParentPropertyAnnotation.java | 2 +-
.../org/apache/juneau/annotation/SwapAnnotation.java | 2 +-
.../org/apache/juneau/annotation/UriAnnotation.java | 2 +-
.../apache/juneau/csv/annotation/CsvAnnotation.java | 2 +-
.../juneau/csv/annotation/CsvConfigAnnotation.java | 2 +-
.../apache/juneau/html/annotation/HtmlAnnotation.java | 2 +-
.../juneau/html/annotation/HtmlConfigAnnotation.java | 2 +-
.../html/annotation/HtmlDocConfigAnnotation.java | 2 +-
.../juneau/html/annotation/HtmlLinkAnnotation.java | 2 +-
.../apache/juneau/http/annotation/BodyAnnotation.java | 2 +-
.../juneau/http/annotation/FormDataAnnotation.java | 2 +-
.../juneau/http/annotation/HeaderAnnotation.java | 2 +-
.../apache/juneau/http/annotation/PathAnnotation.java | 2 +-
.../apache/juneau/http/annotation/QueryAnnotation.java | 2 +-
.../juneau/http/annotation/RequestAnnotation.java | 2 +-
.../juneau/http/annotation/ResponseAnnotation.java | 2 +-
.../juneau/http/annotation/ResponseBodyAnnotation.java | 2 +-
.../http/annotation/ResponseHeaderAnnotation.java | 2 +-
.../http/annotation/ResponseStatusAnnotation.java | 2 +-
.../apache/juneau/jso/annotation/JsoAnnotation.java | 2 +-
.../juneau/jso/annotation/JsoConfigAnnotation.java | 2 +-
.../apache/juneau/json/annotation/JsonAnnotation.java | 2 +-
.../juneau/json/annotation/JsonConfigAnnotation.java | 2 +-
.../annotation/JsonSchemaConfigAnnotation.java | 2 +-
.../juneau/jsonschema/annotation/SchemaAnnotation.java | 2 +-
.../juneau/msgpack/annotation/MsgPackAnnotation.java | 2 +-
.../msgpack/annotation/MsgPackConfigAnnotation.java | 2 +-
.../juneau/oapi/annotation/OpenApiAnnotation.java | 2 +-
.../oapi/annotation/OpenApiConfigAnnotation.java | 2 +-
.../parser/annotation/ParserConfigAnnotation.java | 2 +-
.../plaintext/annotation/PlainTextAnnotation.java | 2 +-
.../annotation/PlainTextConfigAnnotation.java | 2 +-
.../java/org/apache/juneau/reflect/AnnotationInfo.java | 18 +++++++++---------
.../annotation/SerializerConfigAnnotation.java | 2 +-
.../juneau/soap/annotation/SoapXmlAnnotation.java | 2 +-
.../soap/annotation/SoapXmlConfigAnnotation.java | 2 +-
.../apache/juneau/uon/annotation/UonAnnotation.java | 2 +-
.../juneau/uon/annotation/UonConfigAnnotation.java | 2 +-
.../urlencoding/annotation/UrlEncodingAnnotation.java | 2 +-
.../annotation/UrlEncodingConfigAnnotation.java | 2 +-
.../apache/juneau/xml/annotation/XmlAnnotation.java | 2 +-
.../juneau/xml/annotation/XmlConfigAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestAnnotation.java | 2 +-
.../juneau/rest/annotation/RestDeleteAnnotation.java | 2 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../org/apache/juneau/reflection/ClassInfoTest.java | 2 +-
.../org/apache/juneau/reflection/MethodInfoTest.java | 2 +-
63 files changed, 73 insertions(+), 73 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
index 79f12db..58fa688 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
@@ -228,7 +228,7 @@ public class RdfAnnotation {
/**
* Applies targeted {@link Rdf} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Rdf,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Rdf,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
index 7ebd263..aeea41d 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfigAnnotation.java
@@ -28,7 +28,7 @@ public class RdfConfigAnnotation {
/**
* Applies {@link RdfConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<RdfConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<RdfConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextApplier.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextApplier.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 5433528..8b0e4db 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextApplier.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -30,7 +30,7 @@ import org.apache.juneau.svl.*;
* @param <A> The annotation that this <c>ConfigApply</c> reads from.
* @param <B> The builder class to apply the annotation to.
*/
-public abstract class ContextApplier<A extends Annotation, B> {
+public abstract class AnnotationApplier<A extends Annotation, B> {
private final VarResolverSession vr;
private final Class<A> ca;
@@ -43,7 +43,7 @@ public abstract class ContextApplier<A extends Annotation, B>
{
* @param builderClass The annotation class.
* @param vr The string resolver to use for resolving strings.
*/
- protected ContextApplier(Class<A> annotationClass, Class<B>
builderClass, VarResolverSession vr) {
+ protected AnnotationApplier(Class<A> annotationClass, Class<B>
builderClass, VarResolverSession vr) {
this.vr = vr == null ? VarResolver.DEFAULT.createSession() : vr;
this.ca = annotationClass;
this.cb = builderClass;
@@ -240,7 +240,7 @@ public abstract class ContextApplier<A extends Annotation,
B> {
/**
* Represents a no-op configuration apply.
*/
- public static class NoOp extends ContextApplier<Annotation,Object> {
+ public static class NoOp extends AnnotationApplier<Annotation,Object> {
/**
* Constructor.
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 1216404..0a43592 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
@@ -145,7 +145,7 @@ public abstract class ContextBuilder {
public ContextBuilder applyAnnotations(AnnotationList al,
VarResolverSession vr) {
for (AnnotationInfo<?> ai : al.sort()) {
try {
- for (ContextApplier ca : ai.getApplies(vr))
+ for (AnnotationApplier ca : ai.getApplies(vr))
if (ca.canApply(this))
ca.apply(ai, this);
else if (ca.canApply(cpb))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
index eabcc0e..6181146 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanAnnotation.java
@@ -491,7 +491,7 @@ public class BeanAnnotation {
/**
* Applies targeted {@link Bean} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Bean,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Bean,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
index ce1c8db..6c426f8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
@@ -30,7 +30,7 @@ public class BeanConfigAnnotation {
/**
* Applies {@link BeanConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<BeanConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<BeanConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
index ad780f3..aafefc9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
@@ -152,7 +152,7 @@ public class BeanIgnoreAnnotation {
/**
* Applies targeted {@link BeanIgnore} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<BeanIgnore,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<BeanIgnore,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
index f6cfe12..48d7299 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeancAnnotation.java
@@ -138,7 +138,7 @@ public class BeancAnnotation {
/**
* Applies targeted {@link Beanc} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Beanc,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Beanc,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
index 85510a4..8a4b9c9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanpAnnotation.java
@@ -294,7 +294,7 @@ public class BeanpAnnotation {
/**
* Applies targeted {@link Beanp} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Beanp,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Beanp,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
index 0561ad7..410c0eb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
@@ -32,5 +32,5 @@ public @interface ContextApply {
* Identifies the class used to push values from an annotation into a
property store.
*/
@SuppressWarnings("rawtypes")
- public Class<? extends ContextApplier>[] value();
+ public Class<? extends AnnotationApplier>[] value();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
index 34a263d..5c03ed0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ExampleAnnotation.java
@@ -168,7 +168,7 @@ public class ExampleAnnotation {
/**
* Applies targeted {@link Example} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Example,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Example,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
index d88bd63..8943a12 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledAnnotation.java
@@ -174,7 +174,7 @@ public class MarshalledAnnotation {
/**
* Applies targeted {@link Marshalled} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Marshalled,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Marshalled,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
index 4d71467..5ca5b8d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NamePropertyAnnotation.java
@@ -123,7 +123,7 @@ public class NamePropertyAnnotation {
/**
* Applies targeted {@link NameProperty} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<NameProperty,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<NameProperty,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
index 930d3c7..e87a347 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentPropertyAnnotation.java
@@ -123,7 +123,7 @@ public class ParentPropertyAnnotation {
/**
* Applies targeted {@link ParentProperty} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<ParentProperty,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<ParentProperty,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
index be09581..ca5c289 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
@@ -227,7 +227,7 @@ public class SwapAnnotation {
/**
* Applies targeted {@link Swap} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Swap,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Swap,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
index 793f260..f86cb38 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
@@ -146,7 +146,7 @@ public class UriAnnotation {
/**
* Applies targeted {@link Uri} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Uri,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Uri,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
index 1173c91..1587473 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
@@ -147,7 +147,7 @@ public class CsvAnnotation {
/**
* Applies targeted {@link Csv} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Csv,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Csv,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
index c84bfbc..51cfde7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
@@ -24,7 +24,7 @@ public class CsvConfigAnnotation {
/**
* Applies {@link CsvConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<CsvConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<CsvConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
index acdc7fa..36b6aec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
@@ -267,7 +267,7 @@ public class HtmlAnnotation {
/**
* Applies targeted {@link Html} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Html,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Html,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
index 20c19fa..24136b5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
@@ -26,7 +26,7 @@ public class HtmlConfigAnnotation {
/**
* Applies {@link HtmlConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<HtmlConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<HtmlConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
index 776df95..98c5b3e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
@@ -32,7 +32,7 @@ public class HtmlDocConfigAnnotation {
/**
* Applies {@link HtmlDocConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<HtmlDocConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<HtmlDocConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
index 62df0c7..636a48c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
@@ -174,7 +174,7 @@ public class HtmlLinkAnnotation {
/**
* Applies targeted {@link HtmlLink} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<HtmlLink,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<HtmlLink,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
index 01d4e8d..79281fb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
@@ -359,7 +359,7 @@ public class BodyAnnotation {
/**
* Applies targeted {@link Body} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Body,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Body,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
index 276fee5..73909c0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
@@ -1076,7 +1076,7 @@ public class FormDataAnnotation {
/**
* Applies targeted {@link FormData} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<FormData,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<FormData,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
index 66d5b9b..d9f2aa9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
@@ -1077,7 +1077,7 @@ public class HeaderAnnotation {
/**
* Applies targeted {@link Header} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Header,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Header,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
index f969796..d35e88e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
@@ -987,7 +987,7 @@ public class PathAnnotation {
/**
* Applies targeted {@link Path} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Path,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Path,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
index b6867d0..fb8303a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
@@ -1076,7 +1076,7 @@ public class QueryAnnotation {
/**
* Applies targeted {@link Query} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Query,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Query,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
index 538f8bb..2410e93 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/RequestAnnotation.java
@@ -177,7 +177,7 @@ public class RequestAnnotation {
/**
* Applies targeted {@link Request} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Request,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Request,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
index d9a0593..52ff654 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
@@ -403,7 +403,7 @@ public class ResponseAnnotation {
/**
* Applies targeted {@link Response} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Response,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Response,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
index 85a3558..ce55997 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
@@ -141,7 +141,7 @@ public class ResponseBodyAnnotation {
/**
* Applies targeted {@link ResponseBody} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<ResponseBody,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<ResponseBody,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
index 742fb54..7793701 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
@@ -977,7 +977,7 @@ public class ResponseHeaderAnnotation {
/**
* Applies targeted {@link ResponseHeader} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<ResponseHeader,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<ResponseHeader,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
index af796e3..79ac3a2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatusAnnotation.java
@@ -141,7 +141,7 @@ public class ResponseStatusAnnotation {
/**
* Applies targeted {@link ResponseStatus} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<ResponseStatus,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<ResponseStatus,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
index 6536194..5e0f5a2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
@@ -147,7 +147,7 @@ public class JsoAnnotation {
/**
* Applies targeted {@link Jso} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Jso,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Jso,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
index 8d0779c..508261a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
@@ -24,7 +24,7 @@ public class JsoConfigAnnotation {
/**
* Applies {@link JsoConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<JsoConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<JsoConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
index f279ebf..4157838 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
@@ -169,7 +169,7 @@ public class JsonAnnotation {
/**
* Applies targeted {@link Json} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Json,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Json,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
index 9f65d02..6d234e9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
@@ -27,7 +27,7 @@ public class JsonConfigAnnotation {
/**
* Applies {@link JsonConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<JsonConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<JsonConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
index b420fdf..fe500ea 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
@@ -28,7 +28,7 @@ public class JsonSchemaConfigAnnotation {
/**
* Applies {@link JsonSchemaConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<JsonSchemaConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<JsonSchemaConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
index 951100f..0309252 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
@@ -1280,7 +1280,7 @@ public class SchemaAnnotation {
/**
* Applies targeted {@link Schema} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Schema,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Schema,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
index 262c435..0ab68e4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
@@ -147,7 +147,7 @@ public class MsgPackAnnotation {
/**
* Applies targeted {@link MsgPack} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<MsgPack,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<MsgPack,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
index 70251e5..9dcdc96 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
@@ -26,7 +26,7 @@ public class MsgPackConfigAnnotation {
/**
* Applies {@link MsgPackConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<MsgPackConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<MsgPackConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
index e3bd9d1..e3322d1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
@@ -147,7 +147,7 @@ public class OpenApiAnnotation {
/**
* Applies targeted {@link OpenApi} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<OpenApi,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<OpenApi,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
index 13ec027..6fbd05f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
@@ -26,7 +26,7 @@ public class OpenApiConfigAnnotation {
/**
* Applies {@link OpenApiConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<OpenApiConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<OpenApiConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
index c49ac2c..180f3fc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
@@ -30,7 +30,7 @@ public class ParserConfigAnnotation {
/**
* Applies {@link ParserConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<ParserConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<ParserConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
index 9dd10d8..6c6e4f5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
@@ -147,7 +147,7 @@ public class PlainTextAnnotation {
/**
* Applies targeted {@link PlainText} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<PlainText,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<PlainText,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
index e23e2e3..c00ba93 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
@@ -24,7 +24,7 @@ public class PlainTextConfigAnnotation {
/**
* Applies {@link PlainTextConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<PlainTextConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<PlainTextConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
index e186e1e..39e0b99 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/AnnotationInfo.java
@@ -165,31 +165,31 @@ public class AnnotationInfo<T extends Annotation> {
return om;
}
- private Constructor<? extends ContextApplier<?,?>>[] applyConstructors;
+ private Constructor<? extends AnnotationApplier<?,?>>[]
applyConstructors;
/**
- * If this annotation has a {@link ContextApply} annotation, returns an
instance of the specified {@link ContextApplier} class.
+ * If this annotation has a {@link ContextApply} annotation, returns an
instance of the specified {@link AnnotationApplier} class.
*
- * @param vrs Variable resolver passed to the {@link ContextApplier}
object.
- * @return A new {@link ContextApplier} object. Never <jk>null</jk>.
+ * @param vrs Variable resolver passed to the {@link AnnotationApplier}
object.
+ * @return A new {@link AnnotationApplier} object. Never <jk>null</jk>.
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
@SuppressWarnings("unchecked")
- public ContextApplier<Annotation,Object>[]
getApplies(VarResolverSession vrs) throws ExecutableException {
+ public AnnotationApplier<Annotation,Object>[]
getApplies(VarResolverSession vrs) throws ExecutableException {
try {
if (applyConstructors == null) {
ContextApply cpa =
a.annotationType().getAnnotation(ContextApply.class);
if (cpa == null)
- applyConstructors = new Constructor[]{
ContextApplier.NoOp.class.getConstructor(VarResolverSession.class) };
+ applyConstructors = new Constructor[]{
AnnotationApplier.NoOp.class.getConstructor(VarResolverSession.class) };
else {
applyConstructors = new
Constructor[cpa.value().length];
for (int i = 0; i < cpa.value().length;
i++)
- applyConstructors[i] =
(Constructor<? extends ContextApplier<?,?>>)
cpa.value()[i].getConstructor(VarResolverSession.class);
+ applyConstructors[i] =
(Constructor<? extends AnnotationApplier<?,?>>)
cpa.value()[i].getConstructor(VarResolverSession.class);
}
}
- ContextApplier<Annotation,Object>[] aa = new
ContextApplier[applyConstructors.length];
+ AnnotationApplier<Annotation,Object>[] aa = new
AnnotationApplier[applyConstructors.length];
for (int i = 0; i < aa.length; i++)
- aa[i] = (ContextApplier<Annotation,Object>)
applyConstructors[i].newInstance(vrs);
+ aa[i] = (AnnotationApplier<Annotation,Object>)
applyConstructors[i].newInstance(vrs);
return aa;
} catch (InstantiationException | IllegalAccessException |
IllegalArgumentException | InvocationTargetException | NoSuchMethodException |
SecurityException e) {
throw new ExecutableException(e);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
index ae26e54..0ac317e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
@@ -31,7 +31,7 @@ public class SerializerConfigAnnotation {
/**
* Applies {@link SerializerConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<SerializerConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<SerializerConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
index ead2507..e645b02 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
@@ -147,7 +147,7 @@ public class SoapXmlAnnotation {
/**
* Applies targeted {@link SoapXml} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<SoapXml,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<SoapXml,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
index 9e8c7d4..f2ff30c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
@@ -26,7 +26,7 @@ public class SoapXmlConfigAnnotation {
/**
* Applies {@link SoapXmlConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<SoapXmlConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<SoapXmlConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
index 295d000..49cb53f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
@@ -147,7 +147,7 @@ public class UonAnnotation {
/**
* Applies targeted {@link Uon} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Uon,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Uon,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
index 46e22b0..45cbfb7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
@@ -27,7 +27,7 @@ public class UonConfigAnnotation {
/**
* Applies {@link UonConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<UonConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<UonConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
index 2a6a84e..074c3e3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
@@ -171,7 +171,7 @@ public class UrlEncodingAnnotation {
/**
* Applies targeted {@link UrlEncoding} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<UrlEncoding,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<UrlEncoding,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
index 1f4cda1..a7b4295 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
@@ -25,7 +25,7 @@ public class UrlEncodingConfigAnnotation {
/**
* Applies {@link UrlEncodingConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<UrlEncodingConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<UrlEncodingConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
index 2646495..f3c335f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
@@ -225,7 +225,7 @@ public class XmlAnnotation {
/**
* Applies targeted {@link Xml} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Xml,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Xml,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
index 3371119..543dbee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
@@ -28,7 +28,7 @@ public class XmlConfigAnnotation {
/**
* Applies {@link XmlConfig} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<XmlConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<XmlConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index 754b0ec..285c957 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -1024,7 +1024,7 @@ public class RestAnnotation {
/**
* Applies {@link Rest} annotations to a {@link
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ContextApplier<Rest,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Rest,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index b65315b..e22c496 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -439,7 +439,7 @@ public class RestDeleteAnnotation {
/**
* Applies {@link RestDelete} annotations to a {@link
RestOperationContextBuilder}.
*/
- public static class Apply extends
ContextApplier<RestDelete,RestOperationContextBuilder> {
+ public static class Apply extends
AnnotationApplier<RestDelete,RestOperationContextBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index 3c56711..549745b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -492,7 +492,7 @@ public class RestGetAnnotation {
/**
* Applies {@link RestGet} annotations to a {@link
RestOperationContextBuilder}.
*/
- public static class Apply extends
ContextApplier<RestGet,RestOperationContextBuilder> {
+ public static class Apply extends
AnnotationApplier<RestGet,RestOperationContextBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 6303820..6445b30 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -594,7 +594,7 @@ public class RestOpAnnotation {
/**
* Applies {@link RestOp} annotations to a {@link
RestOperationContextBuilder}.
*/
- public static class Apply extends
ContextApplier<RestOp,RestOperationContextBuilder> {
+ public static class Apply extends
AnnotationApplier<RestOp,RestOperationContextBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 5792137..b496d2c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -577,7 +577,7 @@ public class RestPostAnnotation {
/**
* Applies {@link RestPost} annotations to a {@link
RestOperationContextBuilder}.
*/
- public static class Apply extends
ContextApplier<RestPost,RestOperationContextBuilder> {
+ public static class Apply extends
AnnotationApplier<RestPost,RestOperationContextBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 479116c..c9cbb2f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -577,7 +577,7 @@ public class RestPutAnnotation {
/**
* Applies {@link RestPut} annotations to a {@link
RestOperationContextBuilder}.
*/
- public static class Apply extends
ContextApplier<RestPut,RestOperationContextBuilder> {
+ public static class Apply extends
AnnotationApplier<RestPut,RestOperationContextBuilder> {
/**
* Constructor.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
index c32df62..4bb5b66 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
@@ -63,7 +63,7 @@ public class ClassInfoTest {
int value();
}
- public static class AConfigApply extends
ContextApplier<AConfig,ContextPropertiesBuilder> {
+ public static class AConfigApply extends
AnnotationApplier<AConfig,ContextPropertiesBuilder> {
protected AConfigApply(VarResolverSession vr) {
super(AConfig.class, ContextPropertiesBuilder.class,
vr);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
b/juneau-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
index ca05792..912b2d0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/reflection/MethodInfoTest.java
@@ -58,7 +58,7 @@ public class MethodInfoTest {
String value();
}
- public static class AConfigApply extends
ContextApplier<AConfig,ContextPropertiesBuilder> {
+ public static class AConfigApply extends
AnnotationApplier<AConfig,ContextPropertiesBuilder> {
protected AConfigApply(VarResolverSession vr) {
super(AConfig.class, ContextPropertiesBuilder.class,
vr);
}
