This is an automated email from the ASF dual-hosted git repository.
jochen 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 0635758 FILEUPLOAD-314 - Replace C-style array declaration for java
new e25b708 Merge pull request #62 from
arturobernalg/feature/FILEUPLOAD-314
0635758 is described below
commit 06357585199fe659d9cc4914d04279bb6d5d18ec
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Thu Apr 22 20:21:07 2021 +0200
FILEUPLOAD-314 - Replace C-style array declaration for java
---
pom.xml | 4 ++++
.../apache/commons/fileupload2/DefaultFileItemTest.java | 14 +++++++-------
.../apache/commons/fileupload2/MockHttpServletRequest.java | 2 +-
.../java/org/apache/commons/fileupload2/StreamingTest.java | 2 +-
.../fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java | 2 +-
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7520276..0dfa165 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,6 +183,10 @@
<name>Merbin J Anselm</name>
<email>merbinjans...@gmail.com</email>
</contributor>
+ <contributor>
+ <name>Arturo Bernal</name>
+ <email>arturobern...@gmail.com</email>
+ </contributor>
</contributors>
<scm>
diff --git
a/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
b/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
index 5a458e4..dd2d09b 100644
--- a/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
@@ -222,36 +222,36 @@ public class DefaultFileItemTest {
static final String CHARSET_WIN1251 = "Cp1251";
- static final int SWISS_GERMAN_STUFF_UNICODE [] = {
+ static final int[] SWISS_GERMAN_STUFF_UNICODE = {
0x47, 0x72, 0xFC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xE4, 0x6D, 0xE4
};
- static final int SWISS_GERMAN_STUFF_ISO8859_1 [] = {
+ static final int[] SWISS_GERMAN_STUFF_ISO8859_1 = {
0x47, 0x72, 0xFC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xE4, 0x6D, 0xE4
};
- static final int SWISS_GERMAN_STUFF_UTF8 [] = {
+ static final int[] SWISS_GERMAN_STUFF_UTF8 = {
0x47, 0x72, 0xC3, 0xBC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xC3, 0xA4,
0x6D, 0xC3, 0xA4
};
- static final int RUSSIAN_STUFF_UNICODE [] = {
+ static final int[] RUSSIAN_STUFF_UNICODE = {
0x412, 0x441, 0x435, 0x43C, 0x5F, 0x43F, 0x440, 0x438,
0x432, 0x435, 0x442
};
- static final int RUSSIAN_STUFF_UTF8 [] = {
+ static final int[] RUSSIAN_STUFF_UTF8 = {
0xD0, 0x92, 0xD1, 0x81, 0xD0, 0xB5, 0xD0, 0xBC, 0x5F,
0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0,
0xB5, 0xD1, 0x82
};
- static final int RUSSIAN_STUFF_KOI8R [] = {
+ static final int[] RUSSIAN_STUFF_KOI8R = {
0xF7, 0xD3, 0xC5, 0xCD, 0x5F, 0xD0, 0xD2, 0xC9, 0xD7,
0xC5, 0xD4
};
- static final int RUSSIAN_STUFF_WIN1251 [] = {
+ static final int[] RUSSIAN_STUFF_WIN1251 = {
0xC2, 0xF1, 0xE5, 0xEC, 0x5F, 0xEF, 0xF0, 0xE8, 0xE2,
0xE5, 0xF2
};
diff --git
a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
index 71a4643..29a949f 100644
--- a/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
+++ b/src/test/java/org/apache/commons/fileupload2/MockHttpServletRequest.java
@@ -557,7 +557,7 @@ public class MockHttpServletRequest implements
HttpServletRequest {
}
@Override
- public int read(final byte b[], final int off, final int len) throws
IOException {
+ public int read(final byte[] b, final int off, final int len) throws
IOException {
if (readLimit > 0) {
return in.read(b, off, Math.min(readLimit, len));
}
diff --git a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index cfe04a8..79af396 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -139,7 +139,7 @@ public class StreamingTest {
return bais.read();
}
@Override
- public int read(final byte b[], final int off, final int len)
throws IOException
+ public int read(final byte[] b, final int off, final int len)
throws IOException
{
return bais.read(b, off, Math.min(len, 3));
}
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 b863c5b..c564ed8 100644
---
a/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
+++
b/src/test/java/org/apache/commons/fileupload2/jaksrvlt/MockJakSrvltHttpRequest.java
@@ -561,7 +561,7 @@ public class MockJakSrvltHttpRequest implements
HttpServletRequest {
}
@Override
- public int read(final byte b[], final int off, final int len) throws
IOException {
+ public int read(final byte[] b, final int off, final int len) throws
IOException {
if (readLimit > 0) {
return in.read(b, off, Math.min(readLimit, len));
}
