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 fe80df5 Context API refactoring.
fe80df5 is described below
commit fe80df5cf9e8fed9a15d10e74f12d574907886ed
Author: JamesBognar <[email protected]>
AuthorDate: Sun Sep 12 11:43:00 2021 -0400
Context API refactoring.
---
.../org/apache/juneau/jena/RdfParserBuilder.java | 2 +-
.../org/apache/juneau/jena/RdfSerializerBuilder.java | 2 +-
.../src/main/java/org/apache/juneau/Context.java | 14 +++++++-------
.../main/java/org/apache/juneau/ContextBuilder.java | 20 ++++++++++----------
.../java/org/apache/juneau/csv/CsvParserBuilder.java | 2 +-
.../org/apache/juneau/csv/CsvSerializerBuilder.java | 2 +-
.../apache/juneau/html/HtmlDocSerializerBuilder.java | 2 +-
.../org/apache/juneau/html/HtmlParserBuilder.java | 2 +-
.../juneau/html/HtmlSchemaSerializerBuilder.java | 2 +-
.../apache/juneau/html/HtmlSerializerBuilder.java | 2 +-
.../html/HtmlStrippedDocSerializerBuilder.java | 2 +-
.../java/org/apache/juneau/jso/JsoParserBuilder.java | 2 +-
.../org/apache/juneau/jso/JsoSerializerBuilder.java | 2 +-
.../org/apache/juneau/json/JsonParserBuilder.java | 2 +-
.../juneau/json/JsonSchemaSerializerBuilder.java | 2 +-
.../apache/juneau/json/JsonSerializerBuilder.java | 2 +-
.../jsonschema/JsonSchemaGeneratorBuilder.java | 2 +-
.../apache/juneau/msgpack/MsgPackParserBuilder.java | 2 +-
.../juneau/msgpack/MsgPackSerializerBuilder.java | 2 +-
.../org/apache/juneau/oapi/OpenApiParserBuilder.java | 2 +-
.../apache/juneau/oapi/OpenApiSerializerBuilder.java | 2 +-
.../juneau/plaintext/PlainTextParserBuilder.java | 2 +-
.../juneau/plaintext/PlainTextSerializerBuilder.java | 2 +-
.../apache/juneau/soap/SoapXmlSerializerBuilder.java | 2 +-
.../java/org/apache/juneau/uon/UonParserBuilder.java | 2 +-
.../org/apache/juneau/uon/UonSerializerBuilder.java | 2 +-
.../juneau/urlencoding/UrlEncodingParserBuilder.java | 2 +-
.../urlencoding/UrlEncodingSerializerBuilder.java | 2 +-
.../java/org/apache/juneau/xml/XmlParserBuilder.java | 2 +-
.../org/apache/juneau/xml/XmlSerializerBuilder.java | 2 +-
.../apache/juneau/rest/client/RestClientBuilder.java | 6 +++---
.../juneau/rest/mock/MockRestClientBuilder.java | 4 ++--
.../java/org/apache/juneau/rest/RestContext.java | 6 +++---
.../org/apache/juneau/rest/RestContextBuilder.java | 9 ++++-----
.../org/apache/juneau/rest/RestOpContextBuilder.java | 10 +++++-----
.../java/org/apache/juneau/rest/annotation/Rest.java | 2 +-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
.../apache/juneau/rest/annotation/RestDelete.java | 2 +-
.../juneau/rest/annotation/RestDeleteAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestGet.java | 2 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestOp.java | 2 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPost.java | 2 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../org/apache/juneau/rest/annotation/RestPut.java | 2 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../juneau/rest/annotation/Rest_Context_Test.java | 2 +-
48 files changed, 75 insertions(+), 76 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
index f484570..4afa7de 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserBuilder.java
@@ -39,7 +39,7 @@ public class RdfParserBuilder extends ReaderParserBuilder {
*/
protected RdfParserBuilder() {
super();
- contextClass(RdfParser.class);
+ type(RdfParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
index 06c6dc7..1bc161d 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerBuilder.java
@@ -40,7 +40,7 @@ public class RdfSerializerBuilder extends
WriterSerializerBuilder {
*/
protected RdfSerializerBuilder() {
super();
- contextClass(RdfSerializer.class);
+ type(RdfSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 04ac632..b835518 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -62,20 +62,20 @@ public abstract class Context implements MetaProvider {
* Looks for a public static method called <c>create</c> that returns
an object that can be passed into a public
* or protected constructor of the class.
*
- * @param c The builder to create.
+ * @param type The builder to create.
* @return A new builder.
*/
- public static ContextBuilder createBuilder(Class<? extends Context> c) {
+ public static ContextBuilder createBuilder(Class<? extends Context>
type) {
try {
- MethodInfo mi = BUILDER_CREATE_METHODS.get(c);
+ MethodInfo mi = BUILDER_CREATE_METHODS.get(type);
if (mi == null) {
- mi = ClassInfo.of(c).getBuilderCreateMethod();
+ mi =
ClassInfo.of(type).getBuilderCreateMethod();
if (mi == null)
- throw new RuntimeException("Could not
find builder create method on class " + c);
- BUILDER_CREATE_METHODS.put(c, mi);
+ throw new RuntimeException("Could not
find builder create method on class " + type);
+ BUILDER_CREATE_METHODS.put(type, mi);
}
ContextBuilder b = (ContextBuilder)mi.invoke(null);
- b.contextClass(c);
+ b.type(type);
return b;
} catch (ExecutableException e) {
throw new RuntimeException(e);
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 2d2c390..d5ee9ec 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
@@ -58,7 +58,7 @@ public abstract class ContextBuilder {
private final ContextPropertiesBuilder cpb;
boolean debug;
- Class<?> contextClass;
+ Class<?> type;
private final List<Object> builders = new ArrayList<>();
private final AnnotationWorkList applied = new AnnotationWorkList();
@@ -81,7 +81,7 @@ public abstract class ContextBuilder {
protected ContextBuilder(Context copyFrom) {
this.cpb = copyFrom.properties.copy();
this.debug = copyFrom.debug;
- this.contextClass = copyFrom.getClass();
+ this.type = copyFrom.getClass();
registerBuilders(this, cpb);
}
@@ -93,7 +93,7 @@ public abstract class ContextBuilder {
protected ContextBuilder(ContextBuilder copyFrom) {
this.cpb = new ContextPropertiesBuilder(copyFrom.cpb);
this.debug = copyFrom.debug;
- this.contextClass = copyFrom.contextClass;
+ this.type = copyFrom.type;
registerBuilders(this, cpb);
}
@@ -112,17 +112,17 @@ public abstract class ContextBuilder {
* <br>Subsequent calls to this method will create new instances
(unless context object is cacheable).
*/
public Context build() {
- if (contextClass == null)
+ if (type == null)
throw runtimeException("Context class not specified.");
try {
- ClassInfo ci = ClassInfo.of(contextClass);
+ ClassInfo ci = ClassInfo.of(type);
ConstructorInfo cc =
ci.getConstructor(isVisible(PROTECTED).and(hasParentArgs(this))).map(x ->
x.accessible()).orElse(null);
if (cc != null)
return cc.invoke(this);
cc = ci.getPublicConstructor(cpb);
if (cc != null)
return cc.invoke(cpb);
- throw runtimeException("Constructor not found for class
{0}", contextClass);
+ throw runtimeException("Constructor not found for class
{0}", type);
} catch (ExecutableException e) {
throw runtimeException(e, "Error occurred trying to
create context.");
}
@@ -135,8 +135,8 @@ public abstract class ContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public ContextBuilder contextClass(Class<? extends Context> value) {
- this.contextClass = value;
+ public ContextBuilder type(Class<? extends Context> value) {
+ this.type = value;
return this;
}
@@ -145,8 +145,8 @@ public abstract class ContextBuilder {
*
* @return The context class if it was specified.
*/
- public Optional<Class<?>> getContextClass() {
- return Optional.ofNullable(contextClass);
+ public Optional<Class<?>> getType() {
+ return Optional.ofNullable(type);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
index 37b5b47..91fa169 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserBuilder.java
@@ -34,7 +34,7 @@ public class CsvParserBuilder extends ReaderParserBuilder {
protected CsvParserBuilder() {
super();
consumes("text/csv");
- contextClass(CsvParser.class);
+ type(CsvParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
index 54dccb5..81cf040 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerBuilder.java
@@ -34,7 +34,7 @@ public class CsvSerializerBuilder extends
WriterSerializerBuilder {
protected CsvSerializerBuilder() {
super();
produces("text/csv");
- contextClass(CsvSerializer.class);
+ type(CsvSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
index 557fe73..a368be2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerBuilder.java
@@ -39,7 +39,7 @@ public class HtmlDocSerializerBuilder extends
HtmlStrippedDocSerializerBuilder {
super();
produces("text/html");
accept("text/html");
- contextClass(HtmlDocSerializer.class);
+ type(HtmlDocSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
index 8bc38c3..913ff23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserBuilder.java
@@ -37,7 +37,7 @@ public class HtmlParserBuilder extends XmlParserBuilder {
protected HtmlParserBuilder() {
super();
consumes("text/html,text/html+stripped");
- contextClass(HtmlParser.class);
+ type(HtmlParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
index a51f9ca..6d67f81 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerBuilder.java
@@ -42,7 +42,7 @@ public class HtmlSchemaSerializerBuilder extends
HtmlSerializerBuilder {
super();
produces("text/html");
accept("text/html+schema");
- contextClass(HtmlSchemaSerializer.class);
+ type(HtmlSchemaSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
index 667c677..ef436b1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerBuilder.java
@@ -37,7 +37,7 @@ public class HtmlSerializerBuilder extends
XmlSerializerBuilder {
protected HtmlSerializerBuilder() {
super();
produces("text/html");
- contextClass(HtmlSerializer.class);
+ type(HtmlSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
index 55d6de8..7f77660 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerBuilder.java
@@ -35,7 +35,7 @@ public class HtmlStrippedDocSerializerBuilder extends
HtmlSerializerBuilder {
super();
produces("text/html");
accept("text/html+stripped");
- contextClass(HtmlStrippedDocSerializer.class);
+ type(HtmlStrippedDocSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
index 734ca24..d0befee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserBuilder.java
@@ -33,7 +33,7 @@ public class JsoParserBuilder extends
InputStreamParserBuilder {
protected JsoParserBuilder() {
super();
consumes("application/x-java-serialized-object");
- contextClass(JsoParser.class);
+ type(JsoParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
index d5751e8..3b9708f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerBuilder.java
@@ -33,7 +33,7 @@ public class JsoSerializerBuilder extends
OutputStreamSerializerBuilder {
protected JsoSerializerBuilder() {
super();
produces("application/x-java-serialized-object");
- contextClass(JsoSerializer.class);
+ type(JsoSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
index 119826c..0c00cde 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserBuilder.java
@@ -37,7 +37,7 @@ public class JsonParserBuilder extends ReaderParserBuilder {
protected JsonParserBuilder() {
super();
consumes("application/json,text/json");
- contextClass(JsonParser.class);
+ type(JsonParser.class);
}
/**
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 0d80cf2..1ccb808 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
@@ -42,7 +42,7 @@ public class JsonSchemaSerializerBuilder extends
JsonSerializerBuilder {
super();
produces("application/json");
accept("application/json+schema,text/json+schema");
- contextClass(JsonSchemaSerializer.class);
+ type(JsonSchemaSerializer.class);
generatorBuilder = (JsonSchemaGeneratorBuilder)
JsonSchemaGenerator.create().beanContextBuilder(getBeanContextBuilder());
}
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 874759a..2fb4c7b 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
@@ -38,7 +38,7 @@ public class JsonSerializerBuilder extends
WriterSerializerBuilder {
super();
produces("application/json");
accept("application/json,text/json");
- contextClass(JsonSerializer.class);
+ type(JsonSerializer.class);
}
/**
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 ed1dcf7..4e5607b 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
@@ -44,7 +44,7 @@ public class JsonSchemaGeneratorBuilder extends
BeanTraverseBuilder {
BeanContextBuilder bc = getBeanContextBuilder();
jsonSerializerBuilder =
JsonSerializer.create().beanContextBuilder(bc);
jsonParserBuilder = (JsonParserBuilder)
JsonParser.create().beanContextBuilder(bc);
- contextClass(JsonSchemaGenerator.class);
+ type(JsonSchemaGenerator.class);
registerBuilders(jsonSerializerBuilder, jsonParserBuilder);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
index 6b48d48..b924e2f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserBuilder.java
@@ -33,7 +33,7 @@ public class MsgPackParserBuilder extends
InputStreamParserBuilder {
protected MsgPackParserBuilder() {
super();
consumes("octal/msgpack");
- contextClass(MsgPackParser.class);
+ type(MsgPackParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
index 61ab203..4a4209e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerBuilder.java
@@ -33,7 +33,7 @@ public class MsgPackSerializerBuilder extends
OutputStreamSerializerBuilder {
protected MsgPackSerializerBuilder() {
super();
produces("octal/msgpack");
- contextClass(MsgPackSerializer.class);
+ type(MsgPackSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
index 5178ceb..18863a3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserBuilder.java
@@ -37,7 +37,7 @@ public class OpenApiParserBuilder extends UonParserBuilder {
protected OpenApiParserBuilder() {
super();
consumes("text/openapi");
- contextClass(OpenApiParser.class);
+ type(OpenApiParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
index eeb7a19..97d1324 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerBuilder.java
@@ -37,7 +37,7 @@ public class OpenApiSerializerBuilder extends
UonSerializerBuilder {
protected OpenApiSerializerBuilder() {
super();
produces("text/openapi");
- contextClass(OpenApiSerializer.class);
+ type(OpenApiSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
index bc2c8c9..2d50d1d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserBuilder.java
@@ -34,7 +34,7 @@ public class PlainTextParserBuilder extends
ReaderParserBuilder {
protected PlainTextParserBuilder() {
super();
consumes("text/plain");
- contextClass(PlainTextParser.class);
+ type(PlainTextParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
index 81121a1..8a7a330 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerBuilder.java
@@ -34,7 +34,7 @@ public class PlainTextSerializerBuilder extends
WriterSerializerBuilder {
protected PlainTextSerializerBuilder() {
super();
produces("text/plain");
- contextClass(PlainTextSerializer.class);
+ type(PlainTextSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
index 4e5ca9c..4210c03 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerBuilder.java
@@ -37,7 +37,7 @@ public class SoapXmlSerializerBuilder extends
XmlSerializerBuilder {
super();
produces("text/xml");
accept("text/xml+soap");
- contextClass(SoapXmlSerializer.class);
+ type(SoapXmlSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
index 10e4b3f..1caf9cc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserBuilder.java
@@ -37,7 +37,7 @@ public class UonParserBuilder extends ReaderParserBuilder {
protected UonParserBuilder() {
super();
consumes("text/uon");
- contextClass(UonParser.class);
+ type(UonParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
index 028fa3d..829e878 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerBuilder.java
@@ -37,7 +37,7 @@ public class UonSerializerBuilder extends
WriterSerializerBuilder {
protected UonSerializerBuilder() {
super();
produces("text/uon");
- contextClass(UonSerializer.class);
+ type(UonSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
index a578037..75a0bbf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserBuilder.java
@@ -38,7 +38,7 @@ public class UrlEncodingParserBuilder extends
UonParserBuilder {
super();
decoding();
consumes("application/x-www-form-urlencoded");
- contextClass(UrlEncodingParser.class);
+ type(UrlEncodingParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
index 7505b29..decbb3e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerBuilder.java
@@ -37,7 +37,7 @@ public class UrlEncodingSerializerBuilder extends
UonSerializerBuilder {
protected UrlEncodingSerializerBuilder() {
super();
produces("application/x-www-form-urlencoded");
- contextClass(UrlEncodingSerializer.class);
+ type(UrlEncodingSerializer.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
index 4756878..8dc099d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserBuilder.java
@@ -41,7 +41,7 @@ public class XmlParserBuilder extends ReaderParserBuilder {
protected XmlParserBuilder() {
super();
consumes("text/xml,application/xml");
- contextClass(XmlParser.class);
+ type(XmlParser.class);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
index ee9492c..6b0ae35 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerBuilder.java
@@ -37,7 +37,7 @@ public class XmlSerializerBuilder extends
WriterSerializerBuilder {
protected XmlSerializerBuilder() {
super();
produces("text/xml");
- contextClass(XmlSerializer.class);
+ type(XmlSerializer.class);
}
/**
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 c06382c..7df9cd5 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
@@ -120,7 +120,7 @@ public class RestClientBuilder extends
BeanContextableBuilder {
this.parserGroupBuilder =
ParserGroup.create().beanContextBuilder(getBeanContextBuilder());
this.partSerializerBuilder = (SerializerBuilder)
OpenApiSerializer.create().beanContextBuilder(getBeanContextBuilder());
this.partParserBuilder = (ParserBuilder)
OpenApiParser.create().beanContextBuilder(getBeanContextBuilder());
- contextClass(RestClient.class);
+ type(RestClient.class);
}
/**
@@ -148,7 +148,7 @@ public class RestClientBuilder extends
BeanContextableBuilder {
} else {
this.simplePartParser = copyFrom.partParser;
}
- contextClass(copyFrom.getClass());
+ type(copyFrom.getClass());
}
@Override /* ContextBuilder */
@@ -166,7 +166,7 @@ public class RestClientBuilder extends
BeanContextableBuilder {
@Override /* ContextBuilder */
public <T extends Context> T build(Class<T> c) {
contextProperties();
- contextClass(c);
+ type(c);
return (T)super.build();
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
index 2a34ebb..3bf7533 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClientBuilder.java
@@ -75,7 +75,7 @@ public class MockRestClientBuilder extends RestClientBuilder {
protected MockRestClientBuilder() {
super();
connectionManager(new MockHttpClientConnectionManager());
- contextClass(MockRestClient.class);
+ type(MockRestClient.class);
}
/**
@@ -86,7 +86,7 @@ public class MockRestClientBuilder extends RestClientBuilder {
protected MockRestClientBuilder(MockRestClient copyFrom) {
super(copyFrom);
connectionManager(new MockHttpClientConnectionManager());
- contextClass(MockRestClient.class);
+ type(MockRestClient.class);
}
@Override /* ContextBuilder */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index a4cea95..e7f3b92 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -106,7 +106,7 @@ public class RestContext extends Context {
* <p>
* The builder class can be subclassed by using the {@link
Rest#builder()} annotation.
* This can be useful when you want to perform any customizations on
the builder class, typically by overriding protected methods that create
- * the various builders used in the created {@link RestContext}
object (which itself can be overridden via {@link
RestContextBuilder#contextClass(Class)}).
+ * the various builders used in the created {@link RestContext}
object (which itself can be overridden via {@link
RestContextBuilder#type(Class)}).
* The subclass must contain a public constructor that takes in the
same arguments passed in to this method.
*
* @param resourceClass
@@ -1199,7 +1199,7 @@ public class RestContext extends Context {
RestOpContext roc = RestOpContext
.create(mi.inner(), this)
.beanStore(beanStore)
-
.contextClass(builder.opContextClass)
+ .type(builder.opContextClass)
.build();
String httpMethod = roc.getHttpMethod();
@@ -1213,7 +1213,7 @@ public class RestContext extends Context {
.create(mi.inner(),
this)
.dotAll()
.beanStore(rootBeanStore)
-
.contextClass(RrpcRestOpContext.class)
+
.type(RrpcRestOpContext.class)
.build();
x
.add("GET", roc2)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index 820c8fb..8f769d2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -227,7 +227,7 @@ public class RestContextBuilder extends ContextBuilder
implements ServletConfig
*/
protected RestContextBuilder(Class<?> resourceClass, RestContext
parentContext, ServletConfig servletConfig) throws ServletException {
try {
- contextClass(RestContext.class);
+ type(RestContext.class);
this.resourceClass = resourceClass;
this.inner = servletConfig;
@@ -285,7 +285,7 @@ public class RestContextBuilder extends ContextBuilder
implements ServletConfig
@Override /* BeanContextBuilder */
public RestContext build() {
try {
- return (RestContext) BeanStore.of(beanStore(),
resource.get()).addBeans(RestContextBuilder.class,
this).createBean(getContextClass().orElse(RestContext.class));
+ return (RestContext) BeanStore.of(beanStore(),
resource.get()).addBeans(RestContextBuilder.class,
this).createBean(getType().orElse(RestContext.class));
} catch (Exception e) {
throw toHttpException(e, InternalServerError.class);
}
@@ -1954,9 +1954,8 @@ public class RestContextBuilder extends ContextBuilder
implements ServletConfig
}
@Override
- @FluentSetter
- public RestContextBuilder contextClass(Class<? extends Context> value) {
- super.contextClass(value);
+ public RestContextBuilder type(Class<? extends Context> value) {
+ super.type(value);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
index 0523915..b753d27 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
@@ -80,7 +80,7 @@ public class RestOpContextBuilder extends BeanContextBuilder {
@Override /* BeanContextBuilder */
public RestOpContext build() {
try {
- Class<? extends RestOpContext> ic = (Class<? extends
RestOpContext>) getContextClass().orElse(getDefaultImplClass());
+ Class<? extends RestOpContext> ic = (Class<? extends
RestOpContext>) getType().orElse(getDefaultImplClass());
return
BeanStore.of(beanStore).addBean(RestOpContextBuilder.class,
this).createBean(ic);
} catch (Exception e) {
throw toHttpException(e, InternalServerError.class);
@@ -88,9 +88,9 @@ public class RestOpContextBuilder extends BeanContextBuilder {
}
/**
- * Specifies the default implementation class if not specified via
{@link #contextClass(Class)}.
+ * Specifies the default implementation class if not specified via
{@link #type(Class)}.
*
- * @return The default implementation class if not specified via {@link
#contextClass(Class)}.
+ * @return The default implementation class if not specified via {@link
#type(Class)}.
*/
protected Class<? extends RestOpContext> getDefaultImplClass() {
return RestOpContext.class;
@@ -346,8 +346,8 @@ public class RestOpContextBuilder extends
BeanContextBuilder {
@Override
@FluentSetter
- public RestOpContextBuilder contextClass(Class<? extends Context>
value) {
- super.contextClass(value);
+ public RestOpContextBuilder type(Class<? extends Context> value) {
+ super.type(value);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
index c659545..773ca09 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/Rest.java
@@ -299,7 +299,7 @@ public @interface Rest {
* Allows you to extend the {@link RestContext} class to modify how any
of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link RestContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestContextBuilder#type(Class)}
* </ul>
*/
Class<? extends RestContext> contextClass() default
RestContext.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index e17ffd2..88034c2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -1062,7 +1062,7 @@ public class RestAnnotation {
b.children((Object[])a.children());
b.restOpArgs(a.restOpArgs());
classes(a.encoders()).ifPresent(x ->
b.getEncoders().add(x));
- type(a.contextClass()).ifPresent(x ->
b.contextClass(x));
+ type(a.contextClass()).ifPresent(x -> b.type(x));
string(a.uriContext()).ifPresent(x -> b.uriContext(x));
string(a.uriAuthority()).ifPresent(x ->
b.uriAuthority(x));
string(a.uriRelativity()).map(UriRelativity::valueOf).ifPresent(x ->
b.uriRelativity(x));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
index 8bb1377..77e61a0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDelete.java
@@ -106,7 +106,7 @@ public @interface RestDelete {
* Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#type(Class)}
* </ul>
*/
Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index 3571351..d208ffc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -455,7 +455,7 @@ public class RestDeleteAnnotation {
b.httpMethod("delete");
classes(a.encoders()).ifPresent(x ->
b.getEncoders().set(x));
- type(a.contextClass()).ifPresent(x ->
b.contextClass(x));
+ type(a.contextClass()).ifPresent(x -> b.type(x));
strings(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
strings(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultResponseHeaders(x));
strings(a.defaultRequestAttributes()).map(x ->
BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes(x));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
index a063d8a..0948554 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java
@@ -110,7 +110,7 @@ public @interface RestGet {
* Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#type(Class)}
* </ul>
*/
Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index e12b293..fa25b52 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -513,7 +513,7 @@ public class RestGetAnnotation {
classes(a.serializers()).ifPresent(x ->
b.getSerializers().set(x));
classes(a.encoders()).ifPresent(x ->
b.getEncoders().set(x));
- type(a.contextClass()).ifPresent(x ->
b.contextClass(x));
+ type(a.contextClass()).ifPresent(x -> b.type(x));
strings(a.produces()).map(MediaType::of).forEach(x ->
b.produces(x));
strings(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
strings(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultResponseHeaders(x));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
index 237429e..2478138 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java
@@ -127,7 +127,7 @@ public @interface RestOp {
* Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#type(Class)}
* </ul>
*/
Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 9a3c8ca..2b4fce0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -617,7 +617,7 @@ public class RestOpAnnotation {
classes(a.serializers()).ifPresent(x ->
b.getSerializers().set(x));
classes(a.parsers()).ifPresent(x ->
b.getParsers().set(x));
classes(a.encoders()).ifPresent(x ->
b.getEncoders().set(x));
- type(a.contextClass()).ifPresent(x ->
b.contextClass(x));
+ type(a.contextClass()).ifPresent(x -> b.type(x));
strings(a.produces()).map(MediaType::of).forEach(x ->
b.produces(x));
strings(a.consumes()).map(MediaType::of).forEach(x ->
b.consumes(x));
strings(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
index f8b88a0..4d606b9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java
@@ -129,7 +129,7 @@ public @interface RestPost {
* Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#type(Class)}
* </ul>
*/
Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 7efddec..eeb84e7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -601,7 +601,7 @@ public class RestPostAnnotation {
classes(a.serializers()).ifPresent(x ->
b.getSerializers().set(x));
classes(a.parsers()).ifPresent(x ->
b.getParsers().set(x));
classes(a.encoders()).ifPresent(x ->
b.getEncoders().set(x));
- type(a.contextClass()).ifPresent(x ->
b.contextClass(x));
+ type(a.contextClass()).ifPresent(x -> b.type(x));
strings(a.produces()).map(MediaType::of).forEach(x ->
b.produces(x));
strings(a.consumes()).map(MediaType::of).forEach(x ->
b.consumes(x));
strings(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
index 5706fe0..01d4141 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java
@@ -129,7 +129,7 @@ public @interface RestPut {
* Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#type(Class)}
* </ul>
*/
Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index f9f2213..49d1c6c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -601,7 +601,7 @@ public class RestPutAnnotation {
classes(a.serializers()).ifPresent(x ->
b.getSerializers().set(x));
classes(a.parsers()).ifPresent(x ->
b.getParsers().set(x));
classes(a.encoders()).ifPresent(x ->
b.getEncoders().set(x));
- type(a.contextClass()).ifPresent(x ->
b.contextClass(x));
+ type(a.contextClass()).ifPresent(x -> b.type(x));
strings(a.produces()).map(MediaType::of).forEach(x ->
b.produces(x));
strings(a.consumes()).map(MediaType::of).forEach(x ->
b.consumes(x));
strings(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
index 84e781a..eed2c06 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_Context_Test.java
@@ -64,7 +64,7 @@ public class Rest_Context_Test {
public static class A4 extends A1 {
@RestHook(HookEvent.INIT)
public void init(RestContextBuilder builder) throws Exception {
- builder.contextClass(X1.class);
+ builder.type(X1.class);
}
}
