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 dddfd1f Context API refactoring.
dddfd1f is described below
commit dddfd1f29551b1f17ee24385ef478e636bfb598c
Author: JamesBognar <[email protected]>
AuthorDate: Mon Sep 27 09:56:42 2021 -0400
Context API refactoring.
---
.../apache/juneau/csv/annotation/CsvConfig.java | 2 +-
.../juneau/csv/annotation/CsvConfigAnnotation.java | 8 +++---
.../apache/juneau/html/annotation/HtmlConfig.java | 2 +-
.../html/annotation/HtmlConfigAnnotation.java | 23 +++++++++++++++--
.../juneau/html/annotation/HtmlDocConfig.java | 2 +-
.../html/annotation/HtmlDocConfigAnnotation.java | 4 +--
.../apache/juneau/jso/annotation/JsoConfig.java | 2 +-
.../juneau/jso/annotation/JsoConfigAnnotation.java | 30 ++++++++++++++++++----
.../apache/juneau/json/annotation/JsonConfig.java | 2 +-
.../json/annotation/JsonConfigAnnotation.java | 8 +++---
.../juneau/msgpack/annotation/MsgPackConfig.java | 2 +-
.../annotation/MsgPackConfigAnnotation.java | 23 +++++++++++++++--
.../juneau/oapi/annotation/OpenApiConfig.java | 2 +-
.../oapi/annotation/OpenApiConfigAnnotation.java | 8 +++---
.../apache/juneau/plaintext/PlainTextParser.java | 9 +------
.../juneau/plaintext/PlainTextSerializer.java | 9 +------
.../plaintext/annotation/PlainTextConfig.java | 2 +-
.../annotation/PlainTextConfigAnnotation.java | 30 ++++++++++++++++++----
18 files changed, 116 insertions(+), 52 deletions(-)
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 de4a1ec..7c28cd9 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
-@ContextApply({CsvConfigAnnotation.ApplySerializer.class,CsvConfigAnnotation.ApplyParser.class})
+@ContextApply({CsvConfigAnnotation.SerializerApply.class,CsvConfigAnnotation.ParserApply.class})
public @interface CsvConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
index 070be7e..554e89f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/annotation/CsvConfigAnnotation.java
@@ -25,14 +25,14 @@ public class CsvConfigAnnotation {
/**
* Applies {@link CsvConfig} annotations to a {@link
CsvSerializerBuilder}.
*/
- public static class ApplySerializer extends
AnnotationApplier<CsvConfig,CsvSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<CsvConfig,CsvSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplySerializer(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(CsvConfig.class, CsvSerializerBuilder.class, vr);
}
@@ -44,14 +44,14 @@ public class CsvConfigAnnotation {
/**
* Applies {@link CsvConfig} annotations to a {@link CsvParserBuilder}.
*/
- public static class ApplyParser extends
AnnotationApplier<CsvConfig,CsvParserBuilder> {
+ public static class ParserApply extends
AnnotationApplier<CsvConfig,CsvParserBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplyParser(VarResolverSession vr) {
+ public ParserApply(VarResolverSession vr) {
super(CsvConfig.class, CsvParserBuilder.class, vr);
}
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 3f97495..e2c69ec 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
-@ContextApply(HtmlConfigAnnotation.ApplySerializer.class)
+@ContextApply({HtmlConfigAnnotation.SerializerApply.class,HtmlConfigAnnotation.ParserApply.class})
public @interface HtmlConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
index 2aa0d7e..bb0ec01 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
@@ -25,14 +25,14 @@ public class HtmlConfigAnnotation {
/**
* Applies {@link HtmlConfig} annotations to a {@link
HtmlSerializerBuilder}.
*/
- public static class ApplySerializer extends
AnnotationApplier<HtmlConfig,HtmlSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<HtmlConfig,HtmlSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplySerializer(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(HtmlConfig.class, HtmlSerializerBuilder.class,
vr);
}
@@ -48,4 +48,23 @@ public class HtmlConfigAnnotation {
string(a.uriAnchorText()).map(AnchorText::valueOf).ifPresent(x ->
b.uriAnchorText(x));
}
}
+
+ /**
+ * Applies {@link HtmlConfig} annotations to a {@link
HtmlParserBuilder}.
+ */
+ public static class ParserApply extends
AnnotationApplier<HtmlConfig,HtmlParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ParserApply(VarResolverSession vr) {
+ super(HtmlConfig.class, HtmlParserBuilder.class, vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<HtmlConfig> ai,
HtmlParserBuilder b) {
+ }
+ }
}
\ No newline at end of file
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 a570942..7f88fb4 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
-@ContextApply(HtmlDocConfigAnnotation.ApplySerializer.class)
+@ContextApply(HtmlDocConfigAnnotation.SerializerApply.class)
public @interface HtmlDocConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
index 2031325..4b146f7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
@@ -25,14 +25,14 @@ public class HtmlDocConfigAnnotation {
/**
* Applies {@link HtmlDocConfig} annotations to a {@link
HtmlDocSerializerBuilder}.
*/
- public static class ApplySerializer extends
AnnotationApplier<HtmlDocConfig,HtmlDocSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<HtmlDocConfig,HtmlDocSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplySerializer(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(HtmlDocConfig.class,
HtmlDocSerializerBuilder.class, vr);
}
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 aa2343d..07c9f48 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
-@ContextApply(JsoConfigAnnotation.Apply.class)
+@ContextApply({JsoConfigAnnotation.SerializerApply.class,JsoConfigAnnotation.ParserApply.class})
public @interface JsoConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
index 508261a..0adf263 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/annotation/JsoConfigAnnotation.java
@@ -13,6 +13,7 @@
package org.apache.juneau.jso.annotation;
import org.apache.juneau.*;
+import org.apache.juneau.jso.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -22,21 +23,40 @@ import org.apache.juneau.svl.*;
public class JsoConfigAnnotation {
/**
- * Applies {@link JsoConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link JsoConfig} annotations to a {@link
JsoSerializerBuilder}.
*/
- public static class Apply extends
AnnotationApplier<JsoConfig,ContextPropertiesBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<JsoConfig,JsoSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(JsoConfig.class, ContextPropertiesBuilder.class,
vr);
+ public SerializerApply(VarResolverSession vr) {
+ super(JsoConfig.class, JsoSerializerBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<JsoConfig> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<JsoConfig> ai,
JsoSerializerBuilder b) {
+ }
+ }
+
+ /**
+ * Applies {@link JsoConfig} annotations to a {@link JsoParserBuilder}.
+ */
+ public static class ParserApply extends
AnnotationApplier<JsoConfig,JsoParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ParserApply(VarResolverSession vr) {
+ super(JsoConfig.class, JsoParserBuilder.class, vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<JsoConfig> ai,
JsoParserBuilder b) {
}
}
}
\ No newline at end of file
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 0aba309..0e1a93b 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
-@ContextApply({JsonConfigAnnotation.ApplySerializer.class,JsonConfigAnnotation.ApplyParser.class})
+@ContextApply({JsonConfigAnnotation.SerializerApply.class,JsonConfigAnnotation.ParserApply.class})
public @interface JsonConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
index 29144c1..12f3380 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
@@ -25,14 +25,14 @@ public class JsonConfigAnnotation {
/**
* Applies {@link JsonConfig} annotations to a {@link
JsonSerializerBuilder}.
*/
- public static class ApplySerializer extends
AnnotationApplier<JsonConfig,JsonSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<JsonConfig,JsonSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplySerializer(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(JsonConfig.class, JsonSerializerBuilder.class,
vr);
}
@@ -49,14 +49,14 @@ public class JsonConfigAnnotation {
/**
* Applies {@link JsonConfig} annotations to a {@link
JsonParserBuilder}.
*/
- public static class ApplyParser extends
AnnotationApplier<JsonConfig,JsonParserBuilder> {
+ public static class ParserApply extends
AnnotationApplier<JsonConfig,JsonParserBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplyParser(VarResolverSession vr) {
+ public ParserApply(VarResolverSession vr) {
super(JsonConfig.class, JsonParserBuilder.class, vr);
}
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 30be756..04ef640 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
-@ContextApply(MsgPackConfigAnnotation.ApplySerializer.class)
+@ContextApply({MsgPackConfigAnnotation.SerializerApply.class,MsgPackConfigAnnotation.ParserApply.class})
public @interface MsgPackConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
index 5b60158..6a6c0f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
@@ -25,14 +25,14 @@ public class MsgPackConfigAnnotation {
/**
* Applies {@link MsgPackConfig} annotations to a {@link
MsgPackSerializerBuilder}.
*/
- public static class ApplySerializer extends
AnnotationApplier<MsgPackConfig,MsgPackSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<MsgPackConfig,MsgPackSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplySerializer(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(MsgPackConfig.class,
MsgPackSerializerBuilder.class, vr);
}
@@ -43,4 +43,23 @@ public class MsgPackConfigAnnotation {
bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesMsgPack(x));
}
}
+
+ /**
+ * Applies {@link MsgPackConfig} annotations to a {@link
MsgPackParserBuilder}.
+ */
+ public static class ParserApply extends
AnnotationApplier<MsgPackConfig,MsgPackParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ParserApply(VarResolverSession vr) {
+ super(MsgPackConfig.class, MsgPackParserBuilder.class,
vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<MsgPackConfig> ai,
MsgPackParserBuilder b) {
+ }
+ }
}
\ No newline at end of file
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 06d405f..f9dcb1e 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
@@ -32,7 +32,7 @@ import org.apache.juneau.oapi.*;
@Target({TYPE,METHOD})
@Retention(RUNTIME)
@Inherited
-@ContextApply({OpenApiConfigAnnotation.ApplySerializer.class,OpenApiConfigAnnotation.ApplyParser.class})
+@ContextApply({OpenApiConfigAnnotation.SerializerApply.class,OpenApiConfigAnnotation.ParserApply.class})
public @interface OpenApiConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
index 3c53d5f..00b9b76 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
@@ -26,14 +26,14 @@ public class OpenApiConfigAnnotation {
/**
* Applies {@link OpenApiConfig} annotations to a {@link
OpenApiSerializerBuilder}.
*/
- public static class ApplySerializer extends
AnnotationApplier<OpenApiConfig,OpenApiSerializerBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<OpenApiConfig,OpenApiSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplySerializer(VarResolverSession vr) {
+ public SerializerApply(VarResolverSession vr) {
super(OpenApiConfig.class,
OpenApiSerializerBuilder.class, vr);
}
@@ -49,14 +49,14 @@ public class OpenApiConfigAnnotation {
/**
* Applies {@link OpenApiConfig} annotations to a {@link
OpenApiParserBuilder}.
*/
- public static class ApplyParser extends
AnnotationApplier<OpenApiConfig,OpenApiParserBuilder> {
+ public static class ParserApply extends
AnnotationApplier<OpenApiConfig,OpenApiParserBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public ApplyParser(VarResolverSession vr) {
+ public ParserApply(VarResolverSession vr) {
super(OpenApiConfig.class, OpenApiParserBuilder.class,
vr);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 271bf16..ab6b2d2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -46,19 +46,12 @@ import org.apache.juneau.transform.*;
public class PlainTextParser extends ReaderParser implements
PlainTextMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "PlainTextParser";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined subclasses
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default parser, all default settings.*/
public static final PlainTextParser DEFAULT = new
PlainTextParser(create());
-
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index f0c6f2a..5ff907e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -42,19 +42,12 @@ import org.apache.juneau.transform.*;
public class PlainTextSerializer extends WriterSerializer implements
PlainTextMetaProvider {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "PlainTextSerializer";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default serializer, all default settings.*/
public static final PlainTextSerializer DEFAULT = new
PlainTextSerializer(create());
-
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
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 052641c..92207a8 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
-@ContextApply(PlainTextConfigAnnotation.Apply.class)
+@ContextApply({PlainTextConfigAnnotation.SerializerApply.class,PlainTextConfigAnnotation.ParserApply.class})
public @interface PlainTextConfig {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
index c00ba93..c6024fb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/annotation/PlainTextConfigAnnotation.java
@@ -13,6 +13,7 @@
package org.apache.juneau.plaintext.annotation;
import org.apache.juneau.*;
+import org.apache.juneau.plaintext.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -22,21 +23,40 @@ import org.apache.juneau.svl.*;
public class PlainTextConfigAnnotation {
/**
- * Applies {@link PlainTextConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link PlainTextConfig} annotations to a {@link
PlainTextSerializerBuilder}.
*/
- public static class Apply extends
AnnotationApplier<PlainTextConfig,ContextPropertiesBuilder> {
+ public static class SerializerApply extends
AnnotationApplier<PlainTextConfig,PlainTextSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(PlainTextConfig.class,
ContextPropertiesBuilder.class, vr);
+ public SerializerApply(VarResolverSession vr) {
+ super(PlainTextConfig.class,
PlainTextSerializerBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<PlainTextConfig> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<PlainTextConfig> ai,
PlainTextSerializerBuilder b) {
+ }
+ }
+
+ /**
+ * Applies {@link PlainTextConfig} annotations to a {@link
PlainTextParserBuilder}.
+ */
+ public static class ParserApply extends
AnnotationApplier<PlainTextConfig,PlainTextParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ParserApply(VarResolverSession vr) {
+ super(PlainTextConfig.class,
PlainTextParserBuilder.class, vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<PlainTextConfig> ai,
PlainTextParserBuilder b) {
}
}
}
\ No newline at end of file
