Initial implementation for JSON wire format for REST binding

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@937850 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 22 insertions, 6 deletions

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 5739fbea77..3b0b69bcd7 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
@@ -92,17 +92,33 @@ public class RESTBindingListenerServlet extends HttpServlet {
         RESTCacheContext cacheContext = null;
         try { 
            cacheContext = RESTCacheContext.getCacheContextFromRequest(request);
-        } catch (ParseException e) {        	
+        } catch (ParseException e) { 
+            
+        }
+        
+        if (path == null || path.length() == 0 || path.equals("/")) {
+            
         }
 
         // Route message based on availability of cache info and cache methods
-        if (( cacheContext != null ) && (cacheContext.isEnabled()) && (conditionalGetInvoker != null )) {        
-        	requestMessage.setBody(new Object[] {id, cacheContext});
-        	responseMessage = conditionalGetInvoker.invoke(requestMessage);
+        if (( cacheContext != null ) && (cacheContext.isEnabled()) && (conditionalGetInvoker != null )) {
+            if(id != null && id.length() > 0) {
+                requestMessage.setBody(new Object[] {id, cacheContext});
+            } else {
+                requestMessage.setBody(new Object[] {cacheContext});
+            }
+
+            responseMessage = conditionalGetInvoker.invoke(requestMessage);
         } else {
-        	requestMessage.setBody(new Object[] {id});
-        	responseMessage = getInvoker.invoke(requestMessage);
+            if(id != null && id.length() > 0) {
+                requestMessage.setBody(new Object[] {id});
+            } else {
+                //requestMessage.setBody(new Object[] {id});
+            }
+
+            responseMessage = getInvoker.invoke(requestMessage);
         }
+        
         if (responseMessage.isFault()) {
         	Object body = responseMessage.getBody();