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 97cf594 Context API refactoring.
97cf594 is described below
commit 97cf594aba4bdc0446b886938519e4ff8f0a1d4d
Author: JamesBognar <[email protected]>
AuthorDate: Sun Sep 26 16:40:05 2021 -0400
Context API refactoring.
---
.../main/java/org/apache/juneau/csv/CsvParser.java | 9 +------
.../java/org/apache/juneau/csv/CsvSerializer.java | 9 +------
.../apache/juneau/csv/annotation/CsvConfig.java | 2 +-
.../juneau/csv/annotation/CsvConfigAnnotation.java | 30 ++++++++++++++++++----
.../json/annotation/JsonConfigAnnotation.java | 4 +--
5 files changed, 30 insertions(+), 24 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index e64c820..1d99948 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -27,19 +27,12 @@ import org.apache.juneau.parser.*;
public class CsvParser extends ReaderParser implements CsvMetaProvider,
CsvCommon {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "CsvParser";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default parser, all default settings.*/
public static final CsvParser DEFAULT = new CsvParser(create());
-
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index e8bc9b3..69e56ae 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -27,19 +27,12 @@ import org.apache.juneau.serializer.*;
public final class CsvSerializer extends WriterSerializer implements
CsvMetaProvider,CsvCommon {
//-------------------------------------------------------------------------------------------------------------------
- // Configurable properties
-
//-------------------------------------------------------------------------------------------------------------------
-
- static final String PREFIX = "CsvSerializer";
-
-
//-------------------------------------------------------------------------------------------------------------------
- // Predefined instances
+ // Static
//-------------------------------------------------------------------------------------------------------------------
/** Default serializer, all default settings.*/
public static final CsvSerializer DEFAULT = new CsvSerializer(create());
-
//-------------------------------------------------------------------------------------------------------------------
// Instance
//-------------------------------------------------------------------------------------------------------------------
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 1a3d441..de4a1ec 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.Apply.class)
+@ContextApply({CsvConfigAnnotation.ApplySerializer.class,CsvConfigAnnotation.ApplyParser.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 51cfde7..070be7e 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
@@ -13,6 +13,7 @@
package org.apache.juneau.csv.annotation;
import org.apache.juneau.*;
+import org.apache.juneau.csv.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -22,21 +23,40 @@ import org.apache.juneau.svl.*;
public class CsvConfigAnnotation {
/**
- * Applies {@link CsvConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link CsvConfig} annotations to a {@link
CsvSerializerBuilder}.
*/
- public static class Apply extends
AnnotationApplier<CsvConfig,ContextPropertiesBuilder> {
+ public static class ApplySerializer extends
AnnotationApplier<CsvConfig,CsvSerializerBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public Apply(VarResolverSession vr) {
- super(CsvConfig.class, ContextPropertiesBuilder.class,
vr);
+ public ApplySerializer(VarResolverSession vr) {
+ super(CsvConfig.class, CsvSerializerBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<CsvConfig> ai,
ContextPropertiesBuilder b) {
+ public void apply(AnnotationInfo<CsvConfig> ai,
CsvSerializerBuilder b) {
+ }
+ }
+
+ /**
+ * Applies {@link CsvConfig} annotations to a {@link CsvParserBuilder}.
+ */
+ public static class ApplyParser extends
AnnotationApplier<CsvConfig,CsvParserBuilder> {
+
+ /**
+ * Constructor.
+ *
+ * @param vr The resolver for resolving values in annotations.
+ */
+ public ApplyParser(VarResolverSession vr) {
+ super(CsvConfig.class, CsvParserBuilder.class, vr);
+ }
+
+ @Override
+ public void apply(AnnotationInfo<CsvConfig> ai,
CsvParserBuilder b) {
}
}
}
\ No newline at end of file
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 464189b..29144c1 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
@@ -23,7 +23,7 @@ import org.apache.juneau.svl.*;
public class JsonConfigAnnotation {
/**
- * Applies {@link JsonConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link JsonConfig} annotations to a {@link
JsonSerializerBuilder}.
*/
public static class ApplySerializer extends
AnnotationApplier<JsonConfig,JsonSerializerBuilder> {
@@ -47,7 +47,7 @@ public class JsonConfigAnnotation {
}
/**
- * Applies {@link JsonConfig} annotations to a {@link
ContextPropertiesBuilder}.
+ * Applies {@link JsonConfig} annotations to a {@link
JsonParserBuilder}.
*/
public static class ApplyParser extends
AnnotationApplier<JsonConfig,JsonParserBuilder> {
