Author: lresende
Date: Thu Jun 3 19:47:35 2010
New Revision: 951133
URL: http://svn.apache.org/viewvc?rev=951133&view=rev
Log:
TUSCANY-3583 - Making sure we recognize the headers configured declaratively in
composite file when delegating to JAX-RS runtime
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java?rev=951133&r1=951132&r2=951133&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
Thu Jun 3 19:47:35 2010
@@ -22,7 +22,10 @@ package org.apache.tuscany.sca.binding.r
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.net.URI;
+import java.util.Calendar;
import java.util.Collections;
+import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -52,6 +55,8 @@ import org.apache.tuscany.sca.assembly.W
import org.apache.tuscany.sca.binding.rest.RESTBinding;
import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormat;
import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormat;
+import org.apache.tuscany.sca.common.http.HTTPCacheContext;
+import org.apache.tuscany.sca.common.http.HTTPHeader;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
@@ -222,6 +227,22 @@ public class RESTBindingInvoker implemen
resource.contentType(getContentType());
resource.accept(getAccepts());
+
+ //handles declarative headers configured on the composite
+ for(HTTPHeader header : binding.getHttpHeaders()) {
+ //treat special headers that need to be calculated
+ if(header.getName().equalsIgnoreCase("Expires")) {
+ GregorianCalendar calendar = new GregorianCalendar();
+ calendar.setTime(new Date());
+
+ calendar.add(Calendar.HOUR,
Integer.parseInt(header.getValue()));
+
+ resource.header("Expires",
HTTPCacheContext.RFC822DateFormat.format( calendar.getTime() ));
+ } else {
+ //default behaviour to pass the header value to HTTP response
+ resource.header(header.getName(), header.getValue());
+ }
+ }
Object result = resource.invoke(httpMethod, responseType, entity);
msg.setBody(result);
Modified:
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java?rev=951133&r1=951132&r2=951133&view=diff
==============================================================================
---
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
(original)
+++
tuscany/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
Thu Jun 3 19:47:35 2010
@@ -20,6 +20,9 @@
package org.apache.tuscany.sca.binding.rest.provider;
import java.io.IOException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
@@ -29,7 +32,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.binding.rest.RESTBinding;
+import org.apache.tuscany.sca.common.http.HTTPCacheContext;
import org.apache.tuscany.sca.common.http.HTTPContext;
+import org.apache.tuscany.sca.common.http.HTTPHeader;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
@@ -44,7 +50,7 @@ public class RESTServiceListenerServlet
private static final long serialVersionUID = -5543706958107836637L;
- transient private Binding binding;
+ transient private RESTBinding binding;
transient private ServletConfig config;
transient private MessageFactory messageFactory;
transient private Invoker serviceInvoker;
@@ -53,7 +59,7 @@ public class RESTServiceListenerServlet
* Constructs a new HTTPServiceListenerServlet.
*/
public RESTServiceListenerServlet(Binding binding, Invoker serviceInvoker,
MessageFactory messageFactory) {
- this.binding = binding;
+ this.binding = (RESTBinding) binding;
this.serviceInvoker = serviceInvoker;
this.messageFactory = messageFactory;
}
@@ -90,6 +96,23 @@ public class RESTServiceListenerServlet
//throw new ServletException((Throwable)responseMessage.getBody());
Throwable e = (Throwable)responseMessage.getBody();
((HttpServletResponse)response).sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
e.toString());
+ } else {
+ //handles declarative headers configured on the composite
+ for(HTTPHeader header : binding.getHttpHeaders()) {
+ //treat special headers that need to be calculated
+ if(header.getName().equalsIgnoreCase("Expires")) {
+ GregorianCalendar calendar = new GregorianCalendar();
+ calendar.setTime(new Date());
+
+ calendar.add(Calendar.HOUR,
Integer.parseInt(header.getValue()));
+
+ response.setHeader("Expires",
HTTPCacheContext.RFC822DateFormat.format( calendar.getTime() ));
+ } else {
+ //default behaviour to pass the header value to HTTP
response
+ response.setHeader(header.getName(), header.getValue());
+ }
+
+ }
}
}
}
