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 16bc8fa Context API refactoring.
16bc8fa is described below
commit 16bc8fad5aafb34417b772507039d0179b266eef
Author: JamesBognar <[email protected]>
AuthorDate: Sat Aug 28 13:52:50 2021 -0400
Context API refactoring.
---
.../apache/juneau/rest/BasicDebugEnablement.java | 2 +-
.../juneau/rest/BasicSwaggerProviderSession.java | 6 +-
.../org/apache/juneau/rest/DebugEnablement.java | 2 +-
.../main/java/org/apache/juneau/rest/RestCall.java | 8 +-
.../java/org/apache/juneau/rest/RestContext.java | 106 +++++------
.../org/apache/juneau/rest/RestContextBuilder.java | 6 +-
.../rest/{RestOperationArg.java => RestOpArg.java} | 4 +-
...estOperationArgList.java => RestOpArgList.java} | 10 +-
...estOperationContext.java => RestOpContext.java} | 40 ++---
...ntextBuilder.java => RestOpContextBuilder.java} | 194 ++++++++++-----------
...estOperationInvoker.java => RestOpInvoker.java} | 6 +-
.../org/apache/juneau/rest/RestOperations.java | 18 +-
.../apache/juneau/rest/RestOperationsBuilder.java | 8 +-
.../java/org/apache/juneau/rest/RestRequest.java | 10 +-
.../java/org/apache/juneau/rest/RestResponse.java | 10 +-
...perationContext.java => RrpcRestOpContext.java} | 6 +-
.../org/apache/juneau/rest/annotation/Rest.java | 8 +-
.../juneau/rest/annotation/RestAnnotation.java | 46 ++---
.../apache/juneau/rest/annotation/RestDelete.java | 8 +-
.../rest/annotation/RestDeleteAnnotation.java | 20 +--
.../org/apache/juneau/rest/annotation/RestGet.java | 8 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 20 +--
.../org/apache/juneau/rest/annotation/RestOp.java | 8 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 20 +--
.../apache/juneau/rest/annotation/RestPost.java | 8 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 20 +--
.../org/apache/juneau/rest/annotation/RestPut.java | 8 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 20 +--
.../org/apache/juneau/rest/args/AttributeArg.java | 4 +-
.../java/org/apache/juneau/rest/args/BodyArg.java | 4 +-
.../org/apache/juneau/rest/args/DefaultArg.java | 4 +-
.../org/apache/juneau/rest/args/FormDataArg.java | 4 +-
.../apache/juneau/rest/args/HasFormDataArg.java | 4 +-
.../org/apache/juneau/rest/args/HasQueryArg.java | 4 +-
.../org/apache/juneau/rest/args/HeaderArg.java | 4 +-
.../org/apache/juneau/rest/args/MethodArg.java | 4 +-
.../java/org/apache/juneau/rest/args/PathArg.java | 4 +-
.../java/org/apache/juneau/rest/args/QueryArg.java | 4 +-
.../apache/juneau/rest/args/RequestBeanArg.java | 4 +-
.../apache/juneau/rest/args/ResponseBeanArg.java | 4 +-
.../apache/juneau/rest/args/ResponseHeaderArg.java | 4 +-
.../apache/juneau/rest/args/ResponseStatusArg.java | 4 +-
.../juneau/rest/args/SimpleRestOperationArg.java | 6 +-
.../org/apache/juneau/rest/RestOp_Params_Test.java | 4 +-
.../java/org/apache/juneau/rest/Swagger_Test.java | 8 +-
.../rest/annotation/RestAnnotation_Test.java | 20 +--
.../rest/annotation/RestDeleteAnnotation_Test.java | 10 +-
.../rest/annotation/RestGetAnnotation_Test.java | 10 +-
.../rest/annotation/RestOpAnnotation_Test.java | 10 +-
.../rest/annotation/RestPostAnnotation_Test.java | 10 +-
.../rest/annotation/RestPutAnnotation_Test.java | 10 +-
.../apache/juneau/rest/testutils/TestUtils.java | 4 +-
52 files changed, 389 insertions(+), 389 deletions(-)
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicDebugEnablement.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicDebugEnablement.java
index 713a9e4..a65b9fa 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicDebugEnablement.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicDebugEnablement.java
@@ -47,7 +47,7 @@ public class BasicDebugEnablement implements DebugEnablement {
}
@Override
- public boolean isDebug(RestOperationContext context, HttpServletRequest
req) {
+ public boolean isDebug(RestOpContext context, HttpServletRequest req) {
Method m = context.getJavaMethod();
Enablement e =
enablementMap.find(m).orElse(enablementMap.find(m.getDeclaringClass()).orElse(defaultEnablement));
return e == ALWAYS || (e == CONDITIONAL &&
isConditionallyEnabled(req));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
index d6744f6..2ec8f3c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
@@ -208,7 +208,7 @@ public class BasicSwaggerProviderSession {
js.addBeanDef(defId, new
OMap(definitions.getMap(defId)));
// Iterate through all the @RestOp methods.
- for (RestOperationContext sm : context.getMethodContexts()) {
+ for (RestOpContext sm : context.getOpContexts()) {
BeanSession bs = sm.createBeanSession();
@@ -795,7 +795,7 @@ public class BasicSwaggerProviderSession {
return nullIfEmpty(om);
}
- private void addBodyExamples(RestOperationContext sm, OMap piri,
boolean response, Type type, Locale locale) throws Exception {
+ private void addBodyExamples(RestOpContext sm, OMap piri, boolean
response, Type type, Locale locale) throws Exception {
String sex = piri.getString("example");
@@ -851,7 +851,7 @@ public class BasicSwaggerProviderSession {
piri.put(examplesKey, examples);
}
- private void addParamExample(RestOperationContext sm, OMap piri,
RestParamType in, Type type) throws Exception {
+ private void addParamExample(RestOpContext sm, OMap piri, RestParamType
in, Type type) throws Exception {
String s = piri.getString("example");
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/DebugEnablement.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/DebugEnablement.java
index 55a4118..6b1f233 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/DebugEnablement.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/DebugEnablement.java
@@ -59,5 +59,5 @@ public interface DebugEnablement {
* @param req The HTTP request.
* @return <jk>true</jk> if debug is enabled on the specified method
and request.
*/
- public boolean isDebug(RestOperationContext context, HttpServletRequest
req);
+ public boolean isDebug(RestOpContext context, HttpServletRequest req);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCall.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCall.java
index 0fa6d6e..edc2594 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCall.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestCall.java
@@ -40,7 +40,7 @@ public class RestCall {
private RestRequest rreq;
private RestResponse rres;
private RestContext context;
- private RestOperationContext opContext;
+ private RestOpContext opContext;
private UrlPath urlPath;
private String pathInfoUndecoded;
private long startTime = System.currentTimeMillis();
@@ -118,9 +118,9 @@ public class RestCall {
* @return This object (for method chaining).
* @throws Exception If thrown from the {@link RestRequest} or {@link
RestResponse} constructors.
*/
- public RestCall restOperationContext(RestOperationContext value) throws
Exception {
+ public RestCall restOpContext(RestOpContext value) throws Exception {
opContext = value;
- beanStore.addBean(RestOperationContext.class, value);
+ beanStore.addBean(RestOpContext.class, value);
rreq = context.createRequest(this);
beanStore.addBean(RestRequest.class, rreq);
rres = context.createResponse(this);
@@ -284,7 +284,7 @@ public class RestCall {
*
* @return The method context of this call.
*/
- public RestOperationContext getRestOperationContext() {
+ public RestOpContext getRestOpContext() {
return opContext;
}
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 61f68c4..2ed1dd1 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
@@ -2451,29 +2451,29 @@ public class RestContext extends BeanContext {
* <ul class='spaced-list'>
* <li><b>ID:</b> {@link
org.apache.juneau.rest.RestContext#REST_restOperationContextClass
REST_restOperationContextClass}
* <li><b>Name:</b>
<js>"RestContext.restOperationContextClass.c"</js>
- * <li><b>Data type:</b> <c>Class<? extends {@link
org.apache.juneau.rest.RestOperationContext}></c>
- * <li><b>Default:</b> {@link
org.apache.juneau.rest.RestOperationContext}
+ * <li><b>Data type:</b> <c>Class<? extends {@link
org.apache.juneau.rest.RestOpContext}></c>
+ * <li><b>Default:</b> {@link
org.apache.juneau.rest.RestOpContext}
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link
org.apache.juneau.rest.annotation.Rest#restOperationContextClass()}
+ * <li class='ja'>{@link
org.apache.juneau.rest.annotation.Rest#restOpContextClass()}
* <li class='ja'>{@link
org.apache.juneau.rest.annotation.RestOp#contextClass()}
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#restOperationContextClass(Class)}
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#restOpContextClass(Class)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.RestOpContextBuilder#contextClass(Class)}
* </ul>
* </ul>
*
* <h5 class='section'>Description:</h5>
* <p>
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <p>
* The subclass must have a public constructor that takes in any of the
following arguments:
* <ul>
- * <li>{@link RestOperationContextBuilder} - The builder for the
object.
+ * <li>{@link RestOpContextBuilder} - The builder for the object.
* <li>Any beans found in the specified {@link #REST_beanStore
bean store}.
* <li>Any {@link Optional} beans that may or may not be found in
the specified {@link #REST_beanStore bean store}.
* </ul>
@@ -2482,12 +2482,12 @@ public class RestContext extends BeanContext {
* <p class='bcode w800'>
* <jc>// Our extended context class that adds a request attribute
to all requests.</jc>
* <jc>// The attribute value is provided by an injected spring
bean.</jc>
- * <jk>public</jk> MyRestOperationContext <jk>extends</jk>
RestOperationContext {
+ * <jk>public</jk> MyRestOperationContext <jk>extends</jk>
RestOpContext {
*
* <jk>private final</jk> Optional<? <jk>extends</jk>
Supplier<Object>> <jf>fooSupplier</jf>;
*
* <jc>// Constructor that takes in builder and optional
injected attribute provider.</jc>
- * <jk>public</jk>
MyRestOperationContext(RestOperationContextBuilder <jv>builder</jv>,
Optional<AnInjectedFooSupplier> <jv>fooSupplier</jv>) {
+ * <jk>public</jk>
MyRestOperationContext(RestOpContextBuilder <jv>builder</jv>,
Optional<AnInjectedFooSupplier> <jv>fooSupplier</jv>) {
* <jk>super</jk>(<jv>builder</jv>);
* <jk>this</jk>.<jf>fooSupplier</jf> =
<jv>fooSupplier</jv>.orElseGet(()-><jk>null</jk>);
* }
@@ -2503,7 +2503,7 @@ public class RestContext extends BeanContext {
* </p>
* <p class='bcode w800'>
* <jc>// Option #1 - Defined via annotation.</jc>
- *
<ja>@Rest</ja>(restOperationContextClass=MyRestOperationContext.<jk>class</jk>)
+ *
<ja>@Rest</ja>(restOpContextClass=MyRestOperationContext.<jk>class</jk>)
* <jk>public class</jk> MyResource {
* ...
*
@@ -2565,7 +2565,7 @@ public class RestContext extends BeanContext {
* <jc>// Override any methods.</jc>
*
* <ja>@Override</ja>
- * <jk>public</jk> RestOperationContext
findMethod(RestCall <jv>call</jv>) <jk>throws</jk> MethodNotAllowed,
PreconditionFailed, NotFound {
+ * <jk>public</jk> RestOpContext findMethod(RestCall
<jv>call</jv>) <jk>throws</jk> MethodNotAllowed, PreconditionFailed, NotFound {
* String <jv>path</jv> =
<jv>call</jv>.getPathInfo();
* <jk>if</jk>
(<jv>path</jv>.endsWith(<js>"/foo"</js>)) {
* <jc>// Do our own special handling.</jc>
@@ -2597,16 +2597,16 @@ public class RestContext extends BeanContext {
* <ul class='spaced-list'>
* <li><b>ID:</b> {@link
org.apache.juneau.rest.RestContext#REST_restOperationArgs REST_restParams}
* <li><b>Name:</b> <js>"RestContext.restOperationsParams.lo"</js>
- * <li><b>Data type:</b> <c>List<Class<{@link
org.apache.juneau.rest.RestOperationArg}>></c>
+ * <li><b>Data type:</b> <c>List<Class<{@link
org.apache.juneau.rest.RestOpArg}>></c>
* <li><b>Default:</b> empty list
* <li><b>Session property:</b> <jk>false</jk>
* <li><b>Annotations:</b>
* <ul>
- * <li class='ja'>{@link
org.apache.juneau.rest.annotation.Rest#restOperationArgs()}
+ * <li class='ja'>{@link
org.apache.juneau.rest.annotation.Rest#restOpArgs()}
* </ul>
* <li><b>Methods:</b>
* <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#restOperationArgs(Class...)}
+ * <li class='jm'>{@link
org.apache.juneau.rest.RestContextBuilder#restOpArgs(Class...)}
* </ul>
* </ul>
*
@@ -2621,7 +2621,7 @@ public class RestContext extends BeanContext {
* the following resolver:
* <p class='bcode w800'>
* <jc>// Define a parameter resolver for resolving
MySpecialObject objects.</jc>
- * <jk>public class</jk> MyRestParam <jk>implements</jk>
RestOperationArg {
+ * <jk>public class</jk> MyRestParam <jk>implements</jk> RestOpArg
{
*
* <jc>// Must implement a static creator method that
takes in a ParamInfo that describes the parameter
* // being checked. If the parameter isn't of type
MySpecialObject, then it should return null.</jc>
@@ -2642,7 +2642,7 @@ public class RestContext extends BeanContext {
* }
*
* <jc>// Option #1 - Registered via annotation.</jc>
- * <ja>@Rest</ja>(restOperationArgs=MyRestParam.<jk>class</jk>)
+ * <ja>@Rest</ja>(restOpArgs=MyRestParam.<jk>class</jk>)
* <jk>public class</jk> MyResource {
*
* <jc>// Option #2 - Registered via builder passed in
through resource constructor.</jc>
@@ -2673,7 +2673,7 @@ public class RestContext extends BeanContext {
* <li>
* Inner classes of the REST resource class are allowed.
* <li>
- * Refer to {@link RestOperationArg} for the list of
predefined parameter resolvers.
+ * Refer to {@link RestOpArg} for the list of predefined
parameter resolvers.
* </ul>
*/
public static final String REST_restOperationArgs = PREFIX +
".restOperationArgs.lo";
@@ -3370,7 +3370,7 @@ public class RestContext extends BeanContext {
private final Set<String> allowedMethodParams, allowedHeaderParams,
allowedMethodHeaders;
- private final Class<? extends RestOperationArg>[] opArgs,
hookMethodArgs;
+ private final Class<? extends RestOpArg>[] opArgs, hookMethodArgs;
private final HttpPartSerializer partSerializer;
private final HttpPartParser partParser;
private final JsonSchemaGenerator jsonSchemaGenerator;
@@ -3405,7 +3405,7 @@ public class RestContext extends BeanContext {
endCallMethods,
destroyMethods;
- private final RestOperationInvoker[]
+ private final RestOpInvoker[]
preCallMethods,
postCallMethods;
@@ -3524,7 +3524,7 @@ public class RestContext extends BeanContext {
defaultResponseHeaders =
createDefaultResponseHeaders(r, cp, bf).build();
defaultRequestAttributes =
createDefaultRequestAttributes(r, cp, bf);
- opArgs = createRestOperationArgs(r, cp, bf).asArray();
+ opArgs = createOpArgs(r, cp, bf).asArray();
hookMethodArgs = createHookMethodArgs(r, cp,
bf).asArray();
uriContext =
nullIfEmpty(cp.getString(REST_uriContext).orElse(null));
@@ -3555,14 +3555,14 @@ public class RestContext extends BeanContext {
postInitChildFirstMethods =
createPostInitChildFirstMethods(r, cp,
bf).stream().map(this::toMethodInvoker).toArray(MethodInvoker[]::new);
destroyMethods = createDestroyMethods(r, cp,
bf).stream().map(this::toMethodInvoker).toArray(MethodInvoker[]::new);
- preCallMethods = createPreCallMethods(r, cp,
bf).stream().map(this::toRestOperationInvoker).toArray(RestOperationInvoker[]::
new);
- postCallMethods = createPostCallMethods(r, cp,
bf).stream().map(this::toRestOperationInvoker).toArray(RestOperationInvoker[]::
new);
+ preCallMethods = createPreCallMethods(r, cp,
bf).stream().map(this::toRestOpInvoker).toArray(RestOpInvoker[]:: new);
+ postCallMethods = createPostCallMethods(r, cp,
bf).stream().map(this::toRestOpInvoker).toArray(RestOpInvoker[]:: new);
restOperations = createRestOperations(r, cp, bf);
List<MediaType> _produces = cp.getList(REST_produces,
MediaType.class).orElse(null);
List<MediaType> _consumes = cp.getList(REST_consumes,
MediaType.class).orElse(null);
- List<RestOperationContext> opContexts =
restOperations.getOperationContexts();
+ List<RestOpContext> opContexts =
restOperations.getOpContexts();
if (_produces != null)
produces = AList.unmodifiable(_produces);
@@ -3599,8 +3599,8 @@ public class RestContext extends BeanContext {
return new MethodInvoker(m, getMethodExecStats(m));
}
- private MethodInvoker toRestOperationInvoker(Method m) {
- return new RestOperationInvoker(m, findHookMethodArgs(m,
getBeanStore()), getMethodExecStats(m));
+ private MethodInvoker toRestOpInvoker(Method m) {
+ return new RestOpInvoker(m, findHookMethodArgs(m,
getBeanStore()), getMethodExecStats(m));
}
private Set<String> newCaseInsensitiveSet(String value) {
@@ -4330,8 +4330,8 @@ public class RestContext extends BeanContext {
* <ul>
* <li>Looks for {@link #REST_restOperationArgs} value set via any
of the following:
* <ul>
- * <li>{@link
RestContextBuilder#restOperationArgs(Class...)}/{@link
RestContextBuilder#restOperationArgs(Class...)}
- * <li>{@link Rest#restOperationArgs()}.
+ * <li>{@link
RestContextBuilder#restOpArgs(Class...)}/{@link
RestContextBuilder#restOpArgs(Class...)}
+ * <li>{@link Rest#restOpArgs()}.
* </ul>
* <li>Looks for a static or non-static <c>createRestParams()</>
method that returns <c>{@link Class}[]</c>.
* <li>Resolves it via the bean store registered in this context.
@@ -4350,12 +4350,12 @@ public class RestContext extends BeanContext {
* @throws Exception If parameter resolvers could not be instantiated.
*/
@SuppressWarnings("unchecked")
- protected RestOperationArgList createRestOperationArgs(Object resource,
ContextProperties properties, BeanStore beanStore) throws Exception {
+ protected RestOpArgList createOpArgs(Object resource, ContextProperties
properties, BeanStore beanStore) throws Exception {
- RestOperationArgList x = RestOperationArgList.create();
+ RestOpArgList x = RestOpArgList.create();
for (Class<?> c : properties.getList(REST_restOperationArgs,
Class.class).orElse(emptyList()))
- x.append((Class<? extends RestOperationArg>)c);
+ x.append((Class<? extends RestOpArg>)c);
x.append(
AttributeArg.class,
@@ -4403,8 +4403,8 @@ public class RestContext extends BeanContext {
x = BeanStore
.of(beanStore, resource)
- .addBean(RestOperationArgList.class, x)
- .beanCreateMethodFinder(RestOperationArgList.class,
resource)
+ .addBean(RestOpArgList.class, x)
+ .beanCreateMethodFinder(RestOpArgList.class, resource)
.find("createRestOperationArgs")
.withDefault(x)
.run();
@@ -4427,9 +4427,9 @@ public class RestContext extends BeanContext {
* @throws Exception If parameter resolvers could not be instantiated.
*/
@SuppressWarnings("unchecked")
- protected RestOperationArgList createHookMethodArgs(Object resource,
ContextProperties properties, BeanStore beanStore) throws Exception {
+ protected RestOpArgList createHookMethodArgs(Object resource,
ContextProperties properties, BeanStore beanStore) throws Exception {
- RestOperationArgList x = RestOperationArgList.create();
+ RestOpArgList x = RestOpArgList.create();
x.append(
ConfigArg.class,
@@ -4454,8 +4454,8 @@ public class RestContext extends BeanContext {
x = BeanStore
.of(beanStore, resource)
- .addBean(RestOperationArgList.class, x)
- .beanCreateMethodFinder(RestOperationArgList.class,
resource)
+ .addBean(RestOpArgList.class, x)
+ .beanCreateMethodFinder(RestOpArgList.class, resource)
.find("createHookMethodArgs")
.withDefault(x)
.run();
@@ -5237,7 +5237,7 @@ public class RestContext extends BeanContext {
}
/**
- * Creates the set of {@link RestOperationContext} objects that
represent the methods on this resource.
+ * Creates the set of {@link RestOpContext} objects that represent the
methods on this resource.
*
* @param resource
* The REST servlet or bean that this context defines.
@@ -5308,10 +5308,10 @@ public class RestContext extends BeanContext {
if (mi.isNotPublic())
throw new
RestServletException("@RestOp method {0}.{1} must be defined as public.",
rci.inner().getName(), mi.getSimpleName());
- RestOperationContext roc =
RestOperationContext
+ RestOpContext roc = RestOpContext
.create(mi.inner(), this)
.beanStore(beanStore)
-
.contextClass(properties.getClass(REST_restOperationContextClass,
RestOperationContext.class).orElse(null))
+
.contextClass(properties.getClass(REST_restOperationContextClass,
RestOpContext.class).orElse(null))
.build();
String httpMethod = roc.getHttpMethod();
@@ -5321,11 +5321,11 @@ public class RestContext extends BeanContext {
// We override the CallMethod.invoke()
method to insert our logic.
if ("RRPC".equals(httpMethod)) {
- RestOperationContext roc2 =
RestOperationContext
+ RestOpContext roc2 =
RestOpContext
.create(mi.inner(),
this)
.dotAll()
.beanStore(rootBeanStore)
-
.contextClass(RrpcRestOperationContext.class)
+
.contextClass(RrpcRestOpContext.class)
.build();
x
.add("GET", roc2)
@@ -6267,8 +6267,8 @@ public class RestContext extends BeanContext {
* @return
* An unmodifiable map of Java method names to call method objects.
*/
- public List<RestOperationContext> getMethodContexts() {
- return restOperations.getOperationContexts();
+ public List<RestOpContext> getOpContexts() {
+ return restOperations.getOpContexts();
}
/**
@@ -6365,7 +6365,7 @@ public class RestContext extends BeanContext {
}
/**
- * Finds the {@link RestOperationArg} instances to handle resolving
objects on the calls to the specified Java method.
+ * Finds the {@link RestOpArg} instances to handle resolving objects on
the calls to the specified Java method.
*
* @param m The Java method being called.
* @param beanStore
@@ -6373,18 +6373,18 @@ public class RestContext extends BeanContext {
* <br>Created by {@link
#createBeanStore(Object,ContextProperties,RestContext)}.
* @return The array of resolvers.
*/
- protected RestOperationArg[] findRestOperationArgs(Method m, BeanStore
beanStore) {
+ protected RestOpArg[] findRestOperationArgs(Method m, BeanStore
beanStore) {
MethodInfo mi = MethodInfo.of(m);
List<ClassInfo> pt = mi.getParamTypes();
- RestOperationArg[] ra = new RestOperationArg[pt.size()];
+ RestOpArg[] ra = new RestOpArg[pt.size()];
beanStore = BeanStore.of(beanStore, getResource());
for (int i = 0; i < pt.size(); i++) {
ParamInfo pi = mi.getParam(i);
beanStore.addBean(ParamInfo.class, pi);
- for (Class<? extends RestOperationArg> c : opArgs) {
+ for (Class<? extends RestOpArg> c : opArgs) {
try {
ra[i] = beanStore.createBean(c);
if (ra[i] != null)
@@ -6401,7 +6401,7 @@ public class RestContext extends BeanContext {
}
/**
- * Finds the {@link RestOperationArg} instances to handle resolving
objects on pre-call and post-call Java methods.
+ * Finds the {@link RestOpArg} instances to handle resolving objects on
pre-call and post-call Java methods.
*
* @param m The Java method being called.
* @param beanStore
@@ -6409,17 +6409,17 @@ public class RestContext extends BeanContext {
* <br>Created by {@link
#createBeanStore(Object,ContextProperties,RestContext)}.
* @return The array of resolvers.
*/
- protected RestOperationArg[] findHookMethodArgs(Method m, BeanStore
beanStore) {
+ protected RestOpArg[] findHookMethodArgs(Method m, BeanStore beanStore)
{
MethodInfo mi = MethodInfo.of(m);
List<ClassInfo> pt = mi.getParamTypes();
- RestOperationArg[] ra = new RestOperationArg[pt.size()];
+ RestOpArg[] ra = new RestOpArg[pt.size()];
beanStore = BeanStore.of(beanStore, getResource());
for (int i = 0; i < pt.size(); i++) {
ParamInfo pi = mi.getParam(i);
beanStore.addBean(ParamInfo.class, pi);
- for (Class<? extends RestOperationArg> c :
hookMethodArgs) {
+ for (Class<? extends RestOpArg> c : hookMethodArgs) {
try {
ra[i] = beanStore.createBean(c);
if (ra[i] != null)
@@ -6790,7 +6790,7 @@ public class RestContext extends BeanContext {
* @throws BasicHttpException If thrown from call methods.
*/
protected void preCall(RestCall call) throws BasicHttpException {
- for (RestOperationInvoker m : preCallMethods)
+ for (RestOpInvoker m : preCallMethods)
m.invokeFromCall(call, getResource());
}
@@ -6801,7 +6801,7 @@ public class RestContext extends BeanContext {
* @throws BasicHttpException If thrown from call methods.
*/
protected void postCall(RestCall call) throws BasicHttpException {
- for (RestOperationInvoker m : postCallMethods)
+ for (RestOpInvoker m : postCallMethods)
m.invokeFromCall(call, getResource());
}
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 d7a37b0..0227888 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
@@ -1636,7 +1636,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
* <i><l>RestContext</l> configuration property: </i> REST method
context class.
*
* <p>
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
* <li class='jf'>{@link
RestContext#REST_restOperationContextClass}
@@ -1646,7 +1646,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
* @return This object (for method chaining).
*/
@FluentSetter
- public RestContextBuilder restOperationContextClass(Class<? extends
RestOperationContext> value) {
+ public RestContextBuilder restOpContextClass(Class<? extends
RestOpContext> value) {
return set(REST_restOperationContextClass, value);
}
@@ -1667,7 +1667,7 @@ public class RestContextBuilder extends
BeanContextBuilder implements ServletCon
*/
@FluentSetter
@SuppressWarnings("unchecked")
- public RestContextBuilder restOperationArgs(Class<? extends
RestOperationArg>...values) {
+ public RestContextBuilder restOpArgs(Class<? extends
RestOpArg>...values) {
return prependTo(REST_restOperationArgs, values);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpArg.java
similarity index 98%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationArg.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpArg.java
index 2766c47..42eea17 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpArg.java
@@ -23,7 +23,7 @@ import org.apache.juneau.rest.annotation.*;
* <h5 class='figure'>Example:</h5>
* <p class='bcode w800'>
* <jc>// A simple parameter resolver that resolves TimeZone
parameters.</jc>
- * <jk>public class</jk> TimeZoneArg <jk>implements</jk> RestOperationArg {
+ * <jk>public class</jk> TimeZoneArg <jk>implements</jk> RestOpArg {
*
* <jc>// Implementers must provide a static creator method that
returns a RestParam if it's
* // applicable to the specified parameter.</jc>
@@ -47,7 +47,7 @@ import org.apache.juneau.rest.annotation.*;
* <li class='link'>{@doc RestmParameters}
* </ul>
*/
-public interface RestOperationArg {
+public interface RestOpArg {
/**
* Resolves the parameter object.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationArgList.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpArgList.java
similarity index 87%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationArgList.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpArgList.java
index 0f3d173..72dad28 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationArgList.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpArgList.java
@@ -15,9 +15,9 @@ package org.apache.juneau.rest;
import org.apache.juneau.collections.*;
/**
- * A list of {@link RestOperationArg} classes.
+ * A list of {@link RestOpArg} classes.
*/
-public class RestOperationArgList extends AList<Class<? extends
RestOperationArg>> {
+public class RestOpArgList extends AList<Class<? extends RestOpArg>> {
private static final long serialVersionUID = 1L;
@@ -27,8 +27,8 @@ public class RestOperationArgList extends AList<Class<?
extends RestOperationArg
* @return An empty list.
*/
@SuppressWarnings("unchecked")
- public static RestOperationArgList create() {
- return new RestOperationArgList();
+ public static RestOpArgList create() {
+ return new RestOpArgList();
}
/**
@@ -36,7 +36,7 @@ public class RestOperationArgList extends AList<Class<?
extends RestOperationArg
*
* @return The contents of this list as a {@link Class} array.
*/
- public Class<? extends RestOperationArg>[] asArray() {
+ public Class<? extends RestOpArg>[] asArray() {
return asArrayOf(Class.class);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
similarity index 96%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 62742d4..179d0c2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -65,19 +65,19 @@ import org.apache.juneau.utils.*;
* {@review}
*/
@ConfigurableContext(nocache=true)
-public class RestOperationContext extends BeanContext implements
Comparable<RestOperationContext> {
+public class RestOpContext extends BeanContext implements
Comparable<RestOpContext> {
/** Represents a null value for the {@link RestOp#contextClass()}
annotation.*/
@SuppressWarnings("javadoc")
- public static final class Null extends RestOperationContext {
- public Null(RestOperationContextBuilder builder) throws
Exception {
+ public static final class Null extends RestOpContext {
+ public Null(RestOpContextBuilder builder) throws Exception {
super(builder);
}
}
private final String httpMethod;
private final UrlPathMatcher[] pathMatchers;
- private final RestOperationArg[] opArgs;
+ private final RestOpArg[] opArgs;
private final RestGuard[] guards;
private final RestMatcher[] optionalMatchers;
private final RestMatcher[] requiredMatchers;
@@ -116,8 +116,8 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @param context The Java class context.
* @return A new builder.
*/
- public static RestOperationContextBuilder
create(java.lang.reflect.Method method, RestContext context) {
- return new RestOperationContextBuilder(method, context);
+ public static RestOpContextBuilder create(java.lang.reflect.Method
method, RestContext context) {
+ return new RestOpContextBuilder(method, context);
}
/**
@@ -126,7 +126,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @param builder The builder for this object.
* @throws ServletException If context could not be created.
*/
- public RestOperationContext(RestOperationContextBuilder builder) throws
ServletException {
+ public RestOpContext(RestOpContextBuilder builder) throws
ServletException {
super(builder.getContextProperties());
try {
@@ -145,7 +145,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
Object r = context.getResource();
BeanStore bs = BeanStore.of(context.getRootBeanStore(),
r)
- .addBean(RestOperationContext.class, this)
+ .addBean(RestOpContext.class, this)
.addBean(Method.class, method)
.addBean(ContextProperties.class, cp);
bs.addBean(BeanStore.class, bs);
@@ -365,7 +365,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The method matchers for this REST resource method.
* @throws Exception If method matchers could not be instantiated.
*/
- protected RestMatcherList createMatchers(Object resource,
RestOperationContextBuilder builder, BeanStore beanStore) throws Exception {
+ protected RestMatcherList createMatchers(Object resource,
RestOpContextBuilder builder, BeanStore beanStore) throws Exception {
RestMatcherListBuilder x =
builder.restMatchers.beanStore(beanStore);
@@ -691,10 +691,10 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The HTTP part parser for this REST resource.
* @throws Exception If parser could not be instantiated.
*/
- protected UrlPathMatcherList createPathMatchers(Object resource,
ContextProperties properties, RestOperationContextBuilder builder, BeanStore
beanStore) throws Exception {
+ protected UrlPathMatcherList createPathMatchers(Object resource,
ContextProperties properties, RestOpContextBuilder builder, BeanStore
beanStore) throws Exception {
UrlPathMatcherList x = UrlPathMatcherList.create();
- boolean dotAll =
properties.getBoolean("RestOperationContext.dotAll.b").orElse(false);
+ boolean dotAll =
properties.getBoolean("RestOpContext.dotAll.b").orElse(false);
if (builder.path != null) {
for (String p : builder.path) {
@@ -783,7 +783,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The default request headers for this method.
* @throws Exception If default request headers could not be
instantiated.
*/
- protected HeaderListBuilder createDefaultRequestHeaders(Object
resource, RestOperationContextBuilder builder, BeanStore beanStore, Method
method, RestContext context) throws Exception {
+ protected HeaderListBuilder createDefaultRequestHeaders(Object
resource, RestOpContextBuilder builder, BeanStore beanStore, Method method,
RestContext context) throws Exception {
HeaderListBuilder x =
HeaderList.create().setDefault(context.getDefaultRequestHeaders()).setDefault(builder.defaultRequestHeaders.build());
@@ -825,7 +825,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The default request headers for this method.
* @throws Exception If default request headers could not be
instantiated.
*/
- protected HeaderListBuilder createDefaultResponseHeaders(Object
resource, RestOperationContextBuilder builder, BeanStore beanStore, Method
method, RestContext context) throws Exception {
+ protected HeaderListBuilder createDefaultResponseHeaders(Object
resource, RestOpContextBuilder builder, BeanStore beanStore, Method method,
RestContext context) throws Exception {
HeaderListBuilder x =
HeaderList.create().setDefault(context.getDefaultResponseHeaders()).setDefault(builder.defaultResponseHeaders.build());
@@ -851,7 +851,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The default request attributes for this method.
* @throws Exception If default request headers could not be
instantiated.
*/
- protected NamedAttributeList createDefaultRequestAttributes(Object
resource, RestOperationContextBuilder builder, BeanStore beanStore, Method
method, RestContext context) throws Exception {
+ protected NamedAttributeList createDefaultRequestAttributes(Object
resource, RestOpContextBuilder builder, BeanStore beanStore, Method method,
RestContext context) throws Exception {
NamedAttributeList x =
context.getDefaultRequestAttributes().copy().appendUnique(builder.defaultRequestAttributes);
@@ -876,7 +876,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The default request query parameters for this method.
* @throws Exception If default request query parameters could not be
instantiated.
*/
- protected PartListBuilder createDefaultRequestQuery(Object resource,
RestOperationContextBuilder builder, BeanStore beanStore, Method method) throws
Exception {
+ protected PartListBuilder createDefaultRequestQuery(Object resource,
RestOpContextBuilder builder, BeanStore beanStore, Method method) throws
Exception {
PartListBuilder x = builder.defaultQueryData;
@@ -918,7 +918,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* @return The default request form-data parameters for this method.
* @throws Exception If default request form-data parameters could not
be instantiated.
*/
- protected PartListBuilder createDefaultRequestFormData(Object resource,
RestOperationContextBuilder builder, BeanStore beanStore, Method method) throws
Exception {
+ protected PartListBuilder createDefaultRequestFormData(Object resource,
RestOpContextBuilder builder, BeanStore beanStore, Method method) throws
Exception {
PartListBuilder x = builder.defaultFormData;
@@ -1259,7 +1259,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
*/
protected void invoke(RestCall call) throws Throwable {
- call.restOperationContext(this);
+ call.restOpContext(this);
RestRequest req = call.getRestRequest();
RestResponse res = call.getRestResponse();
@@ -1342,7 +1342,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* It maintains the order in which matches are made during requests.
*/
@Override /* Comparable */
- public int compareTo(RestOperationContext o) {
+ public int compareTo(RestOpContext o) {
int c;
for (int i = 0; i < Math.min(pathMatchers.length,
o.pathMatchers.length); i++) {
@@ -1390,7 +1390,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
@Override /* Object */
public boolean equals(Object o) {
- return (o instanceof RestOperationContext) && eq(this,
(RestOperationContext)o, (x,y)->x.method.equals(y.method));
+ return (o instanceof RestOpContext) && eq(this,
(RestOpContext)o, (x,y)->x.method.equals(y.method));
}
@Override /* Object */
@@ -1401,7 +1401,7 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
public OMap toMap() {
return super.toMap()
.a(
- "RestOperationContext",
+ "RestOpContext",
OMap
.create()
.filtered()
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
similarity index 77%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
index f2864bc..8713bf7 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContextBuilder.java
@@ -29,10 +29,10 @@ import org.apache.juneau.svl.*;
import java.lang.reflect.Method;
/**
- * Builder class for {@link RestOperationContext} objects.
+ * Builder class for {@link RestOpContext} objects.
*/
@FluentSetters
-public class RestOperationContextBuilder extends BeanContextBuilder {
+public class RestOpContextBuilder extends BeanContextBuilder {
RestContext restContext;
Method restMethod;
@@ -47,16 +47,16 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
private BeanStore beanStore;
@Override /* ContextBuilder */
- public RestOperationContextBuilder copy() {
+ public RestOpContextBuilder copy() {
throw new NoSuchMethodError("Not implemented.");
}
@SuppressWarnings("unchecked")
@Override /* BeanContextBuilder */
- public RestOperationContext build() {
+ public RestOpContext build() {
try {
- Class<? extends RestOperationContext> ic = (Class<?
extends RestOperationContext>) getContextClass().orElse(getDefaultImplClass());
- return
BeanStore.of(beanStore).addBean(RestOperationContextBuilder.class,
this).createBean(ic);
+ Class<? extends RestOpContext> ic = (Class<? extends
RestOpContext>) getContextClass().orElse(getDefaultImplClass());
+ return
BeanStore.of(beanStore).addBean(RestOpContextBuilder.class,
this).createBean(ic);
} catch (Exception e) {
throw toHttpException(e, InternalServerError.class);
}
@@ -67,11 +67,11 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
*
* @return The default implementation class if not specified via {@link
#contextClass(Class)}.
*/
- protected Class<? extends RestOperationContext> getDefaultImplClass() {
- return RestOperationContext.class;
+ protected Class<? extends RestOpContext> getDefaultImplClass() {
+ return RestOpContext.class;
}
- RestOperationContextBuilder(java.lang.reflect.Method method,
RestContext context) {
+ RestOpContextBuilder(java.lang.reflect.Method method, RestContext
context) {
this.restContext = context;
this.restMethod = method;
@@ -102,8 +102,8 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
*
* @return This object (for method chaining).
*/
- public RestOperationContextBuilder dotAll() {
- set("RestOperationContext.dotAll.b", true);
+ public RestOpContextBuilder dotAll() {
+ set("RestOpContext.dotAll.b", true);
return this;
}
@@ -113,7 +113,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @param beanStore The bean store to use for resolving constructor
arguments.
* @return This object (for method chaining).
*/
- public RestOperationContextBuilder beanStore(BeanStore beanStore) {
+ public RestOpContextBuilder beanStore(BeanStore beanStore) {
this.beanStore = beanStore;
return this;
}
@@ -194,14 +194,14 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder clientVersion(String value) {
+ public RestOpContextBuilder clientVersion(String value) {
clientVersion = value;
return this;
}
@Override
@FluentSetter
- public RestOperationContextBuilder contextClass(Class<? extends
Context> value) {
+ public RestOpContextBuilder contextClass(Class<? extends Context>
value) {
super.contextClass(value);
return this;
}
@@ -223,7 +223,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder debug(Enablement value) {
+ public RestOpContextBuilder debug(Enablement value) {
debug = value;
return this;
}
@@ -249,7 +249,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder
defaultFormData(NameValuePair...values) {
+ public RestOpContextBuilder defaultFormData(NameValuePair...values) {
defaultFormData.setDefault(values);
return this;
}
@@ -281,7 +281,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder
defaultQueryData(NameValuePair...values) {
+ public RestOpContextBuilder defaultQueryData(NameValuePair...values) {
defaultQueryData.setDefault(values);
return this;
}
@@ -311,13 +311,13 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder
defaultRequestAttributes(NamedAttribute...values) {
+ public RestOpContextBuilder
defaultRequestAttributes(NamedAttribute...values) {
defaultRequestAttributes.append(values);
return this;
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default request headers.
+ * <i><l>RestOpContext</l> configuration property: </i> Default
request headers.
*
* <p>
* Specifies default values for request headers if they're not passed
in through the request.
@@ -341,7 +341,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder
defaultRequestHeaders(Header...values) {
+ public RestOpContextBuilder defaultRequestHeaders(Header...values) {
defaultRequestHeaders.setDefault(values);
return this;
}
@@ -371,7 +371,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder
defaultResponseHeaders(Header...values) {
+ public RestOpContextBuilder defaultResponseHeaders(Header...values) {
defaultResponseHeaders.setDefault(values);
return this;
}
@@ -432,7 +432,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder httpMethod(String value) {
+ public RestOpContextBuilder httpMethod(String value) {
this.httpMethod = value;
return this;
}
@@ -459,7 +459,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder matchers(RestMatcher...values) {
+ public RestOpContextBuilder matchers(RestMatcher...values) {
restMatchers.append(values);
return this;
}
@@ -500,7 +500,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
*/
@SuppressWarnings("unchecked")
@FluentSetter
- public RestOperationContextBuilder matchers(Class<? extends
RestMatcher>...values) {
+ public RestOpContextBuilder matchers(Class<? extends
RestMatcher>...values) {
restMatchers.append(values);
return this;
}
@@ -524,7 +524,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder path(String...values) {
+ public RestOpContextBuilder path(String...values) {
if (path == null)
path = new ArrayList<>(Arrays.asList(values));
else
@@ -535,433 +535,433 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
// <FluentSetters>
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder add(Map<String,Object> properties) {
+ public RestOpContextBuilder add(Map<String,Object> properties) {
super.add(properties);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder addTo(String name, Object value) {
+ public RestOpContextBuilder addTo(String name, Object value) {
super.addTo(name, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder appendTo(String name, Object value) {
+ public RestOpContextBuilder appendTo(String name, Object value) {
super.appendTo(name, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder apply(ContextProperties copyFrom) {
+ public RestOpContextBuilder apply(ContextProperties copyFrom) {
super.apply(copyFrom);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder
applyAnnotations(java.lang.Class<?>...fromClasses) {
+ public RestOpContextBuilder
applyAnnotations(java.lang.Class<?>...fromClasses) {
super.applyAnnotations(fromClasses);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder
applyAnnotations(Method...fromMethods) {
+ public RestOpContextBuilder applyAnnotations(Method...fromMethods) {
super.applyAnnotations(fromMethods);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder applyAnnotations(AnnotationList al,
VarResolverSession r) {
+ public RestOpContextBuilder applyAnnotations(AnnotationList al,
VarResolverSession r) {
super.applyAnnotations(al, r);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder debug() {
+ public RestOpContextBuilder debug() {
super.debug();
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder locale(Locale value) {
+ public RestOpContextBuilder locale(Locale value) {
super.locale(value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder mediaType(MediaType value) {
+ public RestOpContextBuilder mediaType(MediaType value) {
super.mediaType(value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder prependTo(String name, Object value)
{
+ public RestOpContextBuilder prependTo(String name, Object value) {
super.prependTo(name, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder putAllTo(String name, Object value) {
+ public RestOpContextBuilder putAllTo(String name, Object value) {
super.putAllTo(name, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder putTo(String name, String key,
Object value) {
+ public RestOpContextBuilder putTo(String name, String key, Object
value) {
super.putTo(name, key, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder removeFrom(String name, Object
value) {
+ public RestOpContextBuilder removeFrom(String name, Object value) {
super.removeFrom(name, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder set(String name) {
+ public RestOpContextBuilder set(String name) {
super.set(name);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder set(Map<String,Object> properties) {
+ public RestOpContextBuilder set(Map<String,Object> properties) {
super.set(properties);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder set(String name, Object value) {
+ public RestOpContextBuilder set(String name, Object value) {
super.set(name, value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder timeZone(TimeZone value) {
+ public RestOpContextBuilder timeZone(TimeZone value) {
super.timeZone(value);
return this;
}
@Override /* GENERATED - ContextBuilder */
- public RestOperationContextBuilder unset(String name) {
+ public RestOpContextBuilder unset(String name) {
super.unset(name);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder annotations(Annotation...values) {
+ public RestOpContextBuilder annotations(Annotation...values) {
super.annotations(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanClassVisibility(Visibility
value) {
+ public RestOpContextBuilder beanClassVisibility(Visibility value) {
super.beanClassVisibility(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanConstructorVisibility(Visibility
value) {
+ public RestOpContextBuilder beanConstructorVisibility(Visibility value)
{
super.beanConstructorVisibility(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanFieldVisibility(Visibility
value) {
+ public RestOpContextBuilder beanFieldVisibility(Visibility value) {
super.beanFieldVisibility(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanInterceptor(Class<?> on, Class<?
extends org.apache.juneau.transform.BeanInterceptor<?>> value) {
+ public RestOpContextBuilder beanInterceptor(Class<?> on, Class<?
extends org.apache.juneau.transform.BeanInterceptor<?>> value) {
super.beanInterceptor(on, value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanMapPutReturnsOldValue() {
+ public RestOpContextBuilder beanMapPutReturnsOldValue() {
super.beanMapPutReturnsOldValue();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanMethodVisibility(Visibility
value) {
+ public RestOpContextBuilder beanMethodVisibility(Visibility value) {
super.beanMethodVisibility(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanProperties(Map<String,Object>
values) {
+ public RestOpContextBuilder beanProperties(Map<String,Object> values) {
super.beanProperties(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanProperties(Class<?> beanClass,
String properties) {
+ public RestOpContextBuilder beanProperties(Class<?> beanClass, String
properties) {
super.beanProperties(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanProperties(String beanClassName,
String properties) {
+ public RestOpContextBuilder beanProperties(String beanClassName, String
properties) {
super.beanProperties(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
beanPropertiesExcludes(Map<String,Object> values) {
+ public RestOpContextBuilder beanPropertiesExcludes(Map<String,Object>
values) {
super.beanPropertiesExcludes(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanPropertiesExcludes(Class<?>
beanClass, String properties) {
+ public RestOpContextBuilder beanPropertiesExcludes(Class<?> beanClass,
String properties) {
super.beanPropertiesExcludes(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanPropertiesExcludes(String
beanClassName, String properties) {
+ public RestOpContextBuilder beanPropertiesExcludes(String
beanClassName, String properties) {
super.beanPropertiesExcludes(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
beanPropertiesReadOnly(Map<String,Object> values) {
+ public RestOpContextBuilder beanPropertiesReadOnly(Map<String,Object>
values) {
super.beanPropertiesReadOnly(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanPropertiesReadOnly(Class<?>
beanClass, String properties) {
+ public RestOpContextBuilder beanPropertiesReadOnly(Class<?> beanClass,
String properties) {
super.beanPropertiesReadOnly(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanPropertiesReadOnly(String
beanClassName, String properties) {
+ public RestOpContextBuilder beanPropertiesReadOnly(String
beanClassName, String properties) {
super.beanPropertiesReadOnly(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
beanPropertiesWriteOnly(Map<String,Object> values) {
+ public RestOpContextBuilder beanPropertiesWriteOnly(Map<String,Object>
values) {
super.beanPropertiesWriteOnly(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanPropertiesWriteOnly(Class<?>
beanClass, String properties) {
+ public RestOpContextBuilder beanPropertiesWriteOnly(Class<?> beanClass,
String properties) {
super.beanPropertiesWriteOnly(beanClass, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beanPropertiesWriteOnly(String
beanClassName, String properties) {
+ public RestOpContextBuilder beanPropertiesWriteOnly(String
beanClassName, String properties) {
super.beanPropertiesWriteOnly(beanClassName, properties);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beansRequireDefaultConstructor() {
+ public RestOpContextBuilder beansRequireDefaultConstructor() {
super.beansRequireDefaultConstructor();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beansRequireSerializable() {
+ public RestOpContextBuilder beansRequireSerializable() {
super.beansRequireSerializable();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder beansRequireSettersForGetters() {
+ public RestOpContextBuilder beansRequireSettersForGetters() {
super.beansRequireSettersForGetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder dictionary(Object...values) {
+ public RestOpContextBuilder dictionary(Object...values) {
super.dictionary(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder dictionaryOn(Class<?> on,
java.lang.Class<?>...values) {
+ public RestOpContextBuilder dictionaryOn(Class<?> on,
java.lang.Class<?>...values) {
super.dictionaryOn(on, values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder disableBeansRequireSomeProperties() {
+ public RestOpContextBuilder disableBeansRequireSomeProperties() {
super.disableBeansRequireSomeProperties();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder disableIgnoreMissingSetters() {
+ public RestOpContextBuilder disableIgnoreMissingSetters() {
super.disableIgnoreMissingSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder disableIgnoreTransientFields() {
+ public RestOpContextBuilder disableIgnoreTransientFields() {
super.disableIgnoreTransientFields();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
disableIgnoreUnknownNullBeanProperties() {
+ public RestOpContextBuilder disableIgnoreUnknownNullBeanProperties() {
super.disableIgnoreUnknownNullBeanProperties();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder disableInterfaceProxies() {
+ public RestOpContextBuilder disableInterfaceProxies() {
super.disableInterfaceProxies();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public <T> RestOperationContextBuilder example(Class<T> pojoClass, T o)
{
+ public <T> RestOpContextBuilder example(Class<T> pojoClass, T o) {
super.example(pojoClass, o);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public <T> RestOperationContextBuilder example(Class<T> pojoClass,
String json) {
+ public <T> RestOpContextBuilder example(Class<T> pojoClass, String
json) {
super.example(pojoClass, json);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder findFluentSetters() {
+ public RestOpContextBuilder findFluentSetters() {
super.findFluentSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder findFluentSetters(Class<?> on) {
+ public RestOpContextBuilder findFluentSetters(Class<?> on) {
super.findFluentSetters(on);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
ignoreInvocationExceptionsOnGetters() {
+ public RestOpContextBuilder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
ignoreInvocationExceptionsOnSetters() {
+ public RestOpContextBuilder ignoreInvocationExceptionsOnSetters() {
super.ignoreInvocationExceptionsOnSetters();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder ignoreUnknownBeanProperties() {
+ public RestOpContextBuilder ignoreUnknownBeanProperties() {
super.ignoreUnknownBeanProperties();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder implClass(Class<?> interfaceClass,
Class<?> implClass) {
+ public RestOpContextBuilder implClass(Class<?> interfaceClass, Class<?>
implClass) {
super.implClass(interfaceClass, implClass);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder implClasses(Map<Class<?>,Class<?>>
values) {
+ public RestOpContextBuilder implClasses(Map<Class<?>,Class<?>> values) {
super.implClasses(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder interfaceClass(Class<?> on, Class<?>
value) {
+ public RestOpContextBuilder interfaceClass(Class<?> on, Class<?> value)
{
super.interfaceClass(on, value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
interfaces(java.lang.Class<?>...value) {
+ public RestOpContextBuilder interfaces(java.lang.Class<?>...value) {
super.interfaces(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder notBeanClasses(Object...values) {
+ public RestOpContextBuilder notBeanClasses(Object...values) {
super.notBeanClasses(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder notBeanPackages(Object...values) {
+ public RestOpContextBuilder notBeanPackages(Object...values) {
super.notBeanPackages(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder propertyNamer(Class<? extends
org.apache.juneau.PropertyNamer> value) {
+ public RestOpContextBuilder propertyNamer(Class<? extends
org.apache.juneau.PropertyNamer> value) {
super.propertyNamer(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder propertyNamer(Class<?> on, Class<?
extends org.apache.juneau.PropertyNamer> value) {
+ public RestOpContextBuilder propertyNamer(Class<?> on, Class<? extends
org.apache.juneau.PropertyNamer> value) {
super.propertyNamer(on, value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder sortProperties() {
+ public RestOpContextBuilder sortProperties() {
super.sortProperties();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder
sortProperties(java.lang.Class<?>...on) {
+ public RestOpContextBuilder sortProperties(java.lang.Class<?>...on) {
super.sortProperties(on);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder stopClass(Class<?> on, Class<?>
value) {
+ public RestOpContextBuilder stopClass(Class<?> on, Class<?> value) {
super.stopClass(on, value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder swaps(Object...values) {
+ public RestOpContextBuilder swaps(Object...values) {
super.swaps(values);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder typeName(Class<?> on, String value) {
+ public RestOpContextBuilder typeName(Class<?> on, String value) {
super.typeName(on, value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder typePropertyName(String value) {
+ public RestOpContextBuilder typePropertyName(String value) {
super.typePropertyName(value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder typePropertyName(Class<?> on, String
value) {
+ public RestOpContextBuilder typePropertyName(Class<?> on, String value)
{
super.typePropertyName(on, value);
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder useEnumNames() {
+ public RestOpContextBuilder useEnumNames() {
super.useEnumNames();
return this;
}
@Override /* GENERATED - BeanContextBuilder */
- public RestOperationContextBuilder useJavaBeanIntrospector() {
+ public RestOpContextBuilder useJavaBeanIntrospector() {
super.useJavaBeanIntrospector();
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationInvoker.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
similarity index 94%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationInvoker.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
index c99fcc9..9d9c851 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationInvoker.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpInvoker.java
@@ -25,9 +25,9 @@ import org.apache.juneau.utils.*;
/**
* A specialized invoker for methods that are called during a servlet request.
*/
-public class RestOperationInvoker extends MethodInvoker {
+public class RestOpInvoker extends MethodInvoker {
- private final RestOperationArg[] opArgs;
+ private final RestOpArg[] opArgs;
/**
* Constructor.
@@ -36,7 +36,7 @@ public class RestOperationInvoker extends MethodInvoker {
* @param opArgs The parameter resolvers.
* @param stats The instrumentor.
*/
- public RestOperationInvoker(Method m, RestOperationArg[] opArgs,
MethodExecStats stats) {
+ public RestOpInvoker(Method m, RestOpArg[] opArgs, MethodExecStats
stats) {
super(m, stats);
this.opArgs = opArgs;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
index b433561..9255fdbf 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
@@ -35,8 +35,8 @@ public class RestOperations {
}
}
- private final Map<String,List<RestOperationContext>> map;
- private List<RestOperationContext> list;
+ private final Map<String,List<RestOpContext>> map;
+ private List<RestOpContext> list;
/**
* Creates a new builder.
@@ -53,8 +53,8 @@ public class RestOperations {
* @param builder The builder containing the settings for this object.
*/
public RestOperations(RestOperationsBuilder builder) {
- AMap<String,List<RestOperationContext>> m = AMap.create();
- for (Map.Entry<String,TreeSet<RestOperationContext>> e :
builder.map.entrySet())
+ AMap<String,List<RestOpContext>> m = AMap.create();
+ for (Map.Entry<String,TreeSet<RestOpContext>> e :
builder.map.entrySet())
m.put(e.getKey(), AList.of(e.getValue()));
this.map = m;
this.list = AList.of(builder.set);
@@ -69,12 +69,12 @@ public class RestOperations {
* @throws PreconditionFailed At least one method was found but it
didn't match one or more matchers.
* @throws NotFound HTTP method match was found but matching path was
not.
*/
- public RestOperationContext findOperation(RestCall call) throws
MethodNotAllowed, PreconditionFailed, NotFound {
+ public RestOpContext findOperation(RestCall call) throws
MethodNotAllowed, PreconditionFailed, NotFound {
String m = call.getMethod();
int rc = 0;
if (map.containsKey(m)) {
- for (RestOperationContext oc : map.get(m)) {
+ for (RestOpContext oc : map.get(m)) {
int mrc = oc.match(call);
if (mrc == 2)
return oc;
@@ -83,7 +83,7 @@ public class RestOperations {
}
if (map.containsKey("*")) {
- for (RestOperationContext oc : map.get("*")) {
+ for (RestOpContext oc : map.get("*")) {
int mrc = oc.match(call);
if (mrc == 2)
return oc;
@@ -94,7 +94,7 @@ public class RestOperations {
// If no paths matched, see if the path matches any other
methods.
// Note that we don't want to match against "/*" patterns such
as getOptions().
if (rc == 0) {
- for (RestOperationContext oc : list) {
+ for (RestOpContext oc : list) {
if (! oc.getPathPattern().endsWith("/*")) {
int orc = oc.match(call);
if (orc == 2)
@@ -115,7 +115,7 @@ public class RestOperations {
*
* @return An unmodifiable list of method contexts in this object.
*/
- public List<RestOperationContext> getOperationContexts() {
+ public List<RestOpContext> getOpContexts() {
return Collections.unmodifiableList(list);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationsBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationsBuilder.java
index 8903b6f..40e7907 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationsBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationsBuilder.java
@@ -26,8 +26,8 @@ import org.apache.juneau.http.response.*;
*/
public class RestOperationsBuilder {
- TreeMap<String,TreeSet<RestOperationContext>> map = new TreeMap<>();
- Set<RestOperationContext> set = ASet.of();
+ TreeMap<String,TreeSet<RestOpContext>> map = new TreeMap<>();
+ Set<RestOpContext> set = ASet.of();
private BeanStore beanStore;
private Class<? extends RestOperations> implClass;
@@ -61,7 +61,7 @@ public class RestOperationsBuilder {
* @param mc The REST method context to add.
* @return Adds a method context to this builder.
*/
- public RestOperationsBuilder add(RestOperationContext mc) {
+ public RestOperationsBuilder add(RestOpContext mc) {
return add(mc.getHttpMethod(), mc);
}
@@ -72,7 +72,7 @@ public class RestOperationsBuilder {
* @param mc The REST method context to add.
* @return Adds a method context to this builder.
*/
- public RestOperationsBuilder add(String httpMethodName,
RestOperationContext mc) {
+ public RestOperationsBuilder add(String httpMethodName, RestOpContext
mc) {
httpMethodName = httpMethodName.toUpperCase();
if (! map.containsKey(httpMethodName))
map.put(httpMethodName, new TreeSet<>());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index b842a27..3094795 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -112,7 +112,7 @@ public final class RestRequest {
// Constructor initialized.
private HttpServletRequest inner;
private final RestContext context;
- private final RestOperationContext opContext;
+ private final RestOpContext opContext;
private final RequestBody body;
private final BeanSession beanSession;
private final RequestQueryParams queryParams;
@@ -140,7 +140,7 @@ public final class RestRequest {
*/
RestRequest(RestCall call) throws Exception {
this.call = call;
- this.opContext = call.getRestOperationContext();
+ this.opContext = call.getRestOpContext();
inner = call.getRequest();
context = call.getContext();
@@ -1655,11 +1655,11 @@ public final class RestRequest {
}
/**
- * Returns access to the inner {@link RestOperationContext} of this
method.
+ * Returns access to the inner {@link RestOpContext} of this method.
*
- * @return The {@link RestOperationContext} of this method. May be
<jk>null</jk> if method has not yet been found.
+ * @return The {@link RestOpContext} of this method. May be
<jk>null</jk> if method has not yet been found.
*/
- public RestOperationContext getOpContext() {
+ public RestOpContext getOpContext() {
return opContext;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index 8e79f40..0ccf83e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -69,7 +69,7 @@ public final class RestResponse {
private FinishableServletOutputStream os;
private FinishablePrintWriter w;
private ResponseBeanMeta responseBeanMeta;
- private RestOperationContext opContext;
+ private RestOpContext opContext;
private Optional<HttpPartSchema> bodySchema;
private Serializer serializer;
private Optional<SerializerMatch> serializerMatch;
@@ -84,7 +84,7 @@ public final class RestResponse {
inner = call.getResponse();
request = call.getRestRequest();
- opContext = call.getRestOperationContext();
+ opContext = call.getRestOpContext();
responseBeanMeta = opContext.getResponseMeta();
RestContext context = call.getContext();
@@ -137,11 +137,11 @@ public final class RestResponse {
}
/**
- * Returns access to the inner {@link RestOperationContext} of this
method.
+ * Returns access to the inner {@link RestOpContext} of this method.
*
- * @return The {@link RestOperationContext} of this method. Never
<jk>null</jk>.
+ * @return The {@link RestOpContext} of this method. Never
<jk>null</jk>.
*/
- public RestOperationContext getOpContext() {
+ public RestOpContext getOpContext() {
return request.getOpContext();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RrpcRestOperationContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RrpcRestOpContext.java
similarity index 93%
rename from
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RrpcRestOperationContext.java
rename to
juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RrpcRestOpContext.java
index b10e738..b4733da 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RrpcRestOperationContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RrpcRestOpContext.java
@@ -26,9 +26,9 @@ import org.apache.juneau.http.response.*;
import org.apache.juneau.parser.*;
/**
- * A specialized {@link RestOperationContext} for handling <js>"RRPC"</js>
HTTP methods.
+ * A specialized {@link RestOpContext} for handling <js>"RRPC"</js> HTTP
methods.
*/
-public class RrpcRestOperationContext extends RestOperationContext {
+public class RrpcRestOpContext extends RestOpContext {
private final RrpcInterfaceMeta meta;
@@ -38,7 +38,7 @@ public class RrpcRestOperationContext extends
RestOperationContext {
* @param builder The builder for this method context.
* @throws ServletException Problem with metadata was detected.
*/
- public RrpcRestOperationContext(RestOperationContextBuilder builder)
throws ServletException {
+ public RrpcRestOpContext(RestOpContextBuilder builder) throws
ServletException {
super(builder);
ClassMeta<?> interfaceClass =
getClassMeta(getJavaMethod().getGenericReturnType());
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 d44de09..e2b97f3 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
@@ -43,7 +43,7 @@ import org.apache.juneau.rest.vars.*;
@Target(TYPE)
@Retention(RUNTIME)
@Inherited
-@ContextApply({RestAnnotation.RestContextApply.class,RestAnnotation.RestOperationContextApply.class})
+@ContextApply({RestAnnotation.RestContextApply.class,RestAnnotation.RestOpContextApply.class})
public @interface Rest {
/**
@@ -946,13 +946,13 @@ public @interface Rest {
Class<? extends RestOperations> restOperationsClass() default
RestOperations.Null.class;
/**
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
* <li class='jf'>{@link
RestContext#REST_restOperationContextClass}
* </ul>
*/
- Class<? extends RestOperationContext> restOperationContextClass()
default RestOperationContext.Null.class;
+ Class<? extends RestOpContext> restOpContextClass() default
RestOpContext.Null.class;
/**
* Java REST operation method parameter resolvers.
@@ -966,7 +966,7 @@ public @interface Rest {
* <li class='jf'>{@link RestContext#REST_restOperationArgs}
* </ul>
*/
- Class<? extends RestOperationArg>[] restOperationArgs() default {};
+ Class<? extends RestOpArg>[] restOpArgs() default {};
/**
* Role guard.
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 554c653..33ca17b 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
@@ -91,9 +91,9 @@ public class RestAnnotation {
Class<? extends RestConverter>[] converters = new Class[0];
Class<? extends RestGuard>[] guards = new Class[0];
Class<? extends SwaggerProvider> swaggerProvider =
SwaggerProvider.Null.class;
- Class<? extends RestOperationArg>[] restOperationArgs = new
Class[0];
+ Class<? extends RestOpArg>[] restOpArgs = new Class[0];
Class<? extends BeanStore> beanStore = BeanStore.Null.class;
- Class<? extends RestOperationContext> restOperationContextClass
= RestOperationContext.Null.class;
+ Class<? extends RestOpContext> restOpContextClass =
RestOpContext.Null.class;
Class<? extends RestChildren> restChildrenClass =
RestChildren.Null.class;
Class<? extends RestOperations> restOperationsClass =
RestOperations.Null.class;
Class<? extends DebugEnablement> debugEnablement =
DebugEnablement.Null.class;
@@ -504,24 +504,24 @@ public class RestAnnotation {
}
/**
- * Sets the {@link Rest#restOperationContextClass()} property
on this annotation.
+ * Sets the {@link Rest#restOpContextClass()} property on this
annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder restOperationContextClass(Class<? extends
RestOperationContext> value) {
- this.restOperationContextClass = value;
+ public Builder restOpContextClass(Class<? extends
RestOpContext> value) {
+ this.restOpContextClass = value;
return this;
}
/**
- * Sets the {@link Rest#restOperationArgs()} property on this
annotation.
+ * Sets the {@link Rest#restOpArgs()} property on this
annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder restOperationArgs(Class<? extends
RestOperationArg>...value) {
- this.restOperationArgs = value;
+ public Builder restOpArgs(Class<? extends RestOpArg>...value) {
+ this.restOpArgs = value;
return this;
}
@@ -704,9 +704,9 @@ public class RestAnnotation {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
private final Class<? extends SwaggerProvider> swaggerProvider;
- private final Class<? extends RestOperationArg>[]
restOperationArgs;
+ private final Class<? extends RestOpArg>[] restOpArgs;
private final Class<? extends BeanStore> beanStore;
- private final Class<? extends RestOperationContext>
restOperationContextClass;
+ private final Class<? extends RestOpContext> restOpContextClass;
private final Class<? extends RestChildren> restChildrenClass;
private final Class<? extends RestOperations>
restOperationsClass;
private final Class<? extends DebugEnablement> debugEnablement;
@@ -752,9 +752,9 @@ public class RestAnnotation {
this.renderResponseStackTraces =
b.renderResponseStackTraces;
this.responseProcessors = copyOf(b.responseProcessors);
this.restChildrenClass = b.restChildrenClass;
- this.restOperationContextClass =
b.restOperationContextClass;
+ this.restOpContextClass = b.restOpContextClass;
this.restOperationsClass = b.restOperationsClass;
- this.restOperationArgs = copyOf(b.restOperationArgs);
+ this.restOpArgs = copyOf(b.restOpArgs);
this.roleGuard = b.roleGuard;
this.rolesDeclared = b.rolesDeclared;
this.serializers = copyOf(b.serializers);
@@ -946,13 +946,13 @@ public class RestAnnotation {
}
@Override /* Rest */
- public Class<? extends RestOperationContext>
restOperationContextClass() {
- return restOperationContextClass;
+ public Class<? extends RestOpContext> restOpContextClass() {
+ return restOpContextClass;
}
@Override /* Rest */
- public Class<? extends RestOperationArg>[] restOperationArgs() {
- return restOperationArgs;
+ public Class<? extends RestOpArg>[] restOpArgs() {
+ return restOpArgs;
}
@Override /* Rest */
@@ -1051,7 +1051,7 @@ public class RestAnnotation {
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
contentType(string(a.defaultContentType())));
b.prependTo(REST_responseProcessors,
a.responseProcessors());
b.prependTo(REST_children, a.children());
- b.prependTo(REST_restOperationArgs,
a.restOperationArgs());
+ b.prependTo(REST_restOperationArgs, a.restOpArgs());
b.setIf(a.contextClass() != RestContext.Null.class,
REST_contextClass, a.contextClass());
b.setIfNotEmpty(REST_uriContext,
string(a.uriContext()));
b.setIfNotEmpty(REST_uriAuthority,
string(a.uriAuthority()));
@@ -1065,7 +1065,7 @@ public class RestAnnotation {
b.setIf(a.beanStore() != BeanStore.Null.class,
REST_beanStore, a.beanStore());
b.setIf(a.callLogger() != RestLogger.Null.class,
REST_callLogger, a.callLogger());
b.setIf(a.swaggerProvider() !=
SwaggerProvider.Null.class, REST_swaggerProvider, a.swaggerProvider());
- b.setIf(a.restOperationContextClass() !=
RestOperationContext.Null.class, REST_restOperationContextClass,
a.restOperationContextClass());
+ b.setIf(a.restOpContextClass() !=
RestOpContext.Null.class, REST_restOperationContextClass,
a.restOpContextClass());
b.setIf(a.restChildrenClass() !=
RestChildren.Null.class, REST_restChildrenClass, a.restChildrenClass());
b.setIf(a.restOperationsClass() !=
RestOperations.Null.class, REST_restOperationsClass, a.restOperationsClass());
b.setIf(a.debugEnablement() !=
DebugEnablement.Null.class, REST_debugEnablement, a.debugEnablement());
@@ -1086,21 +1086,21 @@ public class RestAnnotation {
}
/**
- * Applies {@link Rest} annotations to a {@link
RestOperationContextBuilder}.
+ * Applies {@link Rest} annotations to a {@link RestOpContextBuilder}.
*/
- public static class RestOperationContextApply extends
AnnotationApplier<Rest,RestOperationContextBuilder> {
+ public static class RestOpContextApply extends
AnnotationApplier<Rest,RestOpContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public RestOperationContextApply(VarResolverSession vr) {
- super(Rest.class, RestOperationContextBuilder.class,
vr);
+ public RestOpContextApply(VarResolverSession vr) {
+ super(Rest.class, RestOpContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<Rest> ai,
RestOperationContextBuilder b) {
+ public void apply(AnnotationInfo<Rest> ai, RestOpContextBuilder
b) {
Rest a = ai.getAnnotation();
b.set(REST_serializers,
merge(ConverterUtils.toType(b.peek(REST_serializers), Object[].class),
a.serializers()));
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 37d7ca3..cf965e2 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
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextApply(RestDeleteAnnotation.RestOperationContextApply.class)
+@ContextApply(RestDeleteAnnotation.RestOpContextApply.class)
@AnnotationGroup(RestOp.class)
public @interface RestDelete {
@@ -100,13 +100,13 @@ public @interface RestDelete {
String clientVersion() default "";
/**
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link
RestOperationContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
* </ul>
*/
- Class<? extends RestOperationContext> contextClass() default
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
/**
* Enable debug mode.
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 87c756c..49a0b51 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
@@ -57,7 +57,7 @@ public class RestDeleteAnnotation {
Class<? extends RestGuard>[] guards = new Class[0];
Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends RestOperationContext> contextClass =
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass =
RestOpContext.Null.class;
Class<?>[] encoders=new Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", rolesDeclared="", roleGuard="", summary="", value="";
@@ -96,7 +96,7 @@ public class RestDeleteAnnotation {
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder contextClass(Class<? extends
RestOperationContext> value) {
+ public Builder contextClass(Class<? extends RestOpContext>
value) {
this.contextClass = value;
return this;
}
@@ -309,7 +309,7 @@ public class RestDeleteAnnotation {
private final Class<? extends RestGuard>[] guards;
private final Class<? extends RestMatcher>[] matchers;
- private final Class<? extends RestOperationContext>
contextClass;
+ private final Class<? extends RestOpContext> contextClass;
private final Class<?>[] encoders;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
@@ -345,7 +345,7 @@ public class RestDeleteAnnotation {
}
@Override /* RestDelete */
- public Class<? extends RestOperationContext> contextClass() {
+ public Class<? extends RestOpContext> contextClass() {
return contextClass;
}
@@ -436,27 +436,27 @@ public class RestDeleteAnnotation {
}
/**
- * Applies {@link RestDelete} annotations to a {@link
RestOperationContextBuilder}.
+ * Applies {@link RestDelete} annotations to a {@link
RestOpContextBuilder}.
*/
- public static class RestOperationContextApply extends
AnnotationApplier<RestDelete,RestOperationContextBuilder> {
+ public static class RestOpContextApply extends
AnnotationApplier<RestDelete,RestOpContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public RestOperationContextApply(VarResolverSession vr) {
- super(RestDelete.class,
RestOperationContextBuilder.class, vr);
+ public RestOpContextApply(VarResolverSession vr) {
+ super(RestDelete.class, RestOpContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<RestDelete> ai,
RestOperationContextBuilder b) {
+ public void apply(AnnotationInfo<RestDelete> ai,
RestOpContextBuilder b) {
RestDelete a = ai.getAnnotation();
b.httpMethod("delete");
b.set(REST_encoders,
merge(ConverterUtils.toType(b.peek(REST_encoders), Object[].class),
a.encoders()));
- value(a.contextClass(),
RestOperationContext.Null.class).ifPresent(x -> b.contextClass(x));
+ value(a.contextClass(),
RestOpContext.Null.class).ifPresent(x -> b.contextClass(x));
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
stringStream(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultResponseHeaders(x));
stringStream(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 2576345..2723575 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
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextApply(RestGetAnnotation.RestOperationContextApply.class)
+@ContextApply(RestGetAnnotation.RestOpContextApply.class)
@AnnotationGroup(RestOp.class)
public @interface RestGet {
@@ -102,13 +102,13 @@ public @interface RestGet {
String clientVersion() default "";
/**
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link
RestOperationContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
* </ul>
*/
- Class<? extends RestOperationContext> contextClass() default
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
/**
* Class-level response converters.
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 041e7f4..3612818 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
@@ -58,7 +58,7 @@ public class RestGetAnnotation {
Class<? extends RestConverter>[] converters = new Class[0];
Class<? extends RestGuard>[] guards = new Class[0];
Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends RestOperationContext> contextClass =
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass =
RestOpContext.Null.class;
Class<?>[] encoders=new Class<?>[0], serializers=new
Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", rolesDeclared="", roleGuard="", summary="", value="";
@@ -97,7 +97,7 @@ public class RestGetAnnotation {
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder contextClass(Class<? extends
RestOperationContext> value) {
+ public Builder contextClass(Class<? extends RestOpContext>
value) {
this.contextClass = value;
return this;
}
@@ -344,7 +344,7 @@ public class RestGetAnnotation {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
private final Class<? extends RestMatcher>[] matchers;
- private final Class<? extends RestOperationContext>
contextClass;
+ private final Class<? extends RestOpContext> contextClass;
private final Class<?>[] encoders, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
@@ -383,7 +383,7 @@ public class RestGetAnnotation {
}
@Override /* RestGet */
- public Class<? extends RestOperationContext> contextClass() {
+ public Class<? extends RestOpContext> contextClass() {
return contextClass;
}
@@ -489,28 +489,28 @@ public class RestGetAnnotation {
}
/**
- * Applies {@link RestGet} annotations to a {@link
RestOperationContextBuilder}.
+ * Applies {@link RestGet} annotations to a {@link
RestOpContextBuilder}.
*/
- public static class RestOperationContextApply extends
AnnotationApplier<RestGet,RestOperationContextBuilder> {
+ public static class RestOpContextApply extends
AnnotationApplier<RestGet,RestOpContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public RestOperationContextApply(VarResolverSession vr) {
- super(RestGet.class, RestOperationContextBuilder.class,
vr);
+ public RestOpContextApply(VarResolverSession vr) {
+ super(RestGet.class, RestOpContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<RestGet> ai,
RestOperationContextBuilder b) {
+ public void apply(AnnotationInfo<RestGet> ai,
RestOpContextBuilder b) {
RestGet a = ai.getAnnotation();
b.httpMethod("get");
b.set(REST_serializers,
merge(ConverterUtils.toType(b.peek(REST_serializers), Object[].class),
a.serializers()));
b.set(REST_encoders,
merge(ConverterUtils.toType(b.peek(REST_encoders), Object[].class),
a.encoders()));
- value(a.contextClass(),
RestOperationContext.Null.class).ifPresent(x -> b.contextClass(x));
+ value(a.contextClass(),
RestOpContext.Null.class).ifPresent(x -> b.contextClass(x));
b.setIfNotEmpty(REST_produces,
stringList(a.produces()));
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
stringStream(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 0b24cf8..a7cea06 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
@@ -33,7 +33,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextApply(RestOpAnnotation.RestOperationContextApply.class)
+@ContextApply(RestOpAnnotation.RestOpContextApply.class)
@AnnotationGroup(RestOp.class)
public @interface RestOp {
@@ -118,13 +118,13 @@ public @interface RestOp {
String[] consumes() default {};
/**
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link
RestOperationContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
* </ul>
*/
- Class<? extends RestOperationContext> contextClass() default
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
/**
* Class-level response converters.
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 04356a5..0ec5490 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
@@ -58,7 +58,7 @@ public class RestOpAnnotation {
Class<? extends RestConverter>[] converters = new Class[0];
Class<? extends RestGuard>[] guards = new Class[0];
Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends RestOperationContext> contextClass =
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass =
RestOpContext.Null.class;
Class<?>[] encoders=new Class<?>[0], parsers=new Class<?>[0],
serializers=new Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", defaultContentType="", maxInput="", method="",
rolesDeclared="", roleGuard="", summary="", value="";
@@ -108,7 +108,7 @@ public class RestOpAnnotation {
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder contextClass(Class<? extends
RestOperationContext> value) {
+ public Builder contextClass(Class<? extends RestOpContext>
value) {
this.contextClass = value;
return this;
}
@@ -410,7 +410,7 @@ public class RestOpAnnotation {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
private final Class<? extends RestMatcher>[] matchers;
- private final Class<? extends RestOperationContext>
contextClass;
+ private final Class<? extends RestOpContext> contextClass;
private final Class<?>[] encoders, parsers, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, method, rolesDeclared, roleGuard,
summary, value;
@@ -460,7 +460,7 @@ public class RestOpAnnotation {
}
@Override /* RestOp */
- public Class<? extends RestOperationContext> contextClass() {
+ public Class<? extends RestOpContext> contextClass() {
return contextClass;
}
@@ -591,27 +591,27 @@ public class RestOpAnnotation {
}
/**
- * Applies {@link RestOp} annotations to a {@link
RestOperationContextBuilder}.
+ * Applies {@link RestOp} annotations to a {@link RestOpContextBuilder}.
*/
- public static class RestOperationContextApply extends
AnnotationApplier<RestOp,RestOperationContextBuilder> {
+ public static class RestOpContextApply extends
AnnotationApplier<RestOp,RestOpContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public RestOperationContextApply(VarResolverSession vr) {
- super(RestOp.class, RestOperationContextBuilder.class,
vr);
+ public RestOpContextApply(VarResolverSession vr) {
+ super(RestOp.class, RestOpContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<RestOp> ai,
RestOperationContextBuilder b) {
+ public void apply(AnnotationInfo<RestOp> ai,
RestOpContextBuilder b) {
RestOp a = ai.getAnnotation();
b.set(REST_serializers,
merge(ConverterUtils.toType(b.peek(REST_serializers), Object[].class),
a.serializers()));
b.set(REST_parsers,
merge(ConverterUtils.toType(b.peek(REST_parsers), Object[].class),
a.parsers()));
b.set(REST_encoders,
merge(ConverterUtils.toType(b.peek(REST_encoders), Object[].class),
a.encoders()));
- value(a.contextClass(),
RestOperationContext.Null.class).ifPresent(x -> b.contextClass(x));
+ value(a.contextClass(),
RestOpContext.Null.class).ifPresent(x -> b.contextClass(x));
b.setIfNotEmpty(REST_produces,
stringList(a.produces()));
b.setIfNotEmpty(REST_consumes,
stringList(a.consumes()));
stringStream(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 10c686b..74e7253 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
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextApply(RestPostAnnotation.RestOperationContextApply.class)
+@ContextApply(RestPostAnnotation.RestOpContextApply.class)
@AnnotationGroup(RestOp.class)
public @interface RestPost {
@@ -120,13 +120,13 @@ public @interface RestPost {
String[] consumes() default {};
/**
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link
RestOperationContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
* </ul>
*/
- Class<? extends RestOperationContext> contextClass() default
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
/**
* Class-level response converters.
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 543f57d..f1fb4b9 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
@@ -58,7 +58,7 @@ public class RestPostAnnotation {
Class<? extends RestConverter>[] converters = new Class[0];
Class<? extends RestGuard>[] guards = new Class[0];
Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends RestOperationContext> contextClass =
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass =
RestOpContext.Null.class;
Class<?>[] encoders=new Class<?>[0], parsers=new Class<?>[0],
serializers=new Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", defaultContentType="", maxInput="", rolesDeclared="",
roleGuard="", summary="", value="";
@@ -108,7 +108,7 @@ public class RestPostAnnotation {
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder contextClass(Class<? extends
RestOperationContext> value) {
+ public Builder contextClass(Class<? extends RestOpContext>
value) {
this.contextClass = value;
return this;
}
@@ -399,7 +399,7 @@ public class RestPostAnnotation {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
private final Class<? extends RestMatcher>[] matchers;
- private final Class<? extends RestOperationContext>
contextClass;
+ private final Class<? extends RestOpContext> contextClass;
private final Class<?>[] encoders, parsers, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
@@ -448,7 +448,7 @@ public class RestPostAnnotation {
}
@Override /* RestPost */
- public Class<? extends RestOperationContext> contextClass() {
+ public Class<? extends RestOpContext> contextClass() {
return contextClass;
}
@@ -574,21 +574,21 @@ public class RestPostAnnotation {
}
/**
- * Applies {@link RestPost} annotations to a {@link
RestOperationContextBuilder}.
+ * Applies {@link RestPost} annotations to a {@link
RestOpContextBuilder}.
*/
- public static class RestOperationContextApply extends
AnnotationApplier<RestPost,RestOperationContextBuilder> {
+ public static class RestOpContextApply extends
AnnotationApplier<RestPost,RestOpContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public RestOperationContextApply(VarResolverSession vr) {
- super(RestPost.class,
RestOperationContextBuilder.class, vr);
+ public RestOpContextApply(VarResolverSession vr) {
+ super(RestPost.class, RestOpContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<RestPost> ai,
RestOperationContextBuilder b) {
+ public void apply(AnnotationInfo<RestPost> ai,
RestOpContextBuilder b) {
RestPost a = ai.getAnnotation();
b.httpMethod("post");
@@ -596,7 +596,7 @@ public class RestPostAnnotation {
b.set(REST_serializers,
merge(ConverterUtils.toType(b.peek(REST_serializers), Object[].class),
a.serializers()));
b.set(REST_parsers,
merge(ConverterUtils.toType(b.peek(REST_parsers), Object[].class),
a.parsers()));
b.set(REST_encoders,
merge(ConverterUtils.toType(b.peek(REST_encoders), Object[].class),
a.encoders()));
- value(a.contextClass(),
RestOperationContext.Null.class).ifPresent(x -> b.contextClass(x));
+ value(a.contextClass(),
RestOpContext.Null.class).ifPresent(x -> b.contextClass(x));
b.setIfNotEmpty(REST_produces,
stringList(a.produces()));
b.setIfNotEmpty(REST_consumes,
stringList(a.consumes()));
stringStream(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 b877c4d..b848ac0 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
@@ -35,7 +35,7 @@ import org.apache.juneau.dto.swagger.*;
@Target(METHOD)
@Retention(RUNTIME)
@Inherited
-@ContextApply(RestPutAnnotation.RestOperationContextApply.class)
+@ContextApply(RestPutAnnotation.RestOpContextApply.class)
@AnnotationGroup(RestOp.class)
public @interface RestPut {
@@ -120,13 +120,13 @@ public @interface RestPut {
String[] consumes() default {};
/**
- * Allows you to extend the {@link RestOperationContext} class to
modify how any of the methods are implemented.
+ * Allows you to extend the {@link RestOpContext} class to modify how
any of the methods are implemented.
*
* <ul class='seealso'>
- * <li class='jm'>{@link
RestOperationContextBuilder#contextClass(Class)}
+ * <li class='jm'>{@link RestOpContextBuilder#contextClass(Class)}
* </ul>
*/
- Class<? extends RestOperationContext> contextClass() default
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass() default
RestOpContext.Null.class;
/**
* Class-level response converters.
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 74c6907..08b6279 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
@@ -58,7 +58,7 @@ public class RestPutAnnotation {
Class<? extends RestConverter>[] converters = new Class[0];
Class<? extends RestGuard>[] guards = new Class[0];
Class<? extends RestMatcher>[] matchers = new Class[0];
- Class<? extends RestOperationContext> contextClass =
RestOperationContext.Null.class;
+ Class<? extends RestOpContext> contextClass =
RestOpContext.Null.class;
Class<?>[] encoders=new Class<?>[0], parsers=new Class<?>[0],
serializers=new Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", defaultContentType="", maxInput="", rolesDeclared="",
roleGuard="", summary="", value="";
@@ -108,7 +108,7 @@ public class RestPutAnnotation {
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder contextClass(Class<? extends
RestOperationContext> value) {
+ public Builder contextClass(Class<? extends RestOpContext>
value) {
this.contextClass = value;
return this;
}
@@ -399,7 +399,7 @@ public class RestPutAnnotation {
private final Class<? extends RestConverter>[] converters;
private final Class<? extends RestGuard>[] guards;
private final Class<? extends RestMatcher>[] matchers;
- private final Class<? extends RestOperationContext>
contextClass;
+ private final Class<? extends RestOpContext> contextClass;
private final Class<?>[] encoders, parsers, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
@@ -448,7 +448,7 @@ public class RestPutAnnotation {
}
@Override /* RestPut */
- public Class<? extends RestOperationContext> contextClass() {
+ public Class<? extends RestOpContext> contextClass() {
return contextClass;
}
@@ -574,21 +574,21 @@ public class RestPutAnnotation {
}
/**
- * Applies {@link RestPut} annotations to a {@link
RestOperationContextBuilder}.
+ * Applies {@link RestPut} annotations to a {@link
RestOpContextBuilder}.
*/
- public static class RestOperationContextApply extends
AnnotationApplier<RestPut,RestOperationContextBuilder> {
+ public static class RestOpContextApply extends
AnnotationApplier<RestPut,RestOpContextBuilder> {
/**
* Constructor.
*
* @param vr The resolver for resolving values in annotations.
*/
- public RestOperationContextApply(VarResolverSession vr) {
- super(RestPut.class, RestOperationContextBuilder.class,
vr);
+ public RestOpContextApply(VarResolverSession vr) {
+ super(RestPut.class, RestOpContextBuilder.class, vr);
}
@Override
- public void apply(AnnotationInfo<RestPut> ai,
RestOperationContextBuilder b) {
+ public void apply(AnnotationInfo<RestPut> ai,
RestOpContextBuilder b) {
RestPut a = ai.getAnnotation();
b.httpMethod("put");
@@ -596,7 +596,7 @@ public class RestPutAnnotation {
b.set(REST_serializers,
merge(ConverterUtils.toType(b.peek(REST_serializers), Object[].class),
a.serializers()));
b.set(REST_parsers,
merge(ConverterUtils.toType(b.peek(REST_parsers), Object[].class),
a.parsers()));
b.set(REST_encoders,
merge(ConverterUtils.toType(b.peek(REST_encoders), Object[].class),
a.encoders()));
- value(a.contextClass(),
RestOperationContext.Null.class).ifPresent(x -> b.contextClass(x));
+ value(a.contextClass(),
RestOpContext.Null.class).ifPresent(x -> b.contextClass(x));
b.setIfNotEmpty(REST_produces,
stringList(a.produces()));
b.setIfNotEmpty(REST_consumes,
stringList(a.consumes()));
stringStream(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/args/AttributeArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/AttributeArg.java
index fc16f7a..f7f5b45 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/AttributeArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/AttributeArg.java
@@ -24,7 +24,7 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* The parameter value is resolved using <c><jv>call</jv>.{@link
RestCall#getRestRequest() getRestRequest}().{@link RestRequest#getAttributes()
getAttributes}().{@link RequestAttributes#get(String)
get}(<jv>name</jv>).{@link RequestAttribute#asType(Class) asType}(<jv>type</jv>.
*/
-public class AttributeArg implements RestOperationArg {
+public class AttributeArg implements RestOpArg {
private final String name;
private final Class<?> type;
@@ -62,7 +62,7 @@ public class AttributeArg implements RestOperationArg {
return n;
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
return
call.getRestRequest().getAttribute(name).asType(type).orElse(null);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/BodyArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/BodyArg.java
index d5f5e2e..620b58c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/BodyArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/BodyArg.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
* The parameter value is resolved using <c><jv>call</jv>.{@link
RestCall#getRestRequest() getRestRequest}().{@link RestRequest#getBody()
getBody}().{@link RequestBody#schema(HttpPartSchema)
schema}(<jv>schema</jv>).{@link RequestBody#asType(Type,Type...)
asType}(<jv>type</jv>)</c>.
* with a {@link HttpPartSchema schema} derived from the {@link Body}
annotation.
*/
-public class BodyArg implements RestOperationArg {
+public class BodyArg implements RestOpArg {
private final HttpPartSchema schema;
private final Type type;
@@ -54,7 +54,7 @@ public class BodyArg implements RestOperationArg {
this.schema = HttpPartSchema.create(Body.class, paramInfo);
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
return
call.getRestRequest().getBody().schema(schema).asType(type);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/DefaultArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/DefaultArg.java
index 9815af8..13b1faa 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/DefaultArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/DefaultArg.java
@@ -27,7 +27,7 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* This is the default parameter resolver if no other applicable parameter
resolvers could be found.
*/
-public class DefaultArg implements RestOperationArg {
+public class DefaultArg implements RestOpArg {
private final Class<?> type;
private final ParamInfo paramInfo;
@@ -52,7 +52,7 @@ public class DefaultArg implements RestOperationArg {
this.paramInfo = paramInfo;
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
return call.getBeanStore().getBean(type).orElseThrow(()->new
ArgException(paramInfo, "Could not resolve bean type {0}", type.getName()));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/FormDataArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/FormDataArg.java
index 47c07fd..6c14d6b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/FormDataArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/FormDataArg.java
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.annotation.*;
* The parameter value is resolved using <c><jv>call</jv>.{@link
RestCall#getRestRequest() getRestRequest}().{@link RestRequest#getFormParams()
getFormParams}().{@link RequestFormParams#get(String)
get}(<jv>name</jv>).{@link RequestFormParam#asType(Class)
asType}(<jv>type</jv>)</c>
* with a {@link HttpPartSchema schema} derived from the {@link FormData}
annotation.
*/
-public class FormDataArg implements RestOperationArg {
+public class FormDataArg implements RestOpArg {
private final boolean multi;
private final HttpPartParser partParser;
private final HttpPartSchema schema;
@@ -92,7 +92,7 @@ public class FormDataArg implements RestOperationArg {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
RestRequest req = call.getRestRequest();
HttpPartParserSession ps = partParser == null ?
req.getPartParserSession() :
partParser.createPartSession(req.getParserSessionArgs());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasFormDataArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasFormDataArg.java
index 33bb07d..a42b37f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasFormDataArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasFormDataArg.java
@@ -31,7 +31,7 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* The parameter type can be a <jk>boolean</jk> or anything convertible from a
<jk>boolean</jk>.
*/
-public class HasFormDataArg implements RestOperationArg {
+public class HasFormDataArg implements RestOpArg {
private final String name;
private final Type type;
@@ -67,7 +67,7 @@ public class HasFormDataArg implements RestOperationArg {
return n;
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
RestRequest req = call.getRestRequest();
BeanSession bs = req.getBeanSession();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasQueryArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasQueryArg.java
index 07cd3f3..5cdaae8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasQueryArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HasQueryArg.java
@@ -31,7 +31,7 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* The parameter type can be a <jk>boolean</jk> or anything convertible from a
<jk>boolean</jk>.
*/
-public class HasQueryArg implements RestOperationArg {
+public class HasQueryArg implements RestOpArg {
private final String name;
private final Type type;
@@ -67,7 +67,7 @@ public class HasQueryArg implements RestOperationArg {
return n;
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
RestRequest req = call.getRestRequest();
BeanSession bs = req.getBeanSession();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HeaderArg.java
index d85a2df..a34d725 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/HeaderArg.java
@@ -36,7 +36,7 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* If the {@link Header#multi()} flag is set, then the data type can be a
{@link Collection} or array.
*/
-public class HeaderArg implements RestOperationArg {
+public class HeaderArg implements RestOpArg {
private final HttpPartParser partParser;
private final HttpPartSchema schema;
private final boolean multi;
@@ -95,7 +95,7 @@ public class HeaderArg implements RestOperationArg {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
RestRequest req = call.getRestRequest();
HttpPartParserSession ps = partParser == null ?
req.getPartParserSession() :
partParser.createPartSession(req.getParserSessionArgs());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/MethodArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/MethodArg.java
index 8355b9d..7f637fe 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/MethodArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/MethodArg.java
@@ -25,7 +25,7 @@ import org.apache.juneau.rest.annotation.*;
* <p>
* The parameter type must be {@link String}.
*/
-public class MethodArg implements RestOperationArg {
+public class MethodArg implements RestOpArg {
/**
* Static creator.
@@ -45,7 +45,7 @@ public class MethodArg implements RestOperationArg {
protected MethodArg() {
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
return call.getRestRequest().getMethod();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/PathArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/PathArg.java
index 0f8f752..12cddd1 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/PathArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/PathArg.java
@@ -30,7 +30,7 @@ import org.apache.juneau.rest.util.*;
/**
* Resolves method parameters and parameter types annotated with {@link Path}
on {@link RestOp}-annotated Java methods.
*/
-public class PathArg implements RestOperationArg {
+public class PathArg implements RestOpArg {
private final HttpPartParser partParser;
private final HttpPartSchema schema;
private final String name;
@@ -96,7 +96,7 @@ public class PathArg implements RestOperationArg {
throw new ArgException(paramInfo, "@Path used without name or
value");
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
RestRequest req = call.getRestRequest();
if (name.equals("*")) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/QueryArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/QueryArg.java
index d18817c..8d6accc 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/QueryArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/QueryArg.java
@@ -33,7 +33,7 @@ import org.apache.juneau.rest.annotation.*;
* The parameter value is resolved using <c><jv>call</jv>.{@link
RestCall#getRestRequest() getRestRequest}().{@link RestRequest#getQueryParams()
getQueryParams}().{@link RequestQueryParams#get(String)
get}(<jv>name</jv>).{@link RequestQueryParam#asType(Class)
asType}(<jv>type</jv>)</c>
* with a {@link HttpPartSchema schema} derived from the {@link Query}
annotation.
*/
-public class QueryArg implements RestOperationArg {
+public class QueryArg implements RestOpArg {
private final boolean multi;
private final HttpPartParser partParser;
private final HttpPartSchema schema;
@@ -92,7 +92,7 @@ public class QueryArg implements RestOperationArg {
}
@SuppressWarnings({ "rawtypes", "unchecked" })
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
RestRequest req = call.getRestRequest();
HttpPartParserSession ps = partParser == null ?
req.getPartParserSession() :
partParser.createPartSession(req.getParserSessionArgs());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/RequestBeanArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/RequestBeanArg.java
index e6a9107..a6b3a97 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/RequestBeanArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/RequestBeanArg.java
@@ -26,7 +26,7 @@ import org.apache.juneau.rest.annotation.*;
* The parameter value is resolved using <c><jv>call</jv>.{@link
RestCall#getRestRequest() getRestRequest}().{@link
RestRequest#getRequest(RequestBeanMeta)
getRequest}(<jv>requestBeanMeta</jv>)</c>
* with a {@link RequestBeanMeta meta} derived from the {@link Request}
annotation and context configuration.
*/
-public class RequestBeanArg implements RestOperationArg {
+public class RequestBeanArg implements RestOpArg {
private final RequestBeanMeta meta;
/**
@@ -52,7 +52,7 @@ public class RequestBeanArg implements RestOperationArg {
this.meta = RequestBeanMeta.create(paramInfo, cp);
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
return call.getRestRequest().getRequest(meta);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseBeanArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseBeanArg.java
index 370a2cc..e0481c6 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseBeanArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseBeanArg.java
@@ -28,7 +28,7 @@ import org.apache.juneau.rest.annotation.*;
* The parameter value must be of type {@link Value} that accepts a value that
is then set via
* <c><jv>call</jv>.{@link RestCall#getRestResponse()
getRestResponse}().{@link RestResponse#setOutput(Object)
setOutput}(<jv>value</jv>)</c>.
*/
-public class ResponseBeanArg implements RestOperationArg {
+public class ResponseBeanArg implements RestOpArg {
final ResponseBeanMeta meta;
private final Type type;
@@ -60,7 +60,7 @@ public class ResponseBeanArg implements RestOperationArg {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(final RestCall call) throws Exception {
Value<Object> v = new Value();
v.listener(new ValueListener() {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseHeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseHeaderArg.java
index 8d03b4f..9ce0b33 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseHeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseHeaderArg.java
@@ -33,7 +33,7 @@ import org.apache.juneau.serializer.*;
* The parameter value must be of type {@link Value} that accepts a value that
is then set via
* <c><jv>call</jv>.{@link RestCall#getRestResponse()
getRestResponse}().{@link RestResponse#setHeader(String,String)
setOutput}(<jv>name</jv>,<jv>value</jv>)</c>.
*/
-public class ResponseHeaderArg implements RestOperationArg {
+public class ResponseHeaderArg implements RestOpArg {
final ResponsePartMeta meta;
final String name;
private final Type type;
@@ -80,7 +80,7 @@ public class ResponseHeaderArg implements RestOperationArg {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(final RestCall call) throws Exception {
Value<Object> v = new Value();
v.listener(new ValueListener() {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseStatusArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseStatusArg.java
index ce06324..80081e5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseStatusArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/ResponseStatusArg.java
@@ -23,7 +23,7 @@ import org.apache.juneau.rest.annotation.*;
/**
* Resolves method parameters annotated with {@link ResponseStatus} on {@link
RestOp}-annotated Java methods.
*/
-public class ResponseStatusArg implements RestOperationArg {
+public class ResponseStatusArg implements RestOpArg {
private final Type type;
@@ -52,7 +52,7 @@ public class ResponseStatusArg implements RestOperationArg {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(final RestCall call) throws Exception {
Value<Object> v = new Value();
v.listener(new ValueListener() {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/SimpleRestOperationArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/SimpleRestOperationArg.java
index 3646c6d..3f85274 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/SimpleRestOperationArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/args/SimpleRestOperationArg.java
@@ -18,9 +18,9 @@ import org.apache.juneau.rest.*;
import org.apache.juneau.utils.*;
/**
- * An implementation of a {@link RestOperationArg} that takes in a {@link
ThrowingFunction} for resolving a parameter value.
+ * An implementation of a {@link RestOpArg} that takes in a {@link
ThrowingFunction} for resolving a parameter value.
*/
-public class SimpleRestOperationArg implements RestOperationArg {
+public class SimpleRestOperationArg implements RestOpArg {
private final Function<RestCall,Object> function;
@@ -34,7 +34,7 @@ public class SimpleRestOperationArg implements
RestOperationArg {
this.function = (Function<RestCall,Object>)function;
}
- @Override /* RestOperationArg */
+ @Override /* RestOpArg */
public Object resolve(RestCall call) throws Exception {
return function.apply(call);
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
index dfadb35..89d552f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/RestOp_Params_Test.java
@@ -367,7 +367,7 @@ public class RestOp_Params_Test {
//------------------------------------------------------------------------------------------------------------------
@Rest(
- restOperationArgs=B2a.class,
+ restOpArgs=B2a.class,
allowedHeaderParams="Custom"
)
public static class B2 {
@@ -377,7 +377,7 @@ public class RestOp_Params_Test {
}
}
- public static class B2a implements RestOperationArg {
+ public static class B2a implements RestOpArg {
public static B2a create(ParamInfo pi) {
if (pi.isType(B2b.class))
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
index f5c5f65..6e28357 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/Swagger_Test.java
@@ -46,16 +46,16 @@ public class Swagger_Test {
private org.apache.juneau.dto.swagger.Swagger getSwaggerWithFile(Object
resource) throws Exception {
RestContext rc =
RestContext.create(resource).fileFinder(TestClasspathFileFinder.class).build();
- RestOperationContext roc =
RestOperationContext.create(Swagger_Test.class.getMethod("testMethod"),
rc).build();
- RestRequest req = rc.createRequest(new RestCall(resource, rc,
new MockServletRequest(), new MockServletResponse()).restOperationContext(roc));
+ RestOpContext roc =
RestOpContext.create(Swagger_Test.class.getMethod("testMethod"), rc).build();
+ RestRequest req = rc.createRequest(new RestCall(resource, rc,
new MockServletRequest(), new MockServletResponse()).restOpContext(roc));
SwaggerProvider ip = rc.getSwaggerProvider();
return ip.getSwagger(rc, req.getLocale());
}
private static org.apache.juneau.dto.swagger.Swagger getSwagger(Object
resource) throws Exception {
RestContext rc = RestContext.create(resource).build();
- RestOperationContext roc =
RestOperationContext.create(Swagger_Test.class.getMethod("testMethod"),
rc).build();
- RestRequest req = rc.createRequest(new RestCall(resource, rc,
new MockServletRequest(), new MockServletResponse()).restOperationContext(roc));
+ RestOpContext roc =
RestOpContext.create(Swagger_Test.class.getMethod("testMethod"), rc).build();
+ RestRequest req = rc.createRequest(new RestCall(resource, rc,
new MockServletRequest(), new MockServletResponse()).restOpContext(roc));
SwaggerProvider ip = rc.getSwaggerProvider();
return ip.getSwagger(rc, req.getLocale());
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
index 7771216..8116afa 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestAnnotation_Test.java
@@ -74,8 +74,8 @@ public class RestAnnotation_Test {
.renderResponseStackTraces("renderResponseStackTraces")
.responseProcessors(ResponseProcessor.class)
.restChildrenClass(RestChildren.class)
- .restOperationContextClass(RestOperationContext.class)
- .restOperationArgs(RestOperationArg.class)
+ .restOpContextClass(RestOpContext.class)
+ .restOpArgs(RestOpArg.class)
.restOperationsClass(RestOperations.class)
.roleGuard("roleGuard")
.rolesDeclared("rolesDeclared")
@@ -129,8 +129,8 @@ public class RestAnnotation_Test {
.renderResponseStackTraces("renderResponseStackTraces")
.responseProcessors(ResponseProcessor.class)
.restChildrenClass(RestChildren.class)
- .restOperationContextClass(RestOperationContext.class)
- .restOperationArgs(RestOperationArg.class)
+ .restOpContextClass(RestOpContext.class)
+ .restOpArgs(RestOpArg.class)
.restOperationsClass(RestOperations.class)
.roleGuard("roleGuard")
.rolesDeclared("rolesDeclared")
@@ -187,8 +187,8 @@ public class RestAnnotation_Test {
+
"renderResponseStackTraces:'renderResponseStackTraces',"
+
"responseProcessors:['org.apache.juneau.rest.ResponseProcessor'],"
+
"restChildrenClass:'org.apache.juneau.rest.RestChildren',"
- +
"restOperationArgs:['org.apache.juneau.rest.RestOperationArg'],"
- +
"restOperationContextClass:'org.apache.juneau.rest.RestOperationContext',"
+ +
"restOpArgs:['org.apache.juneau.rest.RestOpArg'],"
+ +
"restOpContextClass:'org.apache.juneau.rest.RestOpContext',"
+
"restOperationsClass:'org.apache.juneau.rest.RestOperations',"
+ "roleGuard:'roleGuard',"
+ "rolesDeclared:'rolesDeclared',"
@@ -287,8 +287,8 @@ public class RestAnnotation_Test {
renderResponseStackTraces="renderResponseStackTraces",
responseProcessors=ResponseProcessor.class,
restChildrenClass=RestChildren.class,
- restOperationContextClass=RestOperationContext.class,
- restOperationArgs=RestOperationArg.class,
+ restOpContextClass=RestOpContext.class,
+ restOpArgs=RestOpArg.class,
restOperationsClass=RestOperations.class,
roleGuard="roleGuard",
rolesDeclared="rolesDeclared",
@@ -344,8 +344,8 @@ public class RestAnnotation_Test {
renderResponseStackTraces="renderResponseStackTraces",
responseProcessors=ResponseProcessor.class,
restChildrenClass=RestChildren.class,
- restOperationContextClass=RestOperationContext.class,
- restOperationArgs=RestOperationArg.class,
+ restOpContextClass=RestOpContext.class,
+ restOpArgs=RestOpArg.class,
restOperationsClass=RestOperations.class,
roleGuard="roleGuard",
rolesDeclared="rolesDeclared",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
index 7d715d8..421de88 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation_Test.java
@@ -33,7 +33,7 @@ public class RestDeleteAnnotation_Test {
RestDelete a1 = RestDeleteAnnotation.create()
.clientVersion("clientVersion")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.debug("debug")
.defaultAccept("defaultAccept")
.defaultCharset("defaultCharset")
@@ -56,7 +56,7 @@ public class RestDeleteAnnotation_Test {
RestDelete a2 = RestDeleteAnnotation.create()
.clientVersion("clientVersion")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.debug("debug")
.defaultAccept("defaultAccept")
.defaultCharset("defaultCharset")
@@ -82,7 +82,7 @@ public class RestDeleteAnnotation_Test {
assertObject(a1).asJson().is(""
+ "{"
+ "clientVersion:'clientVersion',"
- +
"contextClass:'org.apache.juneau.rest.RestOperationContext',"
+ +
"contextClass:'org.apache.juneau.rest.RestOpContext',"
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
+ "defaultCharset:'defaultCharset',"
@@ -150,7 +150,7 @@ public class RestDeleteAnnotation_Test {
@RestDelete(
clientVersion="clientVersion",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
debug="debug",
defaultAccept="defaultAccept",
defaultCharset="defaultCharset",
@@ -174,7 +174,7 @@ public class RestDeleteAnnotation_Test {
@RestDelete(
clientVersion="clientVersion",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
debug="debug",
defaultAccept="defaultAccept",
defaultCharset="defaultCharset",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
index 35af47a..2b122a7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestGetAnnotation_Test.java
@@ -34,7 +34,7 @@ public class RestGetAnnotation_Test {
RestGet a1 = RestGetAnnotation.create()
.clientVersion("clientVersion")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -60,7 +60,7 @@ public class RestGetAnnotation_Test {
RestGet a2 = RestGetAnnotation.create()
.clientVersion("clientVersion")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -89,7 +89,7 @@ public class RestGetAnnotation_Test {
assertObject(a1).asJson().is(""
+ "{"
+ "clientVersion:'clientVersion',"
- +
"contextClass:'org.apache.juneau.rest.RestOperationContext',"
+ +
"contextClass:'org.apache.juneau.rest.RestOpContext',"
+
"converters:['org.apache.juneau.rest.RestConverter'],"
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
@@ -160,7 +160,7 @@ public class RestGetAnnotation_Test {
@RestGet(
clientVersion="clientVersion",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
@@ -187,7 +187,7 @@ public class RestGetAnnotation_Test {
@RestGet(
clientVersion="clientVersion",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
index 7157dad..1405215 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOpAnnotation_Test.java
@@ -36,7 +36,7 @@ public class RestOpAnnotation_Test {
RestOp a1 = RestOpAnnotation.create()
.clientVersion("clientVersion")
.consumes("consumes")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -68,7 +68,7 @@ public class RestOpAnnotation_Test {
RestOp a2 = RestOpAnnotation.create()
.clientVersion("clientVersion")
.consumes("consumes")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -103,7 +103,7 @@ public class RestOpAnnotation_Test {
+ "{"
+ "clientVersion:'clientVersion',"
+ "consumes:['consumes'],"
- +
"contextClass:'org.apache.juneau.rest.RestOperationContext',"
+ +
"contextClass:'org.apache.juneau.rest.RestOpContext',"
+
"converters:['org.apache.juneau.rest.RestConverter'],"
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
@@ -180,7 +180,7 @@ public class RestOpAnnotation_Test {
@RestOp(
clientVersion="clientVersion",
consumes="consumes",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
@@ -213,7 +213,7 @@ public class RestOpAnnotation_Test {
@RestOp(
clientVersion="clientVersion",
consumes="consumes",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
index a2af442..b2f71e7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPostAnnotation_Test.java
@@ -36,7 +36,7 @@ public class RestPostAnnotation_Test {
RestPost a1 = RestPostAnnotation.create()
.clientVersion("clientVersion")
.consumes("consumes")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -67,7 +67,7 @@ public class RestPostAnnotation_Test {
RestPost a2 = RestPostAnnotation.create()
.clientVersion("clientVersion")
.consumes("consumes")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -101,7 +101,7 @@ public class RestPostAnnotation_Test {
+ "{"
+ "clientVersion:'clientVersion',"
+ "consumes:['consumes'],"
- +
"contextClass:'org.apache.juneau.rest.RestOperationContext',"
+ +
"contextClass:'org.apache.juneau.rest.RestOpContext',"
+
"converters:['org.apache.juneau.rest.RestConverter'],"
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
@@ -177,7 +177,7 @@ public class RestPostAnnotation_Test {
@RestPost(
clientVersion="clientVersion",
consumes="consumes",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
@@ -209,7 +209,7 @@ public class RestPostAnnotation_Test {
@RestPost(
clientVersion="clientVersion",
consumes="consumes",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
index d528ed1..6d910b2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestPutAnnotation_Test.java
@@ -36,7 +36,7 @@ public class RestPutAnnotation_Test {
RestPut a1 = RestPutAnnotation.create()
.clientVersion("clientVersion")
.consumes("consumes")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -67,7 +67,7 @@ public class RestPutAnnotation_Test {
RestPut a2 = RestPutAnnotation.create()
.clientVersion("clientVersion")
.consumes("consumes")
- .contextClass(RestOperationContext.class)
+ .contextClass(RestOpContext.class)
.converters(RestConverter.class)
.debug("debug")
.defaultAccept("defaultAccept")
@@ -101,7 +101,7 @@ public class RestPutAnnotation_Test {
+ "{"
+ "clientVersion:'clientVersion',"
+ "consumes:['consumes'],"
- +
"contextClass:'org.apache.juneau.rest.RestOperationContext',"
+ +
"contextClass:'org.apache.juneau.rest.RestOpContext',"
+
"converters:['org.apache.juneau.rest.RestConverter'],"
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
@@ -177,7 +177,7 @@ public class RestPutAnnotation_Test {
@RestPut(
clientVersion="clientVersion",
consumes="consumes",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
@@ -209,7 +209,7 @@ public class RestPutAnnotation_Test {
@RestPut(
clientVersion="clientVersion",
consumes="consumes",
- contextClass=RestOperationContext.class,
+ contextClass=RestOpContext.class,
converters=RestConverter.class,
debug="debug",
defaultAccept="defaultAccept",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
index 36dcd5f..f593e83 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/testutils/TestUtils.java
@@ -28,8 +28,8 @@ public class TestUtils extends
org.apache.juneau.testutils.TestUtils {
try {
Object r = c.newInstance();
RestContext rc = RestContext.create(r).build();
- RestOperationContext ctx =
RestOperationContext.create(TestUtils.class.getMethod("getSwagger",
Class.class), rc).build();
- RestRequest req = rc.createRequest(new RestCall(r, rc,
new MockServletRequest(), new MockServletResponse()).restOperationContext(ctx));
+ RestOpContext ctx =
RestOpContext.create(TestUtils.class.getMethod("getSwagger", Class.class),
rc).build();
+ RestRequest req = rc.createRequest(new RestCall(r, rc,
new MockServletRequest(), new MockServletResponse()).restOpContext(ctx));
SwaggerProvider ip = rc.getSwaggerProvider();
return ip.getSwagger(rc, req.getLocale());
} catch (Exception e) {
