change: 用TempFile的新方法重新实现Upload适配器的几个注入器

src/org/nutz/mvc/adaptor/WhaleAdaptor.java

@@ -25,9 +25,7 @@
 /**
  * 自动适配普通表单/文件上传表单/Json表单的数据
  * 
- * @since 1.r.55开始使用与servlet 3.0+一致的Part接口,原方法标记为弃用.
  */
-@Deprecated
 public class WhaleAdaptor extends PairAdaptor {
 
 	protected static Log log = Logs.get();
@@ -56,6 +54,7 @@ public WhaleAdaptor(UploadingContext up) {
         uploadCtx = up;
     }
 
+	@SuppressWarnings("deprecation")
 	protected ParamInjector evalInjectorBy(Type type, Param param) {
         // TODO 这里的实现感觉很丑, 感觉可以直接用type进行验证与传递
         // TODO 这里将Type的影响局限在了 github issue #30 中提到的局部范围

src/org/nutz/mvc/upload/injector/AbstractUploadInjector.java

@@ -0,0 +1,39 @@
+package org.nutz.mvc.upload.injector;
+
+import java.util.List;
+import java.util.Map;
+
+import org.nutz.mvc.adaptor.ParamInjector;
+import org.nutz.mvc.upload.TempFile;
+
+public abstract class AbstractUploadInjector implements ParamInjector {
+
+	protected String name;
+
+	public AbstractUploadInjector(String name) {
+		this.name = name;
+	}
+
+    @SuppressWarnings("unchecked")
+	protected TempFile getTempFile(Object refer, String name) {
+    	if (refer == null)
+            return null;
+        Object obj = ((Map<String, Object>) refer).get(name);
+        if (obj == null)
+            return null;
+
+        // Map 中只有可能有两种值， TempFile 或者 List<TempFile>
+        // 如果是单一对象直接返回
+        if (obj instanceof TempFile) {
+            return (TempFile) obj;
+        }
+        // 如果是列表，则取第一项
+        else {
+            List<?> list = (List<?>) obj;
+            if (list.isEmpty())
+                return null;
+            else
+                return (TempFile) list.get(0);
+        }
+    }
+}

src/org/nutz/mvc/upload/injector/FileInjector.java

@@ -1,49 +1,28 @@
 package org.nutz.mvc.upload.injector;
 
 import java.io.File;
-import java.util.List;
-import java.util.Map;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.nutz.mvc.adaptor.ParamInjector;
 import org.nutz.mvc.upload.TempFile;
 
 /**
  * @since 1.r.55开始使用与servlet 3.0+一致的Part接口,原方法标记为弃用.
  */
 @Deprecated
-public class FileInjector implements ParamInjector {
+public class FileInjector extends AbstractUploadInjector {
 
     public FileInjector(String name) {
-        this.name = name;
+        super(name);
     }
 
-    private String name;
-
-    @SuppressWarnings("unchecked")
     protected File getFile(Object refer) {
-        if (refer == null)
-            return null;
-        Object obj = ((Map<String, Object>) refer).get(name);
-        if (obj == null)
-            return null;
-
-        // Map 中只有可能有两种值， TempFile 或者 List<TempFile>
-        // 如果是单一对象直接返回
-        if (obj instanceof TempFile) {
-            return ((TempFile) obj).getFile();
-        }
-        // 如果是列表，则取第一项
-        else {
-            List<?> list = (List<?>) obj;
-            if (list.isEmpty())
-                return null;
-            else
-                return ((TempFile) list.get(0)).getFile();
-        }
+        TempFile tmp = getTempFile(refer, name);
+        if (tmp == null)
+        	return null;
+        return tmp.getFile();
     }
 
     public Object get(    ServletContext sc,

src/org/nutz/mvc/upload/injector/FileMetaInjector.java

@@ -1,28 +1,25 @@
 package org.nutz.mvc.upload.injector;
 
-import java.util.Map;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.nutz.mvc.adaptor.ParamInjector;
 import org.nutz.mvc.upload.TempFile;
 
 @Deprecated
-public class FileMetaInjector implements ParamInjector {
+public class FileMetaInjector extends AbstractUploadInjector {
 
     public FileMetaInjector(String name) {
-        this.name = name;
+        super(name);
     }
 
-    private String name;
-
-    @SuppressWarnings("unchecked")
     public Object get(ServletContext sc, HttpServletRequest req, HttpServletResponse resp, Object refer) {
         if (refer == null)
             return null;
-        return ((TempFile) ((Map<String, Object>) refer).get(name)).getMeta();
+        TempFile tmp = getTempFile(refer, name);
+        if (tmp == null)
+        	return null;
+        return tmp.getMeta();
     }
 
 }

src/org/nutz/mvc/upload/injector/InputStreamInjector.java

@@ -1,29 +1,34 @@
 package org.nutz.mvc.upload.injector;
 
-import java.io.File;
+import java.io.IOException;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.nutz.lang.Streams;
+import org.nutz.lang.Lang;
+import org.nutz.mvc.upload.TempFile;
 
-@Deprecated
-public class InputStreamInjector extends FileInjector {
+public class InputStreamInjector extends AbstractUploadInjector {
 
     public InputStreamInjector(String name) {
         super(name);
     }
 
-    @Override
     public Object get(    ServletContext sc,
                         HttpServletRequest req,
                         HttpServletResponse resp,
                         Object refer) {
         if (refer == null)
             return null;
-        File f = getFile(refer);
-        return Streams.buff(Streams.fileIn(f));
+        TempFile tmp = getTempFile(refer, name);
+        if (tmp == null)
+        	return null;
+        try {
+			return tmp.getInputStream();
+		} catch (IOException e) {
+			throw Lang.wrapThrow(e);
+		}
     }
 
 }

src/org/nutz/mvc/upload/injector/ReaderInjector.java

@@ -1,32 +1,36 @@
 package org.nutz.mvc.upload.injector;
 
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.nutz.lang.Lang;
 import org.nutz.lang.Streams;
+import org.nutz.mvc.upload.TempFile;
 
-/**
- * @since 1.r.55开始使用与servlet 3.0+一致的Part接口,原方法标记为弃用.
- */
-@Deprecated
-public class ReaderInjector extends FileInjector {
+public class ReaderInjector extends AbstractUploadInjector {
 
     public ReaderInjector(String name) {
         super(name);
     }
 
-    @Override
     public Object get(    ServletContext sc,
                         HttpServletRequest req,
                         HttpServletResponse resp,
                         Object refer) {
         if (refer == null)
             return null;
-        File f = getFile(refer);
-        return Streams.buffr(Streams.fileInr(f));
+        TempFile tmp = getTempFile(refer, name);
+        if (tmp == null)
+        	return null;
+        try {
+			return Streams.buffr(new InputStreamReader(tmp.getInputStream()));
+		} catch (IOException e) {
+			throw Lang.wrapThrow(e);
+		}
     }
 
 }

src/org/nutz/mvc/upload/injector/TempFileInjector.java

@@ -1,30 +1,19 @@
 package org.nutz.mvc.upload.injector;
 
-import java.util.Map;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.nutz.mvc.adaptor.ParamInjector;
 import org.nutz.mvc.upload.TempFile;
 
-public class TempFileInjector implements ParamInjector {
+public class TempFileInjector extends AbstractUploadInjector {
 
     public TempFileInjector(String name) {
-        this.name = name;
+        super(name);
     }
 
-    private String name;
-
-    @SuppressWarnings("unchecked")
     public TempFile get(ServletContext sc, HttpServletRequest req, HttpServletResponse resp, Object refer) {
-        if (refer == null)
-            return null;
-        Object tmp = ((Map<String, Object>) refer).get(name);
-        if (tmp != null && tmp instanceof TempFile)
-            return (TempFile)tmp;
-        return null;
+        return getTempFile(refer, name);
     }
 
 }