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/07/30 14:07:17 UTC
[juneau] branch master updated: Create new HttpPart class.
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 3533faf Create new HttpPart class.
3533faf is described below
commit 3533fafa356c0fd03d163478048cedea378f80c9
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Jul 30 10:07:04 2018 -0400
Create new HttpPart class.
---
.../java/org/apache/juneau/httppart/HttpPart.java | 77 ++++++++++++++++++----
.../org/apache/juneau/rest/RestParamDefaults.java | 4 +-
.../java/org/apache/juneau/rest/RestResponse.java | 4 +-
.../juneau/rest/reshandlers/DefaultHandler.java | 8 +--
4 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponsePart.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java
similarity index 53%
rename from juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponsePart.java
rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java
index 31b5b89..0404e56 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/ResponsePart.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPart.java
@@ -10,39 +10,76 @@
// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
// * specific language governing permissions and limitations under the License. *
// ***************************************************************************************************************************
-package org.apache.juneau.rest;
+package org.apache.juneau.httppart;
-import org.apache.juneau.httppart.*;
+import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
/**
- * Represents part of an HTTP response such as an HTTP response header.
+ * Represents an instance of an HTTP part.
+ *
+ * <p>
+ * Can be used to represent both request and response parts.
*/
-public class ResponsePart {
+public class HttpPart {
private final String name;
- private final Object part;
+ private final Object opart;
+ private final String spart;
private final HttpPartType partType;
private final HttpPartSchema schema;
private final HttpPartSerializer serializer;
- private final SerializerSessionArgs args;
+ private final HttpPartParser parser;
+ private final SerializerSessionArgs sargs;
+ private final ParserSessionArgs pargs;
/**
* Constructor.
*
- * @param name The HTTP part name (e.g. the response header name).
+ * <p>
+ * Used when the part is in POJO form and needs to be converted to a String.
+ *
+ * @param name The HTTP part name (e.g. the header name).
* @param partType The HTTP part type.
* @param schema Schema information about the part.
* @param serializer The part serializer to use to serialize the part.
- * @param part The part POJO being serialized.
* @param args Session arguments to pass to the serializer.
+ * @param part The part POJO being serialized.
*/
- public ResponsePart(String name, HttpPartType partType, HttpPartSchema schema, HttpPartSerializer serializer, Object part, SerializerSessionArgs args) {
+ public HttpPart(String name, HttpPartType partType, HttpPartSchema schema, HttpPartSerializer serializer, SerializerSessionArgs args, Object part) {
this.name = name;
this.partType = partType;
this.schema = schema;
this.serializer = serializer;
- this.part = part;
- this.args = args;
+ this.sargs = args;
+ this.opart = part;
+ this.spart = null;
+ this.parser = null;
+ this.pargs = null;
+ }
+
+ /**
+ * Constructor.
+ *
+ * <p>
+ * Used when the part is in String form and needs to be converted to a POJO.
+ *
+ * @param name The HTTP part name (e.g. the header name).
+ * @param partType The HTTP part type.
+ * @param schema Schema information about the part.
+ * @param parser The part parser to use to parse the part.
+ * @param args Session arguments to pass to the parser.
+ * @param part The part string being parsed.
+ */
+ public HttpPart(String name, HttpPartType partType, HttpPartSchema schema, HttpPartParser parser, ParserSessionArgs args, String part) {
+ this.name = name;
+ this.partType = partType;
+ this.schema = schema;
+ this.parser = parser;
+ this.pargs = args;
+ this.spart = part;
+ this.serializer = null;
+ this.sargs = null;
+ this.opart = null;
}
/**
@@ -61,7 +98,21 @@ public class ResponsePart {
* @throws SchemaValidationException
* @throws SerializeException
*/
- public String getValue() throws SchemaValidationException, SerializeException {
- return serializer.createSession(args).serialize(partType, schema, part);
+ public String asString() throws SchemaValidationException, SerializeException {
+ if (spart != null)
+ return spart;
+ return serializer.createSession(sargs).serialize(partType, schema, opart);
+ }
+
+ /**
+ * Returns the value of the part converted to a string.
+ *
+ * @param c
+ * @return The value of the part converted to a string.
+ * @throws SchemaValidationException
+ * @throws ParseException
+ */
+ public <T> T asType(Class<T> c) throws SchemaValidationException, ParseException {
+ return parser.createSession(pargs).parse(partType, schema, spart, c);
}
}
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 c2dc966..445097a 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
@@ -640,9 +640,9 @@ class RestParamDefaults {
Value<Object> v = (Value<Object>)getTypeClass().newInstance();
v.listener(new ValueListener() {
@Override
- public void onSet(Object newValue) {
+ public void onSet(Object o) {
try {
- res.setHeader(new ResponsePart(name, HttpPartType.HEADER, schema, partSerializer, newValue, req.getSerializerSessionArgs()));
+ res.setHeader(new HttpPart(name, HttpPartType.HEADER, schema, partSerializer, req.getSerializerSessionArgs(), o));
} catch (SerializeException | SchemaValidationException e) {
throw new RuntimeException(e);
}
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 dd03659..2842eb7 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
@@ -507,8 +507,8 @@ public final class RestResponse extends HttpServletResponseWrapper {
* @throws SchemaValidationException
* @throws SerializeException
*/
- public void setHeader(ResponsePart h) throws SchemaValidationException, SerializeException {
- setHeader(h.getName(), h.getValue());
+ public void setHeader(HttpPart h) throws SchemaValidationException, SerializeException {
+ setHeader(h.getName(), h.asString());
}
/**
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 e253f4b..fc337ee 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
@@ -61,10 +61,10 @@ public class DefaultHandler implements ResponseHandler {
for (ResponsePropertyMeta hm : rm.getHeaderMetas()) {
try {
- Object headerValue = hm.getGetter().invoke(o);
- if (headerValue instanceof URI)
- headerValue = req.getUriResolver().resolve(headerValue);
- res.setHeader(new ResponsePart(hm.getPartName(), HttpPartType.HEADER, hm.getSchema(), hm.getSerializer(req.getPartSerializer()), headerValue, req.getSerializerSessionArgs()));
+ Object ho = hm.getGetter().invoke(o);
+ if (ho instanceof URI)
+ ho = req.getUriResolver().resolve(ho);
+ res.setHeader(new HttpPart(hm.getPartName(), HttpPartType.HEADER, hm.getSchema(), hm.getSerializer(req.getPartSerializer()), req.getSerializerSessionArgs(), ho));
} catch (Exception e) {
throw new InternalServerError(e, "Could not set header ''{0}''", hm.getPartName());
}