You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2018/01/20 18:32:48 UTC
juneau git commit: RestRequest refactoring.
Repository: juneau
Updated Branches:
refs/heads/master 62b041abd -> e9df09ee8
RestRequest refactoring.
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/e9df09ee
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/e9df09ee
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/e9df09ee
Branch: refs/heads/master
Commit: e9df09ee892e2719f5f2d61cecec702749a979f5
Parents: 62b041a
Author: JamesBognar <ja...@apache.org>
Authored: Sat Jan 20 13:32:44 2018 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Sat Jan 20 13:32:44 2018 -0500
----------------------------------------------------------------------
.../java/org/apache/juneau/rest/RequestBody.java | 10 +++++-----
.../org/apache/juneau/rest/RequestHeaders.java | 6 +++---
.../java/org/apache/juneau/rest/RequestQuery.java | 4 ++--
.../java/org/apache/juneau/rest/RestRequest.java | 18 +++++++++---------
4 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/e9df09ee/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
index b804e75..7047109 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
@@ -48,27 +48,27 @@ public class RequestBody {
this.req = req;
}
- RequestBody setEncoders(EncoderGroup encoders) {
+ RequestBody encoders(EncoderGroup encoders) {
this.encoders = encoders;
return this;
}
- RequestBody setParsers(ParserGroup parsers) {
+ RequestBody parsers(ParserGroup parsers) {
this.parsers = parsers;
return this;
}
- RequestBody setHeaders(RequestHeaders headers) {
+ RequestBody headers(RequestHeaders headers) {
this.headers = headers;
return this;
}
- RequestBody setMaxInput(long maxInput) {
+ RequestBody maxInput(long maxInput) {
this.maxInput = maxInput;
return this;
}
- RequestBody setBeanSession(BeanSession beanSession) {
+ RequestBody beanSession(BeanSession beanSession) {
this.beanSession = beanSession;
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/e9df09ee/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
index d94c02b..a79a384 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
@@ -43,12 +43,12 @@ public class RequestHeaders extends TreeMap<String,String[]> {
super(String.CASE_INSENSITIVE_ORDER);
}
- RequestHeaders setParser(HttpPartParser parser) {
+ RequestHeaders parser(HttpPartParser parser) {
this.parser = parser;
return this;
}
- RequestHeaders setBeanSession(BeanSession beanSession) {
+ RequestHeaders beanSession(BeanSession beanSession) {
this.beanSession = beanSession;
return this;
}
@@ -337,7 +337,7 @@ public class RequestHeaders extends TreeMap<String,String[]> {
* @return A new headers object.
*/
public RequestHeaders subset(String...headers) {
- RequestHeaders rh2 = new RequestHeaders().setParser(parser).setBeanSession(beanSession).setQueryParams(queryParams);
+ RequestHeaders rh2 = new RequestHeaders().parser(parser).beanSession(beanSession).setQueryParams(queryParams);
for (String h : headers)
if (containsKey(h))
rh2.put(h, get(h));
http://git-wip-us.apache.org/repos/asf/juneau/blob/e9df09ee/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
index f51d5be..aff7e5e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
@@ -37,12 +37,12 @@ public final class RequestQuery extends LinkedHashMap<String,String[]> {
private HttpPartParser parser;
private BeanSession beanSession;
- RequestQuery setParser(HttpPartParser parser) {
+ RequestQuery parser(HttpPartParser parser) {
this.parser = parser;
return this;
}
- RequestQuery setBeanSession(BeanSession beanSession) {
+ RequestQuery beanSession(BeanSession beanSession) {
this.beanSession = beanSession;
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/e9df09ee/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
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 c5ec797..b80e3a7 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
@@ -160,19 +160,19 @@ public final class RestRequest extends HttpServletRequestWrapper {
.beanSession(beanSession);
this.queryParams
.addDefault(rjm.defaultQuery)
- .setParser(rjm.partParser)
- .setBeanSession(beanSession);
+ .parser(rjm.partParser)
+ .beanSession(beanSession);
this.headers
.addDefault(rjm.defaultRequestHeaders)
.addDefault(context.getDefaultRequestHeaders())
- .setParser(rjm.partParser)
- .setBeanSession(beanSession);
+ .parser(rjm.partParser)
+ .beanSession(beanSession);
this.body
- .setEncoders(rjm.encoders)
- .setParsers(rjm.parsers)
- .setHeaders(headers)
- .setBeanSession(beanSession)
- .setMaxInput(rjm.maxInput);
+ .encoders(rjm.encoders)
+ .parsers(rjm.parsers)
+ .headers(headers)
+ .beanSession(beanSession)
+ .maxInput(rjm.maxInput);
String stylesheet = getQuery().getString("stylesheet");
if (stylesheet != null)