From ec5fba7af9d62ac8a84dc1cd43d3bfee65dccca3 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 22 Nov 2016 09:38:20 +0100
Subject: [PATCH] Reverts back to pure File

---
 .../struts2/showcase/fileupload/FileUploadAction.java    | 7 +++----
 .../fileupload/MultipleFileUploadUsingArrayAction.java   | 9 ++++-----
 .../fileupload/MultipleFileUploadUsingListAction.java    | 9 ++++-----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
index 0568a517e..60053067e 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
@@ -21,7 +21,6 @@
 package org.apache.struts2.showcase.fileupload;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
 
 import java.io.File;
 
@@ -33,7 +32,7 @@ public class FileUploadAction extends ActionSupport {
 	private static final long serialVersionUID = 5156288255337069381L;
 
 	private String contentType;
-	private UploadedFile upload;
+	private File upload;
 	private String fileName;
 	private String caption;
 
@@ -69,11 +68,11 @@ public class FileUploadAction extends ActionSupport {
 
 	// since we are using <s:file name="upload" ... /> the File itself will be
 	// obtained through getter/setter of <file-tag-name>
-	public UploadedFile getUpload() {
+	public File getUpload() {
 		return upload;
 	}
 
-	public void setUpload(UploadedFile upload) {
+	public void setUpload(File upload) {
 		this.upload = upload;
 	}
 
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
index 183b2b33f..b1a598543 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
@@ -22,7 +22,6 @@
 package org.apache.struts2.showcase.fileupload;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
 
 import java.io.File;
 
@@ -33,7 +32,7 @@ import java.io.File;
  */
 public class MultipleFileUploadUsingArrayAction extends ActionSupport {
 
-	private UploadedFile[] uploads;
+	private File[] uploads;
 	private String[] uploadFileNames;
 	private String[] uploadContentTypes;
 
@@ -41,7 +40,7 @@ public class MultipleFileUploadUsingArrayAction extends ActionSupport {
 	public String upload() throws Exception {
 		System.out.println("\n\n upload2");
 		System.out.println("files:");
-		for (UploadedFile u : uploads) {
+		for (File u : uploads) {
 			System.out.println("*** " + u + "\t" + u.length());
 		}
 		System.out.println("filenames:");
@@ -56,11 +55,11 @@ public class MultipleFileUploadUsingArrayAction extends ActionSupport {
 		return SUCCESS;
 	}
 
-	public UploadedFile[] getUpload() {
+	public File[] getUpload() {
 		return this.uploads;
 	}
 
-	public void setUpload(UploadedFile[] upload) {
+	public void setUpload(File[] upload) {
 		this.uploads = upload;
 	}
 
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
index 5327ae78d..7b4325e98 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
@@ -22,7 +22,6 @@
 package org.apache.struts2.showcase.fileupload;
 
 import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.dispatcher.multipart.UploadedFile;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -35,16 +34,16 @@ import java.util.List;
  */
 public class MultipleFileUploadUsingListAction extends ActionSupport {
 
-	private List<UploadedFile> uploads = new ArrayList<>();
+	private List<File> uploads = new ArrayList<>();
 	private List<String> uploadFileNames = new ArrayList<>();
 	private List<String> uploadContentTypes = new ArrayList<>();
 
 
-	public List<UploadedFile> getUpload() {
+	public List<File> getUpload() {
 		return this.uploads;
 	}
 
-	public void setUpload(List<UploadedFile> uploads) {
+	public void setUpload(List<File> uploads) {
 		this.uploads = uploads;
 	}
 
@@ -68,7 +67,7 @@ public class MultipleFileUploadUsingListAction extends ActionSupport {
 
 		System.out.println("\n\n upload1");
 		System.out.println("files:");
-		for (UploadedFile u : uploads) {
+		for (File u : uploads) {
 			System.out.println("*** " + u + "\t" + u.length());
 		}
 		System.out.println("filenames:");