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 e21dbfa Clean up builders.
e21dbfa is described below
commit e21dbfa878cbeb64c069fb5214a481c28ba5878a
Author: JamesBognar <[email protected]>
AuthorDate: Sun Aug 8 10:03:54 2021 -0400
Clean up builders.
---
.../org/apache/juneau/jena/annotation/Rdf.java | 2 +-
.../juneau/jena/annotation/RdfAnnotation.java | 36 ++++++++++--
.../apache/juneau/jena/annotation/RdfConfig.java | 2 +-
.../jena/annotation/RdfConfigAnnotation.java | 67 ++++++++++++++++++++--
.../java/org/apache/juneau/ContextBuilder.java | 2 -
.../java/org/apache/juneau/annotation/Bean.java | 2 +-
.../apache/juneau/annotation/BeanAnnotation.java | 10 ++--
.../org/apache/juneau/annotation/BeanConfig.java | 2 +-
.../juneau/annotation/BeanConfigAnnotation.java | 10 ++--
.../org/apache/juneau/annotation/BeanIgnore.java | 2 +-
.../juneau/annotation/BeanIgnoreAnnotation.java | 10 ++--
.../java/org/apache/juneau/annotation/Beanc.java | 2 +-
.../apache/juneau/annotation/BeancAnnotation.java | 10 ++--
.../java/org/apache/juneau/annotation/Beanp.java | 2 +-
.../apache/juneau/annotation/BeanpAnnotation.java | 10 ++--
.../java/org/apache/juneau/annotation/Example.java | 2 +-
.../juneau/annotation/ExampleAnnotation.java | 10 ++--
.../org/apache/juneau/annotation/Marshalled.java | 2 +-
.../juneau/annotation/MarshalledAnnotation.java | 10 ++--
.../org/apache/juneau/annotation/NameProperty.java | 2 +-
.../juneau/annotation/NamePropertyAnnotation.java | 10 ++--
.../apache/juneau/annotation/ParentProperty.java | 2 +-
.../annotation/ParentPropertyAnnotation.java | 10 ++--
.../java/org/apache/juneau/annotation/Swap.java | 2 +-
.../apache/juneau/annotation/SwapAnnotation.java | 10 ++--
.../java/org/apache/juneau/annotation/Uri.java | 2 +-
.../apache/juneau/annotation/UriAnnotation.java | 10 ++--
.../org/apache/juneau/http/annotation/Body.java | 2 +-
.../juneau/http/annotation/BodyAnnotation.java | 10 ++--
.../apache/juneau/http/annotation/FormData.java | 2 +-
.../juneau/http/annotation/FormDataAnnotation.java | 10 ++--
.../org/apache/juneau/http/annotation/Header.java | 2 +-
.../juneau/http/annotation/HeaderAnnotation.java | 10 ++--
.../org/apache/juneau/http/annotation/Path.java | 2 +-
.../juneau/http/annotation/PathAnnotation.java | 10 ++--
.../org/apache/juneau/http/annotation/Query.java | 2 +-
.../juneau/http/annotation/QueryAnnotation.java | 10 ++--
.../org/apache/juneau/http/annotation/Request.java | 2 +-
.../juneau/http/annotation/RequestAnnotation.java | 10 ++--
.../apache/juneau/http/annotation/Response.java | 2 +-
.../juneau/http/annotation/ResponseAnnotation.java | 10 ++--
.../juneau/http/annotation/ResponseBody.java | 2 +-
.../http/annotation/ResponseBodyAnnotation.java | 10 ++--
.../juneau/http/annotation/ResponseHeader.java | 2 +-
.../http/annotation/ResponseHeaderAnnotation.java | 10 ++--
.../juneau/http/annotation/ResponseStatus.java | 2 +-
.../http/annotation/ResponseStatusAnnotation.java | 10 ++--
47 files changed, 221 insertions(+), 140 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 356dde8..3f3c9be 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)
-@ContextApply(RdfAnnotation.Apply.class)
+@ContextApply({RdfAnnotation.SerializerApplier.class,RdfAnnotation.ParserApplier.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 58fa688..1160d9e 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
@@ -226,9 +226,9 @@ public class RdfAnnotation {
}
/**
- * Applies targeted {@link Rdf} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Rdf} annotations to a {@link
RdfSerializerBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Rdf,ContextPropertiesBuilder> {
+ public static class SerializerApplier extends
AnnotationApplier<Rdf,RdfSerializerBuilder> {
/**
* Constructor.
@@ -236,12 +236,38 @@ public class RdfAnnotation {
* @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Rdf.class, ContextPropertiesBuilder.class, vr);
+ public SerializerApplier(VarResolverSession vr) {
+ super(Rdf.class, RdfSerializerBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Rdf> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Rdf> ai, RdfSerializerBuilder
b) {
+ Rdf a = ai.getAnnotation();
+
+ if (isEmpty(a.on()) && isEmpty(a.onClass()))
+ return;
+
+ b.prependTo(BEAN_annotations, copy(a, vr()));
+ }
+ }
+
+ /**
+ * Applies targeted {@link Rdf} annotations to a {@link
RdfParserBuilder}.
+ */
+ public static class ParserApplier extends
AnnotationApplier<Rdf,RdfParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param c The annotation class.
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ParserApplier(VarResolverSession vr) {
+ super(Rdf.class, RdfParserBuilder.class, vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<Rdf> ai, RdfParserBuilder b) {
Rdf a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 6fa3f7e..5d4b2f5 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
-@ContextApply(RdfConfigAnnotation.Apply.class)
+@ContextApply({RdfConfigAnnotation.SerializerApplier.class,RdfConfigAnnotation.ParserApplier.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 aeea41d..db535d5 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
@@ -17,6 +17,8 @@ import static org.apache.juneau.jena.RdfParser.*;
import static org.apache.juneau.jena.RdfSerializer.*;
import org.apache.juneau.*;
+import org.apache.juneau.jena.RdfParserBuilder;
+import org.apache.juneau.jena.RdfSerializerBuilder;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -26,9 +28,9 @@ import org.apache.juneau.svl.*;
public class RdfConfigAnnotation {
/**
- * Applies {@link RdfConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link RdfConfig} annotations to a {@link
RdfSerializerBuilder}.
*/
- public static class Apply extends
AnnotationApplier<RdfConfig,ContextPropertiesBuilder> {
+ public static class SerializerApplier extends
AnnotationApplier<RdfConfig,RdfSerializerBuilder> {
/**
* Constructor.
@@ -36,12 +38,67 @@ public class RdfConfigAnnotation {
* @param c The annotation class.
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(RdfConfig.class, ContextPropertiesBuilder.class,
vr);
+ public SerializerApplier(VarResolverSession vr) {
+ super(RdfConfig.class, RdfSerializerBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<RdfConfig> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<RdfConfig> ai,
RdfSerializerBuilder b) {
+ RdfConfig a = ai.getAnnotation();
+ b.setIfNotEmpty(RDF_language, string(a.language()));
+ b.setIfNotEmpty(RDF_juneauNs, string(a.juneauNs()));
+ b.setIfNotEmpty(RDF_juneauBpNs, string(a.juneauBpNs()));
+ b.setIfNotEmpty(RDF_disableUseXmlNamespaces,
bool(a.disableUseXmlNamespaces()));
+ b.setIfNotEmpty(RDF_arp_iriRules,
string(a.arp_iriRules()));
+ b.setIfNotEmpty(RDF_arp_errorMode,
string(a.arp_errorMode()));
+ b.setIfNotEmpty(RDF_arp_embedding,
bool(a.arp_embedding()));
+ b.setIfNotEmpty(RDF_rdfxml_xmlBase,
string(a.rdfxml_xmlBase()));
+ b.setIfNotEmpty(RDF_rdfxml_longId,
bool(a.rdfxml_longId()));
+ b.setIfNotEmpty(RDF_rdfxml_allowBadUris,
bool(a.rdfxml_allowBadUris()));
+ b.setIfNotEmpty(RDF_rdfxml_relativeUris,
string(a.rdfxml_relativeUris()));
+ b.setIfNotEmpty(RDF_rdfxml_showXmlDeclaration,
string(a.rdfxml_showXmlDeclaration()));
+
b.setIfNotEmpty(RDF_rdfxml_disableShowDoctypeDeclaration,
bool(a.rdfxml_disableShowDoctypeDeclaration()));
+ b.setIfNotEmpty(RDF_rdfxml_tab, integer(a.rdfxml_tab(),
"rdfxml_tab"));
+ b.setIfNotEmpty(RDF_rdfxml_attributeQuoteChar,
string(a.rdfxml_attributeQuoteChar()));
+ b.setIfNotEmpty(RDF_rdfxml_blockRules,
string(a.rdfxml_blockRules()));
+ b.setIfNotEmpty(RDF_n3_minGap, integer(a.n3_minGap(),
"n3_minGap"));
+ b.setIfNotEmpty(RDF_n3_disableObjectLists,
bool(a.n3_disableObjectLists()));
+ b.setIfNotEmpty(RDF_n3_subjectColumn,
integer(a.n3_subjectColumn(), "n3_subjectColumn"));
+ b.setIfNotEmpty(RDF_n3_propertyColumn,
integer(a.n3_propertyColumn(), "n3_propertyColumn"));
+ b.setIfNotEmpty(RDF_n3_indentProperty,
integer(a.n3_indentProperty(), "n3_indentProperty"));
+ b.setIfNotEmpty(RDF_n3_widePropertyLen,
integer(a.n3_widePropertyLen(), "n3_widePropertyLen"));
+ b.setIfNotEmpty(RDF_n3_disableAbbrevBaseUri,
bool(a.n3_disableAbbrevBaseUri()));
+ b.setIfNotEmpty(RDF_n3_disableUsePropertySymbols,
bool(a.n3_disableUsePropertySymbols()));
+ b.setIfNotEmpty(RDF_n3_disableUseTripleQuotedStrings,
bool(a.n3_disableUseTripleQuotedStrings()));
+ b.setIfNotEmpty(RDF_n3_disableUseDoubles,
bool(a.n3_disableUseDoubles()));
+ b.setIfNotEmpty(RDF_collectionFormat,
string(a.collectionFormat()));
+ b.setIfNotEmpty(RDF_looseCollections,
bool(a.looseCollections()));
+ b.setIfNotEmpty(RDF_addBeanTypes,
bool(a.addBeanTypes()));
+ b.setIfNotEmpty(RDF_addLiteralTypes,
bool(a.addLiteralTypes()));
+ b.setIfNotEmpty(RDF_addRootProperty,
bool(a.addRootProperty()));
+ b.setIfNotEmpty(RDF_disableAutoDetectNamespaces,
bool(a.disableAutoDetectNamespaces()));
+ b.setIfNotEmpty(RDF_namespaces,
stringList(a.namespaces()));
+ b.setIfNotEmpty(RDF_trimWhitespace,
bool(a.trimWhitespace()));
+ }
+ }
+
+ /**
+ * Applies {@link RdfConfig} annotations to a {@link RdfParserBuilder}.
+ */
+ public static class ParserApplier extends
AnnotationApplier<RdfConfig,RdfParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param c The annotation class.
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ParserApplier(VarResolverSession vr) {
+ super(RdfConfig.class, RdfParserBuilder.class, vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<RdfConfig> ai,
RdfParserBuilder b) {
RdfConfig a = ai.getAnnotation();
b.setIfNotEmpty(RDF_language, string(a.language()));
b.setIfNotEmpty(RDF_juneauNs, string(a.juneauNs()));
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 0a43592..707eab6 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
@@ -150,8 +150,6 @@ public abstract class ContextBuilder {
ca.apply(ai, this);
else if (ca.canApply(cpb))
ca.apply(ai, cpb);
- else
- throw new
ConfigException("Cannot apply annotation " + ca.getBuilderClass());
} 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 80d44db..b1a07f9 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)
-@ContextApply(BeanAnnotation.Apply.class)
+@ContextApply(BeanAnnotation.Applier.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 6181146..1ea53a2 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
@@ -489,21 +489,21 @@ public class BeanAnnotation {
}
/**
- * Applies targeted {@link Bean} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Bean} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Bean,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Bean,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Bean.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Bean.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Bean> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Bean> ai, BeanContextBuilder
b) {
Bean a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 bcb1a04..f1fcae9 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
-@ContextApply(BeanConfigAnnotation.Apply.class)
+@ContextApply(BeanConfigAnnotation.Applier.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 6c426f8..a3c471a 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
@@ -28,21 +28,21 @@ import org.apache.juneau.svl.*;
public class BeanConfigAnnotation {
/**
- * Applies {@link BeanConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link BeanConfig} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<BeanConfig,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<BeanConfig,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(BeanConfig.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(BeanConfig.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<BeanConfig> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<BeanConfig> ai,
BeanContextBuilder b) {
BeanConfig a = ai.getAnnotation();
b.setIfNotEmpty(BEAN_beanClassVisibility,
visibility(a.beanClassVisibility(), "beanClassVisibility"));
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 235ad6b..7d694b7 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)
-@ContextApply(BeanIgnoreAnnotation.Apply.class)
+@ContextApply(BeanIgnoreAnnotation.Applier.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 aafefc9..abc1a0d 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
@@ -150,21 +150,21 @@ public class BeanIgnoreAnnotation {
}
/**
- * Applies targeted {@link BeanIgnore} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link BeanIgnore} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<BeanIgnore,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<BeanIgnore,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(BeanIgnore.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(BeanIgnore.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<BeanIgnore> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<BeanIgnore> ai,
BeanContextBuilder b) {
BeanIgnore a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 b0e2db0..d5863e5 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)
-@ContextApply(BeancAnnotation.Apply.class)
+@ContextApply(BeancAnnotation.Applier.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 48d7299..d569c56 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
@@ -136,21 +136,21 @@ public class BeancAnnotation {
}
/**
- * Applies targeted {@link Beanc} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Beanc} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Beanc,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Beanc,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Beanc.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Beanc.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Beanc> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Beanc> ai, BeanContextBuilder
b) {
Beanc a = ai.getAnnotation();
if (isEmpty(a.on()))
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 f0c38a3..f554a9e 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)
-@ContextApply(BeanpAnnotation.Apply.class)
+@ContextApply(BeanpAnnotation.Applier.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 8a4b9c9..89fc992 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
@@ -292,21 +292,21 @@ public class BeanpAnnotation {
}
/**
- * Applies targeted {@link Beanp} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Beanp} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Beanp,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Beanp,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Beanp.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Beanp.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Beanp> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Beanp> ai, BeanContextBuilder
b) {
Beanp a = ai.getAnnotation();
if (isEmpty(a.on()))
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 7af9027..73506f8 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)
-@ContextApply(ExampleAnnotation.Apply.class)
+@ContextApply(ExampleAnnotation.Applier.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 5c03ed0..6e6c74f 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
@@ -166,21 +166,21 @@ public class ExampleAnnotation {
}
/**
- * Applies targeted {@link Example} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Example} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Example,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Example,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Example.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(Example.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Example> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Example> ai,
BeanContextBuilder b) {
Example a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 6352149..6f6582c 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)
-@ContextApply(MarshalledAnnotation.Apply.class)
+@ContextApply(MarshalledAnnotation.Applier.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 8943a12..b11cee1 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
@@ -172,21 +172,21 @@ public class MarshalledAnnotation {
}
/**
- * Applies targeted {@link Marshalled} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Marshalled} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Marshalled,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Marshalled,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Marshalled.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(Marshalled.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Marshalled> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Marshalled> ai,
BeanContextBuilder b) {
Marshalled a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 2889965..bcf79d5 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)
-@ContextApply(NamePropertyAnnotation.Apply.class)
+@ContextApply(NamePropertyAnnotation.Applier.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 5ca5b8d..62ec819 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
@@ -121,21 +121,21 @@ public class NamePropertyAnnotation {
}
/**
- * Applies targeted {@link NameProperty} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link NameProperty} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<NameProperty,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<NameProperty,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(NameProperty.class,
ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(NameProperty.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<NameProperty> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<NameProperty> ai,
BeanContextBuilder b) {
NameProperty a = ai.getAnnotation();
if (isEmpty(a.on()))
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 a99df26..e442512 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)
-@ContextApply(ParentPropertyAnnotation.Apply.class)
+@ContextApply(ParentPropertyAnnotation.Applier.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 e87a347..aca10bf 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
@@ -121,21 +121,21 @@ public class ParentPropertyAnnotation {
}
/**
- * Applies targeted {@link ParentProperty} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link ParentProperty} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<ParentProperty,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<ParentProperty,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(ParentProperty.class,
ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(ParentProperty.class, BeanContextBuilder.class,
vr);
}
@Override
- public void apply(AnnotationInfo<ParentProperty> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<ParentProperty> ai,
BeanContextBuilder b) {
ParentProperty a = ai.getAnnotation();
if (isEmpty(a.on()))
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 7d36af5..beb8d2d 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)
-@ContextApply(SwapAnnotation.Apply.class)
+@ContextApply(SwapAnnotation.Applier.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 ca5c289..72d1560 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
@@ -225,21 +225,21 @@ public class SwapAnnotation {
}
/**
- * Applies targeted {@link Swap} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Swap} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Swap,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Swap,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Swap.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Swap.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Swap> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Swap> ai, BeanContextBuilder
b) {
Swap a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 0c6bde0..65fec75 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)
-@ContextApply(UriAnnotation.Apply.class)
+@ContextApply(UriAnnotation.Applier.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 f86cb38..3272bb4 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
@@ -144,21 +144,21 @@ public class UriAnnotation {
}
/**
- * Applies targeted {@link Uri} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Uri} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Uri,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Uri,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Uri.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Uri.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Uri> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Uri> ai, BeanContextBuilder b)
{
Uri a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 04862bd..0895abb 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)
-@ContextApply(BodyAnnotation.Apply.class)
+@ContextApply(BodyAnnotation.Applier.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 79281fb..c5f0e93 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
@@ -357,21 +357,21 @@ public class BodyAnnotation {
}
/**
- * Applies targeted {@link Body} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Body} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Body,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Body,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Body.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Body.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Body> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Body> ai, BeanContextBuilder
b) {
Body a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 a5e4f60..35a47a3 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)
-@ContextApply(FormDataAnnotation.Apply.class)
+@ContextApply(FormDataAnnotation.Applier.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 73909c0..5007f83 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
@@ -1074,21 +1074,21 @@ public class FormDataAnnotation {
}
/**
- * Applies targeted {@link FormData} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link FormData} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<FormData,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<FormData,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(FormData.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(FormData.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<FormData> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<FormData> ai,
BeanContextBuilder b) {
FormData a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 7f809df..72b77d8 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)
-@ContextApply(HeaderAnnotation.Apply.class)
+@ContextApply(HeaderAnnotation.Applier.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 d9f2aa9..91c22cf 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
@@ -1075,21 +1075,21 @@ public class HeaderAnnotation {
}
/**
- * Applies targeted {@link Header} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Header} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Header,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Header,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Header.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Header.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Header> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Header> ai, BeanContextBuilder
b) {
Header a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 4895225..7c6494e 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)
-@ContextApply(PathAnnotation.Apply.class)
+@ContextApply(PathAnnotation.Applier.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 d35e88e..ba1dbfe 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
@@ -985,21 +985,21 @@ public class PathAnnotation {
}
/**
- * Applies targeted {@link Path} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Path} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Path,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Path,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Path.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Path.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Path> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Path> ai, BeanContextBuilder
b) {
Path a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 5bfaea2..8690e46 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)
-@ContextApply(QueryAnnotation.Apply.class)
+@ContextApply(QueryAnnotation.Applier.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 fb8303a..eaedc76 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
@@ -1074,21 +1074,21 @@ public class QueryAnnotation {
}
/**
- * Applies targeted {@link Query} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Query} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Query,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Query,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Query.class, ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(Query.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Query> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Query> ai, BeanContextBuilder
b) {
Query a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 b95ce3d..512f0bc 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)
-@ContextApply(RequestAnnotation.Apply.class)
+@ContextApply(RequestAnnotation.Applier.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 2410e93..fdf4d52 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
@@ -175,21 +175,21 @@ public class RequestAnnotation {
}
/**
- * Applies targeted {@link Request} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Request} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Request,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Request,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Request.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(Request.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Request> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Request> ai,
BeanContextBuilder b) {
Request a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 e9197d8..7515697 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)
-@ContextApply(ResponseAnnotation.Apply.class)
+@ContextApply(ResponseAnnotation.Applier.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 52ff654..11b454a 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
@@ -401,21 +401,21 @@ public class ResponseAnnotation {
}
/**
- * Applies targeted {@link Response} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Response} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Response,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<Response,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(Response.class, ContextPropertiesBuilder.class,
vr);
+ public Applier(VarResolverSession vr) {
+ super(Response.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Response> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Response> ai,
BeanContextBuilder b) {
Response a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 32613fd..1eb417e 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)
-@ContextApply(ResponseBodyAnnotation.Apply.class)
+@ContextApply(ResponseBodyAnnotation.Applier.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 ce55997..1a82413 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
@@ -139,21 +139,21 @@ public class ResponseBodyAnnotation {
}
/**
- * Applies targeted {@link ResponseBody} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link ResponseBody} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<ResponseBody,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<ResponseBody,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(ResponseBody.class,
ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(ResponseBody.class, BeanContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<ResponseBody> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<ResponseBody> ai,
BeanContextBuilder b) {
ResponseBody a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 9602e23..297e09c 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)
-@ContextApply(ResponseHeaderAnnotation.Apply.class)
+@ContextApply(ResponseHeaderAnnotation.Applier.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 7793701..f03ac24 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
@@ -975,21 +975,21 @@ public class ResponseHeaderAnnotation {
}
/**
- * Applies targeted {@link ResponseHeader} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link ResponseHeader} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<ResponseHeader,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<ResponseHeader,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(ResponseHeader.class,
ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(ResponseHeader.class, BeanContextBuilder.class,
vr);
}
@Override
- public void apply(AnnotationInfo<ResponseHeader> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<ResponseHeader> ai,
BeanContextBuilder b) {
ResponseHeader a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
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 742b57c..8034a18 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)
-@ContextApply(ResponseStatusAnnotation.Apply.class)
+@ContextApply(ResponseStatusAnnotation.Applier.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 79ac3a2..c575664 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
@@ -139,21 +139,21 @@ public class ResponseStatusAnnotation {
}
/**
- * Applies targeted {@link ResponseStatus} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link ResponseStatus} annotations to a {@link
BeanContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<ResponseStatus,ContextPropertiesBuilder> {
+ public static class Applier extends
AnnotationApplier<ResponseStatus,BeanContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(ResponseStatus.class,
ContextPropertiesBuilder.class, vr);
+ public Applier(VarResolverSession vr) {
+ super(ResponseStatus.class, BeanContextBuilder.class,
vr);
}
@Override
- public void apply(AnnotationInfo<ResponseStatus> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<ResponseStatus> ai,
BeanContextBuilder b) {
ResponseStatus a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
