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 d5c305e Context API refactoring.
d5c305e is described below
commit d5c305eb13ec067ed0ead426573fa467c355de4e
Author: JamesBognar <[email protected]>
AuthorDate: Sat Sep 25 11:31:19 2021 -0400
Context API refactoring.
---
.../java/org/apache/juneau/BeanContextableBuilder.java | 16 ++++++++++++++--
.../juneau/json/JsonSchemaSerializerBuilder.java | 6 +++---
.../org/apache/juneau/json/JsonSerializerBuilder.java | 4 ++--
.../juneau/jsonschema/JsonSchemaGeneratorBuilder.java | 18 +++++++++---------
.../java/org/apache/juneau/parser/ParserGroup.java | 10 +++++-----
.../org/apache/juneau/serializer/SerializerGroup.java | 10 +++++-----
.../apache/juneau/rest/client/RestClientBuilder.java | 8 ++++----
7 files changed, 42 insertions(+), 30 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextableBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextableBuilder.java
index 28feb60..e0c1d66 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextableBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextableBuilder.java
@@ -17,6 +17,7 @@ import java.io.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
import java.util.*;
+import java.util.function.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.http.header.*;
@@ -98,10 +99,21 @@ public abstract class BeanContextableBuilder extends
ContextBuilder {
*
* @return The inner bean context builder.
*/
- public BeanContextBuilder getBeanContextBuilder() {
+ public BeanContextBuilder beanContext() {
return bcBuilder;
}
+ /**
+ * Applies an operation to the inner bean context builder.
+ *
+ * @param operation The operation to apply.
+ * @return This object.
+ */
+ public final BeanContextableBuilder
beanContext(Consumer<BeanContextBuilder> operation) {
+ operation.accept(beanContext());
+ return this;
+ }
+
//-----------------------------------------------------------------------------------------------------------------
// Properties
//-----------------------------------------------------------------------------------------------------------------
@@ -118,7 +130,7 @@ public abstract class BeanContextableBuilder extends
ContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public BeanContextableBuilder beanContextBuilder(BeanContextBuilder
value) {
+ public BeanContextableBuilder beanContext(BeanContextBuilder value) {
this.bcBuilder = value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
index 1ccb808..967a488 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerBuilder.java
@@ -43,7 +43,7 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
produces("application/json");
accept("application/json+schema,text/json+schema");
type(JsonSchemaSerializer.class);
- generatorBuilder = (JsonSchemaGeneratorBuilder)
JsonSchemaGenerator.create().beanContextBuilder(getBeanContextBuilder());
+ generatorBuilder = (JsonSchemaGeneratorBuilder)
JsonSchemaGenerator.create().beanContext(beanContext());
}
/**
@@ -53,7 +53,7 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
*/
protected JsonSchemaSerializerBuilder(JsonSchemaSerializer copyFrom) {
super(copyFrom);
- generatorBuilder = (JsonSchemaGeneratorBuilder)
copyFrom.generator.copy().beanContextBuilder(getBeanContextBuilder());
+ generatorBuilder = (JsonSchemaGeneratorBuilder)
copyFrom.generator.copy().beanContext(beanContext());
}
/**
@@ -63,7 +63,7 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
*/
protected JsonSchemaSerializerBuilder(JsonSchemaSerializerBuilder
copyFrom) {
super(copyFrom);
- generatorBuilder = (JsonSchemaGeneratorBuilder)
copyFrom.generatorBuilder.copy().beanContextBuilder(getBeanContextBuilder());
+ generatorBuilder = (JsonSchemaGeneratorBuilder)
copyFrom.generatorBuilder.copy().beanContext(beanContext());
}
@Override /* ContextBuilder */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
index 2fb4c7b..d2c0541 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerBuilder.java
@@ -208,8 +208,8 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
// <FluentSetters>
@Override
- public JsonSerializerBuilder beanContextBuilder(BeanContextBuilder
value) {
- super.beanContextBuilder(value);
+ public JsonSerializerBuilder beanContext(BeanContextBuilder value) {
+ super.beanContext(value);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
index 4e5607b..d5cb3e4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorBuilder.java
@@ -41,9 +41,9 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
*/
protected JsonSchemaGeneratorBuilder() {
super();
- BeanContextBuilder bc = getBeanContextBuilder();
- jsonSerializerBuilder =
JsonSerializer.create().beanContextBuilder(bc);
- jsonParserBuilder = (JsonParserBuilder)
JsonParser.create().beanContextBuilder(bc);
+ BeanContextBuilder bc = beanContext();
+ jsonSerializerBuilder = JsonSerializer.create().beanContext(bc);
+ jsonParserBuilder = (JsonParserBuilder)
JsonParser.create().beanContext(bc);
type(JsonSchemaGenerator.class);
registerBuilders(jsonSerializerBuilder, jsonParserBuilder);
}
@@ -55,9 +55,9 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
*/
protected JsonSchemaGeneratorBuilder(JsonSchemaGenerator copyFrom) {
super(copyFrom);
- BeanContextBuilder bc = getBeanContextBuilder();
- jsonSerializerBuilder =
copyFrom.jsonSerializer.copy().beanContextBuilder(bc);
- jsonParserBuilder = (JsonParserBuilder)
copyFrom.jsonParser.copy().beanContextBuilder(bc);
+ BeanContextBuilder bc = beanContext();
+ jsonSerializerBuilder =
copyFrom.jsonSerializer.copy().beanContext(bc);
+ jsonParserBuilder = (JsonParserBuilder)
copyFrom.jsonParser.copy().beanContext(bc);
registerBuilders(jsonSerializerBuilder, jsonParserBuilder);
}
@@ -68,9 +68,9 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
*/
protected JsonSchemaGeneratorBuilder(JsonSchemaGeneratorBuilder
copyFrom) {
super(copyFrom);
- BeanContextBuilder bc = getBeanContextBuilder();
- jsonSerializerBuilder =
copyFrom.jsonSerializerBuilder.copy().beanContextBuilder(bc);
- jsonParserBuilder = (JsonParserBuilder)
copyFrom.jsonParserBuilder.copy().beanContextBuilder(bc);
+ BeanContextBuilder bc = beanContext();
+ jsonSerializerBuilder =
copyFrom.jsonSerializerBuilder.copy().beanContext(bc);
+ jsonParserBuilder = (JsonParserBuilder)
copyFrom.jsonParserBuilder.copy().beanContext(bc);
registerBuilders(jsonSerializerBuilder, jsonParserBuilder);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
index 3dc9831..a081cd9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserGroup.java
@@ -170,7 +170,7 @@ public final class ParserGroup {
ParserBuilder x = (ParserBuilder)o;
x = x.copy();
if (bcBuilder != null)
- x.beanContextBuilder(bcBuilder);
+ x.beanContext(bcBuilder);
return x;
}
return o;
@@ -196,9 +196,9 @@ public final class ParserGroup {
* @param value The bean contest builder to associate.
* @return This object (for method chaining).
*/
- public Builder beanContextBuilder(BeanContextBuilder value) {
+ public Builder beanContext(BeanContextBuilder value) {
bcBuilder = value;
- forEach(x -> x.beanContextBuilder(value));
+ forEach(x -> x.beanContext(value));
return this;
}
@@ -208,7 +208,7 @@ public final class ParserGroup {
* @param operation The operation to apply.
* @return This object.
*/
- public final Builder
beanContextBuilder(Consumer<BeanContextBuilder> operation) {
+ public final Builder beanContext(Consumer<BeanContextBuilder>
operation) {
if (bcBuilder != null)
operation.accept(bcBuilder);
return this;
@@ -298,7 +298,7 @@ public final class ParserGroup {
@SuppressWarnings("unchecked")
ParserBuilder b =
Parser.createParserBuilder((Class<? extends Parser>)o);
if (bcBuilder != null)
- b.beanContextBuilder(bcBuilder);
+ b.beanContext(bcBuilder);
o = b;
}
return o;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
index bfc86eb..d0cb1df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerGroup.java
@@ -162,7 +162,7 @@ public final class SerializerGroup {
SerializerBuilder x = (SerializerBuilder)o;
x = x.copy();
if (bcBuilder != null)
- x.beanContextBuilder(bcBuilder);
+ x.beanContext(bcBuilder);
return x;
}
return o;
@@ -188,9 +188,9 @@ public final class SerializerGroup {
* @param value The bean contest builder to associate.
* @return This object (for method chaining).
*/
- public Builder beanContextBuilder(BeanContextBuilder value) {
+ public Builder beanContext(BeanContextBuilder value) {
bcBuilder = value;
- forEach(x -> x.beanContextBuilder(value));
+ forEach(x -> x.beanContext(value));
return this;
}
@@ -200,7 +200,7 @@ public final class SerializerGroup {
* @param operation The operation to apply.
* @return This object.
*/
- public final Builder
beanContextBuilder(Consumer<BeanContextBuilder> operation) {
+ public final Builder beanContext(Consumer<BeanContextBuilder>
operation) {
if (bcBuilder != null)
operation.accept(bcBuilder);
return this;
@@ -287,7 +287,7 @@ public final class SerializerGroup {
@SuppressWarnings("unchecked")
SerializerBuilder b =
Serializer.createSerializerBuilder((Class<? extends Serializer>)o);
if (bcBuilder != null)
- b.beanContextBuilder(bcBuilder);
+ b.beanContext(bcBuilder);
o = b;
}
return o;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index b5f11c5..2fc9a5a 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -127,10 +127,10 @@ public class RestClientBuilder extends
BeanContextableBuilder {
*/
protected RestClientBuilder() {
super();
- this.serializers =
SerializerGroup.create().beanContextBuilder(getBeanContextBuilder());
- this.parsers =
ParserGroup.create().beanContextBuilder(getBeanContextBuilder());
- this.partSerializer = (SerializerBuilder)
OpenApiSerializer.create().beanContextBuilder(getBeanContextBuilder());
- this.partParser = (ParserBuilder)
OpenApiParser.create().beanContextBuilder(getBeanContextBuilder());
+ this.serializers =
SerializerGroup.create().beanContext(beanContext());
+ this.parsers = ParserGroup.create().beanContext(beanContext());
+ this.partSerializer = (SerializerBuilder)
OpenApiSerializer.create().beanContext(beanContext());
+ this.partParser = (ParserBuilder)
OpenApiParser.create().beanContext(beanContext());
type(RestClient.class);
}
