You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/09/16 09:00:24 UTC
[tomcat] 01/05: Improve alignment with Commons FileUpload 1.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6b31b66171cf18c4e5feb23b6f123c4001cfc131
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 15 22:43:39 2023 +0100
Improve alignment with Commons FileUpload 1.x
---
.../tomcat/util/http/fileupload/FileUploadBase.java | 7 +++----
.../tomcat/util/http/fileupload/disk/DiskFileItem.java | 6 ++----
.../util/http/fileupload/disk/DiskFileItemFactory.java | 2 +-
.../util/http/fileupload/servlet/ServletFileUpload.java | 1 -
.../http/fileupload/servlet/ServletRequestContext.java | 4 +---
.../apache/tomcat/util/http/fileupload/util/Streams.java | 9 ++++-----
.../util/http/fileupload/util/mime/RFC2231Utility.java | 15 +++++++--------
7 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
index 4c61fa718c..c17eb978af 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
@@ -221,11 +221,11 @@ public abstract class FileUploadBase {
}
/**
- * Sets the maximum number of files allowed per request/
+ * Sets the maximum number of files allowed per request.
*
* @param fileCountMax The new limit. {@code -1} means no limit.
*/
- public void setFileCountMax(long fileCountMax) {
+ public void setFileCountMax(final long fileCountMax) {
this.fileCountMax = fileCountMax;
}
@@ -560,8 +560,7 @@ public abstract class FileUploadBase {
return;
}
final String headerName = header.substring(0, colonOffset).trim();
- final String headerValue =
- header.substring(colonOffset + 1).trim();
+ final String headerValue = header.substring(colonOffset + 1).trim();
headers.addHeader(headerName, headerValue);
}
diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
index ccf937c410..e8fdb67b9c 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -398,8 +398,7 @@ public class DiskFileItem
* desired file.
*/
if (file.exists() && !file.delete()) {
- throw new FileUploadException(
- "Cannot write uploaded file to disk!");
+ throw new FileUploadException("Cannot write uploaded file to disk!");
}
if (!outputFile.renameTo(file)) {
BufferedInputStream in = null;
@@ -588,8 +587,7 @@ public class DiskFileItem
@Override
public String toString() {
return String.format("name=%s, StoreLocation=%s, size=%s bytes, isFormField=%s, FieldName=%s",
- getName(), getStoreLocation(), Long.valueOf(getSize()),
- Boolean.valueOf(isFormField()), getFieldName());
+ getName(), getStoreLocation(), Long.valueOf(getSize()), Boolean.valueOf(isFormField()), getFieldName());
}
/**
diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
index 43e766e83c..a6bd67e943 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
@@ -178,7 +178,7 @@ public class DiskFileItemFactory implements FileItemFactory {
*/
@Override
public FileItem createItem(final String fieldName, final String contentType,
- final boolean isFormField, final String fileName) {
+ final boolean isFormField, final String fileName) {
final DiskFileItem result = new DiskFileItem(fieldName, contentType,
isFormField, fileName, sizeThreshold, repository);
result.setDefaultCharset(defaultCharset);
diff --git a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
index 268bad8e1b..e2d074c3df 100644
--- a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
+++ b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
@@ -29,7 +29,6 @@ import org.apache.tomcat.util.http.fileupload.FileUpload;
import org.apache.tomcat.util.http.fileupload.FileUploadBase;
import org.apache.tomcat.util.http.fileupload.FileUploadException;
-
/**
* <p>High level API for processing file uploads.</p>
*
diff --git a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
index a23f69360c..d9c01984fe 100644
--- a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
+++ b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
@@ -24,7 +24,6 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.tomcat.util.http.fileupload.FileUploadBase;
import org.apache.tomcat.util.http.fileupload.UploadContext;
-
/**
* <p>Provides access to the request information needed for a request made to
* an HTTP servlet.</p>
@@ -110,8 +109,7 @@ public class ServletRequestContext implements UploadContext {
@Override
public String toString() {
return String.format("ContentLength=%s, ContentType=%s",
- Long.valueOf(this.contentLength()),
- this.getContentType());
+ Long.valueOf(this.contentLength()), this.getContentType());
}
}
diff --git a/java/org/apache/tomcat/util/http/fileupload/util/Streams.java b/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
index 03c1f90486..ed83840d90 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
@@ -55,10 +55,10 @@ public final class Streams {
* @param outputStream The output stream, to which data should
* be written. May be null, in which case the input streams
* contents are simply discarded.
- * @param closeOutputStream True guarantees, that
- * {@link OutputStream#close()} is called on the stream.
- * False indicates, that only
+ * @param closeOutputStream True guarantees, that {@link OutputStream#close()}
+ * is called on the stream. False indicates, that only
* {@link OutputStream#flush()} should be called finally.
+ *
* @return Number of bytes, which have been copied.
* @throws IOException An I/O error occurred.
*/
@@ -145,8 +145,7 @@ public final class Streams {
* @return The streams contents, as a string.
* @throws IOException An I/O error occurred.
*/
- public static String asString(final InputStream inputStream, final String encoding)
- throws IOException {
+ public static String asString(final InputStream inputStream, final String encoding) throws IOException {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
copy(inputStream, baos, true);
return baos.toString(encoding);
diff --git a/java/org/apache/tomcat/util/http/fileupload/util/mime/RFC2231Utility.java b/java/org/apache/tomcat/util/http/fileupload/util/mime/RFC2231Utility.java
index c15bb2027d..8a522a313f 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/mime/RFC2231Utility.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/mime/RFC2231Utility.java
@@ -20,13 +20,12 @@ import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
/**
* Utility class to decode/encode character set on HTTP Header fields based on RFC 2231.
- * This implementation adheres to RFC 5987 in particular, which was defined for HTTP headers
- *
+ * This implementation adheres to RFC 5987 in particular, which was defined for HTTP headers.
+ * <p>
* RFC 5987 builds on RFC 2231, but has lesser scope like
* <a href="https://tools.ietf.org/html/rfc5987#section-3.2">mandatory charset definition</a>
* and <a href="https://tools.ietf.org/html/rfc5987#section-4">no parameter continuation</a>
*
- * <p>
* @see <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a>
* @see <a href="https://tools.ietf.org/html/rfc5987">RFC 5987</a>
*/
@@ -93,15 +92,15 @@ public final class RFC2231Utility {
/**
* Decode a string of text obtained from a HTTP header as per RFC 2231
- *
+ * <p>
* <b>Eg 1.</b> {@code us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A}
* will be decoded to {@code This is ***fun***}
- *
+ * <p>
* <b>Eg 2.</b> {@code iso-8859-1'en'%A3%20rate}
- * will be decoded to {@code £ rate}.
- *
+ * will be decoded to {@code £ rate}
+ * <p>
* <b>Eg 3.</b> {@code UTF-8''%c2%a3%20and%20%e2%82%ac%20rates}
- * will be decoded to {@code £ and € rates}.
+ * will be decoded to {@code £ and € rates}
*
* @param encodedText - Text to be decoded has a format of {@code <charset>'<language>'<encoded_value>}
* and ASCII only
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org