You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/06/05 22:46:55 UTC
[commons-fileupload] branch master updated (e2f49f4 -> aed1ff8)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
from e2f49f4 Update migration document
new a79aaf4 Consistent naming
new b9ccc1c Use generics
new 507db99 Drop @since Javadoc tags for 2.0
new ada3d83 Drop @since Javadoc tags for 2.0
new aed1ff8 Drop @since Javadoc tags for 2.0
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/fileupload2/AbstractFileUpload.java | 1 -
.../commons/fileupload2/AbstractRequestContext.java | 16 +++++++++++++---
.../org/apache/commons/fileupload2/FileItem.java | 2 --
.../apache/commons/fileupload2/FileItemHeaders.java | 2 --
.../commons/fileupload2/FileItemHeadersSupport.java | 1 -
.../org/apache/commons/fileupload2/FileUpload.java | 1 -
.../apache/commons/fileupload2/MultipartStream.java | 1 -
.../apache/commons/fileupload2/RequestContext.java | 3 ---
.../commons/fileupload2/disk/DiskFileItem.java | 2 --
.../fileupload2/disk/DiskFileItemFactory.java | 2 --
.../fileupload2/util/FileItemHeadersImpl.java | 2 --
.../commons/fileupload2/util/mime/MimeUtility.java | 2 --
.../fileupload2/util/mime/ParseException.java | 1 -
.../util/mime/QuotedPrintableDecoder.java | 1 -
.../commons/fileupload2/AbstractFileUploadTest.java | 1 -
.../org/apache/commons/fileupload2/Constants.java | 2 --
.../fileupload2/util/mime/MimeUtilityTestCase.java | 2 --
.../util/mime/QuotedPrintableDecoderTestCase.java | 1 -
.../jakarta/JakartaServletFileUpload.java | 2 --
.../jakarta/JakartaServletRequestContext.java | 7 ++-----
.../jakarta/JakartaServletFileUploadTest.java | 1 -
...nerCleanup.java => JavaxFileCleanerCleanup.java} | 4 ++--
.../fileupload2/javax/JavaxServletFileUpload.java | 9 ++++-----
...Context.java => JavaxServletRequestContext.java} | 21 ++++++---------------
.../javax/JavaxServletFileUploadTest.java | 3 +--
.../fileupload2/javax/JavaxStreamingTest.java | 6 +++---
.../fileupload2/portlet/JavaxPortletFileUpload.java | 3 ---
.../fileupload2/portlet/PortletRequestContext.java | 18 +++++-------------
.../portlet/MockPortletActionRequest.java | 1 -
.../fileupload2/portlet/PortletFileUploadTest.java | 5 ++---
30 files changed, 38 insertions(+), 85 deletions(-)
rename commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/{FileCleanerCleanup.java => JavaxFileCleanerCleanup.java} (95%)
rename commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/{ServletRequestContext.java => JavaxServletRequestContext.java} (78%)
[commons-fileupload] 03/05: Drop @since Javadoc tags for 2.0
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 507db9947f28505857f6778a3b92ec5fd75ce66a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 17:11:52 2023 -0400
Drop @since Javadoc tags for 2.0
@since tags are not helpful since we are not binary and source
compatible with 1.x
---
.../main/java/org/apache/commons/fileupload2/AbstractFileUpload.java | 1 -
.../java/org/apache/commons/fileupload2/AbstractRequestContext.java | 1 -
.../src/main/java/org/apache/commons/fileupload2/FileItem.java | 2 --
.../src/main/java/org/apache/commons/fileupload2/FileItemHeaders.java | 2 --
.../java/org/apache/commons/fileupload2/FileItemHeadersSupport.java | 1 -
.../src/main/java/org/apache/commons/fileupload2/FileUpload.java | 1 -
.../src/main/java/org/apache/commons/fileupload2/MultipartStream.java | 1 -
.../src/main/java/org/apache/commons/fileupload2/RequestContext.java | 3 ---
.../main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java | 2 --
.../java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java | 2 --
.../java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java | 2 --
.../java/org/apache/commons/fileupload2/util/mime/MimeUtility.java | 2 --
.../java/org/apache/commons/fileupload2/util/mime/ParseException.java | 1 -
.../apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java | 1 -
14 files changed, 22 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
index a7d6ab4..65974e7 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractFileUpload.java
@@ -386,7 +386,6 @@ public abstract class AbstractFileUpload {
* @param ctx The context for the request to be parsed.
* @return A map of {@code FileItem} instances parsed from the request.
* @throws FileUploadException if there are problems reading/parsing the request or storing files.
- * @since 1.3
*/
public Map<String, List<FileItem>> parseParameterMap(final RequestContext ctx) throws FileUploadException {
final List<FileItem> items = parseRequest(ctx);
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java
index f8f9c9f..8cf9d67 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java
@@ -54,7 +54,6 @@ public abstract class AbstractRequestContext<T> implements RequestContext {
* Gets the content length of the request.
*
* @return The content length of the request.
- * @since 1.3
*/
@Override
public long getContentLength() {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItem.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItem.java
index 0477cfc..ff3da7f 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItem.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItem.java
@@ -38,8 +38,6 @@ import java.io.UnsupportedEncodingException;
* specifically defined with the same signatures as methods in that interface. This allows an implementation of this interface to also implement
* {@code javax.activation.DataSource} with minimal additional work.
* </p>
- *
- * @since 1.3 additionally implements FileItemHeadersSupport
*/
public interface FileItem extends FileItemHeadersSupport {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeaders.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeaders.java
index ab258da..06af484 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeaders.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeaders.java
@@ -20,8 +20,6 @@ import java.util.Iterator;
/**
* This class provides support for accessing the headers for a file or form item that was received within a {@code multipart/form-data} POST request.
- *
- * @since 1.2.1
*/
public interface FileItemHeaders {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersSupport.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersSupport.java
index 54b14f5..4928efc 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersSupport.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileItemHeadersSupport.java
@@ -21,7 +21,6 @@ package org.apache.commons.fileupload2;
*
* @see FileItem
* @see FileItemStream
- * @since 1.2.1
*/
public interface FileItemHeadersSupport {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUpload.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUpload.java
index 32753cc..ed8e9ef 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUpload.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/FileUpload.java
@@ -86,7 +86,6 @@ public abstract class FileUpload<T> extends AbstractFileUpload {
* @param request The servlet request to be parsed.
* @return A map of {@code FileItem} instances parsed from the request.
* @throws FileUploadException if there are problems reading/parsing the request or storing files.
- * @since 1.3
*/
public abstract Map<String, List<FileItem>> parseParameterMap(T request) throws FileUploadException;
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
index 2f0360e..5a3a37b 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MultipartStream.java
@@ -569,7 +569,6 @@ public class MultipartStream {
* @param bufferSize The size of the buffer to be used, in bytes.
* @param notifier The notifier, which is used for calling the progress listener, if any.
* @throws IllegalArgumentException If the buffer size is too small.
- * @since 1.3.1
*/
public MultipartStream(final InputStream input, final byte[] boundary, final int bufferSize, final ProgressNotifier notifier) {
if (boundary == null) {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RequestContext.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RequestContext.java
index 66c44bb..b463497 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RequestContext.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RequestContext.java
@@ -24,8 +24,6 @@ import java.io.InputStream;
* <p>
* This interface should be implemented for each type of request that may be handled by FileUpload, such as servlets and portlets.
* </p>
- *
- * @since 1.1
*/
public interface RequestContext {
@@ -40,7 +38,6 @@ public interface RequestContext {
* Gets the content length of the request.
*
* @return The content length of the request.
- * @since 1.3
*/
long getContentLength();
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
index b4fe13d..8a21c53 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
@@ -56,8 +56,6 @@ import org.apache.commons.io.output.DeferredFileOutputStream;
* {@link org.apache.commons.io.FileCleaningTracker} when there are files to be tracked. It might make sense to terminate that thread, for example, if your web
* application ends. See the section on "Resource cleanup" in the users guide of Commons FileUpload.
* </p>
- *
- * @since 1.1
*/
public class DiskFileItem implements FileItem {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java
index 7bdc817..399c19a 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItemFactory.java
@@ -50,8 +50,6 @@ import org.apache.commons.io.FileCleaningTracker;
* the so-called reaper thread, which is started and stopped automatically by the {@link FileCleaningTracker} when there are files to be tracked. It might make
* sense to terminate that thread, for example, if your web application ends. See the section on "Resource cleanup" in the users guide of commons-fileupload.
* </p>
- *
- * @since 1.1
*/
public class DiskFileItemFactory implements FileItemFactory {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
index 1cc98ca..d3c0c8f 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
@@ -28,8 +28,6 @@ import org.apache.commons.fileupload2.FileItemHeaders;
/**
* Default implementation of the {@link FileItemHeaders} interface.
- *
- * @since 1.2.1
*/
public class FileItemHeadersImpl implements FileItemHeaders {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
index 79b83bb..18fd9d8 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
@@ -27,8 +27,6 @@ import java.util.Map;
/**
* Utility class to decode MIME texts.
- *
- * @since 1.3
*/
public final class MimeUtility {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
index ee82700..6ea1efc 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/ParseException.java
@@ -17,7 +17,6 @@
package org.apache.commons.fileupload2.util.mime;
/**
- * @since 1.3
*/
final class ParseException extends Exception {
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
index 09d227e..9ca256f 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoder.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.OutputStream;
/**
- * @since 1.3
*/
final class QuotedPrintableDecoder {
[commons-fileupload] 05/05: Drop @since Javadoc tags for 2.0
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit aed1ff80a21d02d109fa10ff98ad1e8ca387e2d1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 18:46:50 2023 -0400
Drop @since Javadoc tags for 2.0
@since tags are not helpful since we are not binary and source
compatible with 1.x
---
.../java/org/apache/commons/fileupload2/AbstractFileUploadTest.java | 1 -
.../src/test/java/org/apache/commons/fileupload2/Constants.java | 2 --
.../org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java | 2 --
.../commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java | 1 -
.../commons/fileupload2/jakarta/JakartaServletFileUploadTest.java | 1 -
.../apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java | 1 -
.../org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java | 3 ---
.../org/apache/commons/fileupload2/portlet/PortletRequestContext.java | 2 --
.../apache/commons/fileupload2/portlet/MockPortletActionRequest.java | 1 -
.../org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java | 1 -
10 files changed, 15 deletions(-)
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractFileUploadTest.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractFileUploadTest.java
index 4f2f387..2d79d24 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractFileUploadTest.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/AbstractFileUploadTest.java
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
* added as parameter in this class.
*
* @param <T> The type for {@link FileUpload}.
- * @since 1.4
*/
public abstract class AbstractFileUploadTest<T extends FileUpload<?>> extends AbstractFileUploadWrapper<T> {
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/Constants.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/Constants.java
index 72c2b4a..ccf4753 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/Constants.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/Constants.java
@@ -18,8 +18,6 @@ package org.apache.commons.fileupload2;
/**
* Constants used for testing.
- *
- * @since 1.4
*/
public final class Constants {
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
index dcedae6..b20ca36 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/MimeUtilityTestCase.java
@@ -25,8 +25,6 @@ import org.junit.jupiter.api.Test;
/**
* Use the online <a href="http://dogmamix.com/MimeHeadersDecoder/">MimeHeadersDecoder</a> to validate expected values.
- *
- * @since 1.3
*/
public final class MimeUtilityTestCase {
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
index 646140f..7ff7014 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/util/mime/QuotedPrintableDecoderTestCase.java
@@ -28,7 +28,6 @@ import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Test;
/**
- * @since 1.3
*/
public final class QuotedPrintableDecoderTestCase {
diff --git a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
index 07b340e..4e7fb79 100644
--- a/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
+++ b/commons-fileupload2-jakarta/src/test/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUploadTest.java
@@ -36,7 +36,6 @@ import jakarta.servlet.http.HttpServletRequest;
* Tests {@link JakartaServletFileUpload}.
*
* @see AbstractFileUploadTest
- * @since 1.4
*/
public class JakartaServletFileUploadTest extends AbstractFileUploadTest<JakartaServletFileUpload> {
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
index 6628d66..a4d4d00 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
@@ -40,7 +40,6 @@ import org.junit.jupiter.api.Test;
* Tests {@link JavaxServletFileUpload}.
*
* @see AbstractFileUploadTest
- * @since 1.4
*/
public class JavaxServletFileUploadTest extends AbstractFileUploadTest<JavaxServletFileUpload> {
diff --git a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java
index 59fc443..9d896f4 100644
--- a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java
+++ b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/JavaxPortletFileUpload.java
@@ -40,8 +40,6 @@ import org.apache.commons.fileupload2.FileUploadException;
* <p>
* How the data for individual parts is stored is determined by the factory used to create them; a given part may be in memory, on disk, or somewhere else.
* </p>
- *
- * @since 1.1
*/
public class JavaxPortletFileUpload extends FileUpload<ActionRequest> {
@@ -94,7 +92,6 @@ public class JavaxPortletFileUpload extends FileUpload<ActionRequest> {
* @param request The portlet request to be parsed.
* @return A map of {@code FileItem} instances parsed from the request.
* @throws FileUploadException if there are problems reading/parsing the request or storing files.
- * @since 1.3
*/
@Override
public Map<String, List<FileItem>> parseParameterMap(final ActionRequest request) throws FileUploadException {
diff --git a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
index f48f5b4..212209d 100644
--- a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
+++ b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
@@ -25,8 +25,6 @@ import org.apache.commons.fileupload2.AbstractRequestContext;
/**
* Provides access to the request information needed for a request made to a portlet.
- *
- * @since 1.1
*/
public class PortletRequestContext extends AbstractRequestContext<ActionRequest> {
diff --git a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
index 4fdda3a..efb847b 100644
--- a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
+++ b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
@@ -43,7 +43,6 @@ import org.apache.commons.fileupload2.AbstractFileUpload;
* Mock class for tests. Implements an {@link ActionRequest}.
*
* @see PortletFileUploadTest
- * @since 1.4
*/
@SuppressWarnings("rawtypes") // because of the portlet ActionRequest API does not use generics
public class MockPortletActionRequest implements ActionRequest {
diff --git a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java
index 2be1ebe..483dde8 100644
--- a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java
+++ b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test;
* Tests {@link JavaxPortletFileUpload}.
*
* @see AbstractFileUploadTest
- * @since 1.4
*/
public class PortletFileUploadTest extends AbstractFileUploadTest<JavaxPortletFileUpload> {
[commons-fileupload] 01/05: Consistent naming
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit a79aaf4bf204f00ba5ddb9133a7e3ef40d32c7f4
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 17:01:51 2023 -0400
Consistent naming
---
.../{FileCleanerCleanup.java => JavaxFileCleanerCleanup.java} | 4 ++--
.../apache/commons/fileupload2/javax/JavaxServletFileUpload.java | 8 ++++----
...ServletRequestContext.java => JavaxServletRequestContext.java} | 4 ++--
.../commons/fileupload2/javax/JavaxServletFileUploadTest.java | 2 +-
.../org/apache/commons/fileupload2/javax/JavaxStreamingTest.java | 6 +++---
.../apache/commons/fileupload2/portlet/PortletFileUploadTest.java | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/FileCleanerCleanup.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxFileCleanerCleanup.java
similarity index 95%
rename from commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/FileCleanerCleanup.java
rename to commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxFileCleanerCleanup.java
index 4f12a7d..d083087 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/FileCleanerCleanup.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxFileCleanerCleanup.java
@@ -25,12 +25,12 @@ import org.apache.commons.io.FileCleaningTracker;
/**
* A servlet context listener, which ensures that the {@link FileCleaningTracker}'s reaper thread is terminated, when the web application is destroyed.
*/
-public class FileCleanerCleanup implements ServletContextListener {
+public class JavaxFileCleanerCleanup implements ServletContextListener {
/**
* Attribute name, which is used for storing an instance of {@link FileCleaningTracker} in the web application.
*/
- public static final String FILE_CLEANING_TRACKER_ATTRIBUTE = FileCleanerCleanup.class.getName() + ".FileCleaningTracker";
+ public static final String FILE_CLEANING_TRACKER_ATTRIBUTE = JavaxFileCleanerCleanup.class.getName() + ".FileCleaningTracker";
/**
* Gets the instance of {@link FileCleaningTracker}, which is associated with the given {@link ServletContext}.
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
index 683884b..c2ecbbe 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
@@ -55,7 +55,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> {
* @return {@code true} if the request is multipart; {@code false} otherwise.
*/
public static final boolean isMultipartContent(final HttpServletRequest request) {
- return POST_METHOD.equalsIgnoreCase(request.getMethod()) && AbstractFileUpload.isMultipartContent(new ServletRequestContext(request));
+ return POST_METHOD.equalsIgnoreCase(request.getMethod()) && AbstractFileUpload.isMultipartContent(new JavaxServletRequestContext(request));
}
/**
@@ -88,7 +88,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> {
*/
@Override
public FileItemIterator getItemIterator(final HttpServletRequest request) throws FileUploadException, IOException {
- return super.getItemIterator(new ServletRequestContext(request));
+ return super.getItemIterator(new JavaxServletRequestContext(request));
}
/**
@@ -101,7 +101,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> {
*/
@Override
public Map<String, List<FileItem>> parseParameterMap(final HttpServletRequest request) throws FileUploadException {
- return parseParameterMap(new ServletRequestContext(request));
+ return parseParameterMap(new JavaxServletRequestContext(request));
}
/**
@@ -113,7 +113,7 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> {
*/
@Override
public List<FileItem> parseRequest(final HttpServletRequest request) throws FileUploadException {
- return parseRequest(new ServletRequestContext(request));
+ return parseRequest(new JavaxServletRequestContext(request));
}
}
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletRequestContext.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
similarity index 93%
rename from commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletRequestContext.java
rename to commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
index 49c7a16..1be7308 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/ServletRequestContext.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
@@ -28,7 +28,7 @@ import org.apache.commons.fileupload2.AbstractRequestContext;
*
* @since 1.1
*/
-public class ServletRequestContext extends AbstractRequestContext {
+public class JavaxServletRequestContext extends AbstractRequestContext {
/**
* The request for which the context is being provided.
@@ -40,7 +40,7 @@ public class ServletRequestContext extends AbstractRequestContext {
*
* @param request The request to which this context applies.
*/
- public ServletRequestContext(final HttpServletRequest request) {
+ public JavaxServletRequestContext(final HttpServletRequest request) {
super(request::getHeader, request::getContentLength);
this.request = request;
}
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
index 2b448b6..6628d66 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxServletFileUploadTest.java
@@ -115,7 +115,7 @@ public class JavaxServletFileUploadTest extends AbstractFileUploadTest<JavaxServ
@Override
public List<FileItem> parseUpload(final JavaxServletFileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException {
final HttpServletRequest request = new JavaxMockHttpServletRequest(bytes, contentType);
- return upload.parseRequest(new ServletRequestContext(request));
+ return upload.parseRequest(new JavaxServletRequestContext(request));
}
/**
diff --git a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java
index 3f2931c..4f7c64e 100644
--- a/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java
+++ b/commons-fileupload2-javax/src/test/java/org/apache/commons/fileupload2/javax/JavaxStreamingTest.java
@@ -25,7 +25,7 @@ import org.apache.commons.fileupload2.AbstractStreamingTest;
/**
* Unit test for items with varying sizes.
*/
-public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUpload, HttpServletRequest, ServletRequestContext> {
+public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUpload, HttpServletRequest, JavaxServletRequestContext> {
@Override
protected JavaxServletFileUpload newFileUpload() {
@@ -38,8 +38,8 @@ public class JavaxStreamingTest extends AbstractStreamingTest<JavaxServletFileUp
}
@Override
- protected ServletRequestContext newServletRequestContext(final HttpServletRequest request) {
- return new ServletRequestContext(request);
+ protected JavaxServletRequestContext newServletRequestContext(final HttpServletRequest request) {
+ return new JavaxServletRequestContext(request);
}
}
diff --git a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java
index 00f117a..2be1ebe 100644
--- a/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java
+++ b/commons-fileupload2-portlet/src/test/java/org/apache/commons/fileupload2/portlet/PortletFileUploadTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.fileupload2.FileItem;
import org.apache.commons.fileupload2.FileUploadException;
import org.apache.commons.fileupload2.disk.DiskFileItemFactory;
import org.apache.commons.fileupload2.javax.JavaxMockHttpServletRequest;
-import org.apache.commons.fileupload2.javax.ServletRequestContext;
+import org.apache.commons.fileupload2.javax.JavaxServletRequestContext;
import org.junit.jupiter.api.Test;
/**
@@ -87,7 +87,7 @@ public class PortletFileUploadTest extends AbstractFileUploadTest<JavaxPortletFi
@Override
public List<FileItem> parseUpload(final JavaxPortletFileUpload upload, final byte[] bytes, final String contentType) throws FileUploadException {
final HttpServletRequest request = new JavaxMockHttpServletRequest(bytes, contentType);
- return upload.parseRequest(new ServletRequestContext(request));
+ return upload.parseRequest(new JavaxServletRequestContext(request));
}
}
[commons-fileupload] 04/05: Drop @since Javadoc tags for 2.0
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit ada3d8393d683343ec6e9622bfc74ce3288854ed
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 18:45:58 2023 -0400
Drop @since Javadoc tags for 2.0
@since tags are not helpful since we are not binary and source
compatible with 1.x
---
.../apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java | 2 --
.../commons/fileupload2/jakarta/JakartaServletRequestContext.java | 2 --
.../org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java | 1 -
.../apache/commons/fileupload2/javax/JavaxServletRequestContext.java | 2 --
4 files changed, 7 deletions(-)
diff --git a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java b/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
index 0df0a71..52cac30 100644
--- a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
+++ b/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletFileUpload.java
@@ -97,8 +97,6 @@ public class JakartaServletFileUpload extends FileUpload<HttpServletRequest> {
* @param request The servlet request to be parsed.
* @return A map of {@code FileItem} instances parsed from the request.
* @throws FileUploadException if there are problems reading/parsing the request or storing files.
- *
- * @since 1.3
*/
@Override
public Map<String, List<FileItem>> parseParameterMap(final HttpServletRequest request) throws FileUploadException {
diff --git a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java b/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
index 9f2304f..639a1c1 100644
--- a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
+++ b/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
@@ -25,8 +25,6 @@ import jakarta.servlet.http.HttpServletRequest;
/**
* Provides access to the request information needed for a request made to an HTTP servlet.
- *
- * @since 1.1
*/
public class JakartaServletRequestContext extends AbstractRequestContext<HttpServletRequest> {
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
index c2ecbbe..ea1879e 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletFileUpload.java
@@ -97,7 +97,6 @@ public class JavaxServletFileUpload extends FileUpload<HttpServletRequest> {
* @param request The servlet request to be parsed.
* @return A map of {@code FileItem} instances parsed from the request.
* @throws FileUploadException if there are problems reading/parsing the request or storing files.
- * @since 1.3
*/
@Override
public Map<String, List<FileItem>> parseParameterMap(final HttpServletRequest request) throws FileUploadException {
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
index 3204b17..4a65609 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
@@ -25,8 +25,6 @@ import org.apache.commons.fileupload2.AbstractRequestContext;
/**
* Provides access to the request information needed for a request made to an HTTP servlet.
- *
- * @since 1.1
*/
public class JavaxServletRequestContext extends AbstractRequestContext<HttpServletRequest> {
[commons-fileupload] 02/05: Use generics
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit b9ccc1ce41836f0a19c826e6d07148f5517526b8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jun 5 17:08:54 2023 -0400
Use generics
---
.../commons/fileupload2/AbstractRequestContext.java | 15 +++++++++++++--
.../jakarta/JakartaServletRequestContext.java | 5 ++---
.../fileupload2/javax/JavaxServletRequestContext.java | 17 +++++------------
.../fileupload2/portlet/PortletRequestContext.java | 16 +++++-----------
4 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java
index 61ab217..f8f9c9f 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/AbstractRequestContext.java
@@ -20,7 +20,7 @@ package org.apache.commons.fileupload2;
import java.util.function.Function;
import java.util.function.LongSupplier;
-public abstract class AbstractRequestContext implements RequestContext {
+public abstract class AbstractRequestContext<T> implements RequestContext {
/**
* Supplies the content length default.
@@ -32,15 +32,22 @@ public abstract class AbstractRequestContext implements RequestContext {
*/
private final Function<String, String> contentLengthString;
+ /**
+ * The request.
+ */
+ private final T request;
+
/**
* Constructs a new instance.
*
* @param contentLengthString How to get the content length string.
* @param contentLengthDefault How to get the content length default.
+ * @param request TODO
*/
- protected AbstractRequestContext(final Function<String, String> contentLengthString, final LongSupplier contentLengthDefault) {
+ protected AbstractRequestContext(final Function<String, String> contentLengthString, final LongSupplier contentLengthDefault, final T request) {
this.contentLengthString = contentLengthString;
this.contentLengthDefault = contentLengthDefault;
+ this.request = request;
}
/**
@@ -58,6 +65,10 @@ public abstract class AbstractRequestContext implements RequestContext {
}
}
+ public T getRequest() {
+ return request;
+ }
+
/**
* Returns a string representation of this object.
*
diff --git a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java b/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
index caa25fc..9f2304f 100644
--- a/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
+++ b/commons-fileupload2-jakarta/src/main/java/org/apache/commons/fileupload2/jakarta/JakartaServletRequestContext.java
@@ -28,7 +28,7 @@ import jakarta.servlet.http.HttpServletRequest;
*
* @since 1.1
*/
-public class JakartaServletRequestContext extends AbstractRequestContext {
+public class JakartaServletRequestContext extends AbstractRequestContext<HttpServletRequest> {
/**
* The request for which the context is being provided.
@@ -41,7 +41,7 @@ public class JakartaServletRequestContext extends AbstractRequestContext {
* @param request The request to which this context applies.
*/
public JakartaServletRequestContext(final HttpServletRequest request) {
- super(request::getHeader, request::getContentLength);
+ super(request::getHeader, request::getContentLength, request);
this.request = request;
}
@@ -69,7 +69,6 @@ public class JakartaServletRequestContext extends AbstractRequestContext {
* Gets the input stream for the request.
*
* @return The input stream for the request.
- *
* @throws IOException if a problem occurs.
*/
@Override
diff --git a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
index 1be7308..3204b17 100644
--- a/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
+++ b/commons-fileupload2-javax/src/main/java/org/apache/commons/fileupload2/javax/JavaxServletRequestContext.java
@@ -28,12 +28,7 @@ import org.apache.commons.fileupload2.AbstractRequestContext;
*
* @since 1.1
*/
-public class JavaxServletRequestContext extends AbstractRequestContext {
-
- /**
- * The request for which the context is being provided.
- */
- private final HttpServletRequest request;
+public class JavaxServletRequestContext extends AbstractRequestContext<HttpServletRequest> {
/**
* Constructs a context for this request.
@@ -41,8 +36,7 @@ public class JavaxServletRequestContext extends AbstractRequestContext {
* @param request The request to which this context applies.
*/
public JavaxServletRequestContext(final HttpServletRequest request) {
- super(request::getHeader, request::getContentLength);
- this.request = request;
+ super(request::getHeader, request::getContentLength, request);
}
/**
@@ -52,7 +46,7 @@ public class JavaxServletRequestContext extends AbstractRequestContext {
*/
@Override
public String getCharacterEncoding() {
- return request.getCharacterEncoding();
+ return getRequest().getCharacterEncoding();
}
/**
@@ -62,19 +56,18 @@ public class JavaxServletRequestContext extends AbstractRequestContext {
*/
@Override
public String getContentType() {
- return request.getContentType();
+ return getRequest().getContentType();
}
/**
* Gets the input stream for the request.
*
* @return The input stream for the request.
- *
* @throws IOException if a problem occurs.
*/
@Override
public InputStream getInputStream() throws IOException {
- return request.getInputStream();
+ return getRequest().getInputStream();
}
}
diff --git a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
index b30bf70..f48f5b4 100644
--- a/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
+++ b/commons-fileupload2-portlet/src/main/java/org/apache/commons/fileupload2/portlet/PortletRequestContext.java
@@ -28,12 +28,7 @@ import org.apache.commons.fileupload2.AbstractRequestContext;
*
* @since 1.1
*/
-public class PortletRequestContext extends AbstractRequestContext {
-
- /**
- * The request for which the context is being provided.
- */
- private final ActionRequest request;
+public class PortletRequestContext extends AbstractRequestContext<ActionRequest> {
/**
* Constructs a context for this request.
@@ -41,8 +36,7 @@ public class PortletRequestContext extends AbstractRequestContext {
* @param request The request to which this context applies.
*/
public PortletRequestContext(final ActionRequest request) {
- super(request::getProperty, request::getContentLength);
- this.request = request;
+ super(request::getProperty, request::getContentLength, request);
}
/**
@@ -52,7 +46,7 @@ public class PortletRequestContext extends AbstractRequestContext {
*/
@Override
public String getCharacterEncoding() {
- return request.getCharacterEncoding();
+ return getRequest().getCharacterEncoding();
}
/**
@@ -62,7 +56,7 @@ public class PortletRequestContext extends AbstractRequestContext {
*/
@Override
public String getContentType() {
- return request.getContentType();
+ return getRequest().getContentType();
}
/**
@@ -73,7 +67,7 @@ public class PortletRequestContext extends AbstractRequestContext {
*/
@Override
public InputStream getInputStream() throws IOException {
- return request.getPortletInputStream();
+ return getRequest().getPortletInputStream();
}
}