Issue #5868 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeRequest.java

@@ -39,6 +39,10 @@ import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.WebSocketConstants;
 import org.eclipse.jetty.websocket.core.server.internal.UpgradeHttpServletRequest;
 
+/**
+ * Upgrade request used for websocket negotiation.
+ * Provides getters for things like the requested extensions and subprotocols so that the headers don't have to be parsed manually.
+ */
 public class ServerUpgradeRequest
 {
     private final URI requestURI;

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/ServerUpgradeResponse.java

@@ -26,6 +26,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 
+/**
+ * Upgrade response used for websocket negotiation.
+ * Allows setting of extensions and subprotocol without using headers directly.
+ */
 public class ServerUpgradeResponse
 {
     private final HttpServletResponse response;

jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/UpgradeHttpServletRequest.java

@@ -14,6 +14,8 @@
 package org.eclipse.jetty.websocket.core.server.internal;
 
 import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -30,6 +32,7 @@ import javax.servlet.AsyncContext;
 import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -85,6 +88,9 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
     private final String remoteName;
     private final InetSocketAddress serverAddress;
 
+    private boolean isAsyncStarted;
+    private boolean isAsyncSupported;
+
     public UpgradeHttpServletRequest(HttpServletRequest httpRequest)
     {
         // The original request object must be held temporarily for the duration of the handshake
@@ -145,6 +151,8 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
             attributes.put(name, request.getAttribute(name));
         }
 
+        this.isAsyncStarted = request.isAsyncStarted();
+        this.isAsyncSupported = request.isAsyncSupported();
         request = null;
     }
 
@@ -197,13 +205,17 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
     @Override
     public long getDateHeader(String name)
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getDateHeader(name);
     }
 
     @Override
     public int getIntHeader(String name)
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getIntHeader(name);
     }
 
     @Override
@@ -291,31 +303,41 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
     @Override
     public String getRequestedSessionId()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getRequestedSessionId();
     }
 
     @Override
     public boolean isRequestedSessionIdValid()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.isRequestedSessionIdValid();
     }
 
     @Override
     public boolean isRequestedSessionIdFromCookie()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.isRequestedSessionIdFromCookie();
     }
 
     @Override
     public boolean isRequestedSessionIdFromURL()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.isRequestedSessionIdFromURL();
     }
 
     @Override
     public boolean isRequestedSessionIdFromUrl()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.isRequestedSessionIdFromUrl();
     }
 
     @Override
@@ -407,7 +429,7 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
     public void setAttribute(String name, Object value)
     {
         if (request == null)
-            throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+            attributes.put(name, value);
         request.setAttribute(name, value);
     }
 
@@ -415,7 +437,7 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
     public void removeAttribute(String name)
     {
         if (request == null)
-            throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+            attributes.remove(name);
         request.removeAttribute(name);
     }
 
@@ -476,122 +498,162 @@ public class UpgradeHttpServletRequest implements HttpServletRequest
     }
 
     @Override
-    public boolean authenticate(HttpServletResponse response)
+    public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.authenticate(response);
     }
 
     @Override
     public String changeSessionId()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.changeSessionId();
     }
 
     @Override
     public AsyncContext getAsyncContext()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getAsyncContext();
     }
 
     @Override
     public String getCharacterEncoding()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getCharacterEncoding();
     }
 
     @Override
     public int getContentLength()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getContentLength();
     }
 
     @Override
     public long getContentLengthLong()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getContentLengthLong();
     }
 
     @Override
     public String getContentType()
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getContentType();
     }
 
     @Override
-    public ServletInputStream getInputStream()
+    public ServletInputStream getInputStream() throws IOException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getInputStream();
     }
 
     @Override
-    public Part getPart(String name)
+    public Part getPart(String name) throws IOException, ServletException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getPart(name);
     }
 
     @Override
-    public Collection<Part> getParts()
+    public Collection<Part> getParts() throws IOException, ServletException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getParts();
     }
 
     @Override
-    public BufferedReader getReader()
+    public BufferedReader getReader() throws IOException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getReader();
     }
 
     @Override
     public RequestDispatcher getRequestDispatcher(String path)
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.getRequestDispatcher(path);
     }
 
     @Override
     public boolean isAsyncStarted()
     {
-        return false;
+        if (request == null)
+            return isAsyncStarted;
+        return request.isAsyncStarted();
     }
 
     @Override
     public boolean isAsyncSupported()
     {
-        return false;
+        if (request == null)
+            return isAsyncSupported;
+        return request.isAsyncSupported();
     }
 
     @Override
-    public void login(String username, String password)
+    public void login(String username, String password) throws ServletException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        request.login(username, password);
     }
 
     @Override
-    public void logout()
+    public void logout() throws ServletException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        request.logout();
     }
 
     @Override
-    public void setCharacterEncoding(String enc)
+    public void setCharacterEncoding(String enc) throws UnsupportedEncodingException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        request.setCharacterEncoding(enc);
     }
 
     @Override
     public AsyncContext startAsync() throws IllegalStateException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.startAsync();
     }
 
     @Override
     public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.startAsync(servletRequest, servletResponse);
     }
 
     @Override
-    public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass)
+    public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException
     {
+        if (request == null)
             throw new UnsupportedOperationException(UNSUPPORTED_AFTER_WEBSOCKET_UPGRADE);
+        return request.upgrade(handlerClass);
     }
 }