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-io.git
The following commit(s) were added to refs/heads/master by this push:
new 8814b6d7 Replace "Invalid" with "Illegal" in some exception messages
8814b6d7 is described below
commit 8814b6d7efa235fc1410c9699eb136da780d70a2
Author: Gary Gregory <[email protected]>
AuthorDate: Tue May 9 09:06:37 2023 -0400
Replace "Invalid" with "Illegal" in some exception messages
---
src/main/java/org/apache/commons/io/IOCase.java | 2 +-
.../java/org/apache/commons/io/input/XmlStreamReader.java | 10 +++++-----
.../commons/io/input/buffer/CircularBufferInputStream.java | 2 +-
.../apache/commons/io/input/buffer/CircularByteBuffer.java | 12 ++++++------
src/test/java/org/apache/commons/io/FileUtilsTest.java | 10 +++++-----
.../org/apache/commons/io/input/XmlStreamReaderTest.java | 4 ++--
.../commons/io/input/XmlStreamReaderUtilitiesTest.java | 6 +++---
.../commons/io/input/compatibility/XmlStreamReader.java | 10 +++++-----
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/IOCase.java
b/src/main/java/org/apache/commons/io/IOCase.java
index 58b13f7d..cc425609 100644
--- a/src/main/java/org/apache/commons/io/IOCase.java
+++ b/src/main/java/org/apache/commons/io/IOCase.java
@@ -77,7 +77,7 @@ public enum IOCase {
*/
public static IOCase forName(final String name) {
return Stream.of(IOCase.values()).filter(ioCase ->
ioCase.getName().equals(name)).findFirst()
- .orElseThrow(() -> new IllegalArgumentException("Invalid
IOCase name: " + name));
+ .orElseThrow(() -> new IllegalArgumentException("Illegal
IOCase name: " + name));
}
/**
diff --git a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java
b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java
index 7fa756d2..3320d0d6 100644
--- a/src/main/java/org/apache/commons/io/input/XmlStreamReader.java
+++ b/src/main/java/org/apache/commons/io/input/XmlStreamReader.java
@@ -191,15 +191,15 @@ public class XmlStreamReader extends Reader {
*/
public static final Pattern ENCODING_PATTERN =
Pattern.compile("<\\?xml.*encoding[\\s]*=[\\s]*((?:\".[^\"]*\")|(?:'.[^']*'))",
Pattern.MULTILINE);
- private static final String RAW_EX_1 = "Invalid encoding, BOM [{0}] XML
guess [{1}] XML prolog [{2}] encoding mismatch";
+ private static final String RAW_EX_1 = "Illegal encoding, BOM [{0}] XML
guess [{1}] XML prolog [{2}] encoding mismatch";
- private static final String RAW_EX_2 = "Invalid encoding, BOM [{0}] XML
guess [{1}] XML prolog [{2}] unknown BOM";
+ private static final String RAW_EX_2 = "Illegal encoding, BOM [{0}] XML
guess [{1}] XML prolog [{2}] unknown BOM";
- private static final String HTTP_EX_1 = "Invalid encoding, CT-MIME [{0}]
CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], BOM must be NULL";
+ private static final String HTTP_EX_1 = "Illegal encoding, CT-MIME [{0}]
CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], BOM must be NULL";
- private static final String HTTP_EX_2 = "Invalid encoding, CT-MIME [{0}]
CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], encoding mismatch";
+ private static final String HTTP_EX_2 = "Illegal encoding, CT-MIME [{0}]
CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], encoding mismatch";
- private static final String HTTP_EX_3 = "Invalid encoding, CT-MIME [{0}]
CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], Invalid MIME";
+ private static final String HTTP_EX_3 = "Illegal encoding, CT-MIME [{0}]
CT-Enc [{1}] BOM [{2}] XML guess [{3}] XML prolog [{4}], Illegal MIME";
/**
* Constructs a new {@link Builder}.
diff --git
a/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
b/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
index 8c8f1f10..2553c747 100644
---
a/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
+++
b/src/main/java/org/apache/commons/io/input/buffer/CircularBufferInputStream.java
@@ -59,7 +59,7 @@ public class CircularBufferInputStream extends
FilterInputStream {
public CircularBufferInputStream(final InputStream inputStream, final int
bufferSize) {
super(Objects.requireNonNull(inputStream, "inputStream"));
if (bufferSize <= 0) {
- throw new IllegalArgumentException("Invalid bufferSize: " +
bufferSize);
+ throw new IllegalArgumentException("Illegal bufferSize: " +
bufferSize);
}
this.buffer = new CircularByteBuffer(bufferSize);
this.bufferSize = bufferSize;
diff --git
a/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java
b/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java
index 98a4897e..b65992a3 100644
--- a/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java
+++ b/src/main/java/org/apache/commons/io/input/buffer/CircularByteBuffer.java
@@ -87,10 +87,10 @@ public class CircularByteBuffer {
public void add(final byte[] targetBuffer, final int offset, final int
length) {
Objects.requireNonNull(targetBuffer, "Buffer");
if (offset < 0 || offset >= targetBuffer.length) {
- throw new IllegalArgumentException("Invalid offset: " + offset);
+ throw new IllegalArgumentException("Illegal offset: " + offset);
}
if (length < 0) {
- throw new IllegalArgumentException("Invalid length: " + length);
+ throw new IllegalArgumentException("Illegal length: " + length);
}
if (currentNumberOfBytes + length > buffer.length) {
throw new IllegalStateException("No space available");
@@ -182,10 +182,10 @@ public class CircularByteBuffer {
public boolean peek(final byte[] sourceBuffer, final int offset, final int
length) {
Objects.requireNonNull(sourceBuffer, "Buffer");
if (offset < 0 || offset >= sourceBuffer.length) {
- throw new IllegalArgumentException("Invalid offset: " + offset);
+ throw new IllegalArgumentException("Illegal offset: " + offset);
}
if (length < 0 || length > buffer.length) {
- throw new IllegalArgumentException("Invalid length: " + length);
+ throw new IllegalArgumentException("Illegal length: " + length);
}
if (length < currentNumberOfBytes) {
return false;
@@ -239,10 +239,10 @@ public class CircularByteBuffer {
public void read(final byte[] targetBuffer, final int targetOffset, final
int length) {
Objects.requireNonNull(targetBuffer, "targetBuffer");
if (targetOffset < 0 || targetOffset >= targetBuffer.length) {
- throw new IllegalArgumentException("Invalid offset: " +
targetOffset);
+ throw new IllegalArgumentException("Illegal offset: " +
targetOffset);
}
if (length < 0 || length > buffer.length) {
- throw new IllegalArgumentException("Invalid length: " + length);
+ throw new IllegalArgumentException("Illegal length: " + length);
}
if (targetOffset + length > targetBuffer.length) {
throw new IllegalArgumentException("The supplied byte array
contains only "
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java
b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index cd38f587..febdf39e 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -142,13 +142,13 @@ public class FileUtilsTest extends AbstractTempDirTest {
private static final String UTF_8 = StandardCharsets.UTF_8.name();
/** Test data. */
- private static final long DATE3 = 1000000002000L;
+ private static final long DATE3 = 1_000_000_002_000L;
/** Test data. */
- private static final long DATE2 = 1000000001000L;
+ private static final long DATE2 = 1_000_000_001_000L;
/** Test data. */
- private static final long DATE1 = 1000000000000L;
+ private static final long DATE1 = 1_000_000_000_000L;
/**
* Size of test directory.
@@ -1759,7 +1759,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertFalse(FileUtils.isFileNewer(newFile, localDatePlusDay), "New
File - Newer - LocalDate plus one day");
assertFalse(FileUtils.isFileNewer(newFile, localDatePlusDay,
localTime0), "New File - Newer - LocalDate plus one day,LocalTime");
assertFalse(FileUtils.isFileNewer(newFile, localDatePlusDay,
offsetTime0), "New File - Newer - LocalDate plus one day,OffsetTime");
- assertFalse(FileUtils.isFileNewer(invalidFile, refFile), "Invalid -
Newer - File");
+ assertFalse(FileUtils.isFileNewer(invalidFile, refFile), "Illegal -
Newer - File");
assertThrows(IllegalArgumentException.class, () ->
FileUtils.isFileNewer(newFile, invalidFile));
// Test isFileOlder()
@@ -1793,7 +1793,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
assertTrue(FileUtils.isFileOlder(newFile, localDatePlusDay,
localTime0), "New File - Older - LocalDate plus one day,LocalTime");
assertTrue(FileUtils.isFileOlder(newFile, localDatePlusDay,
offsetTime0), "New File - Older - LocalDate plus one day,OffsetTime");
- assertFalse(FileUtils.isFileOlder(invalidFile, refFile), "Invalid -
Older - File");
+ assertFalse(FileUtils.isFileOlder(invalidFile, refFile), "Illegal -
Older - File");
assertThrows(IllegalArgumentException.class, () ->
FileUtils.isFileOlder(newFile, invalidFile));
// Null File
diff --git a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
index 1ee934fe..e7c1a208 100644
--- a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
@@ -392,7 +392,7 @@ public class XmlStreamReaderTest {
new XmlStreamReader(is, cT, false).close();
fail("It should have failed for HTTP Content-type " + cT + ",
BOM " + bomEnc + ", streamEnc " + streamEnc + " and prologEnc " + prologEnc);
} catch (final IOException ex) {
- assertTrue(ex.getMessage().contains("Invalid encoding,"));
+ assertTrue(ex.getMessage().contains("Illegal encoding,"));
}
}
}
@@ -445,7 +445,7 @@ public class XmlStreamReaderTest {
fail("Expected IOException for BOM " + bomEnc + ", streamEnc " +
streamEnc + " and prologEnc " + prologEnc
+ ": found " + foundEnc);
} catch (final IOException ex) {
- assertTrue(ex.getMessage().contains("Invalid encoding,"));
+ assertTrue(ex.getMessage().contains("Illegal encoding,"));
}
if (xmlReader != null) {
xmlReader.close();
diff --git
a/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
index 2f90a263..d6aac11a 100644
---
a/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
+++
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
@@ -41,7 +41,7 @@ public class XmlStreamReaderUtilitiesTest {
private static final String HTTPMGS1 = "BOM must be NULL";
private static final String HTTPMGS2 = "encoding mismatch";
- private static final String HTTPMGS3 = "Invalid MIME";
+ private static final String HTTPMGS3 = "Illegal MIME";
private static final String APPXML = "application/xml";
private static final String APPXML_UTF8 =
"application/xml;charset=UTF-8";
private static final String APPXML_UTF16 =
"application/xml;charset=UTF-16";
@@ -100,7 +100,7 @@ public class XmlStreamReaderUtilitiesTest {
checkHttpEncoding("XmlStreamReaderException", lenient,
httpContentType, bomEnc, xmlGuessEnc, xmlEnc, defaultEncoding);
fail("Expected XmlStreamReaderException");
} catch (final XmlStreamReaderException e) {
- assertTrue(e.getMessage().startsWith("Invalid encoding"), "Msg
Start: " + e.getMessage());
+ assertTrue(e.getMessage().startsWith("Illegal encoding"), "Msg
Start: " + e.getMessage());
assertTrue(e.getMessage().endsWith(msgSuffix), "Msg End: " +
e.getMessage());
assertEquals(bomEnc, e.getBomEncoding(), "bomEnc");
assertEquals(xmlGuessEnc, e.getXmlGuessEncoding(), "xmlGuessEnc");
@@ -131,7 +131,7 @@ public class XmlStreamReaderUtilitiesTest {
checkRawEncoding("XmlStreamReaderException", bomEnc, xmlGuessEnc,
xmlEnc, defaultEncoding);
fail("Expected XmlStreamReaderException");
} catch (final XmlStreamReaderException e) {
- assertTrue(e.getMessage().startsWith("Invalid encoding"), "Msg
Start: " + e.getMessage());
+ assertTrue(e.getMessage().startsWith("Illegal encoding"), "Msg
Start: " + e.getMessage());
assertTrue(e.getMessage().endsWith(msgSuffix), "Msg End: " +
e.getMessage());
assertEquals(bomEnc, e.getBomEncoding(), "bomEnc");
assertEquals(xmlGuessEnc, e.getXmlGuessEncoding(), "xmlGuessEnc");
diff --git
a/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
b/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
index d80818e2..b599238e 100644
---
a/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
+++
b/src/test/java/org/apache/commons/io/input/compatibility/XmlStreamReader.java
@@ -98,19 +98,19 @@ public class XmlStreamReader extends Reader {
Pattern.MULTILINE);
private static final MessageFormat RAW_EX_1 = new MessageFormat(
- "Invalid encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}]
encoding mismatch");
+ "Illegal encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}]
encoding mismatch");
private static final MessageFormat RAW_EX_2 = new MessageFormat(
- "Invalid encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}]
unknown BOM");
+ "Illegal encoding, BOM [{0}] XML guess [{1}] XML prolog [{2}]
unknown BOM");
private static final MessageFormat HTTP_EX_1 = new MessageFormat(
- "Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess
[{3}] XML prolog [{4}], BOM must be NULL");
+ "Illegal encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess
[{3}] XML prolog [{4}], BOM must be NULL");
private static final MessageFormat HTTP_EX_2 = new MessageFormat(
- "Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess
[{3}] XML prolog [{4}], encoding mismatch");
+ "Illegal encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess
[{3}] XML prolog [{4}], encoding mismatch");
private static final MessageFormat HTTP_EX_3 = new MessageFormat(
- "Invalid encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess
[{3}] XML prolog [{4}], Invalid MIME");
+ "Illegal encoding, CT-MIME [{0}] CT-Enc [{1}] BOM [{2}] XML guess
[{3}] XML prolog [{4}], Illegal MIME");
// returns the BOM in the stream, NULL if not present,
// if there was BOM the in the stream it is consumed
