diff options
author | ritchie <ritchie@gmx.at> | 2015-09-12 08:22:09 +0200 |
---|---|---|
committer | ritchie <ritchie@gmx.at> | 2015-09-12 08:22:09 +0200 |
commit | afdc49fd4c3644346ece0ff66e0db41cc98aaf42 (patch) | |
tree | 1b68fafe8633bd410e991726023fc37b9c67cd71 /fileupload | |
parent | 350ed420bc91cfa8b6f57478691777fd6499363b (diff) | |
parent | 2ac451afa642739b14a02424e933d9313350f4c6 (diff) | |
download | nanohttpd-afdc49fd4c3644346ece0ff66e0db41cc98aaf42.tar.gz |
Merge branch 'vnnv-originalMaster'
Diffstat (limited to 'fileupload')
-rw-r--r-- | fileupload/pom.xml | 39 | ||||
-rw-r--r-- | fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java | 89 |
2 files changed, 128 insertions, 0 deletions
diff --git a/fileupload/pom.xml b/fileupload/pom.xml new file mode 100644 index 0000000..da60ecf --- /dev/null +++ b/fileupload/pom.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <parent> + <artifactId>nanohttpd-project</artifactId> + <groupId>org.nanohttpd</groupId> + <version>2.2.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>apache-fileupload-integration</artifactId> + <dependencies> + <dependency> + <groupId>org.nanohttpd</groupId> + <artifactId>nanohttpd</artifactId> + <version>2.2.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.3.1</version> + <scope>provided</scope> + </dependency> + + <!-- this is just to pass the compilation. Servlets are not used in NanoHTTPD --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + </dependencies> + + +</project>
\ No newline at end of file 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..f51df3c --- /dev/null +++ b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java @@ -0,0 +1,89 @@ +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 org.apache.commons.fileupload.UploadContext; + +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Map; + +/** + * Created by victor on 7/30/15. + */ +public class NanoFileUpload extends FileUpload { + + public static 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(); + } + } + + 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<FileItem> parseRequest(NanoHTTPD.IHTTPSession session) throws FileUploadException { + return this.parseRequest(new NanoHttpdContext(session)); + } + + public Map<String, List<FileItem>> 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)); + } + +} |