Migrated from javax to jakarta packages
This commit is contained in:
parent
c4f32a1329
commit
0c5fc58b5c
26
pom.xml
26
pom.xml
|
@ -24,7 +24,7 @@
|
|||
<version>56</version>
|
||||
</parent>
|
||||
|
||||
<groupId>commons-fileupload</groupId>
|
||||
<groupId>org.nanoboot.commons-fileupload</groupId>
|
||||
<artifactId>commons-fileupload</artifactId>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
|
||||
|
@ -190,17 +190,29 @@
|
|||
<url>https://issues.apache.org/jira/browse/FILEUPLOAD</url>
|
||||
</issueManagement>
|
||||
|
||||
<distributionManagement>
|
||||
<!-- <distributionManagement>
|
||||
<site>
|
||||
<id>apache.website</id>
|
||||
<name>Apache Commons Site</name>
|
||||
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-fileupload/</url>
|
||||
</site>
|
||||
</distributionManagement>-->
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>nanoboot-releases-repository</id>
|
||||
<url>https://maven.nanoboot.org/releases</url>
|
||||
</repository>
|
||||
|
||||
<snapshotRepository>
|
||||
<id>nanoboot-snapshots-repository</id>
|
||||
<url>https://maven.nanoboot.org/snapshots</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>1.6</maven.compiler.source>
|
||||
<maven.compiler.target>1.6</maven.compiler.target>
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
<maven.compiler.target>1.7</maven.compiler.target>
|
||||
<commons.componentid>fileupload</commons.componentid>
|
||||
<commons.module.name>org.apache.commons.fileupload</commons.module.name>
|
||||
<commons.release.version>1.5.1</commons.release.version>
|
||||
|
@ -232,9 +244,9 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
<version>2.4</version>
|
||||
<groupId>jakarta.platform</groupId>
|
||||
<artifactId>jakarta.jakartaee-web-api</artifactId>
|
||||
<version>9.1.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -26,7 +26,7 @@ import org.apache.commons.fileupload.disk.DiskFileItem;
|
|||
* <p> After retrieving an instance of this class from a {@link
|
||||
* org.apache.commons.fileupload.DiskFileUpload DiskFileUpload} instance (see
|
||||
* {@link org.apache.commons.fileupload.DiskFileUpload
|
||||
* #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
|
||||
* #parseRequest(jakarta.servlet.http.HttpServletRequest)}), you may
|
||||
* either request all contents of file at once using {@link #get()} or
|
||||
* request an {@link java.io.InputStream InputStream} with
|
||||
* {@link #getInputStream()} and process the file without attempting to load
|
||||
|
|
|
@ -18,7 +18,7 @@ package org.apache.commons.fileupload;
|
|||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* <p>High level API for processing file uploads.</p>
|
||||
|
|
|
@ -29,7 +29,7 @@ import java.io.UnsupportedEncodingException;
|
|||
* <p> After retrieving an instance of this class from a {@link
|
||||
* org.apache.commons.fileupload.FileUpload FileUpload} instance (see
|
||||
* {@link org.apache.commons.fileupload.servlet.ServletFileUpload
|
||||
* #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
|
||||
* #parseRequest(jakarta.servlet.http.HttpServletRequest)}), you may
|
||||
* either request all contents of the file at once using {@link #get()} or
|
||||
* request an {@link java.io.InputStream InputStream} with
|
||||
* {@link #getInputStream()} and process the file without attempting to load
|
||||
|
|
|
@ -29,7 +29,7 @@ import java.util.Locale;
|
|||
import java.util.Map;
|
||||
import java.util.NoSuchElementException;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.MultipartStream.ItemInputStream;
|
||||
import org.apache.commons.fileupload.servlet.ServletFileUpload;
|
||||
|
|
|
@ -46,7 +46,7 @@ import org.apache.commons.io.output.DeferredFileOutputStream;
|
|||
* <p> After retrieving an instance of this class from a {@link
|
||||
* DiskFileItemFactory} instance (see
|
||||
* {@link org.apache.commons.fileupload.servlet.ServletFileUpload
|
||||
* #parseRequest(javax.servlet.http.HttpServletRequest)}), you may
|
||||
* #parseRequest(jakarta.servlet.http.HttpServletRequest)}), you may
|
||||
* either request all contents of file at once using {@link #get()} or
|
||||
* request an {@link java.io.InputStream InputStream} with
|
||||
* {@link #getInputStream()} and process the file without attempting to load
|
||||
|
|
|
@ -47,7 +47,7 @@ import org.apache.commons.io.FileCleaningTracker;
|
|||
* implementation in an environment with local, untrusted users,
|
||||
* {@link #setRepository(File)} MUST be used to configure a repository location
|
||||
* that is not publicly writable. In a Servlet container the location identified
|
||||
* by the ServletContext attribute <code>javax.servlet.context.tempdir</code>
|
||||
* by the ServletContext attribute <code>jakarta.servlet.context.tempdir</code>
|
||||
* may be used.
|
||||
* </p>
|
||||
*
|
||||
|
|
|
@ -36,7 +36,7 @@ import org.apache.commons.fileupload.FileUploadException;
|
|||
* <code>multipart/mixed</code> encoding type, as specified by
|
||||
* <a href="http://www.ietf.org/rfc/rfc1867.txt">RFC 1867</a>. Use
|
||||
* {@link org.apache.commons.fileupload.servlet.ServletFileUpload
|
||||
* #parseRequest(javax.servlet.http.HttpServletRequest)} to acquire a list
|
||||
* #parseRequest(jakarta.servlet.http.HttpServletRequest)} to acquire a list
|
||||
* of {@link org.apache.commons.fileupload.FileItem FileItems} associated
|
||||
* with a given HTML widget.</p>
|
||||
*
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
*/
|
||||
package org.apache.commons.fileupload.servlet;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.ServletContextListener;
|
||||
import javax.servlet.ServletContextEvent;
|
||||
import jakarta.servlet.ServletContext;
|
||||
import jakarta.servlet.ServletContextListener;
|
||||
import jakarta.servlet.ServletContextEvent;
|
||||
|
||||
import org.apache.commons.io.FileCleaningTracker;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ import java.io.IOException;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.FileItem;
|
||||
import org.apache.commons.fileupload.FileItemFactory;
|
||||
|
|
|
@ -21,7 +21,7 @@ import static java.lang.String.format;
|
|||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.FileUploadBase;
|
||||
import org.apache.commons.fileupload.UploadContext;
|
||||
|
|
|
@ -145,7 +145,7 @@ DiskFileItemFactory factory = new DiskFileItemFactory();
|
|||
|
||||
// Configure a repository (to ensure a secure temp location is used)
|
||||
ServletContext servletContext = this.getServletConfig().getServletContext();
|
||||
File repository = (File) servletContext.getAttribute("javax.servlet.context.tempdir");
|
||||
File repository = (File) servletContext.getAttribute("jakarta.servlet.context.tempdir");
|
||||
factory.setRepository(repository);
|
||||
|
||||
// Create a new file upload handler
|
||||
|
|
|
@ -21,7 +21,7 @@ import static org.junit.Assert.*;
|
|||
import java.io.File;
|
||||
import java.util.List;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.disk.DiskFileItem;
|
||||
import org.junit.Before;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
*/
|
||||
package org.apache.commons.fileupload;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
final class HttpServletRequestFactory {
|
||||
|
||||
|
|
|
@ -16,6 +16,9 @@
|
|||
*/
|
||||
package org.apache.commons.fileupload;
|
||||
|
||||
import jakarta.servlet.AsyncContext;
|
||||
import jakarta.servlet.DispatcherType;
|
||||
import jakarta.servlet.ReadListener;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
|
@ -26,11 +29,19 @@ import java.util.Enumeration;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.RequestDispatcher;
|
||||
import javax.servlet.ServletInputStream;
|
||||
import javax.servlet.http.Cookie;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import jakarta.servlet.RequestDispatcher;
|
||||
import jakarta.servlet.ServletContext;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.ServletInputStream;
|
||||
import jakarta.servlet.ServletRequest;
|
||||
import jakarta.servlet.ServletResponse;
|
||||
import jakarta.servlet.http.Cookie;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
import jakarta.servlet.http.HttpUpgradeHandler;
|
||||
import jakarta.servlet.http.Part;
|
||||
import java.util.Collection;
|
||||
|
||||
public class MockHttpServletRequest implements HttpServletRequest {
|
||||
|
||||
|
@ -70,7 +81,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getAuthType()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getAuthType()
|
||||
*/
|
||||
@Override
|
||||
public String getAuthType() {
|
||||
|
@ -78,7 +89,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getCookies()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getCookies()
|
||||
*/
|
||||
@Override
|
||||
public Cookie[] getCookies() {
|
||||
|
@ -86,7 +97,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getDateHeader(String)
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getDateHeader(String)
|
||||
*/
|
||||
@Override
|
||||
public long getDateHeader(String arg0) {
|
||||
|
@ -94,7 +105,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getHeader(String)
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getHeader(String)
|
||||
*/
|
||||
@Override
|
||||
public String getHeader(String headerName) {
|
||||
|
@ -102,7 +113,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getHeaders(String)
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getHeaders(String)
|
||||
*/
|
||||
@Override
|
||||
public Enumeration<String> getHeaders(String arg0) {
|
||||
|
@ -111,7 +122,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getHeaderNames()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getHeaderNames()
|
||||
*/
|
||||
@Override
|
||||
public Enumeration<String> getHeaderNames() {
|
||||
|
@ -120,7 +131,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getIntHeader(String)
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getIntHeader(String)
|
||||
*/
|
||||
@Override
|
||||
public int getIntHeader(String arg0) {
|
||||
|
@ -128,7 +139,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getMethod()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getMethod()
|
||||
*/
|
||||
@Override
|
||||
public String getMethod() {
|
||||
|
@ -136,7 +147,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getPathInfo()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getPathInfo()
|
||||
*/
|
||||
@Override
|
||||
public String getPathInfo() {
|
||||
|
@ -144,7 +155,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getPathTranslated()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getPathTranslated()
|
||||
*/
|
||||
@Override
|
||||
public String getPathTranslated() {
|
||||
|
@ -152,7 +163,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getContextPath()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getContextPath()
|
||||
*/
|
||||
@Override
|
||||
public String getContextPath() {
|
||||
|
@ -160,7 +171,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getQueryString()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getQueryString()
|
||||
*/
|
||||
@Override
|
||||
public String getQueryString() {
|
||||
|
@ -168,7 +179,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getRemoteUser()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getRemoteUser()
|
||||
*/
|
||||
@Override
|
||||
public String getRemoteUser() {
|
||||
|
@ -176,7 +187,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#isUserInRole(String)
|
||||
* @see jakarta.servlet.http.HttpServletRequest#isUserInRole(String)
|
||||
*/
|
||||
@Override
|
||||
public boolean isUserInRole(String arg0) {
|
||||
|
@ -184,7 +195,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal()
|
||||
*/
|
||||
@Override
|
||||
public Principal getUserPrincipal() {
|
||||
|
@ -192,7 +203,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getRequestedSessionId()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getRequestedSessionId()
|
||||
*/
|
||||
@Override
|
||||
public String getRequestedSessionId() {
|
||||
|
@ -200,7 +211,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getRequestURI()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getRequestURI()
|
||||
*/
|
||||
@Override
|
||||
public String getRequestURI() {
|
||||
|
@ -208,7 +219,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getRequestURL()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getRequestURL()
|
||||
*/
|
||||
@Override
|
||||
public StringBuffer getRequestURL() {
|
||||
|
@ -216,7 +227,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getServletPath()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getServletPath()
|
||||
*/
|
||||
@Override
|
||||
public String getServletPath() {
|
||||
|
@ -224,7 +235,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getSession(boolean)
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getSession(boolean)
|
||||
*/
|
||||
@Override
|
||||
public HttpSession getSession(boolean arg0) {
|
||||
|
@ -232,7 +243,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#getSession()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#getSession()
|
||||
*/
|
||||
@Override
|
||||
public HttpSession getSession() {
|
||||
|
@ -240,7 +251,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
|
||||
*/
|
||||
@Override
|
||||
public boolean isRequestedSessionIdValid() {
|
||||
|
@ -248,7 +259,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie()
|
||||
*/
|
||||
@Override
|
||||
public boolean isRequestedSessionIdFromCookie() {
|
||||
|
@ -256,7 +267,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL()
|
||||
*/
|
||||
@Override
|
||||
public boolean isRequestedSessionIdFromURL() {
|
||||
|
@ -264,7 +275,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl()
|
||||
* @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl()
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
|
@ -274,7 +285,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getAttribute(String)
|
||||
* @see jakarta.servlet.ServletRequest#getAttribute(String)
|
||||
*/
|
||||
@Override
|
||||
public Object getAttribute(String arg0) {
|
||||
|
@ -282,7 +293,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getAttributeNames()
|
||||
* @see jakarta.servlet.ServletRequest#getAttributeNames()
|
||||
*/
|
||||
@Override
|
||||
public Enumeration<String> getAttributeNames() {
|
||||
|
@ -290,7 +301,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getCharacterEncoding()
|
||||
* @see jakarta.servlet.ServletRequest#getCharacterEncoding()
|
||||
*/
|
||||
@Override
|
||||
public String getCharacterEncoding() {
|
||||
|
@ -298,7 +309,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#setCharacterEncoding(String)
|
||||
* @see jakarta.servlet.ServletRequest#setCharacterEncoding(String)
|
||||
*/
|
||||
@Override
|
||||
public void setCharacterEncoding(String arg0)
|
||||
|
@ -306,7 +317,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getContentLength()
|
||||
* @see jakarta.servlet.ServletRequest#getContentLength()
|
||||
*/
|
||||
@Override
|
||||
public int getContentLength() {
|
||||
|
@ -331,7 +342,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getContentType()
|
||||
* @see jakarta.servlet.ServletRequest#getContentType()
|
||||
*/
|
||||
@Override
|
||||
public String getContentType() {
|
||||
|
@ -339,7 +350,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getInputStream()
|
||||
* @see jakarta.servlet.ServletRequest#getInputStream()
|
||||
*/
|
||||
@Override
|
||||
public ServletInputStream getInputStream() throws IOException {
|
||||
|
@ -357,7 +368,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getParameter(String)
|
||||
* @see jakarta.servlet.ServletRequest#getParameter(String)
|
||||
*/
|
||||
@Override
|
||||
public String getParameter(String arg0) {
|
||||
|
@ -365,7 +376,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getParameterNames()
|
||||
* @see jakarta.servlet.ServletRequest#getParameterNames()
|
||||
*/
|
||||
@Override
|
||||
public Enumeration<String> getParameterNames() {
|
||||
|
@ -373,7 +384,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getParameterValues(String)
|
||||
* @see jakarta.servlet.ServletRequest#getParameterValues(String)
|
||||
*/
|
||||
@Override
|
||||
public String[] getParameterValues(String arg0) {
|
||||
|
@ -381,7 +392,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getParameterMap()
|
||||
* @see jakarta.servlet.ServletRequest#getParameterMap()
|
||||
*/
|
||||
@Override
|
||||
public Map<String, String[]> getParameterMap() {
|
||||
|
@ -389,7 +400,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getProtocol()
|
||||
* @see jakarta.servlet.ServletRequest#getProtocol()
|
||||
*/
|
||||
@Override
|
||||
public String getProtocol() {
|
||||
|
@ -397,7 +408,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getScheme()
|
||||
* @see jakarta.servlet.ServletRequest#getScheme()
|
||||
*/
|
||||
@Override
|
||||
public String getScheme() {
|
||||
|
@ -405,7 +416,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getServerName()
|
||||
* @see jakarta.servlet.ServletRequest#getServerName()
|
||||
*/
|
||||
@Override
|
||||
public String getServerName() {
|
||||
|
@ -413,7 +424,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getLocalName()
|
||||
* @see jakarta.servlet.ServletRequest#getLocalName()
|
||||
*/
|
||||
@Override
|
||||
@SuppressWarnings("javadoc") // This is a Servlet 2.4 method
|
||||
|
@ -422,7 +433,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getServerPort()
|
||||
* @see jakarta.servlet.ServletRequest#getServerPort()
|
||||
*/
|
||||
@Override
|
||||
public int getServerPort() {
|
||||
|
@ -430,7 +441,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getLocalPort()
|
||||
* @see jakarta.servlet.ServletRequest#getLocalPort()
|
||||
*/
|
||||
@Override
|
||||
@SuppressWarnings("javadoc") // This is a Servlet 2.4 method
|
||||
|
@ -439,7 +450,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getRemotePort()
|
||||
* @see jakarta.servlet.ServletRequest#getRemotePort()
|
||||
*/
|
||||
@Override
|
||||
@SuppressWarnings("javadoc") // This is a Servlet 2.4 method
|
||||
|
@ -448,7 +459,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getReader()
|
||||
* @see jakarta.servlet.ServletRequest#getReader()
|
||||
*/
|
||||
@Override
|
||||
public BufferedReader getReader() throws IOException {
|
||||
|
@ -456,7 +467,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getRemoteAddr()
|
||||
* @see jakarta.servlet.ServletRequest#getRemoteAddr()
|
||||
*/
|
||||
@Override
|
||||
public String getRemoteAddr() {
|
||||
|
@ -464,7 +475,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getLocalAddr()
|
||||
* @see jakarta.servlet.ServletRequest#getLocalAddr()
|
||||
*/
|
||||
@Override
|
||||
@SuppressWarnings("javadoc") // This is a Servlet 2.4 method
|
||||
|
@ -473,7 +484,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getRemoteHost()
|
||||
* @see jakarta.servlet.ServletRequest#getRemoteHost()
|
||||
*/
|
||||
@Override
|
||||
public String getRemoteHost() {
|
||||
|
@ -481,21 +492,21 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#setAttribute(String, Object)
|
||||
* @see jakarta.servlet.ServletRequest#setAttribute(String, Object)
|
||||
*/
|
||||
@Override
|
||||
public void setAttribute(String arg0, Object arg1) {
|
||||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#removeAttribute(String)
|
||||
* @see jakarta.servlet.ServletRequest#removeAttribute(String)
|
||||
*/
|
||||
@Override
|
||||
public void removeAttribute(String arg0) {
|
||||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getLocale()
|
||||
* @see jakarta.servlet.ServletRequest#getLocale()
|
||||
*/
|
||||
@Override
|
||||
public Locale getLocale() {
|
||||
|
@ -503,7 +514,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getLocales()
|
||||
* @see jakarta.servlet.ServletRequest#getLocales()
|
||||
*/
|
||||
@Override
|
||||
public Enumeration<Locale> getLocales() {
|
||||
|
@ -511,7 +522,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#isSecure()
|
||||
* @see jakarta.servlet.ServletRequest#isSecure()
|
||||
*/
|
||||
@Override
|
||||
public boolean isSecure() {
|
||||
|
@ -519,7 +530,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getRequestDispatcher(String)
|
||||
* @see jakarta.servlet.ServletRequest#getRequestDispatcher(String)
|
||||
*/
|
||||
@Override
|
||||
public RequestDispatcher getRequestDispatcher(String arg0) {
|
||||
|
@ -527,7 +538,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
}
|
||||
|
||||
/**
|
||||
* @see javax.servlet.ServletRequest#getRealPath(String)
|
||||
* @see jakarta.servlet.ServletRequest#getRealPath(String)
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
|
@ -536,8 +547,83 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends HttpUpgradeHandler> T upgrade(Class<T> type) throws IOException, ServletException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public String changeSessionId() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean authenticate(HttpServletResponse hsr) throws IOException, ServletException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public void login(String string, String string1) throws ServletException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public void logout() throws ServletException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<Part> getParts() throws IOException, ServletException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public Part getPart(String string) throws IOException, ServletException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getContentLengthLong() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public ServletContext getServletContext() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public AsyncContext startAsync() throws IllegalStateException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public AsyncContext startAsync(ServletRequest sr, ServletResponse sr1) throws IllegalStateException {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAsyncStarted() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAsyncSupported() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public AsyncContext getAsyncContext() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public DispatcherType getDispatcherType() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
private static class MyServletInputStream
|
||||
extends javax.servlet.ServletInputStream {
|
||||
extends jakarta.servlet.ServletInputStream {
|
||||
|
||||
private final InputStream in;
|
||||
private final int readLimit;
|
||||
|
@ -564,6 +650,21 @@ public class MockHttpServletRequest implements HttpServletRequest {
|
|||
return in.read(b, off, len);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFinished() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isReady() {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setReadListener(ReadListener rl) {
|
||||
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ import java.io.InputStream;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.FileUploadBase.FileUploadIOException;
|
||||
import org.apache.commons.fileupload.FileUploadBase.SizeException;
|
||||
|
|
|
@ -24,7 +24,7 @@ import java.io.InputStream;
|
|||
import java.io.OutputStreamWriter;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.FileUploadBase.IOFileUploadException;
|
||||
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
||||
|
|
|
@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
|
|||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
||||
import org.apache.commons.fileupload.portlet.PortletFileUpload;
|
||||
|
|
|
@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
import org.apache.commons.fileupload.Constants;
|
||||
import org.apache.commons.fileupload.FileItem;
|
||||
|
|
Loading…
Reference in New Issue