Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #4368 - make MultiParts a class instead of interface 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-11-27 15:32:38 +11:00
parent 02bb5affd9
commit 6988c4feaa
2 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
jetty-server/src/main/java/org/eclipse/jetty/server/MultiParts.java
View File

@ -30,55 +30,40 @@ import org.eclipse.jetty.http.MultiPartFormInputStream;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandler.Context;
public interface MultiParts extends Closeable
public class MultiParts implements Closeable
{
Collection<Part> getParts() throws IOException;
private final MultiPartFormInputStream _httpParser;
private final ContextHandler.Context _context;
Part getPart(String name) throws IOException;
boolean isEmpty();
ContextHandler.Context getContext();
class MultiPartsHttpParser implements MultiParts
public MultiParts(InputStream in, String contentType, MultipartConfigElement config, File contextTmpDir, Request request)
{
private final MultiPartFormInputStream _httpParser;
private final ContextHandler.Context _context;
_httpParser = new MultiPartFormInputStream(in, contentType, config, contextTmpDir);
_context = request.getContext();
}
public MultiPartsHttpParser(InputStream in, String contentType, MultipartConfigElement config, File contextTmpDir, Request request) throws IOException
{
_httpParser = new MultiPartFormInputStream(in, contentType, config, contextTmpDir);
_context = request.getContext();
}
public Collection<Part> getParts() throws IOException
{
return _httpParser.getParts();
}
@Override
public Collection<Part> getParts() throws IOException
{
return _httpParser.getParts();
}
public Part getPart(String name) throws IOException
{
return _httpParser.getPart(name);
}
@Override
public Part getPart(String name) throws IOException
{
return _httpParser.getPart(name);
}
@Override
public void close()
{
_httpParser.deleteParts();
}
@Override
public void close()
{
_httpParser.deleteParts();
}
public boolean isEmpty()
{
return _httpParser.isEmpty();
}
@Override
public boolean isEmpty()
{
return _httpParser.isEmpty();
}
@Override
public Context getContext()
{
return _context;
}
public Context getContext()
{
return _context;
}
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -2379,7 +2379,7 @@ public class Request implements HttpServletRequest
private MultiParts newMultiParts(MultipartConfigElement config) throws IOException
{
return new MultiParts.MultiPartsHttpParser(getInputStream(), getContentType(), config,
return new MultiParts(getInputStream(), getContentType(), config,
(_context != null ? (File)_context.getAttribute("javax.servlet.context.tempdir") : null), this);
}