From f8dee028695c57d27ddfc59936d073cfccaa1d4b Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 30 Apr 2010 20:44:28 +0000 Subject: Updating REST binding to use common-http cache context class and minor update to HTTPCacheContext factory method git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@939810 13f79535-47bb-0310-9956-ffa450edef68 --- .../rest/provider/RESTBindingListenerServlet.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache') diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java index cb65d74293..b91c6d7f6d 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java @@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.binding.rest.RESTCacheContext; +import org.apache.tuscany.sca.common.http.HTTPCacheContext; import org.apache.tuscany.sca.common.http.HTTPContentTypeMapper; import org.apache.tuscany.sca.common.http.HTTPContext; import org.apache.tuscany.sca.invocation.Invoker; @@ -148,9 +148,9 @@ public class RESTBindingListenerServlet extends HttpServlet { String id = path.substring(1); Message responseMessage = null; - RESTCacheContext cacheContext = null; + HTTPCacheContext cacheContext = null; try { - cacheContext = RESTCacheContext.getCacheContextFromRequest(request); + cacheContext = HTTPCacheContext.createCacheContextFromRequest(request); } catch (ParseException e) { } @@ -238,9 +238,9 @@ public class RESTBindingListenerServlet extends HttpServlet { String id = path.substring(1); Message responseMessage = null; - RESTCacheContext cacheContext = null; + HTTPCacheContext cacheContext = null; try { - cacheContext = RESTCacheContext.getCacheContextFromRequest(request); + cacheContext = HTTPCacheContext.createCacheContextFromRequest(request); } catch (ParseException e) { } @@ -304,9 +304,9 @@ public class RESTBindingListenerServlet extends HttpServlet { String id = path.substring(1); Message responseMessage = null; - RESTCacheContext cacheContext = null; + HTTPCacheContext cacheContext = null; try { - cacheContext = RESTCacheContext.getCacheContextFromRequest(request); + cacheContext = HTTPCacheContext.createCacheContextFromRequest(request); } catch (ParseException e) { } @@ -370,9 +370,9 @@ public class RESTBindingListenerServlet extends HttpServlet { // String id = path.substring(1); Message responseMessage = null; - RESTCacheContext cacheContext = null; + HTTPCacheContext cacheContext = null; try { - cacheContext = RESTCacheContext.getCacheContextFromRequest(request); + cacheContext = HTTPCacheContext.createCacheContextFromRequest(request); } catch (ParseException e) { } @@ -408,9 +408,9 @@ public class RESTBindingListenerServlet extends HttpServlet { // Test if the ETag and LastModified are returned as a cache context. Object body = responseMessage.getBody(); - if ( body.getClass() == RESTCacheContext.class ) { + if ( body.getClass() == HTTPCacheContext.class ) { // Transfer to header if so. - RESTCacheContext cc = (RESTCacheContext)responseMessage.getBody(); + HTTPCacheContext cc = (HTTPCacheContext)responseMessage.getBody(); if (( cc != null ) && ( cc.isEnabled() )) { String eTag = cc.getETag(); if ( eTag != null ) -- cgit v1.2.3