summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-03-30 05:18:25 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2010-03-30 05:18:25 +0000
commit3fed38d9212456b95c410b0e1b9d7275dadb0b5d (patch)
treeff0ae8e670d448d327398ac18219404e5c6aeac8 /sca-java-2.x/trunk
parent7e31b252cbc3c03ddfe8d9711cdee565db8a932c (diff)
TUSCANY-3516 - Adding eTag support when using json-rpc binding with GET method
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928990 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java43
1 files changed, 40 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
index 00d9c9c8dd..a792d167a4 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
@@ -24,8 +24,9 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
import java.net.URLDecoder;
-import java.util.Calendar;
+import java.security.MessageDigest;
import java.util.Date;
import java.util.List;
@@ -153,7 +154,6 @@ public class JSONRPCServiceServlet extends JSONRPCServlet {
while ((ret = in.read(buf, 0, 4096)) != -1) {
data.write(buf, 0, ret);
}
-
}
JSONObject jsonReq = null;
@@ -196,6 +196,27 @@ public class JSONRPCServiceServlet extends JSONRPCServlet {
response.setHeader("Cache-Control", "no-cache");
response.setHeader("Expires", new Date(0).toGMTString());
+ //handle etag if using GET
+ if( request.getMethod().equals("GET")) {
+ String eTag = calculateETag(bout);
+
+ // Test request for predicates.
+ String predicate = request.getHeader( "If-Match" );
+ if (( predicate != null ) && ( !predicate.equals(eTag) )) {
+ // No match, should short circuit
+ response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
+ return;
+ }
+ predicate = request.getHeader( "If-None-Match" );
+ if (( predicate != null ) && ( predicate.equals(eTag) )) {
+ // Match, should short circuit
+ response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
+ return;
+ }
+
+ response.addHeader("ETag", eTag);
+ }
+
OutputStream out = response.getOutputStream();
out.write(bout);
out.flush();
@@ -342,5 +363,21 @@ public class JSONRPCServiceServlet extends JSONRPCServlet {
}
return result;
- }
+ }
+
+ private String calculateETag(byte[] content) {
+ String eTag = "invalid";
+ try {
+ MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+ byte[] digest = messageDigest.digest(content);
+ BigInteger number = new BigInteger(1, digest);
+ StringBuffer sb = new StringBuffer('0');
+ sb.append(number.toString(16));
+ eTag = sb.toString();
+ } catch(Exception e) {
+ //ignore, we will return random etag
+ eTag = Integer.toString((new java.util.Random()).nextInt(Integer.MAX_VALUE));
+ }
+ return eTag;
+ }
}