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 817357f Context API refactoring.
817357f is described below
commit 817357f7fc111d9e8098d702d44738e1919f6490
Author: JamesBognar <[email protected]>
AuthorDate: Tue Sep 28 16:04:39 2021 -0400
Context API refactoring.
---
.../java/org/apache/juneau/csv/annotation/CsvAnnotation.java | 11 +++++------
.../org/apache/juneau/html/annotation/HtmlAnnotation.java | 12 +++++-------
.../apache/juneau/html/annotation/HtmlLinkAnnotation.java | 12 +++++-------
.../java/org/apache/juneau/jso/annotation/JsoAnnotation.java | 12 +++++-------
.../org/apache/juneau/json/annotation/JsonAnnotation.java | 12 +++++-------
.../juneau/jsonschema/annotation/SchemaAnnotation.java | 11 +++++------
.../apache/juneau/msgpack/annotation/MsgPackAnnotation.java | 12 +++++-------
.../org/apache/juneau/oapi/annotation/OpenApiAnnotation.java | 12 +++++-------
.../juneau/plaintext/annotation/PlainTextAnnotation.java | 12 +++++-------
.../org/apache/juneau/soap/annotation/SoapXmlAnnotation.java | 12 +++++-------
.../java/org/apache/juneau/uon/annotation/UonAnnotation.java | 12 +++++-------
.../juneau/urlencoding/annotation/UrlEncodingAnnotation.java | 12 +++++-------
.../java/org/apache/juneau/xml/annotation/XmlAnnotation.java | 12 +++++-------
13 files changed, 65 insertions(+), 89 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
index ec8e166..0281809 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvAnnotation.java
@@ -14,7 +14,6 @@ package org.apache.juneau.csv.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +160,9 @@ public class CsvAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Csv} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Csv} annotations to a {@link ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Csv,ContextPropertiesBuilder> {
+ public static class Apply extends AnnotationApplier<Csv,ContextBuilder>
{
/**
* Constructor.
@@ -171,17 +170,17 @@ public class CsvAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Csv.class, ContextPropertiesBuilder.class, vr);
+ super(Csv.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Csv> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Csv> ai, ContextBuilder b) {
Csv a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
index 91b5004..1ad708b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.html.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -281,9 +279,9 @@ public class HtmlAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Html} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Html} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Html,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Html,ContextBuilder> {
/**
* Constructor.
@@ -291,17 +289,17 @@ public class HtmlAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Html.class, ContextPropertiesBuilder.class, vr);
+ super(Html.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Html> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Html> ai, ContextBuilder b) {
Html a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
index 408dd55..e76fe57 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlLinkAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.html.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import org.apache.juneau.*;
@@ -188,9 +186,9 @@ public class HtmlLinkAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link HtmlLink} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link HtmlLink} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<HtmlLink,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<HtmlLink,ContextBuilder> {
/**
* Constructor.
@@ -198,17 +196,17 @@ public class HtmlLinkAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(HtmlLink.class, ContextPropertiesBuilder.class,
vr);
+ super(HtmlLink.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<HtmlLink> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<HtmlLink> ai, ContextBuilder
b) {
HtmlLink a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
index 68b3636..192d693 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.jso.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +159,9 @@ public class JsoAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Jso} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Jso} annotations to a {@link ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Jso,ContextPropertiesBuilder> {
+ public static class Apply extends AnnotationApplier<Jso,ContextBuilder>
{
/**
* Constructor.
@@ -171,17 +169,17 @@ public class JsoAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Jso.class, ContextPropertiesBuilder.class, vr);
+ super(Jso.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Jso> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Jso> ai, ContextBuilder b) {
Jso a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
index 5d760b5..6479240 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.json.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -183,9 +181,9 @@ public class JsonAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Json} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Json} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Json,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Json,ContextBuilder> {
/**
* Constructor.
@@ -193,17 +191,17 @@ public class JsonAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Json.class, ContextPropertiesBuilder.class, vr);
+ super(Json.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Json> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Json> ai, ContextBuilder b) {
Json a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
index 6b74b06..e90fa10 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation.java
@@ -14,7 +14,6 @@ package org.apache.juneau.jsonschema.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import static org.apache.juneau.jsonschema.SchemaUtils.*;
@@ -1294,9 +1293,9 @@ public class SchemaAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Schema} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Schema} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Schema,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<Schema,ContextBuilder> {
/**
* Constructor.
@@ -1304,17 +1303,17 @@ public class SchemaAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Schema.class, ContextPropertiesBuilder.class, vr);
+ super(Schema.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Schema> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Schema> ai, ContextBuilder b) {
Schema a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
index 3084447..28c0773 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.msgpack.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +159,9 @@ public class MsgPackAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link MsgPack} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link MsgPack} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<MsgPack,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<MsgPack,ContextBuilder> {
/**
* Constructor.
@@ -171,17 +169,17 @@ public class MsgPackAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(MsgPack.class, ContextPropertiesBuilder.class,
vr);
+ super(MsgPack.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<MsgPack> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<MsgPack> ai, ContextBuilder b)
{
MsgPack a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
index e043f61..593f4c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.oapi.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +159,9 @@ public class OpenApiAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link OpenApi} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link OpenApi} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<OpenApi,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<OpenApi,ContextBuilder> {
/**
* Constructor.
@@ -171,17 +169,17 @@ public class OpenApiAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(OpenApi.class, ContextPropertiesBuilder.class,
vr);
+ super(OpenApi.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<OpenApi> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<OpenApi> ai, ContextBuilder b)
{
OpenApi a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
index 6e1771c..5fe6004 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.plaintext.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +159,9 @@ public class PlainTextAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link PlainText} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link PlainText} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<PlainText,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<PlainText,ContextBuilder> {
/**
* Constructor.
@@ -171,17 +169,17 @@ public class PlainTextAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(PlainText.class, ContextPropertiesBuilder.class,
vr);
+ super(PlainText.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<PlainText> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<PlainText> ai, ContextBuilder
b) {
PlainText a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
index bd3294f..5d95248 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.soap.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +159,9 @@ public class SoapXmlAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link SoapXml} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link SoapXml} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<SoapXml,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<SoapXml,ContextBuilder> {
/**
* Constructor.
@@ -171,17 +169,17 @@ public class SoapXmlAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(SoapXml.class, ContextPropertiesBuilder.class,
vr);
+ super(SoapXml.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<SoapXml> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<SoapXml> ai, ContextBuilder b)
{
SoapXml a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
index cefc206..373c1d9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.uon.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -161,9 +159,9 @@ public class UonAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Uon} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Uon} annotations to a {@link ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Uon,ContextPropertiesBuilder> {
+ public static class Apply extends AnnotationApplier<Uon,ContextBuilder>
{
/**
* Constructor.
@@ -171,17 +169,17 @@ public class UonAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Uon.class, ContextPropertiesBuilder.class, vr);
+ super(Uon.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Uon> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Uon> ai, ContextBuilder b) {
Uon a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
index fa2e36e..aa460fa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.urlencoding.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -185,9 +183,9 @@ public class UrlEncodingAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link UrlEncoding} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link UrlEncoding} annotations to a {@link
ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<UrlEncoding,ContextPropertiesBuilder> {
+ public static class Apply extends
AnnotationApplier<UrlEncoding,ContextBuilder> {
/**
* Constructor.
@@ -195,17 +193,17 @@ public class UrlEncodingAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(UrlEncoding.class,
ContextPropertiesBuilder.class, vr);
+ super(UrlEncoding.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<UrlEncoding> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<UrlEncoding> ai,
ContextBuilder b) {
UrlEncoding a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
index 78f9df6..3de7b9c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
@@ -14,8 +14,6 @@ package org.apache.juneau.xml.annotation;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.*;
-import static org.apache.juneau.BeanContext.*;
-
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -239,9 +237,9 @@ public class XmlAnnotation {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Applies targeted {@link Xml} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies targeted {@link Xml} annotations to a {@link ContextBuilder}.
*/
- public static class Apply extends
AnnotationApplier<Xml,ContextPropertiesBuilder> {
+ public static class Apply extends AnnotationApplier<Xml,ContextBuilder>
{
/**
* Constructor.
@@ -249,17 +247,17 @@ public class XmlAnnotation {
* @param vr The resolver for resolving values in annotations.
*/
public Apply(VarResolverSession vr) {
- super(Xml.class, ContextPropertiesBuilder.class, vr);
+ super(Xml.class, ContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Xml> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<Xml> ai, ContextBuilder b) {
Xml a = ai.getAnnotation();
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.prependTo(CONTEXT_annotations, copy(a, vr()));
+ b.annotations(copy(a, vr()));
}
}
