You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2023/04/30 21:49:35 UTC
[commons-io] branch master updated: Don't expose mutable arrays unnecessarily
This is an automated email from the ASF dual-hosted git repository.
sebb 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 3ec3fd03 Don't expose mutable arrays unnecessarily
3ec3fd03 is described below
commit 3ec3fd03bae58f100468170eaa11b71dfb25ec78
Author: Sebb <se...@apache.org>
AuthorDate: Sun Apr 30 22:49:31 2023 +0100
Don't expose mutable arrays unnecessarily
---
src/main/java/org/apache/commons/io/input/BOMInputStream.java | 8 +++++++-
src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/input/BOMInputStream.java b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
index d9d9560a..495ba885 100644
--- a/src/main/java/org/apache/commons/io/input/BOMInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/BOMInputStream.java
@@ -107,7 +107,7 @@ public class BOMInputStream extends ProxyInputStream {
*/
public static class Builder extends AbstractStreamBuilder<BOMInputStream, Builder> {
- static final ByteOrderMark[] DEFAULT = { ByteOrderMark.UTF_8 };
+ private static final ByteOrderMark[] DEFAULT = { ByteOrderMark.UTF_8 };
private boolean include;
private ByteOrderMark[] byteOrderMarks = DEFAULT;
@@ -140,6 +140,11 @@ public class BOMInputStream extends ProxyInputStream {
return this;
}
+ // for test access
+ static ByteOrderMark getDefaultBOM() {
+ return DEFAULT[0];
+ }
+
}
/**
@@ -147,6 +152,7 @@ public class BOMInputStream extends ProxyInputStream {
*/
private static final Comparator<ByteOrderMark> ByteOrderMarkLengthComparator = Comparator.comparing(ByteOrderMark::length).reversed();
+
/**
* Constructs a new {@link Builder}.
*
diff --git a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
index 411b26f4..50890e8b 100644
--- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
@@ -409,7 +409,7 @@ public class BOMInputStreamTest {
.setInclude(true)
.setByteOrderMarks((ByteOrderMark[]) null)
.get()) {
- assertEquals(BOMInputStream.Builder.DEFAULT[0], bomInputStream.getBOM());
+ assertEquals(BOMInputStream.Builder.getDefaultBOM(), bomInputStream.getBOM());
}
assertThrows(IllegalArgumentException.class, () -> BOMInputStream.builder()
.setInputStream(createUtf8Input(data, true))