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 070f645 ConfigApply code improvements.
070f645 is described below
commit 070f645ae4ba516c87d1f3e80ce273104b18f52f
Author: JamesBognar <[email protected]>
AuthorDate: Sat Aug 7 14:38:47 2021 -0400
ConfigApply code improvements.
---
.../org/apache/juneau/jena/annotation/Rdf.java | 2 +-
.../juneau/jena/annotation/RdfAnnotation.java | 2 +-
.../apache/juneau/jena/annotation/RdfConfig.java | 2 +-
.../jena/annotation/RdfConfigAnnotation.java | 2 +-
.../{ConfigApply.java => ContextApplier.java} | 8 +++---
.../java/org/apache/juneau/ContextBuilder.java | 10 ++++----
.../apache/juneau/ContextPropertiesBuilder.java | 6 ++---
.../java/org/apache/juneau/annotation/Bean.java | 2 +-
.../apache/juneau/annotation/BeanAnnotation.java | 2 +-
.../org/apache/juneau/annotation/BeanConfig.java | 2 +-
.../juneau/annotation/BeanConfigAnnotation.java | 2 +-
.../org/apache/juneau/annotation/BeanIgnore.java | 2 +-
.../juneau/annotation/BeanIgnoreAnnotation.java | 2 +-
.../java/org/apache/juneau/annotation/Beanc.java | 2 +-
.../apache/juneau/annotation/BeancAnnotation.java | 2 +-
.../java/org/apache/juneau/annotation/Beanp.java | 2 +-
.../apache/juneau/annotation/BeanpAnnotation.java | 2 +-
...ntextPropertiesApply.java => ContextApply.java} | 4 +--
.../java/org/apache/juneau/annotation/Example.java | 2 +-
.../juneau/annotation/ExampleAnnotation.java | 2 +-
.../org/apache/juneau/annotation/Marshalled.java | 2 +-
.../juneau/annotation/MarshalledAnnotation.java | 2 +-
.../org/apache/juneau/annotation/NameProperty.java | 2 +-
.../juneau/annotation/NamePropertyAnnotation.java | 2 +-
.../apache/juneau/annotation/ParentProperty.java | 2 +-
.../annotation/ParentPropertyAnnotation.java | 2 +-
.../java/org/apache/juneau/annotation/Swap.java | 2 +-
.../apache/juneau/annotation/SwapAnnotation.java | 2 +-
.../java/org/apache/juneau/annotation/Uri.java | 2 +-
.../apache/juneau/annotation/UriAnnotation.java | 2 +-
.../java/org/apache/juneau/csv/annotation/Csv.java | 2 +-
.../juneau/csv/annotation/CsvAnnotation.java | 2 +-
.../apache/juneau/csv/annotation/CsvConfig.java | 2 +-
.../juneau/csv/annotation/CsvConfigAnnotation.java | 2 +-
.../org/apache/juneau/html/annotation/Html.java | 2 +-
.../juneau/html/annotation/HtmlAnnotation.java | 2 +-
.../apache/juneau/html/annotation/HtmlConfig.java | 2 +-
.../html/annotation/HtmlConfigAnnotation.java | 2 +-
.../juneau/html/annotation/HtmlDocConfig.java | 2 +-
.../html/annotation/HtmlDocConfigAnnotation.java | 2 +-
.../apache/juneau/html/annotation/HtmlLink.java | 2 +-
.../juneau/html/annotation/HtmlLinkAnnotation.java | 2 +-
.../org/apache/juneau/http/annotation/Body.java | 2 +-
.../juneau/http/annotation/BodyAnnotation.java | 2 +-
.../apache/juneau/http/annotation/FormData.java | 2 +-
.../juneau/http/annotation/FormDataAnnotation.java | 2 +-
.../org/apache/juneau/http/annotation/Header.java | 2 +-
.../juneau/http/annotation/HeaderAnnotation.java | 2 +-
.../org/apache/juneau/http/annotation/Path.java | 2 +-
.../juneau/http/annotation/PathAnnotation.java | 2 +-
.../org/apache/juneau/http/annotation/Query.java | 2 +-
.../juneau/http/annotation/QueryAnnotation.java | 2 +-
.../org/apache/juneau/http/annotation/Request.java | 2 +-
.../juneau/http/annotation/RequestAnnotation.java | 2 +-
.../apache/juneau/http/annotation/Response.java | 2 +-
.../juneau/http/annotation/ResponseAnnotation.java | 2 +-
.../juneau/http/annotation/ResponseBody.java | 2 +-
.../http/annotation/ResponseBodyAnnotation.java | 2 +-
.../juneau/http/annotation/ResponseHeader.java | 2 +-
.../http/annotation/ResponseHeaderAnnotation.java | 2 +-
.../juneau/http/annotation/ResponseStatus.java | 2 +-
.../http/annotation/ResponseStatusAnnotation.java | 2 +-
.../java/org/apache/juneau/jso/annotation/Jso.java | 2 +-
.../juneau/jso/annotation/JsoAnnotation.java | 2 +-
.../apache/juneau/jso/annotation/JsoConfig.java | 2 +-
.../juneau/jso/annotation/JsoConfigAnnotation.java | 2 +-
.../org/apache/juneau/json/annotation/Json.java | 2 +-
.../juneau/json/annotation/JsonAnnotation.java | 2 +-
.../apache/juneau/json/annotation/JsonConfig.java | 2 +-
.../json/annotation/JsonConfigAnnotation.java | 2 +-
.../jsonschema/annotation/JsonSchemaConfig.java | 2 +-
.../annotation/JsonSchemaConfigAnnotation.java | 2 +-
.../juneau/jsonschema/annotation/Schema.java | 2 +-
.../jsonschema/annotation/SchemaAnnotation.java | 2 +-
.../apache/juneau/msgpack/annotation/MsgPack.java | 2 +-
.../msgpack/annotation/MsgPackAnnotation.java | 2 +-
.../juneau/msgpack/annotation/MsgPackConfig.java | 2 +-
.../annotation/MsgPackConfigAnnotation.java | 2 +-
.../org/apache/juneau/oapi/annotation/OpenApi.java | 2 +-
.../juneau/oapi/annotation/OpenApiAnnotation.java | 2 +-
.../juneau/oapi/annotation/OpenApiConfig.java | 2 +-
.../oapi/annotation/OpenApiConfigAnnotation.java | 2 +-
.../juneau/parser/annotation/ParserConfig.java | 2 +-
.../parser/annotation/ParserConfigAnnotation.java | 2 +-
.../juneau/plaintext/annotation/PlainText.java | 2 +-
.../plaintext/annotation/PlainTextAnnotation.java | 2 +-
.../plaintext/annotation/PlainTextConfig.java | 2 +-
.../annotation/PlainTextConfigAnnotation.java | 2 +-
.../org/apache/juneau/reflect/AnnotationInfo.java | 30 ++++++++++++----------
...notationFilter.java => ContextApplyFilter.java} | 8 +++---
.../java/org/apache/juneau/reflect/MethodInfo.java | 8 +++---
.../serializer/annotation/SerializerConfig.java | 2 +-
.../annotation/SerializerConfigAnnotation.java | 2 +-
.../org/apache/juneau/soap/annotation/SoapXml.java | 2 +-
.../juneau/soap/annotation/SoapXmlAnnotation.java | 2 +-
.../juneau/soap/annotation/SoapXmlConfig.java | 2 +-
.../soap/annotation/SoapXmlConfigAnnotation.java | 2 +-
.../java/org/apache/juneau/uon/annotation/Uon.java | 2 +-
.../juneau/uon/annotation/UonAnnotation.java | 2 +-
.../apache/juneau/uon/annotation/UonConfig.java | 2 +-
.../juneau/uon/annotation/UonConfigAnnotation.java | 2 +-
.../juneau/urlencoding/annotation/UrlEncoding.java | 2 +-
.../annotation/UrlEncodingAnnotation.java | 2 +-
.../urlencoding/annotation/UrlEncodingConfig.java | 2 +-
.../annotation/UrlEncodingConfigAnnotation.java | 2 +-
.../java/org/apache/juneau/xml/annotation/Xml.java | 2 +-
.../juneau/xml/annotation/XmlAnnotation.java | 2 +-
.../apache/juneau/xml/annotation/XmlConfig.java | 2 +-
.../juneau/xml/annotation/XmlConfigAnnotation.java | 2 +-
.../org/apache/juneau/rest/RestContextBuilder.java | 2 +-
.../juneau/rest/RestOperationContextBuilder.java | 2 +-
.../org/apache/juneau/rest/annotation/Rest.java | 2 +-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestDelete.java | 2 +-
.../rest/annotation/RestDeleteAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestGet.java | 2 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestOp.java | 2 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestPost.java | 2 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPut.java | 2 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../apache/juneau/reflection/ClassInfoTest.java | 10 ++++----
.../apache/juneau/reflection/MethodInfoTest.java | 14 +++++-----
.../client/RestClient_Config_Context_Test.java | 2 +-
126 files changed, 168 insertions(+), 164 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
index 9ccf42f..356dde8 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/Rdf.java
@@ -42,7 +42,7 @@ import org.apache.juneau.jena.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(RdfAnnotation.Array.class)
-@ContextPropertiesApply(RdfAnnotation.Apply.class)
+@ContextApply(RdfAnnotation.Apply.class)
public @interface Rdf {
/**
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 dcaba9f..79f12db 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
ConfigApply<Rdf,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Rdf,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
index d4e17ab..6fa3f7e 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfConfig.java
@@ -33,7 +33,7 @@ import org.apache.juneau.xml.annotation.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RdfConfigAnnotation.Apply.class)
+@ContextApply(RdfConfigAnnotation.Apply.class)
public @interface RdfConfig {
/**
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 3547918..7ebd263 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
ConfigApply<RdfConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<RdfConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextApplier.java
similarity index 96%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextApplier.java
index c3a2990..b4fd7f6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ConfigApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextApplier.java
@@ -25,12 +25,12 @@ import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
/**
- * Class used to add properties to a {@link ContextProperties} from an
annotation (e.g. {@link BeanConfig}).
+ * Class used to add properties to a context builder from an annotation (e.g.
{@link BeanConfig}).
*
* @param <A> The annotation that this <c>ConfigApply</c> reads from.
* @param <B> The builder class to apply the annotation to.
*/
-public abstract class ConfigApply<A extends Annotation, B> {
+public abstract class ContextApplier<A extends Annotation, B> {
private final VarResolverSession vr;
private final Class<A> ca;
@@ -43,7 +43,7 @@ public abstract class ConfigApply<A extends Annotation, B> {
* @param builderClass The annotation class.
* @param vr The string resolver to use for resolving strings.
*/
- protected ConfigApply(Class<A> annotationClass, Class<B> builderClass,
VarResolverSession vr) {
+ protected ContextApplier(Class<A> annotationClass, Class<B>
builderClass, VarResolverSession vr) {
this.vr = vr == null ? VarResolver.DEFAULT.createSession() : vr;
this.ca = annotationClass;
this.cb = builderClass;
@@ -231,7 +231,7 @@ public abstract class ConfigApply<A extends Annotation, B> {
/**
* Represents a no-op configuration apply.
*/
- public static class NoOp extends ConfigApply<Annotation,Object> {
+ public static class NoOp extends ContextApplier<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 bc4bbf9..12dac4d 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
@@ -128,7 +128,7 @@ public abstract class ContextBuilder {
* .build();
* </p>
*
- * @param al The list of all annotations annotated with {@link
ContextPropertiesApply}.
+ * @param al The list of all annotations annotated with {@link
ContextApply}.
* @param r The string resolver for resolving variables in annotation
values.
* @return This object (for method chaining).
*/
@@ -142,7 +142,7 @@ public abstract class ContextBuilder {
* Applies any of the various <ja>@XConfig</ja> annotations on the
specified class to this context.
*
* <p>
- * Any annotations found that themselves are annotated with {@link
ContextPropertiesApply} will be resolved and
+ * Any annotations found that themselves are annotated with {@link
ContextApply} will be resolved and
* applied as properties to this builder. These annotations include:
* <ul class='javatree'>
* <li class ='ja'>{@link BeanConfig}
@@ -195,7 +195,7 @@ public abstract class ContextBuilder {
@FluentSetter
public ContextBuilder applyAnnotations(Class<?>...fromClasses) {
for (Class<?> c : fromClasses)
-
applyAnnotations(ClassInfo.of(c).getAnnotationList(ConfigAnnotationFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
+
applyAnnotations(ClassInfo.of(c).getAnnotationList(ContextApplyFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
return this;
}
@@ -203,7 +203,7 @@ public abstract class ContextBuilder {
* Applies any of the various <ja>@XConfig</ja> annotations on the
specified method to this context.
*
* <p>
- * Any annotations found that themselves are annotated with {@link
ContextPropertiesApply} will be resolved and
+ * Any annotations found that themselves are annotated with {@link
ContextApply} will be resolved and
* applied as properties to this builder. These annotations include:
* <ul class='javatree'>
* <li class ='ja'>{@link BeanConfig}
@@ -259,7 +259,7 @@ public abstract class ContextBuilder {
@FluentSetter
public ContextBuilder applyAnnotations(Method...fromMethods) {
for (Method m : fromMethods)
-
applyAnnotations(MethodInfo.of(m).getAnnotationList(ConfigAnnotationFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
+
applyAnnotations(MethodInfo.of(m).getAnnotationList(ContextApplyFilter.INSTANCE),
VarResolver.DEFAULT.createSession());
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextPropertiesBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextPropertiesBuilder.java
index e55246c..705d7ce 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextPropertiesBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextPropertiesBuilder.java
@@ -115,9 +115,9 @@ public class ContextPropertiesBuilder {
vr = vr == null ? VarResolver.DEFAULT.createSession() : vr;
for (AnnotationInfo<?> ai : al.sort()) {
try {
- ConfigApply ca = ai.getConfigApply(vr);
- if (ca.canApply(this))
- ca.apply(ai, this);
+ for (ContextApplier ca : ai.getApplies(vr))
+ if (ca.canApply(this))
+ ca.apply(ai, this);
} catch (ConfigException ex) {
throw ex;
} catch (Exception ex) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
index 9d88ad1..80d44db 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Bean.java
@@ -42,7 +42,7 @@ import org.apache.juneau.transform.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BeanAnnotation.Array.class)
-@ContextPropertiesApply(BeanAnnotation.Apply.class)
+@ContextApply(BeanAnnotation.Apply.class)
public @interface Bean {
/**
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 378288e..eabcc0e 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
ConfigApply<Bean,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Bean,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
index b0164f4..bcb1a04 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java
@@ -36,7 +36,7 @@ import org.apache.juneau.transform.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(BeanConfigAnnotation.Apply.class)
+@ContextApply(BeanConfigAnnotation.Apply.class)
public @interface BeanConfig {
/**
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 2cc2479..ce1c8db 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
ConfigApply<BeanConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<BeanConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
index cae4033..235ad6b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnore.java
@@ -40,7 +40,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BeanIgnoreAnnotation.Array.class)
-@ContextPropertiesApply(BeanIgnoreAnnotation.Apply.class)
+@ContextApply(BeanIgnoreAnnotation.Apply.class)
public @interface BeanIgnore {
/**
* Dynamically apply this annotation to the specified
classes/methods/fields/constructors.
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 d9da5c3..ad780f3 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
ConfigApply<BeanIgnore,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<BeanIgnore,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
index 4f83b5b..b0e2db0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
@@ -58,7 +58,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BeancAnnotation.Array.class)
-@ContextPropertiesApply(BeancAnnotation.Apply.class)
+@ContextApply(BeancAnnotation.Apply.class)
public @interface Beanc {
/**
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 2180176..f6cfe12 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
ConfigApply<Beanc,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Beanc,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
index 402cabb..f0c38a3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanp.java
@@ -42,7 +42,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BeanpAnnotation.Array.class)
-@ContextPropertiesApply(BeanpAnnotation.Apply.class)
+@ContextApply(BeanpAnnotation.Apply.class)
public @interface Beanp {
/**
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 b4bc7df..85510a4 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
ConfigApply<Beanp,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Beanp,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextPropertiesApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
similarity index 95%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextPropertiesApply.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
index 62afcad..0561ad7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextPropertiesApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextApply.java
@@ -26,11 +26,11 @@ import org.apache.juneau.*;
@Target({ANNOTATION_TYPE})
@Retention(RUNTIME)
@Inherited
-public @interface ContextPropertiesApply {
+public @interface ContextApply {
/**
* Identifies the class used to push values from an annotation into a
property store.
*/
@SuppressWarnings("rawtypes")
- public Class<? extends ConfigApply> value();
+ public Class<? extends ContextApplier>[] value();
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
index e116d95..7af9027 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Example.java
@@ -63,7 +63,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(ExampleAnnotation.Array.class)
-@ContextPropertiesApply(ExampleAnnotation.Apply.class)
+@ContextApply(ExampleAnnotation.Apply.class)
public @interface Example {
/**
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 1788609..34a263d 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
ConfigApply<Example,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Example,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
index 77cf7a7..6352149 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java
@@ -38,7 +38,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(MarshalledAnnotation.Array.class)
-@ContextPropertiesApply(MarshalledAnnotation.Apply.class)
+@ContextApply(MarshalledAnnotation.Apply.class)
public @interface Marshalled {
/**
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 fc529cf..d88bd63 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
ConfigApply<Marshalled,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Marshalled,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
index bc23404..2889965 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/NameProperty.java
@@ -42,7 +42,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(NamePropertyAnnotation.Array.class)
-@ContextPropertiesApply(NamePropertyAnnotation.Apply.class)
+@ContextApply(NamePropertyAnnotation.Apply.class)
public @interface NameProperty {
/**
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 34b89ed..4d71467 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
ConfigApply<NameProperty,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<NameProperty,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
index 30729b2..a99df26 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ParentProperty.java
@@ -45,7 +45,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(ParentPropertyAnnotation.Array.class)
-@ContextPropertiesApply(ParentPropertyAnnotation.Apply.class)
+@ContextApply(ParentPropertyAnnotation.Apply.class)
public @interface ParentProperty {
/**
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 572cd8c..930d3c7 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
ConfigApply<ParentProperty,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<ParentProperty,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
index 40168de..7d36af5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Swap.java
@@ -40,7 +40,7 @@ import org.apache.juneau.transform.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(SwapAnnotation.Array.class)
-@ContextPropertiesApply(SwapAnnotation.Apply.class)
+@ContextApply(SwapAnnotation.Apply.class)
public @interface Swap {
/**
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 659acfa..be09581 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
ConfigApply<Swap,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Swap,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
index 91d4b42..0c6bde0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Uri.java
@@ -42,7 +42,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(UriAnnotation.Array.class)
-@ContextPropertiesApply(UriAnnotation.Apply.class)
+@ContextApply(UriAnnotation.Apply.class)
public @interface Uri {
/**
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 274ca79..793f260 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
ConfigApply<Uri,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Uri,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
index 30efbb3..f1e3285 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/Csv.java
@@ -39,7 +39,7 @@ import org.apache.juneau.csv.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(CsvAnnotation.Array.class)
-@ContextPropertiesApply(CsvAnnotation.Apply.class)
+@ContextApply(CsvAnnotation.Apply.class)
public @interface Csv {
/**
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 50f5213..1173c91 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
ConfigApply<Csv,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Csv,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
index c1b2392..1a3d441 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.csv.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(CsvConfigAnnotation.Apply.class)
+@ContextApply(CsvConfigAnnotation.Apply.class)
public @interface CsvConfig {
/**
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 f84aa29..c84bfbc 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
ConfigApply<CsvConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<CsvConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
index efafda7..379149c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/Html.java
@@ -40,7 +40,7 @@ import org.apache.juneau.html.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(HtmlAnnotation.Array.class)
-@ContextPropertiesApply(HtmlAnnotation.Apply.class)
+@ContextApply(HtmlAnnotation.Apply.class)
public @interface Html {
/**
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 b644037..acdc7fa 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
ConfigApply<Html,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Html,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
index 4e84fdd..e9ab19c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfig.java
@@ -31,7 +31,7 @@ import org.apache.juneau.serializer.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(HtmlConfigAnnotation.Apply.class)
+@ContextApply(HtmlConfigAnnotation.Apply.class)
public @interface HtmlConfig {
/**
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 34b299d..20c19fa 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
ConfigApply<HtmlConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<HtmlConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
index 9b80519..779f139 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfig.java
@@ -32,7 +32,7 @@ import org.apache.juneau.svl.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(HtmlDocConfigAnnotation.Apply.class)
+@ContextApply(HtmlDocConfigAnnotation.Apply.class)
public @interface HtmlDocConfig {
/**
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 f38b659..776df95 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
ConfigApply<HtmlDocConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<HtmlDocConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
index 3445b5c..cd39461 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLink.java
@@ -46,7 +46,7 @@ import org.apache.juneau.html.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(HtmlLinkAnnotation.Array.class)
-@ContextPropertiesApply(HtmlLinkAnnotation.Apply.class)
+@ContextApply(HtmlLinkAnnotation.Apply.class)
public @interface HtmlLink {
/**
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 df9924e..62df0c7 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
ConfigApply<HtmlLink,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<HtmlLink,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index 41c3a2b..04862bd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -133,7 +133,7 @@ import org.apache.juneau.jsonschema.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BodyAnnotation.Array.class)
-@ContextPropertiesApply(BodyAnnotation.Apply.class)
+@ContextApply(BodyAnnotation.Apply.class)
public @interface Body {
/**
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 1966081..01d4e8d 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
ConfigApply<Body,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Body,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 697427e..a5e4f60 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -115,7 +115,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(FormDataAnnotation.Array.class)
-@ContextPropertiesApply(FormDataAnnotation.Apply.class)
+@ContextApply(FormDataAnnotation.Apply.class)
public @interface FormData {
/**
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 dcdad4a..276fee5 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
ConfigApply<FormData,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<FormData,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index 5a793d5..7f809df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -88,7 +88,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(HeaderAnnotation.Array.class)
-@ContextPropertiesApply(HeaderAnnotation.Apply.class)
+@ContextApply(HeaderAnnotation.Apply.class)
public @interface Header {
/**
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 1fae5f4..66d5b9b 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
ConfigApply<Header,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Header,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 654d369..4895225 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -85,7 +85,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(PathAnnotation.Array.class)
-@ContextPropertiesApply(PathAnnotation.Apply.class)
+@ContextApply(PathAnnotation.Apply.class)
public @interface Path {
/**
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 18d945e..f969796 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
ConfigApply<Path,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Path,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index 99e0d71..5bfaea2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -96,7 +96,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(QueryAnnotation.Array.class)
-@ContextPropertiesApply(QueryAnnotation.Apply.class)
+@ContextApply(QueryAnnotation.Apply.class)
public @interface Query {
/**
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 19b935d..b6867d0 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
ConfigApply<Query,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Query,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
index e4684ba..b95ce3d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Request.java
@@ -141,7 +141,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(RequestAnnotation.Array.class)
-@ContextPropertiesApply(RequestAnnotation.Apply.class)
+@ContextApply(RequestAnnotation.Apply.class)
public @interface Request {
/**
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 8696c9a..538f8bb 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
ConfigApply<Request,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Request,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
index e622a70..e9197d8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
@@ -53,7 +53,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(ResponseAnnotation.Array.class)
-@ContextPropertiesApply(ResponseAnnotation.Apply.class)
+@ContextApply(ResponseAnnotation.Apply.class)
public @interface Response {
/**
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 f188c2f..d9a0593 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
ConfigApply<Response,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Response,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBody.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBody.java
index d57e8cb..32613fd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBody.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBody.java
@@ -92,7 +92,7 @@ import org.apache.juneau.annotation.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(ResponseBodyAnnotation.Array.class)
-@ContextPropertiesApply(ResponseBodyAnnotation.Apply.class)
+@ContextApply(ResponseBodyAnnotation.Apply.class)
public @interface ResponseBody {
/**
* Dynamically apply this annotation to the specified classes.
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 e60a5e0..85a3558 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
ConfigApply<ResponseBody,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<ResponseBody,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
index 1ce7d1c..9602e23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
@@ -131,7 +131,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(ResponseHeaderAnnotation.Array.class)
-@ContextPropertiesApply(ResponseHeaderAnnotation.Apply.class)
+@ContextApply(ResponseHeaderAnnotation.Apply.class)
public @interface ResponseHeader {
/**
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 c344112..742fb54 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
ConfigApply<ResponseHeader,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<ResponseHeader,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatus.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatus.java
index 89fbfc2..742b57c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatus.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseStatus.java
@@ -102,7 +102,7 @@ import org.apache.juneau.annotation.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(ResponseStatusAnnotation.Array.class)
-@ContextPropertiesApply(ResponseStatusAnnotation.Apply.class)
+@ContextApply(ResponseStatusAnnotation.Apply.class)
public @interface ResponseStatus {
/**
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 b6697c9..af796e3 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
ConfigApply<ResponseStatus,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<ResponseStatus,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/Jso.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/Jso.java
index 132935c..cc65764 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/Jso.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/Jso.java
@@ -39,7 +39,7 @@ import org.apache.juneau.jso.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(JsoAnnotation.Array.class)
-@ContextPropertiesApply(JsoAnnotation.Apply.class)
+@ContextApply(JsoAnnotation.Apply.class)
public @interface Jso {
/**
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 3e5b938..6536194 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
ConfigApply<Jso,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Jso,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfig.java
index 6e72c7c..aa2343d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.jso.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(JsoConfigAnnotation.Apply.class)
+@ContextApply(JsoConfigAnnotation.Apply.class)
public @interface JsoConfig {
/**
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 b9ae609..8d0779c 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
ConfigApply<JsoConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<JsoConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
index d612c71..10017f0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/Json.java
@@ -42,7 +42,7 @@ import org.apache.juneau.annotation.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(JsonAnnotation.Array.class)
-@ContextPropertiesApply(JsonAnnotation.Apply.class)
+@ContextApply(JsonAnnotation.Apply.class)
public @interface Json {
/**
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 c8307d0..f279ebf 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
ConfigApply<Json,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Json,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
index 901640a..f1f3f1a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfig.java
@@ -31,7 +31,7 @@ import org.apache.juneau.serializer.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(JsonConfigAnnotation.Apply.class)
+@ContextApply(JsonConfigAnnotation.Apply.class)
public @interface JsonConfig {
/**
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 966210e..9f65d02 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
ConfigApply<JsonConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<JsonConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
index 50fa7df..b6358c9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java
@@ -33,7 +33,7 @@ import org.apache.juneau.parser.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(JsonSchemaConfigAnnotation.Apply.class)
+@ContextApply(JsonSchemaConfigAnnotation.Apply.class)
public @interface JsonSchemaConfig {
/**
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 0b57279..b420fdf 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
ConfigApply<JsonSchemaConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<JsonSchemaConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
index e79125d..ffc8163 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/Schema.java
@@ -78,7 +78,7 @@ import org.apache.juneau.oapi.*;
@Documented
@Retention(RUNTIME)
@Repeatable(SchemaAnnotation.Array.class)
-@ContextPropertiesApply(SchemaAnnotation.Apply.class)
+@ContextApply(SchemaAnnotation.Apply.class)
public @interface Schema {
/**
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 6f95594..951100f 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
ConfigApply<Schema,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Schema,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
index 21ca3d5..3e77b1a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPack.java
@@ -39,7 +39,7 @@ import org.apache.juneau.msgpack.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(MsgPackAnnotation.Array.class)
-@ContextPropertiesApply(MsgPackAnnotation.Apply.class)
+@ContextApply(MsgPackAnnotation.Apply.class)
public @interface MsgPack {
/**
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 080b328..262c435 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
ConfigApply<MsgPack,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<MsgPack,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
index 0ec7367..a92f3ff 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java
@@ -31,7 +31,7 @@ import org.apache.juneau.serializer.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(MsgPackConfigAnnotation.Apply.class)
+@ContextApply(MsgPackConfigAnnotation.Apply.class)
public @interface MsgPackConfig {
/**
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 806deb0..70251e5 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
ConfigApply<MsgPackConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<MsgPackConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
index 42eda07..7371f50 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java
@@ -39,7 +39,7 @@ import org.apache.juneau.oapi.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(OpenApiAnnotation.Array.class)
-@ContextPropertiesApply(OpenApiAnnotation.Apply.class)
+@ContextApply(OpenApiAnnotation.Apply.class)
public @interface OpenApi {
/**
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 fe92fbf..e3bd9d1 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
ConfigApply<OpenApi,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<OpenApi,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
index 5d8671f..148168f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfig.java
@@ -31,7 +31,7 @@ import org.apache.juneau.oapi.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(OpenApiConfigAnnotation.Apply.class)
+@ContextApply(OpenApiConfigAnnotation.Apply.class)
public @interface OpenApiConfig {
/**
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 d0f394b..13ec027 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
ConfigApply<OpenApiConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<OpenApiConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
index 5182eb5..5847cb7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfig.java
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(ParserConfigAnnotation.Apply.class)
+@ContextApply(ParserConfigAnnotation.Apply.class)
public @interface ParserConfig {
/**
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 d473414..c49ac2c 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
ConfigApply<ParserConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<ParserConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
index 2e390ad..9fd474a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainText.java
@@ -39,7 +39,7 @@ import org.apache.juneau.plaintext.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(PlainTextAnnotation.Array.class)
-@ContextPropertiesApply(PlainTextAnnotation.Apply.class)
+@ContextApply(PlainTextAnnotation.Apply.class)
public @interface PlainText {
/**
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 9330269..9dd10d8 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
ConfigApply<PlainText,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<PlainText,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
index e76a0c5..052641c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.plaintext.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(PlainTextConfigAnnotation.Apply.class)
+@ContextApply(PlainTextConfigAnnotation.Apply.class)
public @interface PlainTextConfig {
/**
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 7fb899a..e23e2e3 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
ConfigApply<PlainTextConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<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 7be2e29..e186e1e 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,28 +165,32 @@ public class AnnotationInfo<T extends Annotation> {
return om;
}
- private Constructor<? extends ConfigApply<?,?>> configApplyConstructor;
+ private Constructor<? extends ContextApplier<?,?>>[] applyConstructors;
/**
- * If this annotation has a {@link ContextPropertiesApply} annotation,
returns an instance of the specified {@link ConfigApply} class.
+ * If this annotation has a {@link ContextApply} annotation, returns an
instance of the specified {@link ContextApplier} class.
*
- * @param vrs Variable resolver passed to the {@link ConfigApply}
object.
- * @return A new {@link ConfigApply} object. Never <jk>null</jk>.
+ * @param vrs Variable resolver passed to the {@link ContextApplier}
object.
+ * @return A new {@link ContextApplier} object. Never <jk>null</jk>.
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
@SuppressWarnings("unchecked")
- public ConfigApply<Annotation,Object> getConfigApply(VarResolverSession
vrs) throws ExecutableException {
+ public ContextApplier<Annotation,Object>[]
getApplies(VarResolverSession vrs) throws ExecutableException {
try {
- if (configApplyConstructor == null) {
- ContextPropertiesApply cpa =
a.annotationType().getAnnotation(ContextPropertiesApply.class);
+ if (applyConstructors == null) {
+ ContextApply cpa =
a.annotationType().getAnnotation(ContextApply.class);
if (cpa == null)
- configApplyConstructor =
ConfigApply.NoOp.class.getConstructor(VarResolverSession.class);
- else
- configApplyConstructor = (Constructor<?
extends ConfigApply<?,?>>)cpa.value().getConstructor(VarResolverSession.class);
- if (configApplyConstructor == null)
- throw new NoSuchFieldError("Could not
find ConfigApply constructor for annotation:\n" + toString());
+ applyConstructors = new Constructor[]{
ContextApplier.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);
+ }
}
- return (ConfigApply<Annotation,Object>)
configApplyConstructor.newInstance(vrs);
+ ContextApplier<Annotation,Object>[] aa = new
ContextApplier[applyConstructors.length];
+ for (int i = 0; i < aa.length; i++)
+ aa[i] = (ContextApplier<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/reflect/ConfigAnnotationFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ContextApplyFilter.java
similarity index 87%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConfigAnnotationFilter.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ContextApplyFilter.java
index 77e461c..b311b08 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConfigAnnotationFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ContextApplyFilter.java
@@ -18,17 +18,17 @@ import java.util.function.*;
import org.apache.juneau.annotation.*;
/**
- * Filter used to accept only annotations that themselves have the {@link
ContextPropertiesApply} annotation.
+ * Filter used to accept only annotations that themselves have the {@link
ContextApply} annotation.
*/
-public class ConfigAnnotationFilter implements Predicate<AnnotationInfo<?>> {
+public class ContextApplyFilter implements Predicate<AnnotationInfo<?>> {
/**
* Reusable instance.
*/
- public static final ConfigAnnotationFilter INSTANCE = new
ConfigAnnotationFilter();
+ public static final ContextApplyFilter INSTANCE = new
ContextApplyFilter();
@Override
public boolean test(AnnotationInfo<? extends Annotation> t) {
- return t.hasAnnotation(ContextPropertiesApply.class);
+ return t.hasAnnotation(ContextApply.class);
}
}
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 59c7d82..dc6eb84 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
@@ -336,14 +336,14 @@ public final class MethodInfo extends ExecutableInfo
implements Comparable<Metho
}
/**
- * Returns <jk>true</jk> if this method or parent methods have any
annotations annotated with {@link ContextPropertiesApply}.
+ * Returns <jk>true</jk> if this method or parent methods have any
annotations annotated with {@link ContextApply}.
*
- * @return <jk>true</jk> if this method or parent methods have any
annotations annotated with {@link ContextPropertiesApply}.
+ * @return <jk>true</jk> if this method or parent methods have any
annotations annotated with {@link ContextApply}.
*/
- public boolean hasConfigAnnotations() {
+ public boolean hasApplyAnnotations() {
for (Method m2 : getMatching())
for (Annotation a2 : m2.getAnnotations())
- if
(a2.annotationType().getAnnotation(ContextPropertiesApply.class) != null)
+ if
(a2.annotationType().getAnnotation(ContextApply.class) != null)
return true;
return false;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
index e9890e20..1322ef5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfig.java
@@ -32,7 +32,7 @@ import org.apache.juneau.serializer.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(SerializerConfigAnnotation.Apply.class)
+@ContextApply(SerializerConfigAnnotation.Apply.class)
public @interface SerializerConfig {
/**
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 4342bca..ae26e54 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
ConfigApply<SerializerConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<SerializerConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
index 0e0bf43..c5fbf7e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXml.java
@@ -39,7 +39,7 @@ import org.apache.juneau.soap.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(SoapXmlAnnotation.Array.class)
-@ContextPropertiesApply(SoapXmlAnnotation.Apply.class)
+@ContextApply(SoapXmlAnnotation.Apply.class)
public @interface SoapXml {
/**
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 d1ea46c..ead2507 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
ConfigApply<SoapXml,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<SoapXml,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
index 3da9e36..879bb10 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.soap.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(SoapXmlConfigAnnotation.Apply.class)
+@ContextApply(SoapXmlConfigAnnotation.Apply.class)
public @interface SoapXmlConfig {
/**
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 62c4d81..9e8c7d4 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
ConfigApply<SoapXmlConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<SoapXmlConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
index fbc3358..53a463b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/Uon.java
@@ -39,7 +39,7 @@ import org.apache.juneau.uon.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(UonAnnotation.Array.class)
-@ContextPropertiesApply(UonAnnotation.Apply.class)
+@ContextApply(UonAnnotation.Apply.class)
public @interface Uon {
/**
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 ebf323f..295d000 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
ConfigApply<Uon,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Uon,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
index 6249859..38db5ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfig.java
@@ -32,7 +32,7 @@ import org.apache.juneau.urlencoding.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(UonConfigAnnotation.Apply.class)
+@ContextApply(UonConfigAnnotation.Apply.class)
public @interface UonConfig {
/**
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 0c5b4c2..46e22b0 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
ConfigApply<UonConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<UonConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
index df53e4a..778bae8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncoding.java
@@ -37,7 +37,7 @@ import org.apache.juneau.urlencoding.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(UrlEncodingAnnotation.Array.class)
-@ContextPropertiesApply(UrlEncodingAnnotation.Apply.class)
+@ContextApply(UrlEncodingAnnotation.Apply.class)
public @interface UrlEncoding {
/**
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 0eb4ad8..2a6a84e 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
ConfigApply<UrlEncoding,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<UrlEncoding,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
index 1128adb..107c038 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfig.java
@@ -30,7 +30,7 @@ import org.apache.juneau.urlencoding.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(UrlEncodingConfigAnnotation.Apply.class)
+@ContextApply(UrlEncodingConfigAnnotation.Apply.class)
public @interface UrlEncodingConfig {
/**
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 e7ce9c0..1f4cda1 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
ConfigApply<UrlEncodingConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<UrlEncodingConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/Xml.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/Xml.java
index 4aaf6bd..36d944a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/Xml.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/Xml.java
@@ -43,7 +43,7 @@ import org.apache.juneau.annotation.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(XmlAnnotation.Array.class)
-@ContextPropertiesApply(XmlAnnotation.Apply.class)
+@ContextApply(XmlAnnotation.Apply.class)
public @interface Xml {
/**
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 575c53d..2646495 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
ConfigApply<Xml,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Xml,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
index 4f98b1d..8a05546 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java
@@ -35,7 +35,7 @@ import org.apache.juneau.xml.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(XmlConfigAnnotation.Apply.class)
+@ContextApply(XmlConfigAnnotation.Apply.class)
public @interface XmlConfig {
/**
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 7e39308..3371119 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
ConfigApply<XmlConfig,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<XmlConfig,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index e75fcdb..edeb1e4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -181,7 +181,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
}
}
-
applyAnnotations(rci.getAnnotationList(ConfigAnnotationFilter.INSTANCE),
vr.createSession());
+
applyAnnotations(rci.getAnnotationList(ContextApplyFilter.INSTANCE),
vr.createSession());
} catch (Exception e) {
throw new ServletException(e);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
index af5741c..91685ef 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
@@ -81,7 +81,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
VarResolver vr = context.getVarResolver();
VarResolverSession vrs = vr.createSession();
-
applyAnnotations(mi.getAnnotationList(ConfigAnnotationFilter.INSTANCE), vrs);
+
applyAnnotations(mi.getAnnotationList(ContextApplyFilter.INSTANCE), vrs);
} catch (Exception e) {
throw toHttpException(e, InternalServerError.class);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index 58aac16..c0b6f00 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -43,7 +43,7 @@ import org.apache.juneau.rest.vars.*;
@Target(TYPE)
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RestAnnotation.Apply.class)
+@ContextApply(RestAnnotation.Apply.class)
public @interface Rest {
/**
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 3afca38..754b0ec 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
ConfigApply<Rest,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<Rest,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
index e9456ca..01ec71c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RestDeleteAnnotation.Apply.class)
+@ContextApply(RestDeleteAnnotation.Apply.class)
@AnnotationGroup(RestOp.class)
public @interface RestDelete {
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 63825ca..0d87cd9 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
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ConfigApply<RestDelete,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<RestDelete,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
index 27081ab..0d66bb5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RestGetAnnotation.Apply.class)
+@ContextApply(RestGetAnnotation.Apply.class)
@AnnotationGroup(RestOp.class)
public @interface RestGet {
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 502d7a4..1c8e11d 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
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ConfigApply<RestGet,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<RestGet,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
index 480371d..363b0ef 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
@@ -33,7 +33,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RestOpAnnotation.Apply.class)
+@ContextApply(RestOpAnnotation.Apply.class)
@AnnotationGroup(RestOp.class)
public @interface RestOp {
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 61d927a..8f9684b 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
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ConfigApply<RestOp,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<RestOp,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
index 82cf7e1..cef6f75 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RestPostAnnotation.Apply.class)
+@ContextApply(RestPostAnnotation.Apply.class)
@AnnotationGroup(RestOp.class)
public @interface RestPost {
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 8d107ff..39cfb64 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
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ConfigApply<RestPost,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<RestPost,ContextPropertiesBuilder> {
/**
* Constructor.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
index 440af57..0af4b49 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextPropertiesApply(RestPutAnnotation.Apply.class)
+@ContextApply(RestPutAnnotation.Apply.class)
@AnnotationGroup(RestOp.class)
public @interface RestPut {
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 a13e720..a10b6d6 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
ContextPropertiesBuilder}.
*/
- public static class Apply extends
ConfigApply<RestPut,ContextPropertiesBuilder> {
+ public static class Apply extends
ContextApplier<RestPut,ContextPropertiesBuilder> {
/**
* 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 906ed8a..c32df62 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
@@ -58,12 +58,12 @@ public class ClassInfoTest {
@Target(TYPE)
@Retention(RUNTIME)
@Inherited
- @ContextPropertiesApply(AConfigApply.class)
+ @ContextApply(AConfigApply.class)
static @interface AConfig {
int value();
}
- public static class AConfigApply extends
ConfigApply<AConfig,ContextPropertiesBuilder> {
+ public static class AConfigApply extends
ContextApplier<AConfig,ContextPropertiesBuilder> {
protected AConfigApply(VarResolverSession vr) {
super(AConfig.class, ContextPropertiesBuilder.class,
vr);
}
@@ -968,9 +968,9 @@ public class ClassInfoTest {
@Test
public void getConfigAnnotationsMapParentFirst() {
-
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb3.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
-
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb4.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(3)",
gb5.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb3.getAnnotationList(ContextApplyFilter.INSTANCE));
+
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
gb4.getAnnotationList(ContextApplyFilter.INSTANCE));
+ check("@AConfig(3)",
gb5.getAnnotationList(ContextApplyFilter.INSTANCE));
}
//-----------------------------------------------------------------------------------------------------------------
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 ef14bb4..ca05792 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
@@ -53,12 +53,12 @@ public class MethodInfoTest {
@Target({METHOD,TYPE})
@Retention(RUNTIME)
@Inherited
- @ContextPropertiesApply(AConfigApply.class)
+ @ContextApply(AConfigApply.class)
public static @interface AConfig {
String value();
}
- public static class AConfigApply extends
ConfigApply<AConfig,ContextPropertiesBuilder> {
+ public static class AConfigApply extends
ContextApplier<AConfig,ContextPropertiesBuilder> {
protected AConfigApply(VarResolverSession vr) {
super(AConfig.class, ContextPropertiesBuilder.class,
vr);
}
@@ -295,11 +295,11 @@ public class MethodInfoTest {
@Test
public void getConfigAnnotationsMapParentFirst() {
- check("@AConfig(C1),@AConfig(a1),@AConfig(C2),@AConfig(C3)",
cb_a1.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
-
check("@AConfig(C1),@AConfig(a2a),@AConfig(C2),@AConfig(a2b),@AConfig(C3)",
cb_a2.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(C1),@AConfig(a3),@AConfig(C2),@AConfig(C3)",
cb_a3.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(C1),@AConfig(C2),@AConfig(C3),@AConfig(a4)",
cb_a4.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
- check("@AConfig(C1),@AConfig(C2),@AConfig(C3)",
cb_a5.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(a1),@AConfig(C2),@AConfig(C3)",
cb_a1.getAnnotationList(ContextApplyFilter.INSTANCE));
+
check("@AConfig(C1),@AConfig(a2a),@AConfig(C2),@AConfig(a2b),@AConfig(C3)",
cb_a2.getAnnotationList(ContextApplyFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(a3),@AConfig(C2),@AConfig(C3)",
cb_a3.getAnnotationList(ContextApplyFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(C2),@AConfig(C3),@AConfig(a4)",
cb_a4.getAnnotationList(ContextApplyFilter.INSTANCE));
+ check("@AConfig(C1),@AConfig(C2),@AConfig(C3)",
cb_a5.getAnnotationList(ContextApplyFilter.INSTANCE));
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
index a02644c..ca82003 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java
@@ -144,7 +144,7 @@ public class RestClient_Config_Context_Test {
client().applyAnnotations(A6b.class).build().post("/echoBody",A6a.get()).run().cacheBody().assertBody().is("{bar:2,baz:3,foo:1}").getBody().asType(A6a.class);
client().applyAnnotations(A6c.class).build().post("/echoBody",A6a.get()).run().cacheBody().assertBody().is("{bar:2,baz:3,foo:1}").getBody().asType(A6a.class);
client().applyAnnotations(A6d.class.getMethod("foo")).build().post("/echoBody",A6a.get()).run().cacheBody().assertBody().is("{bar:2,baz:3,foo:1}").getBody().asType(A6a.class);
- AnnotationList al =
ClassInfo.of(A6c.class).getAnnotationList(ConfigAnnotationFilter.INSTANCE);
+ AnnotationList al =
ClassInfo.of(A6c.class).getAnnotationList(ContextApplyFilter.INSTANCE);
VarResolverSession vr = VarResolver.DEFAULT.createSession();
client().applyAnnotations(al,vr).build().post("/echoBody",A6a.get()).run().cacheBody().assertBody().is("{bar:2,baz:3,foo:1}").getBody().asType(A6a.class);
}
