Author: lresende
Date: Fri Apr 30 20:44:28 2010
New Revision: 939810
URL: http://svn.apache.org/viewvc?rev=939810&view=rev
Log:
Updating REST binding to use common-http cache context class and minor update
to HTTPCacheContext factory method
Removed:
tuscany/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTCacheContext.java
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
tuscany/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java?rev=939810&r1=939809&r2=939810&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
Fri Apr 30 20:44:28 2010
@@ -163,7 +163,7 @@ class AtomBindingListenerServlet extends
// Test for any cache info in the request
HTTPCacheContext cacheContext = null;
try {
- cacheContext = HTTPCacheContext.getCacheContextFromRequest(
request );
+ cacheContext = HTTPCacheContext.createCacheContextFromRequest(
request );
} catch ( java.text.ParseException e ) {
}
// System.out.println( "AtomBindingListener.doGet cache context=" +
cacheContext );
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java?rev=939810&r1=939809&r2=939810&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
Fri Apr 30 20:44:28 2010
@@ -91,7 +91,7 @@ public class HTTPBindingListenerServlet
Message responseMessage = null;
HTTPCacheContext cacheContext = null;
try {
- cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);
+ cacheContext =
HTTPCacheContext.createCacheContextFromRequest(request);
} catch (ParseException e) {
}
@@ -165,7 +165,7 @@ public class HTTPBindingListenerServlet
Message responseMessage = null;
HTTPCacheContext cacheContext = null;
try {
- cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);
+ cacheContext =
HTTPCacheContext.createCacheContextFromRequest(request);
} catch (ParseException e) {
}
@@ -231,7 +231,7 @@ public class HTTPBindingListenerServlet
Message responseMessage = null;
HTTPCacheContext cacheContext = null;
try {
- cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);
+ cacheContext =
HTTPCacheContext.createCacheContextFromRequest(request);
} catch (ParseException e) {
}
@@ -297,7 +297,7 @@ public class HTTPBindingListenerServlet
Message responseMessage = null;
HTTPCacheContext cacheContext = null;
try {
- cacheContext = HTTPCacheContext.getCacheContextFromRequest(request);
+ cacheContext =
HTTPCacheContext.createCacheContextFromRequest(request);
} catch (ParseException e) {
}
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java?rev=939810&r1=939809&r2=939810&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
Fri Apr 30 20:44:28 2010
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletReq
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
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
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
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
// 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
// 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 )
Modified:
tuscany/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java?rev=939810&r1=939809&r2=939810&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
Fri Apr 30 20:44:28 2010
@@ -50,6 +50,57 @@ public class HTTPCacheContext {
public boolean ifRange;
/**
+ * Gets the cache context information (ETag, LastModified, predicates)
from the Http request.
+ * @param request
+ * @return
+ */
+ public static HTTPCacheContext createCacheContextFromRequest(
HttpServletRequest request ) throws java.text.ParseException {
+ HTTPCacheContext context = new HTTPCacheContext();
+
+ String eTag = request.getHeader( "If-Match" );
+ if ( eTag != null ) {
+ context.setETag( eTag );
+ context.setIfMatch( true );
+ }
+ eTag = request.getHeader( "If-None-Match" );
+ if ( eTag != null ) {
+ context.setETag( eTag );
+ context.setIfNoneMatch( true );
+ }
+ String lastModifiedString = request.getHeader( "If-Modified-Since" );
+ if ( lastModifiedString != null ) {
+ context.setLastModified( lastModifiedString );
+ context.setIfModifiedSince( true );
+ }
+ lastModifiedString = request.getHeader( "If-Unmodified-Since" );
+ if ( lastModifiedString != null ) {
+ context.setLastModified( lastModifiedString );
+ context.setIfUnmodifiedSince( true );
+ }
+ lastModifiedString = request.getHeader( "If-Range" );
+ if ( lastModifiedString != null ) {
+ context.setLastModified( lastModifiedString );
+ context.setIfRange( true );
+ }
+ return context;
+ }
+
+ /**
+ * Enabled is true whenever ETag, LastModified, or predicate is set.
+ * @return the enabled
+ */
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ /**
+ * @param enabled the enabled to set
+ */
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ /**
* An ETag is a unique ID for an item. It changes when
* a field in the item or the update date changes.
* See HTTP specification for how ETags work:
@@ -206,52 +257,4 @@ public class HTTPCacheContext {
+ sb.toString();
}
- /**
- * Gets the cache context information (ETag, LastModified, predicates)
from the Http request.
- * @param request
- * @return
- */
- public static HTTPCacheContext getCacheContextFromRequest(
HttpServletRequest request ) throws java.text.ParseException {
- HTTPCacheContext context = new HTTPCacheContext();
-
- String eTag = request.getHeader( "If-Match" );
- if ( eTag != null ) {
- context.setETag( eTag );
- context.setIfMatch( true );
- }
- eTag = request.getHeader( "If-None-Match" );
- if ( eTag != null ) {
- context.setETag( eTag );
- context.setIfNoneMatch( true );
- }
- String lastModifiedString = request.getHeader( "If-Modified-Since" );
- if ( lastModifiedString != null ) {
- context.setLastModified( lastModifiedString );
- context.setIfModifiedSince( true );
- }
- lastModifiedString = request.getHeader( "If-Unmodified-Since" );
- if ( lastModifiedString != null ) {
- context.setLastModified( lastModifiedString );
- context.setIfUnmodifiedSince( true );
- }
- lastModifiedString = request.getHeader( "If-Range" );
- if ( lastModifiedString != null ) {
- context.setLastModified( lastModifiedString );
- context.setIfRange( true );
- }
- return context;
- }
- /**
- * Enabled is true whenever ETag, LastModified, or predicate is set.
- * @return the enabled
- */
- public boolean isEnabled() {
- return enabled;
- }
- /**
- * @param enabled the enabled to set
- */
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
}
