Revert "javax.servlet-api 4.0.1"

This reverts commit 0cfe1d4.

Author: jeremiahjstacey

pom.xml

@@ -149,20 +149,15 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <!-- Note: v3.1.0+ causes compilation errors. So would have to fix to upgrade. -->
+            <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
             <version>2.3.3</version>
             <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.io7m.xom</groupId>

src/main/java/org/owasp/esapi/waf/internal/InterceptingHTTPServletRequest.java

@@ -24,7 +24,6 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
@@ -172,43 +171,18 @@ public Enumeration getDictionaryParameterNames() {
 	private class RAFInputStream extends ServletInputStream {
 
 		RandomAccessFile raf;
-		boolean isDone = false;
-		
 
 		public RAFInputStream(RandomAccessFile raf) throws IOException {
 			this.raf = raf;
 			this.raf.seek(0);
 		}
 
 		public int read() throws IOException {
-			int rval = raf.read();
-			
-			if (rval == -1) {
-				isDone = true;
-			}
-			
-			return rval;
+			return raf.read();
 		}
 
 		public synchronized void reset() throws IOException {
 			raf.seek(0);
-			isDone = false;
-		}
-
-		@Override
-		public boolean isFinished() {
-			return isDone;
-		}
-
-		@Override
-		public boolean isReady() {
-			// No way to verify that the next read would be non-blocking.
-			return false;
-		}
-
-		@Override
-		public void setReadListener(ReadListener readListener) {
-			//NO-OP. Unused in this scope.
 		}
 	}
 

src/main/java/org/owasp/esapi/waf/internal/InterceptingServletOutputStream.java

@@ -21,7 +21,6 @@
 import java.io.RandomAccessFile;
 
 import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 
 /**
  * This class was inspired by ModSecurity for Java by Ivan Ristic. We hook
@@ -162,13 +161,4 @@ public void close() throws IOException {
 
     }
 
-	@Override
-	public boolean isReady() {
-		return os.isReady();
-	}
-
-	@Override
-	public void setWriteListener(WriteListener writeListener) {
-		os.setWriteListener(writeListener);
-	}
 }

src/test/java/org/owasp/esapi/http/MockHttpServletRequest.java

@@ -46,7 +46,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.Part;
 
 /**
@@ -738,19 +737,4 @@ public DispatcherType getDispatcherType() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
 
-	@Override
-	public long getContentLengthLong() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public String changeSessionId() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
 }

src/test/java/org/owasp/esapi/http/MockHttpServletResponse.java

@@ -24,7 +24,6 @@
 import java.util.Locale;
 
 import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
@@ -280,16 +279,6 @@ public ServletOutputStream getOutputStream() throws IOException {
 			public void write(int b) throws IOException {
 				body.append((char)b);
 			}
-
-			@Override
-			public boolean isReady() {
-				return false;
-			}
-
-			@Override
-			public void setWriteListener(WriteListener writeListener) {
-				// NO OP
-			}
 		};
 	}
 
@@ -380,10 +369,5 @@ public void dump() {
     public Collection<String> getHeaders(String string) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-
-	@Override
-	public void setContentLengthLong(long len) {
-		//Emulating setContentLenth method.  NO OP
-	}
 
 }

src/test/java/org/owasp/esapi/http/MockServletContext.java

@@ -31,7 +31,6 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
@@ -694,44 +693,4 @@ public ClassLoader getClassLoader() {
     public void declareRoles(String... strings) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
-
-	@Override
-	public Dynamic addJspFile(String servletName, String jspFile) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public String getVirtualServerName() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public int getSessionTimeout() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public void setSessionTimeout(int sessionTimeout) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public String getRequestCharacterEncoding() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public void setRequestCharacterEncoding(String encoding) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public String getResponseCharacterEncoding() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
-
-	@Override
-	public void setResponseCharacterEncoding(String encoding) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-	}
 }

src/test/java/org/owasp/esapi/http/MockServletInputStream.java

@@ -15,7 +15,6 @@
  */
 package org.owasp.esapi.http;
 
-import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import java.io.IOException;
 
@@ -28,8 +27,6 @@ public class MockServletInputStream extends ServletInputStream {
     private byte[] body;
 
     private int next;
-    
-    private boolean isDone = false;
 
     /**
      * constructor
@@ -48,23 +45,7 @@ public int read() throws IOException {
         if (next < body.length) {
             return body[next++];
         } else {
-        	isDone = true;
             return -1;
         }
     }
-
-	@Override
-	public boolean isFinished() {
-	return isDone;
-	}
-
-	@Override
-	public boolean isReady() {
-		return false;
-	}
-
-	@Override
-	public void setReadListener(ReadListener readListener) {
-		//NO OP
-	}
 }