From f22e738c41798cac1dc891a29a960f03a2e4336c Mon Sep 17 00:00:00 2001 From: Victor Nikiforov Date: Mon, 10 Aug 2015 11:46:31 +0300 Subject: Issue #216 - Integration with apache.commons.fileupload enhancement --- .../main/java/fi/iki/elonen/NanoFileUpload.java | 43 ++++++++++++++++++ .../main/java/fi/iki/elonen/NanoHttpdContext.java | 51 ++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java create mode 100644 fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java (limited to 'fileupload/src') diff --git a/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java new file mode 100644 index 0000000..ec2e4e8 --- /dev/null +++ b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java @@ -0,0 +1,43 @@ +package fi.iki.elonen; + +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.FileItemFactory; +import org.apache.commons.fileupload.FileItemIterator; +import org.apache.commons.fileupload.FileUpload; +import org.apache.commons.fileupload.FileUploadBase; +import org.apache.commons.fileupload.FileUploadException; + +import java.io.IOException; +import java.util.List; +import java.util.Map; + +/** + * Created by victor on 7/30/15. + */ +public class NanoFileUpload extends FileUpload { + private static final String POST_METHOD = "POST"; + + public static final boolean isMultipartContent(NanoHTTPD.IHTTPSession session) { + return !"POST".equalsIgnoreCase(session.getMethod().toString())?false: FileUploadBase.isMultipartContent(new NanoHttpdContext(session)); + } + + public NanoFileUpload() { + } + + public NanoFileUpload(FileItemFactory fileItemFactory) { + super(fileItemFactory); + } + + public List parseRequest(NanoHTTPD.IHTTPSession session) throws FileUploadException { + return this.parseRequest(new NanoHttpdContext(session)); + } + + public Map> parseParameterMap(NanoHTTPD.IHTTPSession session) throws FileUploadException { + return this.parseParameterMap(new NanoHttpdContext(session)); + } + + public FileItemIterator getItemIterator(NanoHTTPD.IHTTPSession session) throws FileUploadException, IOException { + return super.getItemIterator(new NanoHttpdContext(session)); + } + +} diff --git a/fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java b/fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java new file mode 100644 index 0000000..1c4d89f --- /dev/null +++ b/fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java @@ -0,0 +1,51 @@ +package fi.iki.elonen; + +import org.apache.commons.fileupload.UploadContext; + +import java.io.IOException; +import java.io.InputStream; + +/** + * Created by victor on 7/30/15. + */ +public class NanoHttpdContext implements UploadContext { + + private NanoHTTPD.IHTTPSession session; + + public NanoHttpdContext(NanoHTTPD.IHTTPSession session) { + this.session = session; + } + + @Override + public long contentLength() { + long size; + try { + String cl1 = session.getHeaders().get("content-length"); + size = Long.parseLong(cl1); + } catch (NumberFormatException var4) { + size = -1L; + } + + return size; + } + + @Override + public String getCharacterEncoding() { + return "UTF-8"; + } + + @Override + public String getContentType() { + return this.session.getHeaders().get("content-type"); + } + + @Override + public int getContentLength() { + return (int)contentLength(); + } + + @Override + public InputStream getInputStream() throws IOException { + return session.getInputStream(); + } +} -- cgit v1.2.3