Issue #216 - Integration with apache.commons.fileupload enhancement - Condensing the classes into a single class

2 files changed, 47 insertions, 52 deletions

diff --git a/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java
index ec2e4e8..f51df3c 100644
--- a/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java
+++ b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java
@@ -6,8 +6,10 @@ 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;
 
@@ -15,10 +17,54 @@ 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));
+		return !"POST".equalsIgnoreCase(session.getMethod().toString())
+				? false: FileUploadBase.isMultipartContent(new NanoHttpdContext(session));
 	}
 
 	public NanoFileUpload() {
diff --git a/fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java b/fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java
deleted file mode 100644
index 1c4d89f..0000000
--- a/fileupload/src/main/java/fi/iki/elonen/NanoHttpdContext.java
+++ /dev/null
@@ -1,51 +0,0 @@
-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();
-	}
-}