From e86793482a9e40eb8315655df672fb32ac6cf77c Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 22 Nov 2016 09:38:31 +0100 Subject: [PATCH] Drops generic --- .../struts2/dispatcher/multipart/JakartaUploadedFile.java | 2 +- .../org/apache/struts2/dispatcher/multipart/UploadedFile.java | 4 ++-- .../apache/struts2/dispatcher/multipart/PellUploadedFile.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java index 5461b9d21..3dfdea66a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaUploadedFile.java @@ -21,7 +21,7 @@ package org.apache.struts2.dispatcher.multipart; import java.io.File; -public class JakartaUploadedFile implements UploadedFile { +public class JakartaUploadedFile implements UploadedFile { private File file; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/UploadedFile.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/UploadedFile.java index e6a77a83b..7efe28542 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/UploadedFile.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/UploadedFile.java @@ -22,7 +22,7 @@ package org.apache.struts2.dispatcher.multipart; /** * Virtual representation of a uploaded file used by {@link MultiPartRequest} */ -public interface UploadedFile { +public interface UploadedFile { Long length(); @@ -34,6 +34,6 @@ public interface UploadedFile { String getAbsolutePath(); - T getContent(); + Object getContent(); } diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java index a1d9e4a91..b51c987b9 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java +++ b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellUploadedFile.java @@ -21,7 +21,7 @@ package org.apache.struts2.dispatcher.multipart; import java.io.File; -public class PellUploadedFile implements UploadedFile { +public class PellUploadedFile implements UploadedFile { private File file;