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 92b3e50 Context API refactoring.
92b3e50 is described below
commit 92b3e50d7699173d16d085d63de694fcbd1687f6
Author: JamesBognar <[email protected]>
AuthorDate: Sat Aug 28 10:29:00 2021 -0400
Context API refactoring.
---
.../apache/juneau/rest/RestOperationContext.java | 99 ++---------------
.../juneau/rest/RestOperationContextBuilder.java | 123 ++++++++++++++++-----
.../apache/juneau/rest/annotation/RestDelete.java | 4 +-
.../rest/annotation/RestDeleteAnnotation.java | 18 +--
.../org/apache/juneau/rest/annotation/RestGet.java | 4 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 18 +--
.../org/apache/juneau/rest/annotation/RestOp.java | 4 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 20 ++--
.../apache/juneau/rest/annotation/RestPost.java | 4 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 20 ++--
.../org/apache/juneau/rest/annotation/RestPut.java | 4 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 20 ++--
.../apache/juneau/rest/annotation/Query_Test.java | 4 +-
.../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 +-
18 files changed, 188 insertions(+), 204 deletions(-)
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/RestOperationContext.java
index 61f19b0..5ad76c7 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/RestOperationContext.java
@@ -83,85 +83,6 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
static final String PREFIX = "RestOperationContext";
/**
- * Configuration property: Default form data.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.rest.RestOperationContext#RESTOP_defaultFormData
RESTOP_defaultFormData}
- * <li><b>Name:</b>
<js>"RestOperationContext.defaultFormData.lo"</js>
- * <li><b>Data type:</b> <c>{@link
org.apache.http.NameValuePair}[]</c>
- * <li><b>System property:</b>
<c>RestOperationContext.defaultFormData</c>
- * <li><b>Environment variable:</b>
<c>RESTOPERATIONCONTEXT_DEFAULTFORMDATA</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.RestOp#defaultFormData()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#defaultFormData(String,Object)}
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#defaultFormData(String,Supplier)}
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#defaultFormData(NameValuePair...)}
- * </ul>
- * </ul>
- *
- * <h5 class='section'>Description:</h5>
- * <p>
- * Specifies default values for form-data parameters.
- *
- * <p>
- * Affects values returned by {@link RestRequest#getFormParam(String)}
when the parameter is not present on the
- * request.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <ja>@RestPost</ja>(path=<js>"/*"</js>,
defaultFormData={<js>"foo=bar"</js>})
- * <jk>public</jk> String doGet(<ja>@FormData</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
- * </p>
- */
- public static final String RESTOP_defaultFormData = PREFIX +
".defaultFormData.lo";
-
- /**
- * Configuration property: Default query parameters.
- *
- * <h5 class='section'>Property:</h5>
- * <ul class='spaced-list'>
- * <li><b>ID:</b> {@link
org.apache.juneau.rest.RestOperationContext#RESTOP_defaultQuery
RESTOP_defaultQuery}
- * <li><b>Name:</b>
<js>"RestOperationContext.defaultQuery.lo"</js>
- * <li><b>Data type:</b> <c>{@link
org.apache.http.NameValuePair}[]</c>
- * <li><b>System property:</b>
<c>RestOperationContext.defaultQuery</c>
- * <li><b>Environment variable:</b>
<c>RESTOPERATIONCONTEXT_DEFAULTQUERY</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.RestOp#defaultQuery()}
- * </ul>
- * <li><b>Methods:</b>
- * <ul>
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#defaultQuery(String,Object)}
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#defaultQuery(String,Supplier)}
- * <li class='jm'>{@link
org.apache.juneau.rest.RestOperationContextBuilder#defaultQuery(NameValuePair...)}
- * </ul>
- * </ul>
- *
- * <h5 class='section'>Description:</h5>
- * <p>
- * Specifies default values for query parameters.
- *
- * <p>
- * Affects values returned by {@link RestRequest#getQueryParam(String)}
when the parameter is not present on the request.
- *
- * <h5 class='section'>Example:</h5>
- * <p class='bcode w800'>
- * <ja>@RestGet</ja>(path=<js>"/*"</js>,
defaultQuery={<js>"foo=bar"</js>})
- * <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
- * </p>
- */
- public static final String RESTOP_defaultQuery = PREFIX +
".defaultQuery.lo";
-
- /**
* Configuration property: Default request attributes.
*
* <h5 class='section'>Property:</h5>
@@ -458,8 +379,8 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
defaultRequestHeaders = createDefaultRequestHeaders(r,
cp, bs, method, context).build();
defaultResponseHeaders =
createDefaultResponseHeaders(r, cp, bs, method, context).build();
- defaultRequestQuery = createDefaultRequestQuery(r, cp,
bs, method).build();
- defaultRequestFormData =
createDefaultRequestFormData(r, cp, bs, method).build();
+ defaultRequestQuery = createDefaultRequestQuery(r,
builder, bs, method).build();
+ defaultRequestFormData =
createDefaultRequestFormData(r, builder, bs, method).build();
defaultRequestAttributes =
unmodifiableList(createDefaultRequestAttributes(r, cp, bs, method, context));
int _hierarchyDepth = 0;
@@ -1159,17 +1080,15 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* Instantiates the default query parameters for this method.
*
* @param resource The REST resource object.
- * @param properties xxx
+ * @param builder The builder for this object.
* @param beanStore The bean store to use for retrieving and creating
beans.
* @param method This Java method.
* @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,
ContextProperties properties, BeanStore beanStore, Method method) throws
Exception {
-
- PartListBuilder x = PartList.create();
+ protected PartListBuilder createDefaultRequestQuery(Object resource,
RestOperationContextBuilder builder, BeanStore beanStore, Method method) throws
Exception {
- x.setDefault(properties.getInstanceArray(RESTOP_defaultQuery,
NameValuePair.class, beanStore).orElse(new NameValuePair[0]));
+ PartListBuilder x = builder.defaultQueryData;
for (Annotation[] aa : method.getParameterAnnotations()) {
for (Annotation a : aa) {
@@ -1203,17 +1122,15 @@ public class RestOperationContext extends BeanContext
implements Comparable<Rest
* Instantiates the default form-data parameters for this method.
*
* @param resource The REST resource object.
- * @param properties xxx
+ * @param builder The builder for this object.
* @param beanStore The bean store to use for retrieving and creating
beans.
* @param method This Java method.
* @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,
ContextProperties properties, BeanStore beanStore, Method method) throws
Exception {
-
- PartListBuilder x = PartList.create();
+ protected PartListBuilder createDefaultRequestFormData(Object resource,
RestOperationContextBuilder builder, BeanStore beanStore, Method method) throws
Exception {
-
x.setDefault(properties.getInstanceArray(RESTOP_defaultFormData,
NameValuePair.class, beanStore).orElse(new NameValuePair[0]));
+ PartListBuilder x = builder.defaultFormData;
for (Annotation[] aa : method.getParameterAnnotations()) {
for (Annotation a : aa) {
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/RestOperationContextBuilder.java
index 23fe0b4..eecd605 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/RestOperationContextBuilder.java
@@ -16,7 +16,6 @@ import static java.util.Arrays.*;
import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.rest.HttpRuntimeException.*;
import static org.apache.juneau.rest.RestOperationContext.*;
-import static org.apache.juneau.http.HttpParts.*;
import java.lang.annotation.*;
import java.util.*;
@@ -26,6 +25,7 @@ import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.http.header.*;
+import org.apache.juneau.http.part.*;
import org.apache.juneau.http.remote.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.internal.*;
@@ -45,6 +45,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
String httpMethod, clientVersion;
Enablement debug;
List<String> path;
+ PartListBuilder defaultFormData, defaultQueryData;
private BeanStore beanStore;
@@ -78,6 +79,8 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
this.restContext = context;
this.restMethod = method;
this.beanStore = context.getRootBeanStore();
+ this.defaultFormData = PartList.create();
+ this.defaultQueryData = PartList.create();
MethodInfo mi = MethodInfo.of(context.getResourceClass(),
method);
@@ -225,13 +228,20 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default form data parameters.
+ * Default form data parameters.
*
* <p>
- * Adds a single default form data parameter.
+ * Sets a default value for a form data parameter.
*
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <ja>@RestPost</ja>(path=<js>"/*"</js>,
defaultFormData={<js>"foo=bar"</js>})
+ * <jk>public</jk> String doGet(<ja>@FormData</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
+ * </p>
+
* <ul class='seealso'>
- * <li class='jf'>{@link
RestOperationContext#RESTOP_defaultFormData}
+ * <li class='ja'>{@link RestOp#defaultFormData}
+ * <li class='ja'>{@link RestPost#defaultFormData}
* </ul>
*
* @param name The form data parameter name.
@@ -240,17 +250,25 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
*/
@FluentSetter
public RestOperationContextBuilder defaultFormData(String name, Object
value) {
- return defaultFormData(basicPart(name, value));
+ defaultFormData.setDefault(name, value);
+ return this;
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default form data parameters.
+ * Default form data parameters.
*
* <p>
- * Adds a single default form data parameter.
+ * Sets a default value for a form data parameter.
*
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <ja>@RestPost</ja>(path=<js>"/*"</js>,
defaultFormData={<js>"foo=bar"</js>})
+ * <jk>public</jk> String doGet(<ja>@FormData</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
+ * </p>
+
* <ul class='seealso'>
- * <li class='jf'>{@link
RestOperationContext#RESTOP_defaultFormData}
+ * <li class='ja'>{@link RestOp#defaultFormData}
+ * <li class='ja'>{@link RestPost#defaultFormData}
* </ul>
*
* @param name The form data parameter name.
@@ -259,17 +277,25 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
*/
@FluentSetter
public RestOperationContextBuilder defaultFormData(String name,
Supplier<?> value) {
- return defaultFormData(basicPart(name, value));
+ defaultFormData.setDefault(name, value);
+ return this;
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default form data parameters.
+ * Default form data parameters.
*
* <p>
- * Specifies default values for form data parameters if they're not
specified in the request body.
+ * Sets default values for form data parameters.
*
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <ja>@RestPost</ja>(path=<js>"/*"</js>,
defaultFormData={<js>"foo=bar"</js>})
+ * <jk>public</jk> String doGet(<ja>@FormData</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
+ * </p>
+
* <ul class='seealso'>
- * <li class='jf'>{@link
RestOperationContext#RESTOP_defaultFormData}
+ * <li class='ja'>{@link RestOp#defaultFormData}
+ * <li class='ja'>{@link RestPost#defaultFormData}
* </ul>
*
* @param values The form data parameters to add.
@@ -277,18 +303,31 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
*/
@FluentSetter
public RestOperationContextBuilder
defaultFormData(NameValuePair...values) {
- asList(values).stream().forEach(x ->
appendTo(RESTOP_defaultFormData, x));
+ defaultFormData.setDefault(values);
return this;
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default query parameters.
+ * Default query parameters.
*
* <p>
- * Adds a single default query parameter.
+ * Sets a default value for a query data parameter.
*
+ * <p>
+ * Affects values returned by {@link RestRequest#getQueryParam(String)}
when the parameter is not present on the request.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <ja>@RestGet</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
+ * <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
+ * </p>
+
* <ul class='seealso'>
- * <li class='jf'>{@link RestOperationContext#RESTOP_defaultQuery}
+ * <li class='ja'>{@link RestOp#defaultQueryData}
+ * <li class='ja'>{@link RestGet#defaultQueryData}
+ * <li class='ja'>{@link RestPut#defaultQueryData}
+ * <li class='ja'>{@link RestPost#defaultQueryData}
+ * <li class='ja'>{@link RestDelete#defaultQueryData}
* </ul>
*
* @param name The query parameter name.
@@ -296,18 +335,32 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder defaultQuery(String name, Object
value) {
- return defaultQuery(basicPart(name, value));
+ public RestOperationContextBuilder defaultQueryData(String name, Object
value) {
+ defaultQueryData.setDefault(name, value);
+ return this;
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default query parameters.
+ * Default query parameters.
*
* <p>
- * Adds a single default query parameter.
+ * Sets a default value for a query data parameter.
*
+ * <p>
+ * Affects values returned by {@link RestRequest#getQueryParam(String)}
when the parameter is not present on the request.
+ *
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <ja>@RestGet</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
+ * <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
+ * </p>
+
* <ul class='seealso'>
- * <li class='jf'>{@link RestOperationContext#RESTOP_defaultQuery}
+ * <li class='ja'>{@link RestOp#defaultQueryData}
+ * <li class='ja'>{@link RestGet#defaultQueryData}
+ * <li class='ja'>{@link RestPut#defaultQueryData}
+ * <li class='ja'>{@link RestPost#defaultQueryData}
+ * <li class='ja'>{@link RestDelete#defaultQueryData}
* </ul>
*
* @param name The query parameter name.
@@ -315,26 +368,40 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder defaultQuery(String name,
Supplier<?> value) {
- return defaultQuery(basicPart(name, value));
+ public RestOperationContextBuilder defaultQueryData(String name,
Supplier<?> value) {
+ defaultQueryData.setDefault(name, value);
+ return this;
}
/**
- * <i><l>RestOperationContext</l> configuration property: </i>
Default query parameters.
+ * Default query parameters.
+ *
+ * <p>
+ * Sets default values for query data parameters.
*
* <p>
- * Specifies default values for query parameters if they're not
specified on the request.
+ * Affects values returned by {@link RestRequest#getQueryParam(String)}
when the parameter is not present on the request.
*
+ * <h5 class='section'>Example:</h5>
+ * <p class='bcode w800'>
+ * <ja>@RestGet</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
+ * <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>)
String <jv>foo</jv>) {...}
+ * </p>
+
* <ul class='seealso'>
- * <li class='jf'>{@link RestOperationContext#RESTOP_defaultQuery}
+ * <li class='ja'>{@link RestOp#defaultQueryData}
+ * <li class='ja'>{@link RestGet#defaultQueryData}
+ * <li class='ja'>{@link RestPut#defaultQueryData}
+ * <li class='ja'>{@link RestPost#defaultQueryData}
+ * <li class='ja'>{@link RestDelete#defaultQueryData}
* </ul>
*
* @param values The query parameters to add.
* @return This object (for method chaining).
*/
@FluentSetter
- public RestOperationContextBuilder defaultQuery(NameValuePair...values)
{
- asList(values).stream().forEach(x ->
appendTo(RESTOP_defaultQuery, x));
+ public RestOperationContextBuilder
defaultQueryData(NameValuePair...values) {
+ defaultQueryData.setDefault(values);
return this;
}
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 6744bf7..37d7ca3 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
@@ -181,7 +181,7 @@ public @interface RestDelete {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestDelete</ja>(path=<js>"/*"</js>,
defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestDelete</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
* <jk>public</jk> String doDelete(<ja>@Query</ja>(<js>"foo"</js>)
String foo) {...}
* </p>
*
@@ -195,7 +195,7 @@ public @interface RestDelete {
* (e.g. <js>"$S{mySystemProperty}"</js>).
* </ul>
*/
- String[] defaultQuery() default {};
+ String[] defaultQueryData() default {};
/**
* Default request attributes.
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 19840a0..db2447f 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
@@ -62,7 +62,7 @@ public class RestDeleteAnnotation {
Class<?>[] encoders=new Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", rolesDeclared="", roleGuard="", summary="", value="";
- String[] defaultQuery={}, defaultRequestAttributes={},
defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={};
+ String[] defaultQueryData={}, defaultRequestAttributes={},
defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={};
/**
* Constructor.
@@ -136,13 +136,13 @@ public class RestDeleteAnnotation {
}
/**
- * Sets the {@link RestDelete#defaultQuery()} property on this
annotation.
+ * Sets the {@link RestDelete#defaultQueryData()} property on
this annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder defaultQuery(String...value) {
- this.defaultQuery = value;
+ public Builder defaultQueryData(String...value) {
+ this.defaultQueryData = value;
return this;
}
@@ -314,7 +314,7 @@ public class RestDeleteAnnotation {
private final Class<?>[] encoders;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
- private final String[] defaultQuery, defaultRequestAttributes,
defaultRequestHeaders, defaultResponseHeaders, description, path;
+ private final String[] defaultQueryData,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders,
description, path;
Impl(Builder b) {
super(b);
@@ -323,7 +323,7 @@ public class RestDeleteAnnotation {
this.debug = b.debug;
this.defaultAccept = b.defaultAccept;
this.defaultCharset = b.defaultCharset;
- this.defaultQuery = copyOf(b.defaultQuery);
+ this.defaultQueryData = copyOf(b.defaultQueryData);
this.defaultRequestAttributes =
copyOf(b.defaultRequestAttributes);
this.defaultRequestHeaders =
copyOf(b.defaultRequestHeaders);
this.defaultResponseHeaders =
copyOf(b.defaultResponseHeaders);
@@ -366,8 +366,8 @@ public class RestDeleteAnnotation {
}
@Override /* RestDelete */
- public String[] defaultQuery() {
- return defaultQuery;
+ public String[] defaultQueryData() {
+ return defaultQueryData;
}
@Override /* RestDelete */
@@ -461,7 +461,7 @@ public class RestDeleteAnnotation {
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultRequestHeaders, x));
stringStream(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultResponseHeaders, x));
stringStream(a.defaultRequestAttributes()).map(x ->
BasicNamedAttribute.ofPair(x)).forEach(x ->
b.appendTo(RESTOP_defaultRequestAttributes, x));
- stringStream(a.defaultQuery()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultQuery, x));
+ stringStream(a.defaultQueryData()).map(x ->
basicPart(x)).forEach(x -> b.defaultQueryData(x));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
accept(string(a.defaultAccept())));
b.prependTo(REST_guards, reverse(a.guards()));
b.prependTo(RESTOP_matchers, a.matchers());
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 cecdf0e..2576345 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
@@ -195,7 +195,7 @@ public @interface RestGet {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestGet</ja>(path=<js>"/*"</js>,
defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestGet</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
* <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>)
String foo) {...}
* </p>
*
@@ -209,7 +209,7 @@ public @interface RestGet {
* (e.g. <js>"$S{mySystemProperty}"</js>).
* </ul>
*/
- String[] defaultQuery() default {};
+ String[] defaultQueryData() default {};
/**
* Default request attributes.
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 134919c..60f2682 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
@@ -63,7 +63,7 @@ public class RestGetAnnotation {
Class<?>[] encoders=new Class<?>[0], serializers=new
Class<?>[0];
OpSwagger swagger = OpSwaggerAnnotation.DEFAULT;
String clientVersion="", debug="", defaultAccept="",
defaultCharset="", rolesDeclared="", roleGuard="", summary="", value="";
- String[] defaultQuery={}, defaultRequestAttributes={},
defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={},
produces={};
+ String[] defaultQueryData={}, defaultRequestAttributes={},
defaultRequestHeaders={}, defaultResponseHeaders={}, description={}, path={},
produces={};
/**
* Constructor.
@@ -148,13 +148,13 @@ public class RestGetAnnotation {
}
/**
- * Sets the {@link RestGet#defaultQuery()} property on this
annotation.
+ * Sets the {@link RestGet#defaultQueryData()} property on this
annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder defaultQuery(String...value) {
- this.defaultQuery = value;
+ public Builder defaultQueryData(String...value) {
+ this.defaultQueryData = value;
return this;
}
@@ -349,7 +349,7 @@ public class RestGetAnnotation {
private final Class<?>[] encoders, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, rolesDeclared, roleGuard, summary, value;
- private final String[] defaultQuery, defaultRequestAttributes,
defaultRequestHeaders, defaultResponseHeaders, description, path, produces;
+ private final String[] defaultQueryData,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders,
description, path, produces;
Impl(Builder b) {
super(b);
@@ -359,7 +359,7 @@ public class RestGetAnnotation {
this.debug = b.debug;
this.defaultAccept = b.defaultAccept;
this.defaultCharset = b.defaultCharset;
- this.defaultQuery = copyOf(b.defaultQuery);
+ this.defaultQueryData = copyOf(b.defaultQueryData);
this.defaultRequestAttributes =
copyOf(b.defaultRequestAttributes);
this.defaultRequestHeaders =
copyOf(b.defaultRequestHeaders);
this.defaultResponseHeaders =
copyOf(b.defaultResponseHeaders);
@@ -409,8 +409,8 @@ public class RestGetAnnotation {
}
@Override /* RestGet */
- public String[] defaultQuery() {
- return defaultQuery;
+ public String[] defaultQueryData() {
+ return defaultQueryData;
}
@Override /* RestGet */
@@ -516,7 +516,7 @@ public class RestGetAnnotation {
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultRequestHeaders, x));
stringStream(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultResponseHeaders, x));
stringStream(a.defaultRequestAttributes()).map(x ->
BasicNamedAttribute.ofPair(x)).forEach(x ->
b.appendTo(RESTOP_defaultRequestAttributes, x));
- stringStream(a.defaultQuery()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultQuery, x));
+ stringStream(a.defaultQueryData()).map(x ->
basicPart(x)).forEach(x -> b.defaultQueryData(x));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
accept(string(a.defaultAccept())));
b.prependTo(REST_converters, a.converters());
b.prependTo(REST_guards, reverse(a.guards()));
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 36de67e..0b24cf8 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
@@ -250,7 +250,7 @@ public @interface RestOp {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestOp</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>,
defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestOp</ja>(method=<jsf>GET</jsf>, path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
* <jk>public</jk> String doGet(<ja>@Query</ja>(<js>"foo"</js>)
String foo) {...}
* </p>
*
@@ -264,7 +264,7 @@ public @interface RestOp {
* (e.g. <js>"$S{mySystemProperty}"</js>).
* </ul>
*/
- String[] defaultQuery() default {};
+ String[] defaultQueryData() default {};
/**
* Default request attributes.
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 60feba0..40899b1 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
@@ -63,7 +63,7 @@ public class RestOpAnnotation {
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="";
- String[] consumes={}, defaultFormData={}, defaultQuery={},
defaultRequestAttributes={}, defaultRequestHeaders={},
defaultResponseHeaders={}, description={}, path={}, produces={};
+ String[] consumes={}, defaultFormData={}, defaultQueryData={},
defaultRequestAttributes={}, defaultRequestHeaders={},
defaultResponseHeaders={}, description={}, path={}, produces={};
/**
* Constructor.
@@ -181,13 +181,13 @@ public class RestOpAnnotation {
}
/**
- * Sets the {@link RestOp#defaultQuery()} property on this
annotation.
+ * Sets the {@link RestOp#defaultQueryData()} property on this
annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder defaultQuery(String...value) {
- this.defaultQuery = value;
+ public Builder defaultQueryData(String...value) {
+ this.defaultQueryData = value;
return this;
}
@@ -415,7 +415,7 @@ public class RestOpAnnotation {
private final Class<?>[] encoders, parsers, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, method, rolesDeclared, roleGuard,
summary, value;
- private final String[] consumes, defaultFormData, defaultQuery,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders,
description, path, produces;
+ private final String[] consumes, defaultFormData,
defaultQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, description, path, produces;
Impl(Builder b) {
super(b);
@@ -428,7 +428,7 @@ public class RestOpAnnotation {
this.defaultCharset = b.defaultCharset;
this.defaultContentType = b.defaultContentType;
this.defaultFormData = copyOf(b.defaultFormData);
- this.defaultQuery = copyOf(b.defaultQuery);
+ this.defaultQueryData = copyOf(b.defaultQueryData);
this.defaultRequestAttributes =
copyOf(b.defaultRequestAttributes);
this.defaultRequestHeaders =
copyOf(b.defaultRequestHeaders);
this.defaultResponseHeaders =
copyOf(b.defaultResponseHeaders);
@@ -496,8 +496,8 @@ public class RestOpAnnotation {
}
@Override /* RestOp */
- public String[] defaultQuery() {
- return defaultQuery;
+ public String[] defaultQueryData() {
+ return defaultQueryData;
}
@Override /* RestOp */
@@ -618,8 +618,8 @@ public class RestOpAnnotation {
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultRequestHeaders, x));
stringStream(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultResponseHeaders, x));
stringStream(a.defaultRequestAttributes()).map(x ->
BasicNamedAttribute.ofPair(x)).forEach(x ->
b.appendTo(RESTOP_defaultRequestAttributes, x));
- stringStream(a.defaultQuery()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultQuery, x));
- stringStream(a.defaultFormData()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultFormData, x));
+ stringStream(a.defaultQueryData()).map(x ->
basicPart(x)).forEach(x -> b.defaultQueryData(x));
+ stringStream(a.defaultFormData()).map(x ->
basicPart(x)).forEach(x -> b.defaultFormData(x));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
accept(string(a.defaultAccept())));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
contentType(string(a.defaultContentType())));
b.prependTo(REST_converters, a.converters());
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 80dff49..10c686b 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
@@ -252,7 +252,7 @@ public @interface RestPost {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestPost</ja>(path=<js>"/*"</js>,
defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestPost</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
* <jk>public</jk> String doPost(<ja>@Query</ja>(<js>"foo"</js>)
String foo) {...}
* </p>
*
@@ -266,7 +266,7 @@ public @interface RestPost {
* (e.g. <js>"$S{mySystemProperty}"</js>).
* </ul>
*/
- String[] defaultQuery() default {};
+ String[] defaultQueryData() default {};
/**
* Default request attributes.
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 1f3d9c8..e83d25e 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
@@ -63,7 +63,7 @@ public class RestPostAnnotation {
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="";
- String[] consumes={}, defaultFormData={}, defaultQuery={},
defaultRequestAttributes={}, defaultRequestHeaders={},
defaultResponseHeaders={}, description={}, path={}, produces={};
+ String[] consumes={}, defaultFormData={}, defaultQueryData={},
defaultRequestAttributes={}, defaultRequestHeaders={},
defaultResponseHeaders={}, description={}, path={}, produces={};
/**
* Constructor.
@@ -181,13 +181,13 @@ public class RestPostAnnotation {
}
/**
- * Sets the {@link RestPost#defaultQuery()} property on this
annotation.
+ * Sets the {@link RestPost#defaultQueryData()} property on
this annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder defaultQuery(String...value) {
- this.defaultQuery = value;
+ public Builder defaultQueryData(String...value) {
+ this.defaultQueryData = value;
return this;
}
@@ -404,7 +404,7 @@ public class RestPostAnnotation {
private final Class<?>[] encoders, parsers, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
- private final String[] consumes, defaultFormData, defaultQuery,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders,
description, path, produces;
+ private final String[] consumes, defaultFormData,
defaultQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, description, path, produces;
Impl(Builder b) {
super(b);
@@ -417,7 +417,7 @@ public class RestPostAnnotation {
this.defaultCharset = b.defaultCharset;
this.defaultContentType = b.defaultContentType;
this.defaultFormData = copyOf(b.defaultFormData);
- this.defaultQuery = copyOf(b.defaultQuery);
+ this.defaultQueryData = copyOf(b.defaultQueryData);
this.defaultRequestAttributes =
copyOf(b.defaultRequestAttributes);
this.defaultRequestHeaders =
copyOf(b.defaultRequestHeaders);
this.defaultResponseHeaders =
copyOf(b.defaultResponseHeaders);
@@ -484,8 +484,8 @@ public class RestPostAnnotation {
}
@Override /* RestPost */
- public String[] defaultQuery() {
- return defaultQuery;
+ public String[] defaultQueryData() {
+ return defaultQueryData;
}
@Override /* RestPost */
@@ -603,8 +603,8 @@ public class RestPostAnnotation {
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultRequestHeaders, x));
stringStream(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultResponseHeaders, x));
stringStream(a.defaultRequestAttributes()).map(x ->
BasicNamedAttribute.ofPair(x)).forEach(x ->
b.appendTo(RESTOP_defaultRequestAttributes, x));
- stringStream(a.defaultQuery()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultQuery, x));
- stringStream(a.defaultFormData()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultFormData, x));
+ stringStream(a.defaultQueryData()).map(x ->
basicPart(x)).forEach(x -> b.defaultQueryData(x));
+ stringStream(a.defaultFormData()).map(x ->
basicPart(x)).forEach(x -> b.defaultFormData(x));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
accept(string(a.defaultAccept())));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
contentType(string(a.defaultContentType())));
b.prependTo(REST_converters, a.converters());
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 8db605f..b877c4d 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
@@ -252,7 +252,7 @@ public @interface RestPut {
*
* <h5 class='section'>Example:</h5>
* <p class='bcode w800'>
- * <ja>@RestPut</ja>(path=<js>"/*"</js>,
defaultQuery={<js>"foo=bar"</js>})
+ * <ja>@RestPut</ja>(path=<js>"/*"</js>,
defaultQueryData={<js>"foo=bar"</js>})
* <jk>public</jk> String doPut(<ja>@Query</ja>(<js>"foo"</js>)
String foo) {...}
* </p>
*
@@ -266,7 +266,7 @@ public @interface RestPut {
* (e.g. <js>"$S{mySystemProperty}"</js>).
* </ul>
*/
- String[] defaultQuery() default {};
+ String[] defaultQueryData() default {};
/**
* Default request attributes.
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 dbd921e..b69dc23 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
@@ -63,7 +63,7 @@ public class RestPutAnnotation {
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="";
- String[] consumes={}, defaultFormData={}, defaultQuery={},
defaultRequestAttributes={}, defaultRequestHeaders={},
defaultResponseHeaders={}, description={}, path={}, produces={};
+ String[] consumes={}, defaultFormData={}, defaultQueryData={},
defaultRequestAttributes={}, defaultRequestHeaders={},
defaultResponseHeaders={}, description={}, path={}, produces={};
/**
* Constructor.
@@ -181,13 +181,13 @@ public class RestPutAnnotation {
}
/**
- * Sets the {@link RestPut#defaultQuery()} property on this
annotation.
+ * Sets the {@link RestPut#defaultQueryData()} property on this
annotation.
*
* @param value The new value for this property.
* @return This object (for method chaining).
*/
- public Builder defaultQuery(String...value) {
- this.defaultQuery = value;
+ public Builder defaultQueryData(String...value) {
+ this.defaultQueryData = value;
return this;
}
@@ -404,7 +404,7 @@ public class RestPutAnnotation {
private final Class<?>[] encoders, parsers, serializers;
private final OpSwagger swagger;
private final String clientVersion, debug, defaultAccept,
defaultCharset, defaultContentType, maxInput, rolesDeclared, roleGuard,
summary, value;
- private final String[] consumes, defaultFormData, defaultQuery,
defaultRequestAttributes, defaultRequestHeaders, defaultResponseHeaders,
description, path, produces;
+ private final String[] consumes, defaultFormData,
defaultQueryData, defaultRequestAttributes, defaultRequestHeaders,
defaultResponseHeaders, description, path, produces;
Impl(Builder b) {
super(b);
@@ -417,7 +417,7 @@ public class RestPutAnnotation {
this.defaultCharset = b.defaultCharset;
this.defaultContentType = b.defaultContentType;
this.defaultFormData = copyOf(b.defaultFormData);
- this.defaultQuery = copyOf(b.defaultQuery);
+ this.defaultQueryData = copyOf(b.defaultQueryData);
this.defaultRequestAttributes =
copyOf(b.defaultRequestAttributes);
this.defaultRequestHeaders =
copyOf(b.defaultRequestHeaders);
this.defaultResponseHeaders =
copyOf(b.defaultResponseHeaders);
@@ -484,8 +484,8 @@ public class RestPutAnnotation {
}
@Override /* RestPut */
- public String[] defaultQuery() {
- return defaultQuery;
+ public String[] defaultQueryData() {
+ return defaultQueryData;
}
@Override /* RestPut */
@@ -603,8 +603,8 @@ public class RestPutAnnotation {
stringStream(a.defaultRequestHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultRequestHeaders, x));
stringStream(a.defaultResponseHeaders()).map(x ->
stringHeader(x)).forEach(x -> b.appendTo(RESTOP_defaultResponseHeaders, x));
stringStream(a.defaultRequestAttributes()).map(x ->
BasicNamedAttribute.ofPair(x)).forEach(x ->
b.appendTo(RESTOP_defaultRequestAttributes, x));
- stringStream(a.defaultQuery()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultQuery, x));
- stringStream(a.defaultFormData()).map(x ->
basicPart(x)).forEach(x -> b.appendTo(RESTOP_defaultFormData, x));
+ stringStream(a.defaultQueryData()).map(x ->
basicPart(x)).forEach(x -> b.defaultQueryData(x));
+ stringStream(a.defaultFormData()).map(x ->
basicPart(x)).forEach(x -> b.defaultFormData(x));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
accept(string(a.defaultAccept())));
b.appendToIfNotEmpty(REST_defaultRequestHeaders,
contentType(string(a.defaultContentType())));
b.prependTo(REST_converters, a.converters());
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
index f1ec2a0..c5b95fd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Query_Test.java
@@ -182,7 +182,7 @@ public class Query_Test {
@Rest
public static class D {
- @RestGet(defaultQuery={"f1:1","f2=2"," f3 : 3 "})
+ @RestGet(defaultQueryData={"f1:1","f2=2"," f3 : 3 "})
public OMap a(RequestQueryParams query) {
return OMap.create()
.a("f1", query.getString("f1"))
@@ -203,7 +203,7 @@ public class Query_Test {
.a("f2", f2)
.a("f3", f3);
}
- @RestGet(defaultQuery={"f1:1","f2=2"," f3 : 3 "})
+ @RestGet(defaultQueryData={"f1:1","f2=2"," f3 : 3 "})
public OMap d(@Query(n="f1",df="4") String f1,
@Query(n="f2",df="5") String f2, @Query(n="f3",df="6") String f3) {
return OMap.create()
.a("f1", f1)
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 1269ad3..7d715d8 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
@@ -37,7 +37,7 @@ public class RestDeleteAnnotation_Test {
.debug("debug")
.defaultAccept("defaultAccept")
.defaultCharset("defaultCharset")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -60,7 +60,7 @@ public class RestDeleteAnnotation_Test {
.debug("debug")
.defaultAccept("defaultAccept")
.defaultCharset("defaultCharset")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -86,7 +86,7 @@ public class RestDeleteAnnotation_Test {
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
+ "defaultCharset:'defaultCharset',"
- + "defaultQuery:['defaultQuery'],"
+ + "defaultQueryData:['defaultQueryData'],"
+
"defaultRequestAttributes:['defaultRequestAttributes'],"
+
"defaultRequestHeaders:['defaultRequestHeaders'],"
+
"defaultResponseHeaders:['defaultResponseHeaders'],"
@@ -154,7 +154,7 @@ public class RestDeleteAnnotation_Test {
debug="debug",
defaultAccept="defaultAccept",
defaultCharset="defaultCharset",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
@@ -178,7 +178,7 @@ public class RestDeleteAnnotation_Test {
debug="debug",
defaultAccept="defaultAccept",
defaultCharset="defaultCharset",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
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 239ee26..35af47a 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
@@ -39,7 +39,7 @@ public class RestGetAnnotation_Test {
.debug("debug")
.defaultAccept("defaultAccept")
.defaultCharset("defaultCharset")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -65,7 +65,7 @@ public class RestGetAnnotation_Test {
.debug("debug")
.defaultAccept("defaultAccept")
.defaultCharset("defaultCharset")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -94,7 +94,7 @@ public class RestGetAnnotation_Test {
+ "debug:'debug',"
+ "defaultAccept:'defaultAccept',"
+ "defaultCharset:'defaultCharset',"
- + "defaultQuery:['defaultQuery'],"
+ + "defaultQueryData:['defaultQueryData'],"
+
"defaultRequestAttributes:['defaultRequestAttributes'],"
+
"defaultRequestHeaders:['defaultRequestHeaders'],"
+
"defaultResponseHeaders:['defaultResponseHeaders'],"
@@ -165,7 +165,7 @@ public class RestGetAnnotation_Test {
debug="debug",
defaultAccept="defaultAccept",
defaultCharset="defaultCharset",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
@@ -192,7 +192,7 @@ public class RestGetAnnotation_Test {
debug="debug",
defaultAccept="defaultAccept",
defaultCharset="defaultCharset",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
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 3b7d918..7157dad 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
@@ -43,7 +43,7 @@ public class RestOpAnnotation_Test {
.defaultCharset("defaultCharset")
.defaultContentType("defaultContentType")
.defaultFormData("defaultFormData")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -75,7 +75,7 @@ public class RestOpAnnotation_Test {
.defaultCharset("defaultCharset")
.defaultContentType("defaultContentType")
.defaultFormData("defaultFormData")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -110,7 +110,7 @@ public class RestOpAnnotation_Test {
+ "defaultCharset:'defaultCharset',"
+ "defaultContentType:'defaultContentType',"
+ "defaultFormData:['defaultFormData'],"
- + "defaultQuery:['defaultQuery'],"
+ + "defaultQueryData:['defaultQueryData'],"
+
"defaultRequestAttributes:['defaultRequestAttributes'],"
+
"defaultRequestHeaders:['defaultRequestHeaders'],"
+
"defaultResponseHeaders:['defaultResponseHeaders'],"
@@ -187,7 +187,7 @@ public class RestOpAnnotation_Test {
defaultCharset="defaultCharset",
defaultContentType="defaultContentType",
defaultFormData="defaultFormData",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
@@ -220,7 +220,7 @@ public class RestOpAnnotation_Test {
defaultCharset="defaultCharset",
defaultContentType="defaultContentType",
defaultFormData="defaultFormData",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
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 858c394..a2af442 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
@@ -43,7 +43,7 @@ public class RestPostAnnotation_Test {
.defaultCharset("defaultCharset")
.defaultContentType("defaultContentType")
.defaultFormData("defaultFormData")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -74,7 +74,7 @@ public class RestPostAnnotation_Test {
.defaultCharset("defaultCharset")
.defaultContentType("defaultContentType")
.defaultFormData("defaultFormData")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -108,7 +108,7 @@ public class RestPostAnnotation_Test {
+ "defaultCharset:'defaultCharset',"
+ "defaultContentType:'defaultContentType',"
+ "defaultFormData:['defaultFormData'],"
- + "defaultQuery:['defaultQuery'],"
+ + "defaultQueryData:['defaultQueryData'],"
+
"defaultRequestAttributes:['defaultRequestAttributes'],"
+
"defaultRequestHeaders:['defaultRequestHeaders'],"
+
"defaultResponseHeaders:['defaultResponseHeaders'],"
@@ -184,7 +184,7 @@ public class RestPostAnnotation_Test {
defaultCharset="defaultCharset",
defaultContentType="defaultContentType",
defaultFormData="defaultFormData",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
@@ -216,7 +216,7 @@ public class RestPostAnnotation_Test {
defaultCharset="defaultCharset",
defaultContentType="defaultContentType",
defaultFormData="defaultFormData",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
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 0dcb252..d528ed1 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
@@ -43,7 +43,7 @@ public class RestPutAnnotation_Test {
.defaultCharset("defaultCharset")
.defaultContentType("defaultContentType")
.defaultFormData("defaultFormData")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -74,7 +74,7 @@ public class RestPutAnnotation_Test {
.defaultCharset("defaultCharset")
.defaultContentType("defaultContentType")
.defaultFormData("defaultFormData")
- .defaultQuery("defaultQuery")
+ .defaultQueryData("defaultQueryData")
.defaultRequestAttributes("defaultRequestAttributes")
.defaultRequestHeaders("defaultRequestHeaders")
.defaultResponseHeaders("defaultResponseHeaders")
@@ -108,7 +108,7 @@ public class RestPutAnnotation_Test {
+ "defaultCharset:'defaultCharset',"
+ "defaultContentType:'defaultContentType',"
+ "defaultFormData:['defaultFormData'],"
- + "defaultQuery:['defaultQuery'],"
+ + "defaultQueryData:['defaultQueryData'],"
+
"defaultRequestAttributes:['defaultRequestAttributes'],"
+
"defaultRequestHeaders:['defaultRequestHeaders'],"
+
"defaultResponseHeaders:['defaultResponseHeaders'],"
@@ -184,7 +184,7 @@ public class RestPutAnnotation_Test {
defaultCharset="defaultCharset",
defaultContentType="defaultContentType",
defaultFormData="defaultFormData",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
@@ -216,7 +216,7 @@ public class RestPutAnnotation_Test {
defaultCharset="defaultCharset",
defaultContentType="defaultContentType",
defaultFormData="defaultFormData",
- defaultQuery="defaultQuery",
+ defaultQueryData="defaultQueryData",
defaultRequestAttributes="defaultRequestAttributes",
defaultRequestHeaders="defaultRequestHeaders",
defaultResponseHeaders="defaultResponseHeaders",
