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 d66ec8e Code cleanup.
d66ec8e is described below
commit d66ec8e23c57d158163dc1dbf8616dc0f16d97e4
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Sun Aug 5 14:34:32 2018 -0400
Code cleanup.
---
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../org/apache/juneau/rest/RestParamDefaults.java | 16 ++++++-------
.../java/org/apache/juneau/rest/RestResponse.java | 12 +++++-----
.../juneau/rest/reshandlers/DefaultHandler.java | 26 +++++++++++-----------
4 files changed, 28 insertions(+), 28 deletions(-)
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 aba79f1..225e509 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
@@ -4323,7 +4323,7 @@ public final class RestContext extends BeanContext {
} else if (hasAnnotation(RequestBean.class, method, i))
{
rp[i] = new
RestParamDefaults.RequestBeanObject(method, i, ps);
} else if (hasAnnotation(Response.class, method, i)) {
- rp[i] = new
RestParamDefaults.ResponseBeanObject(method, i, ps);
+ rp[i] = new
RestParamDefaults.ResponseObject(method, i, ps);
} else if (hasAnnotation(ResponseHeader.class, method,
i)) {
rp[i] = new
RestParamDefaults.ResponseHeaderObject(method, i, ps);
} else if (hasAnnotation(ResponseStatus.class, method,
i)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
index 355faea..d912981 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestParamDefaults.java
@@ -673,12 +673,12 @@ class RestParamDefaults {
}
}
- static final class ResponseBeanObject extends RestMethodParam {
- final ResponseBeanMeta rbm;
+ static final class ResponseObject extends RestMethodParam {
+ final ResponseBeanMeta meta;
- protected ResponseBeanObject(Method m, int i, PropertyStore ps)
{
+ protected ResponseObject(Method m, int i, PropertyStore ps) {
super(RESPONSE, m, i);
- this.rbm = ResponseBeanMeta.create(m, i, ps);
+ this.meta = ResponseBeanMeta.create(m, i, ps);
if (getTypeClass() != Value.class)
throw new InternalServerError("Invalid type {0}
specified with @Response annotation. It must be Value.", type);
}
@@ -690,10 +690,10 @@ class RestParamDefaults {
v.listener(new ValueListener() {
@Override
public void onSet(Object o) {
- ResponseBeanMeta rbm =
req.getResponseBeanMeta(o);
- if (rbm == null)
- rbm =
ResponseBeanObject.this.rbm;
- res.setResponseBeanMeta(rbm);
+ ResponseBeanMeta meta =
req.getResponseBeanMeta(o);
+ if (meta == null)
+ meta = ResponseObject.this.meta;
+ res.setResponseMeta(meta);
res.setOutput(o);
}
});
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 70947b4..88cde04 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
@@ -67,7 +67,7 @@ public final class RestResponse extends
HttpServletResponseWrapper {
private FinishablePrintWriter w;
private HtmlDocBuilder htmlDocBuilder;
- private ResponseBeanMeta resBeanMeta;
+ private ResponseBeanMeta responseMeta;
/**
* Constructor.
@@ -120,7 +120,7 @@ public final class RestResponse extends
HttpServletResponseWrapper {
throw new NotAcceptable("No supported charsets in
header ''Accept-Charset'': ''{0}''", request.getHeader("Accept-Charset"));
super.setCharacterEncoding(charset);
- this.resBeanMeta = rjm.responseMeta;
+ this.responseMeta = rjm.responseMeta;
}
/**
@@ -522,8 +522,8 @@ public final class RestResponse extends
HttpServletResponseWrapper {
* The metadata about this response.
* <jk>Never <jk>null</jk>.
*/
- public ResponseBeanMeta getResponseBeanMeta() {
- return resBeanMeta;
+ public ResponseBeanMeta getResponseMeta() {
+ return responseMeta;
}
/**
@@ -532,8 +532,8 @@ public final class RestResponse extends
HttpServletResponseWrapper {
* @param rbm The metadata about this response.
* @return This object (for method chaining).
*/
- public RestResponse setResponseBeanMeta(ResponseBeanMeta rbm) {
- this.resBeanMeta = rbm;
+ public RestResponse setResponseMeta(ResponseBeanMeta rbm) {
+ this.responseMeta = rbm;
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
index 8b9cf43..4eded8d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/reshandlers/DefaultHandler.java
@@ -58,24 +58,24 @@ public class DefaultHandler implements ResponseHandler {
Object o = res.getOutput();
- ResponseBeanMeta rbm = res.getResponseBeanMeta();
- if (rbm == null)
- rbm = req.getResponseBeanMeta(o);
+ ResponseBeanMeta rm = res.getResponseMeta();
+ if (rm == null)
+ rm = req.getResponseBeanMeta(o);
- if (rbm != null) {
+ if (rm != null) {
- Method stm = rbm.getStatusMethod();
+ Method stm = rm.getStatusMethod();
if (stm != null) {
try {
res.setStatus((int)stm.invoke(o));
} catch (Exception e) {
throw new InternalServerError(e, "Could
not get status.");
}
- } else if (rbm.getCode() != 0) {
- res.setStatus(rbm.getCode());
+ } else if (rm.getCode() != 0) {
+ res.setStatus(rm.getCode());
}
- for (ResponseBeanPropertyMeta hm :
rbm.getHeaderMethods()) {
+ for (ResponseBeanPropertyMeta hm :
rm.getHeaderMethods()) {
try {
Object ho = hm.getGetter().invoke(o);
if (ho instanceof URI)
@@ -86,14 +86,14 @@ public class DefaultHandler implements ResponseHandler {
}
}
- Method m = rbm.getBodyMethod();
- boolean usePartSerializer = rbm.isUsePartSerializer();
- HttpPartSchema schema = rbm.getSchema();
+ Method m = rm.getBodyMethod();
+ boolean usePartSerializer = rm.isUsePartSerializer();
+ HttpPartSchema schema = rm.getSchema();
if (m != null) {
try {
o = m.invoke(o);
- schema = rbm.getSchema();
+ schema = rm.getSchema();
usePartSerializer |=
schema.isUsePartSerializer();
} catch (Exception e) {
throw new InternalServerError(e, "Could
not get body.");
@@ -103,7 +103,7 @@ public class DefaultHandler implements ResponseHandler {
if (usePartSerializer) {
if (res.getContentType() == null)
res.setContentType("text/plain");
- HttpPartSerializer ps =
firstNonNull(rbm.getPartSerializer(), req.getPartSerializer());
+ HttpPartSerializer ps =
firstNonNull(rm.getPartSerializer(), req.getPartSerializer());
if (ps != null) {
try (FinishablePrintWriter w =
res.getNegotiatedWriter()) {
w.append(ps.serialize(HttpPartType.BODY, schema, o));
