[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openejb-cvs
Subject:    svn commit: r1526943 - in /tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/se
From:       rmannibucau () apache ! org
Date:       2013-09-27 15:11:21
Message-ID: 20130927151121.DA5682388C4E () eris ! apache ! org
[Download RAW message or body]

Author: rmannibucau
Date: Fri Sep 27 15:11:21 2013
New Revision: 1526943

URL: http://svn.apache.org/r1526943
Log:
OPENEJB-2038 we should support custom http method

Modified:
    tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
  tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java


Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
                
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/ \
org/apache/openejb/server/httpd/HttpRequest.java?rev=1526943&r1=1526942&r2=1526943&view=diff
 ==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java \
                (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java \
Fri Sep 27 15:11:21 2013 @@ -32,7 +32,7 @@ public interface HttpRequest extends jav
      * Request methods
      */
     public static enum Method {
-        OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT, UNSUPPORTED
+        OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT, PATCH, UNSUPPORTED
     }
 
     //

Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
                
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/ \
org/apache/openejb/server/httpd/HttpRequestImpl.java?rev=1526943&r1=1526942&r2=1526943&view=diff
 ==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java \
                (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java \
Fri Sep 27 15:11:21 2013 @@ -411,13 +411,20 @@ public class HttpRequestImpl \
implements   String token;
         try {
             token = lineParts.nextToken();
-        } catch (Exception e) {
+        } catch (final Exception e) {
             throw new IOException("Could not parse the HTTP Request Method :"
                     + e.getClass().getName()
                     + " : "
                     + e.getMessage());
         }
 
+        // in JAXRS you can create your own method
+        try { // to control the case
+            method = Method.valueOf(token.toUpperCase(Locale.ENGLISH)).name();
+        } catch (final Exception e) {
+            method = token;
+        }
+        /*
         if (token.equalsIgnoreCase("GET")) {
             method = Method.GET.name();
         } else if (token.equalsIgnoreCase("POST")) {
@@ -428,10 +435,15 @@ public class HttpRequestImpl implements 
             method = Method.DELETE.name();
         } else if (token.equalsIgnoreCase("HEAD")) {
             method = Method.HEAD.name();
-        }  else {
+        } else if (token.equalsIgnoreCase("OPTIONS")) {
+            method = Method.HEAD.name();
+        } else if (token.equalsIgnoreCase("PATCH")) {
+            method = Method.PATCH.name();
+        } else {
             method = Method.UNSUPPORTED.name();
             throw new IOException("Unsupported HTTP Request Method :" + token);
         }
+        */
     }
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]