update zuul-core to use servlet-3.0

Netflix · Jun 17, 2014 · df3c332 · df3c332
1 parent a903105
commit df3c332
Show file tree

Hide file tree

Showing 2 changed files with 155 additions and 6 deletions.
diff --git a/zuul-core/build.gradle b/zuul-core/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.6'
 
     provided 'junit:junit-dep:4.10'
-    provided 'javax.servlet:servlet-api:2.5'
+    provided 'javax.servlet:javax.servlet-api:3.0.1'
     groovy "org.codehaus.groovy:groovy-all:2.3.1"
 
     compile 'com.netflix.archaius:archaius-core:0.6.0'

diff --git a/zuul-core/src/main/java/com/netflix/zuul/http/HttpServletRequestWrapper.java b/zuul-core/src/main/java/com/netflix/zuul/http/HttpServletRequestWrapper.java
@@ -27,11 +27,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import javax.servlet.*;
+import javax.servlet.http.*;
 import java.io.*;
 import java.net.URLDecoder;
 import java.security.Principal;
@@ -491,6 +488,71 @@ public boolean isRequestedSessionIdFromUrl() {
         return req.isRequestedSessionIdFromUrl();
     }
 
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#authenticate(javax.servlet.http.HttpServletResponse)
+    *
+    * introduced in servlet 3.0
+    *
+    * @param response
+    * @return
+    * @throws IOException
+    * @throws ServletException
+    */
+    public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+        return req.authenticate(response);
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#login(java.lang.String, java.lang.String)
+    *
+    * introduced in servlet 3.0
+    *
+    * @param username
+    * @param password
+    * @throws ServletException
+    */
+    public void login(String username, String password) throws ServletException {
+        req.login(username, password);
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#logout()
+    *
+    * introduced in servlet 3.0
+    *
+    * @throws ServletException
+    */
+    public void logout() throws ServletException {
+        req.logout();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#getParts()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    * @throws IOException
+    * @throws ServletException
+    */
+    public Collection<Part> getParts() throws IOException, ServletException {
+        return req.getParts();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#getPart(java.lang.String)
+    *
+    * introduced in servlet 3.0
+    *
+    * @param name
+    * @return
+    * @throws IOException
+    * @throws ServletException
+    */
+    public Part getPart(String name) throws IOException, ServletException {
+        return req.getPart(name);
+    }
+
     /* (non-Javadoc)
     * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
     */
@@ -562,6 +624,87 @@ public int getLocalPort() {
         return req.getLocalPort();
     }
 
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#getServletContext()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    */
+    public ServletContext getServletContext() {
+        return req.getServletContext();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#startAsync()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    * @throws IllegalStateException
+    */
+    public AsyncContext startAsync() throws IllegalStateException {
+        return req.startAsync();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#startAsync(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+    *
+    * introduced in servlet 3.0
+    *
+    * @param servletRequest
+    * @param servletResponse
+    * @return
+    * @throws IllegalStateException
+    */
+    public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException {
+        return req.startAsync(servletRequest, servletResponse);
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#isAsyncStarted()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    */
+    public boolean isAsyncStarted() {
+        return req.isAsyncStarted();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#isAsyncSupported()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    */
+    public boolean isAsyncSupported() {
+        return req.isAsyncSupported();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#getAsyncContext()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    */
+    public AsyncContext getAsyncContext() {
+        return req.getAsyncContext();
+    }
+
+    /* (non-Javadoc)
+    * @see javax.servlet.ServletRequest#getDispatcherType()
+    *
+    * introduced in servlet 3.0
+    *
+    * @return
+    */
+    public DispatcherType getDispatcherType() {
+        return req.getDispatcherType();
+    }
+
     /* (non-Javadoc)
     * @see javax.servlet.ServletRequest#getLocale()
     */
@@ -755,6 +898,12 @@ public void handlesZipRequestBody() throws IOException {
 
         }
 
+        @Test
+        public void handlesAsync() throws IOException {
+            //TODO: write this test.
+        }
+
+
         public String readZipInputStream(InputStream input) throws IOException {
 
             byte[] uploadedBytes = getBytesFromInputStream(input);