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
The following commit(s) were added to refs/heads/master by this push:
new 6598b7a Use diamonds.
6598b7a is described below
commit 6598b7a492a928db2c3896287363aa81c054da2b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 21 10:55:56 2020 -0500
Use diamonds.
---
.../java/org/apache/commons/fileupload2/FileUploadBase.java | 8 ++++----
.../java/org/apache/commons/fileupload2/ParameterParser.java | 10 +++++-----
.../apache/commons/fileupload2/impl/FileItemIteratorImpl.java | 2 +-
.../apache/commons/fileupload2/util/FileItemHeadersImpl.java | 4 ++--
.../org/apache/commons/fileupload2/util/mime/MimeUtility.java | 2 +-
.../org/apache/commons/fileupload2/MockHttpServletRequest.java | 2 +-
.../commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java | 2 +-
.../commons/fileupload2/portlet/MockPortletActionRequest.java | 4 ++--
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index 934e2aa..d8d752f 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -326,7 +326,7 @@ public abstract class FileUploadBase {
*/
public List<FileItem> parseRequest(final RequestContext ctx)
throws FileUploadException {
- final List<FileItem> items = new ArrayList<FileItem>();
+ final List<FileItem> items = new ArrayList<>();
boolean successful = false;
try {
final FileItemIterator iter = getItemIterator(ctx);
@@ -385,14 +385,14 @@ public abstract class FileUploadBase {
public Map<String, List<FileItem>> parseParameterMap(final RequestContext
ctx)
throws FileUploadException {
final List<FileItem> items = parseRequest(ctx);
- final Map<String, List<FileItem>> itemsMap = new HashMap<String,
List<FileItem>>(items.size());
+ final Map<String, List<FileItem>> itemsMap = new
HashMap<>(items.size());
for (final FileItem fileItem : items) {
final String fieldName = fileItem.getFieldName();
List<FileItem> mappedItems = itemsMap.get(fieldName);
if (mappedItems == null) {
- mappedItems = new ArrayList<FileItem>();
+ mappedItems = new ArrayList<>();
itemsMap.put(fieldName, mappedItems);
}
@@ -628,7 +628,7 @@ public abstract class FileUploadBase {
@Deprecated
protected Map<String, String> parseHeaders(final String headerPart) {
final FileItemHeaders headers = getParsedHeaders(headerPart);
- final Map<String, String> result = new HashMap<String, String>();
+ final Map<String, String> result = new HashMap<>();
for (final Iterator<String> iter = headers.getHeaderNames();
iter.hasNext();) {
final String headerName = iter.next();
final Iterator<String> iter2 = headers.getHeaders(headerName);
diff --git a/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
b/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
index 5ed867f..a8a2528 100644
--- a/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
+++ b/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
@@ -228,7 +228,7 @@ public class ParameterParser {
*/
public Map<String, String> parse(final String str, final char[]
separators) {
if (separators == null || separators.length == 0) {
- return new HashMap<String, String>();
+ return new HashMap<>();
}
char separator = separators[0];
if (str != null) {
@@ -255,7 +255,7 @@ public class ParameterParser {
*/
public Map<String, String> parse(final String str, final char separator) {
if (str == null) {
- return new HashMap<String, String>();
+ return new HashMap<>();
}
return parse(str.toCharArray(), separator);
}
@@ -272,7 +272,7 @@ public class ParameterParser {
*/
public Map<String, String> parse(final char[] charArray, final char
separator) {
if (charArray == null) {
- return new HashMap<String, String>();
+ return new HashMap<>();
}
return parse(charArray, 0, charArray.length, separator);
}
@@ -296,9 +296,9 @@ public class ParameterParser {
final char separator) {
if (charArray == null) {
- return new HashMap<String, String>();
+ return new HashMap<>();
}
- final HashMap<String, String> params = new HashMap<String, String>();
+ final HashMap<String, String> params = new HashMap<>();
this.chars = charArray;
this.pos = offset;
this.len = length;
diff --git
a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
index 810cfdb..482a196 100644
---
a/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
+++
b/src/main/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
@@ -333,7 +333,7 @@ public class FileItemIteratorImpl implements
FileItemIterator {
@Override
public List<FileItem> getFileItems() throws FileUploadException,
IOException {
- final List<FileItem> items = new ArrayList<FileItem>();
+ final List<FileItem> items = new ArrayList<>();
while (hasNext()) {
final FileItemStream fis = next();
final FileItem fi =
fileUploadBase.getFileItemFactory().createItem(fis.getFieldName(),
fis.getContentType(), fis.isFormField(), fis.getName());
diff --git
a/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
b/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
index b6f48eb..06fdf60 100644
--- a/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
+++ b/src/main/java/org/apache/commons/fileupload2/util/FileItemHeadersImpl.java
@@ -43,7 +43,7 @@ public class FileItemHeadersImpl implements FileItemHeaders,
Serializable {
* Map of {@code String} keys to a {@code List} of
* {@code String} instances.
*/
- private final Map<String, List<String>> headerNameToValueListMap = new
LinkedHashMap<String, List<String>>();
+ private final Map<String, List<String>> headerNameToValueListMap = new
LinkedHashMap<>();
/**
* {@inheritDoc}
@@ -89,7 +89,7 @@ public class FileItemHeadersImpl implements FileItemHeaders,
Serializable {
final String nameLower = name.toLowerCase(Locale.ENGLISH);
List<String> headerValueList = headerNameToValueListMap.get(nameLower);
if (null == headerValueList) {
- headerValueList = new ArrayList<String>();
+ headerValueList = new ArrayList<>();
headerNameToValueListMap.put(nameLower, headerValueList);
}
headerValueList.add(value);
diff --git
a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
index d8cb8cc..eac17a3 100644
--- a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
@@ -63,7 +63,7 @@ public final class MimeUtility {
/**
* Mappings between MIME and Java charset.
*/
- private static final Map<String, String> MIME2JAVA = new HashMap<String,
String>();
+ private static final Map<String, String> MIME2JAVA = new HashMap<>();
static {
MIME2JAVA.put("iso-2022-cn", "ISO2022CN");
diff --git
a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
index 99e05ea..12d1bde 100644
--- a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
@@ -44,7 +44,7 @@ public class MockHttpServletRequest implements
HttpServletRequest {
private int readLimit = -1;
- private final Map<String, String> m_headers = new
java.util.HashMap<String, String>();
+ private final Map<String, String> m_headers = new java.util.HashMap<>();
/**
* Creates a new instance with the given request data
diff --git
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
index 52df090..cdab3eb 100644
---
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -56,7 +56,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
private int readLimit = -1;
- private final Map<String, String> m_headers = new
java.util.HashMap<String, String>();
+ private final Map<String, String> m_headers = new java.util.HashMap<>();
/**
* Creates a new instance with the given request data
diff --git
a/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
b/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
index 583ec6b..d7411e7 100644
---
a/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
+++
b/src/test/java/org/apache/commons/fileupload2/portlet/MockPortletActionRequest.java
@@ -48,9 +48,9 @@ import org.apache.commons.fileupload2.FileUploadBase;
@SuppressWarnings("rawtypes") // because of the portlet ActionRequest API does
not use generics
public class MockPortletActionRequest implements ActionRequest {
- private final Hashtable<String, Object> attributes = new Hashtable<String,
Object>();
+ private final Hashtable<String, Object> attributes = new Hashtable<>();
- private final Map<String, String> parameters = new HashMap<String,
String>();
+ private final Map<String, String> parameters = new HashMap<>();
private String characterEncoding;
private final int length;
