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 4d63f67 Rename PropertyStore to ContextProperties.
4d63f67 is described below
commit 4d63f6777bbc0592156205dec3aa5b66517e2e92
Author: JamesBognar <[email protected]>
AuthorDate: Mon Feb 8 17:33:19 2021 -0500
Rename PropertyStore to ContextProperties.
---
.../src/main/java/org/apache/juneau/jena/annotation/Rdf.java | 2 +-
.../main/java/org/apache/juneau/jena/annotation/RdfConfig.java | 2 +-
.../src/main/java/org/apache/juneau/ContextBuilder.java | 6 +++---
.../src/main/java/org/apache/juneau/annotation/Bean.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/BeanConfig.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/BeanIgnore.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/Beanc.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/Beanp.java | 2 +-
.../{PropertyStoreApply.java => ContextPropertiesApply.java} | 2 +-
.../src/main/java/org/apache/juneau/annotation/Example.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/Marshalled.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/NameProperty.java | 2 +-
.../main/java/org/apache/juneau/annotation/ParentProperty.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/Swap.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/Uri.java | 2 +-
.../src/main/java/org/apache/juneau/csv/annotation/Csv.java | 2 +-
.../src/main/java/org/apache/juneau/csv/annotation/CsvConfig.java | 2 +-
.../src/main/java/org/apache/juneau/html/annotation/Html.java | 2 +-
.../main/java/org/apache/juneau/html/annotation/HtmlConfig.java | 2 +-
.../java/org/apache/juneau/html/annotation/HtmlDocConfig.java | 2 +-
.../src/main/java/org/apache/juneau/html/annotation/HtmlLink.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Body.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/FormData.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Header.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Path.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Query.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Request.java | 2 +-
.../src/main/java/org/apache/juneau/http/annotation/Response.java | 2 +-
.../main/java/org/apache/juneau/http/annotation/ResponseBody.java | 2 +-
.../java/org/apache/juneau/http/annotation/ResponseHeader.java | 2 +-
.../java/org/apache/juneau/http/annotation/ResponseStatus.java | 2 +-
.../src/main/java/org/apache/juneau/jso/annotation/Jso.java | 2 +-
.../src/main/java/org/apache/juneau/jso/annotation/JsoConfig.java | 2 +-
.../src/main/java/org/apache/juneau/json/annotation/Json.java | 2 +-
.../main/java/org/apache/juneau/json/annotation/JsonConfig.java | 2 +-
.../org/apache/juneau/jsonschema/annotation/JsonSchemaConfig.java | 2 +-
.../main/java/org/apache/juneau/jsonschema/annotation/Schema.java | 2 +-
.../main/java/org/apache/juneau/msgpack/annotation/MsgPack.java | 2 +-
.../java/org/apache/juneau/msgpack/annotation/MsgPackConfig.java | 2 +-
.../src/main/java/org/apache/juneau/oapi/annotation/OpenApi.java | 2 +-
.../java/org/apache/juneau/oapi/annotation/OpenApiConfig.java | 2 +-
.../java/org/apache/juneau/parser/annotation/ParserConfig.java | 2 +-
.../java/org/apache/juneau/plaintext/annotation/PlainText.java | 2 +-
.../org/apache/juneau/plaintext/annotation/PlainTextConfig.java | 2 +-
.../src/main/java/org/apache/juneau/reflect/AnnotationInfo.java | 8 ++++----
.../java/org/apache/juneau/reflect/ConfigAnnotationFilter.java | 4 ++--
.../src/main/java/org/apache/juneau/reflect/MethodInfo.java | 6 +++---
.../org/apache/juneau/serializer/annotation/SerializerConfig.java | 2 +-
.../src/main/java/org/apache/juneau/soap/annotation/SoapXml.java | 2 +-
.../java/org/apache/juneau/soap/annotation/SoapXmlConfig.java | 2 +-
.../src/main/java/org/apache/juneau/uon/annotation/Uon.java | 2 +-
.../src/main/java/org/apache/juneau/uon/annotation/UonConfig.java | 2 +-
.../org/apache/juneau/urlencoding/annotation/UrlEncoding.java | 2 +-
.../apache/juneau/urlencoding/annotation/UrlEncodingConfig.java | 2 +-
.../src/main/java/org/apache/juneau/xml/annotation/Xml.java | 2 +-
.../src/main/java/org/apache/juneau/xml/annotation/XmlConfig.java | 2 +-
.../src/main/java/org/apache/juneau/rest/annotation/Rest.java | 2 +-
.../src/main/java/org/apache/juneau/rest/annotation/RestOp.java | 2 +-
.../src/test/java/org/apache/juneau/reflection/ClassInfoTest.java | 2 +-
.../test/java/org/apache/juneau/reflection/MethodInfoTest.java | 2 +-
60 files changed, 68 insertions(+), 68 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 2827c94..9ccf42f 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)
-@PropertyStoreApply(RdfAnnotation.Apply.class)
+@ContextPropertiesApply(RdfAnnotation.Apply.class)
public @interface Rdf {
/**
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 8e8451d..d4e17ab 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
-@PropertyStoreApply(RdfConfigAnnotation.Apply.class)
+@ContextPropertiesApply(RdfConfigAnnotation.Apply.class)
public @interface RdfConfig {
/**
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 7ace5ea..f57f09b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextBuilder.java
@@ -155,7 +155,7 @@ public abstract class ContextBuilder {
* .build();
* </p>
*
- * @param al The list of all annotations annotated with {@link
PropertyStoreApply}.
+ * @param al The list of all annotations annotated with {@link
ContextPropertiesApply}.
* @param r The string resolver for resolving variables in annotation
values.
* @return This object (for method chaining).
*/
@@ -169,7 +169,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
PropertyStoreApply} will be resolved and
+ * Any annotations found that themselves are annotated with {@link
ContextPropertiesApply} will be resolved and
* applied as properties to this builder. These annotations include:
* <ul class='javatree'>
* <li class ='ja'>{@link BeanConfig}
@@ -230,7 +230,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
PropertyStoreApply} will be resolved and
+ * Any annotations found that themselves are annotated with {@link
ContextPropertiesApply} will be resolved and
* applied as properties to this builder. These annotations include:
* <ul class='javatree'>
* <li class ='ja'>{@link BeanConfig}
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 8055ae9..79d635f 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
@@ -41,7 +41,7 @@ import org.apache.juneau.transform.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BeanAnnotation.Array.class)
-@PropertyStoreApply(BeanAnnotation.Apply.class)
+@ContextPropertiesApply(BeanAnnotation.Apply.class)
public @interface Bean {
/**
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 f91bc5c..ad2a9a6 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
@@ -34,7 +34,7 @@ import org.apache.juneau.transform.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@PropertyStoreApply(BeanConfigAnnotation.Apply.class)
+@ContextPropertiesApply(BeanConfigAnnotation.Apply.class)
public @interface BeanConfig {
/**
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 e217cb0..cae4033 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)
-@PropertyStoreApply(BeanIgnoreAnnotation.Apply.class)
+@ContextPropertiesApply(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/Beanc.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Beanc.java
index d4dcb01..725e04f 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)
-@PropertyStoreApply(BeancAnnotation.Apply.class)
+@ContextPropertiesApply(BeancAnnotation.Apply.class)
public @interface Beanc {
/**
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 a98e6c8..9216225 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
@@ -41,7 +41,7 @@ import org.apache.juneau.*;
@Retention(RUNTIME)
@Inherited
@Repeatable(BeanpAnnotation.Array.class)
-@PropertyStoreApply(BeanpAnnotation.Apply.class)
+@ContextPropertiesApply(BeanpAnnotation.Apply.class)
public @interface Beanp {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/PropertyStoreApply.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextPropertiesApply.java
similarity index 97%
rename from
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/PropertyStoreApply.java
rename to
juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextPropertiesApply.java
index 28d9bff..62afcad 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/PropertyStoreApply.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ContextPropertiesApply.java
@@ -26,7 +26,7 @@ import org.apache.juneau.*;
@Target({ANNOTATION_TYPE})
@Retention(RUNTIME)
@Inherited
-public @interface PropertyStoreApply {
+public @interface ContextPropertiesApply {
/**
* Identifies the class used to push values from an annotation into a
property store.
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 12d1d0c..e116d95 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)
-@PropertyStoreApply(ExampleAnnotation.Apply.class)
+@ContextPropertiesApply(ExampleAnnotation.Apply.class)
public @interface Example {
/**
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 d85e455..77cf7a7 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)
-@PropertyStoreApply(MarshalledAnnotation.Apply.class)
+@ContextPropertiesApply(MarshalledAnnotation.Apply.class)
public @interface Marshalled {
/**
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 f16fb4a..bc23404 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)
-@PropertyStoreApply(NamePropertyAnnotation.Apply.class)
+@ContextPropertiesApply(NamePropertyAnnotation.Apply.class)
public @interface NameProperty {
/**
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 6e83601..30729b2 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)
-@PropertyStoreApply(ParentPropertyAnnotation.Apply.class)
+@ContextPropertiesApply(ParentPropertyAnnotation.Apply.class)
public @interface ParentProperty {
/**
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 8d3fc8a..40168de 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)
-@PropertyStoreApply(SwapAnnotation.Apply.class)
+@ContextPropertiesApply(SwapAnnotation.Apply.class)
public @interface Swap {
/**
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 348c8ce..91d4b42 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)
-@PropertyStoreApply(UriAnnotation.Apply.class)
+@ContextPropertiesApply(UriAnnotation.Apply.class)
public @interface Uri {
/**
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 36ebd90..30efbb3 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)
-@PropertyStoreApply(CsvAnnotation.Apply.class)
+@ContextPropertiesApply(CsvAnnotation.Apply.class)
public @interface Csv {
/**
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 8cf52d4..c1b2392 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
-@PropertyStoreApply(CsvConfigAnnotation.Apply.class)
+@ContextPropertiesApply(CsvConfigAnnotation.Apply.class)
public @interface CsvConfig {
/**
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 4baec53..efafda7 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)
-@PropertyStoreApply(HtmlAnnotation.Apply.class)
+@ContextPropertiesApply(HtmlAnnotation.Apply.class)
public @interface Html {
/**
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 8f48a5d..4e84fdd 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
-@PropertyStoreApply(HtmlConfigAnnotation.Apply.class)
+@ContextPropertiesApply(HtmlConfigAnnotation.Apply.class)
public @interface HtmlConfig {
/**
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 19af3e8..9b80519 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
-@PropertyStoreApply(HtmlDocConfigAnnotation.Apply.class)
+@ContextPropertiesApply(HtmlDocConfigAnnotation.Apply.class)
public @interface HtmlDocConfig {
/**
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 787b364..3445b5c 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)
-@PropertyStoreApply(HtmlLinkAnnotation.Apply.class)
+@ContextPropertiesApply(HtmlLinkAnnotation.Apply.class)
public @interface HtmlLink {
/**
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 f7002c0..1c8bfc6 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)
-@PropertyStoreApply(BodyAnnotation.Apply.class)
+@ContextPropertiesApply(BodyAnnotation.Apply.class)
public @interface Body {
/**
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 a1bac62..8e0db3f 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)
-@PropertyStoreApply(FormDataAnnotation.Apply.class)
+@ContextPropertiesApply(FormDataAnnotation.Apply.class)
public @interface FormData {
/**
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 c1c1446..ededf3b 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)
-@PropertyStoreApply(HeaderAnnotation.Apply.class)
+@ContextPropertiesApply(HeaderAnnotation.Apply.class)
public @interface Header {
/**
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 c899a98..85f842e 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)
-@PropertyStoreApply(PathAnnotation.Apply.class)
+@ContextPropertiesApply(PathAnnotation.Apply.class)
public @interface Path {
/**
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 9bdbf28..3f89c18 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)
-@PropertyStoreApply(QueryAnnotation.Apply.class)
+@ContextPropertiesApply(QueryAnnotation.Apply.class)
public @interface Query {
/**
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 e6960b1..86eb818 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)
-@PropertyStoreApply(RequestAnnotation.Apply.class)
+@ContextPropertiesApply(RequestAnnotation.Apply.class)
public @interface Request {
/**
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 4bb1711..e622a70 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)
-@PropertyStoreApply(ResponseAnnotation.Apply.class)
+@ContextPropertiesApply(ResponseAnnotation.Apply.class)
public @interface Response {
/**
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 52071ff..6831729 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)
-@PropertyStoreApply(ResponseBodyAnnotation.Apply.class)
+@ContextPropertiesApply(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/ResponseHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
index c4fef69..305e57a 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)
-@PropertyStoreApply(ResponseHeaderAnnotation.Apply.class)
+@ContextPropertiesApply(ResponseHeaderAnnotation.Apply.class)
public @interface ResponseHeader {
/**
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 736cd1f..f4846a2 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)
-@PropertyStoreApply(ResponseStatusAnnotation.Apply.class)
+@ContextPropertiesApply(ResponseStatusAnnotation.Apply.class)
public @interface ResponseStatus {
/**
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 fbdd416..132935c 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)
-@PropertyStoreApply(JsoAnnotation.Apply.class)
+@ContextPropertiesApply(JsoAnnotation.Apply.class)
public @interface Jso {
/**
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 e57e18a..6e72c7c 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
-@PropertyStoreApply(JsoConfigAnnotation.Apply.class)
+@ContextPropertiesApply(JsoConfigAnnotation.Apply.class)
public @interface JsoConfig {
/**
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 aac0bfd..d612c71 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)
-@PropertyStoreApply(JsonAnnotation.Apply.class)
+@ContextPropertiesApply(JsonAnnotation.Apply.class)
public @interface Json {
/**
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 9a1e90b..901640a 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
-@PropertyStoreApply(JsonConfigAnnotation.Apply.class)
+@ContextPropertiesApply(JsonConfigAnnotation.Apply.class)
public @interface JsonConfig {
/**
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 3560770..a53458d 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
@@ -32,7 +32,7 @@ import org.apache.juneau.jsonschema.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@PropertyStoreApply(JsonSchemaConfigAnnotation.Apply.class)
+@ContextPropertiesApply(JsonSchemaConfigAnnotation.Apply.class)
public @interface JsonSchemaConfig {
/**
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 3e4c252..ac9c49c 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)
-@PropertyStoreApply(SchemaAnnotation.Apply.class)
+@ContextPropertiesApply(SchemaAnnotation.Apply.class)
public @interface Schema {
/**
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 f1f7a26..21ca3d5 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)
-@PropertyStoreApply(MsgPackAnnotation.Apply.class)
+@ContextPropertiesApply(MsgPackAnnotation.Apply.class)
public @interface MsgPack {
/**
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 d2dc4dd..0ec7367 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
-@PropertyStoreApply(MsgPackConfigAnnotation.Apply.class)
+@ContextPropertiesApply(MsgPackConfigAnnotation.Apply.class)
public @interface MsgPackConfig {
/**
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 2f5f117..42eda07 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)
-@PropertyStoreApply(OpenApiAnnotation.Apply.class)
+@ContextPropertiesApply(OpenApiAnnotation.Apply.class)
public @interface OpenApi {
/**
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 31d611f..5d8671f 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
-@PropertyStoreApply(OpenApiConfigAnnotation.Apply.class)
+@ContextPropertiesApply(OpenApiConfigAnnotation.Apply.class)
public @interface OpenApiConfig {
/**
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 43f4b6c..5182eb5 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
-@PropertyStoreApply(ParserConfigAnnotation.Apply.class)
+@ContextPropertiesApply(ParserConfigAnnotation.Apply.class)
public @interface ParserConfig {
/**
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 f7d639c..2e390ad 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)
-@PropertyStoreApply(PlainTextAnnotation.Apply.class)
+@ContextPropertiesApply(PlainTextAnnotation.Apply.class)
public @interface PlainText {
/**
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 c3c2d11..e76a0c5 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
-@PropertyStoreApply(PlainTextConfigAnnotation.Apply.class)
+@ContextPropertiesApply(PlainTextConfigAnnotation.Apply.class)
public @interface PlainTextConfig {
/**
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 cd32542..bc19942 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
@@ -168,7 +168,7 @@ public class AnnotationInfo<T extends Annotation> {
private Constructor<? extends ConfigApply<?>> configApplyConstructor;
/**
- * If this annotation has a {@link PropertyStoreApply} annotation,
returns an instance of the specified {@link ConfigApply} class.
+ * If this annotation has a {@link ContextPropertiesApply} annotation,
returns an instance of the specified {@link ConfigApply} class.
*
* @param vrs Variable resolver passed to the {@link ConfigApply}
object.
* @return A new {@link ConfigApply} object. Never <jk>null</jk>.
@@ -178,11 +178,11 @@ public class AnnotationInfo<T extends Annotation> {
public ConfigApply<Annotation> getConfigApply(VarResolverSession vrs)
throws ExecutableException {
try {
if (configApplyConstructor == null) {
- PropertyStoreApply psa =
a.annotationType().getAnnotation(PropertyStoreApply.class);
- if (psa == null)
+ ContextPropertiesApply cpa =
a.annotationType().getAnnotation(ContextPropertiesApply.class);
+ if (cpa == null)
configApplyConstructor =
ConfigApply.NoOp.class.getConstructor(Class.class, VarResolverSession.class);
else
- configApplyConstructor = (Constructor<?
extends ConfigApply<?>>)psa.value().getConstructor(Class.class,
VarResolverSession.class);
+ configApplyConstructor = (Constructor<?
extends ConfigApply<?>>)cpa.value().getConstructor(Class.class,
VarResolverSession.class);
if (configApplyConstructor == null)
throw new NoSuchFieldError("Could not
find ConfigApply constructor for annotation:\n" + toString());
}
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/ConfigAnnotationFilter.java
index 31afb96..77e461c 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/ConfigAnnotationFilter.java
@@ -18,7 +18,7 @@ import java.util.function.*;
import org.apache.juneau.annotation.*;
/**
- * Filter used to accept only annotations that themselves have the {@link
PropertyStoreApply} annotation.
+ * Filter used to accept only annotations that themselves have the {@link
ContextPropertiesApply} annotation.
*/
public class ConfigAnnotationFilter implements Predicate<AnnotationInfo<?>> {
@@ -29,6 +29,6 @@ public class ConfigAnnotationFilter implements
Predicate<AnnotationInfo<?>> {
@Override
public boolean test(AnnotationInfo<? extends Annotation> t) {
- return t.hasAnnotation(PropertyStoreApply.class);
+ return t.hasAnnotation(ContextPropertiesApply.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 7c47ca3..cea5efb 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
@@ -311,14 +311,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 PropertyStoreApply}.
+ * Returns <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 PropertyStoreApply}.
+ * @return <jk>true</jk> if this method or parent methods have any
annotations annotated with {@link ContextPropertiesApply}.
*/
public boolean hasConfigAnnotations() {
for (Method m2 : getMatching())
for (Annotation a2 : m2.getAnnotations())
- if
(a2.annotationType().getAnnotation(PropertyStoreApply.class) != null)
+ if
(a2.annotationType().getAnnotation(ContextPropertiesApply.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 c4640eb..1d6daba 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
@@ -31,7 +31,7 @@ import org.apache.juneau.serializer.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@PropertyStoreApply(SerializerConfigAnnotation.Apply.class)
+@ContextPropertiesApply(SerializerConfigAnnotation.Apply.class)
public @interface SerializerConfig {
/**
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 d17b4af..0e0bf43 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)
-@PropertyStoreApply(SoapXmlAnnotation.Apply.class)
+@ContextPropertiesApply(SoapXmlAnnotation.Apply.class)
public @interface SoapXml {
/**
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 af800d0..3da9e36 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
-@PropertyStoreApply(SoapXmlConfigAnnotation.Apply.class)
+@ContextPropertiesApply(SoapXmlConfigAnnotation.Apply.class)
public @interface SoapXmlConfig {
/**
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 15f1283..fbc3358 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)
-@PropertyStoreApply(UonAnnotation.Apply.class)
+@ContextPropertiesApply(UonAnnotation.Apply.class)
public @interface Uon {
/**
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 c13ae5a..6249859 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
-@PropertyStoreApply(UonConfigAnnotation.Apply.class)
+@ContextPropertiesApply(UonConfigAnnotation.Apply.class)
public @interface UonConfig {
/**
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 63dd229..df53e4a 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)
-@PropertyStoreApply(UrlEncodingAnnotation.Apply.class)
+@ContextPropertiesApply(UrlEncodingAnnotation.Apply.class)
public @interface UrlEncoding {
/**
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 84a3250..1128adb 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
-@PropertyStoreApply(UrlEncodingConfigAnnotation.Apply.class)
+@ContextPropertiesApply(UrlEncodingConfigAnnotation.Apply.class)
public @interface UrlEncodingConfig {
/**
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 29f61f3..4aaf6bd 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)
-@PropertyStoreApply(XmlAnnotation.Apply.class)
+@ContextPropertiesApply(XmlAnnotation.Apply.class)
public @interface Xml {
/**
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 df1b690..4f98b1d 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
-@PropertyStoreApply(XmlConfigAnnotation.Apply.class)
+@ContextPropertiesApply(XmlConfigAnnotation.Apply.class)
public @interface XmlConfig {
/**
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 ff64093..765bf04 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,METHOD})
@Retention(RUNTIME)
@Inherited
-@PropertyStoreApply(RestAnnotation.Apply.class)
+@ContextPropertiesApply(RestAnnotation.Apply.class)
@Repeatable(RestAnnotation.Array.class)
public @interface Rest {
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 541d12f..0d223ea 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,TYPE})
@Retention(RUNTIME)
@Inherited
-@PropertyStoreApply(RestOpAnnotation.Apply.class)
+@ContextPropertiesApply(RestOpAnnotation.Apply.class)
@Repeatable(RestOpAnnotation.Array.class)
public @interface RestOp {
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 2426488..ad6dbf1 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,7 +58,7 @@ public class ClassInfoTest {
@Target(TYPE)
@Retention(RUNTIME)
@Inherited
- @PropertyStoreApply(AConfigApply.class)
+ @ContextPropertiesApply(AConfigApply.class)
static @interface AConfig {
int value();
}
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 2db91fc..0985290 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,7 +53,7 @@ public class MethodInfoTest {
@Target({METHOD,TYPE})
@Retention(RUNTIME)
@Inherited
- @PropertyStoreApply(AConfigApply.class)
+ @ContextPropertiesApply(AConfigApply.class)
public static @interface AConfig {
String value();
}
