You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2010/03/04 01:49:10 UTC

svn commit: r918801 - in /incubator/wink/trunk: ./ wink-common/src/main/java/org/apache/wink/common/internal/ wink-server/src/main/java/org/apache/wink/server/internal/contexts/ wink-server/src/test/java/org/apache/wink/server/internal/

Author: bluk
Date: Thu Mar  4 00:49:09 2010
New Revision: 918801

URL: http://svn.apache.org/viewvc?rev=918801&view=rev
Log:
Add Request.evaluatePreconditions() and JAX-RS 1.1

See [WINK-195]

Thanks to Mike Rheinheimer for the original patch.

Modified:
    incubator/wink/trunk/pom.xml
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java
    incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/PreconditionsTest.java

Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=918801&r1=918800&r2=918801&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Thu Mar  4 00:49:09 2010
@@ -401,7 +401,7 @@
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>jsr311-api</artifactId>
-                <version>1.0</version>
+                <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java?rev=918801&r1=918800&r2=918801&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java Thu Mar  4 00:49:09 2010
@@ -546,6 +546,32 @@
             return this;
         }
 
+        if (isFirstCall) {
+            if (path.indexOf(":") != -1) {
+                // we need to parse this as scheme:scheme-specific-part#fragment
+                // for
+                // a hierarchical URI
+                // if a non-valid URI is passed in, the path is parsed as normal
+                String[] segments = path.split(":", 2);
+                if (segments.length == 2 && segments[0].length() > 0) {
+                    String scheme = segments[0];
+                    segments = segments[1].split("#", 2);
+                    if (segments[0].length() > 0) {
+                        String schemeSpecificPart = segments[0];
+                        String fragment = null;
+                        if (segments.length == 2)
+                            fragment = segments[1];
+                        scheme(scheme);
+                        schemeSpecificPart(schemeSpecificPart);
+                        fragment(fragment);
+                        logger.debug("replacePath() exit");
+                        return this;
+                    }
+                }
+            }
+            isFirstCall = false;
+        }
+
         // strip off the authority prefix if present
         String _path = path;
         if (path.startsWith("//")) {

Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java?rev=918801&r1=918800&r2=918801&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java Thu Mar  4 00:49:09 2010
@@ -75,6 +75,38 @@
         return null;
     }
 
+    // a call into this method is an indicator that the resource does not exist
+    // see C007
+    // http://jcp.org/aboutJava/communityprocess/maintenance/jsr311/311ChangeLog.html
+    public ResponseBuilder evaluatePreconditions() {
+        logger.debug("evaluatePreconditions() called");
+
+        // the resource does not exist yet so any If-Match header would result
+        // in a precondition failed
+        String ifMatch = getHeaderValue(HttpHeaders.IF_MATCH);
+        if (ifMatch != null) {
+            try {
+                EntityTagMatchHeader ifMatchHeader = null;
+                ifMatchHeader = ifMatchHeaderDelegate.fromString(ifMatch);
+                logger.debug("ifMatchHeaderDelegate returned {}", ifMatchHeader);
+            } catch (IllegalArgumentException e) {
+                throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
+            }
+            // we won't find a match. To be consistent with evaluateIfMatch, we
+            // return a built response
+            ResponseBuilder responseBuilder = delegate.createResponseBuilder();
+            responseBuilder.status(HttpServletResponse.SC_PRECONDITION_FAILED);
+            logger
+                .debug("evaluatePreconditions() returning built response because there was no match due to no entity tag");
+            return responseBuilder;
+        }
+
+        // since the resource does not exist yet if there is a If-None-Match
+        // header, then this should return null. if there is no If-None-Match
+        // header, this should still return null
+        return null;
+    }
+
     public ResponseBuilder evaluatePreconditions(EntityTag tag) {
         logger.debug("evaluatePreconditions({}) called", tag); //$NON-NLS-1$
         String ifMatch = getHeaderValue(HttpHeaders.IF_MATCH);

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/PreconditionsTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/PreconditionsTest.java?rev=918801&r1=918800&r2=918801&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/PreconditionsTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/PreconditionsTest.java Thu Mar  4 00:49:09 2010
@@ -150,6 +150,16 @@
             return THE_CONTENT;
         }
 
+        @GET
+        @Produces("text/plain")
+        @Path("nonexistyet")
+        public Object getResourceDoesNotExistYet(@Context Request request) {
+            ResponseBuilder evaluatePreconditions = request.evaluatePreconditions();
+            if (evaluatePreconditions != null) {
+                return evaluatePreconditions.build();
+            }
+            return THE_CONTENT;
+        }
     } // 
 
     public void testNormalGet() throws Exception {
@@ -478,4 +488,40 @@
         assertEquals("status", 412, response.getStatus());
     }
 
+    public void testConditionalIfNotExistYet() throws Exception {
+        // no headers yet
+        MockHttpServletRequest request =
+            MockRequestConstructor.constructMockRequest("GET", "get/abcd/nonexistyet", "*/*");
+        MockHttpServletResponse response = invoke(request);
+        assertEquals("status", 200, response.getStatus());
+        assertEquals("content", THE_CONTENT, response.getContentAsString());
+
+        // GET
+        // If-Match
+        request = MockRequestConstructor.constructMockRequest("GET", "get/abcd/nonexistyet", "*/*");
+        request.addHeader(HttpHeaders.IF_MATCH, "*");
+        response = invoke(request);
+        assertEquals("status", 412, response.getStatus());
+
+        // If-Match
+        request = MockRequestConstructor.constructMockRequest("GET", "get/abcd/nonexistyet", "*/*");
+        request.addHeader(HttpHeaders.IF_MATCH, "\"randomEntityTag\"");
+        response = invoke(request);
+        assertEquals("status", 412, response.getStatus());
+
+        // If-None-Match
+        request = MockRequestConstructor.constructMockRequest("GET", "get/abcd/nonexistyet", "*/*");
+        request.addHeader(HttpHeaders.IF_NONE_MATCH, "\"randomEntityTag\"");
+        response = invoke(request);
+        assertEquals("status", 200, response.getStatus());
+        assertEquals("content", THE_CONTENT, response.getContentAsString());
+
+        // If-None-Match
+        request = MockRequestConstructor.constructMockRequest("GET", "get/abcd/nonexistyet", "*/*");
+        request.addHeader(HttpHeaders.IF_NONE_MATCH, "*");
+        response = invoke(request);
+        assertEquals("status", 200, response.getStatus());
+        assertEquals("content", THE_CONTENT, response.getContentAsString());
+    }
+
 }