Merge branch 'master' of https://github.com/apache/commons-io.git

Author: garydgregory

pom.xml

@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-io</groupId>
   <artifactId>commons-io</artifactId>
-  <version>2.20.1-SNAPSHOT</version>
+  <version>2.21.0-SNAPSHOT</version>
   <name>Apache Commons IO</name>
   <inceptionYear>2002</inceptionYear>
   <description>
@@ -47,7 +47,7 @@ file comparators, endian transformation classes, and much more.
     <connection>scm:git:https://gitbox.apache.org/repos/asf/commons-io.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-io.git</developerConnection>
     <url>https://gitbox.apache.org/repos/asf?p=commons-io.git</url>
-    <tag>rel/commons-io-2.20.0</tag>
+    <tag>rel/commons-io-2.21.0</tag>
   </scm>
   <ciManagement>
     <system>GitHub</system>
@@ -115,9 +115,9 @@ file comparators, endian transformation classes, and much more.
     <commons.componentid>io</commons.componentid>
     <commons.module.name>org.apache.commons.io</commons.module.name>
     <commons.rc.version>RC1</commons.rc.version>
-    <commons.bc.version>2.19.0</commons.bc.version>
-    <commons.release.version>2.20.0</commons.release.version>
-    <commons.release.next>2.20.1</commons.release.next>
+    <commons.bc.version>2.20.0</commons.bc.version>
+    <commons.release.version>2.21.0</commons.release.version>
+    <commons.release.next>2.21.1</commons.release.next>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>2025-07-18T21:12:04Z</project.build.outputTimestamp>
     <commons.release.desc>(requires Java 8)</commons.release.desc>

src/changes/changes.xml

@@ -50,6 +50,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="ggregory"                due-to="Gary Gregory">When testing on Java 21 and up, enable -XX:+EnableDynamicAgentLoading.</action>
       <action type="fix" dev="ggregory"                due-to="Gary Gregory">When testing on Java 24 and up, don't fail FileUtilsListFilesTest for a different behavior in the JRE.</action>
       <!-- ADD -->
+      <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">FileUtils#byteCountToDisplaySize() supports Zettabyte, Yottabyte, Ronnabyte and Quettabyte #763.</action>
+      <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">Add org.apache.commons.io.FileUtils.ONE_RB #763.</action>
+      <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">Add org.apache.commons.io.FileUtils.ONE_QB #763.</action>
       <!-- UPDATE -->
       <action type="update" dev="ggregory"             due-to="Gary Gregory">Bump commons-codec:commons-codec from 1.18.0 to 1.19.0.</action>
   </release>

src/main/java/org/apache/commons/io/FileUtils.java

@@ -194,13 +194,27 @@ public class FileUtils {
     /**
      * The number of bytes in a zettabyte.
      */
-    public static final BigInteger ONE_ZB = BigInteger.valueOf(ONE_KB).multiply(BigInteger.valueOf(ONE_EB));
+    public static final BigInteger ONE_ZB = ONE_KB_BI.multiply(ONE_EB_BI);
 
     /**
      * The number of bytes in a yottabyte.
      */
     public static final BigInteger ONE_YB = ONE_KB_BI.multiply(ONE_ZB);
 
+    /**
+     * The number of bytes in a ronnabyte.
+     *
+     * @since 2.21.0
+     */
+    public static final BigInteger ONE_RB = ONE_KB_BI.multiply(ONE_YB);
+
+    /**
+     * The number of bytes in a quettabyte.
+     *
+     * @since 2.21.0
+     */
+    public static final BigInteger ONE_QB = ONE_KB_BI.multiply(ONE_RB);
+
     /**
      * An empty array of type {@link File}.
      */
@@ -217,7 +231,7 @@ public class FileUtils {
      * </p>
      *
      * @param size the number of bytes
-     * @return a human-readable display value (includes units - EB, PB, TB, GB, MB, KB or bytes)
+     * @return a human-readable display value (includes units - QB, RB, YB, ZB, EB, PB, TB, GB, MB, KB or bytes)
      * @throws NullPointerException if the given {@link BigInteger} is {@code null}.
      * @see <a href="https://issues.apache.org/jira/browse/IO-226">IO-226 - should the rounding be changed?</a>
      * @since 2.4
@@ -227,7 +241,15 @@ public static String byteCountToDisplaySize(final BigInteger size) {
         Objects.requireNonNull(size, "size");
         final String displaySize;
 
-        if (size.divide(ONE_EB_BI).compareTo(BigInteger.ZERO) > 0) {
+        if (size.divide(ONE_QB).compareTo(BigInteger.ZERO) > 0) {
+            displaySize = size.divide(ONE_QB) + " QB";
+        } else if (size.divide(ONE_RB).compareTo(BigInteger.ZERO) > 0) {
+            displaySize = size.divide(ONE_RB) + " RB";
+        } else if (size.divide(ONE_YB).compareTo(BigInteger.ZERO) > 0) {
+            displaySize = size.divide(ONE_YB) + " YB";
+        } else if (size.divide(ONE_ZB).compareTo(BigInteger.ZERO) > 0) {
+            displaySize = size.divide(ONE_ZB) + " ZB";
+        } else if (size.divide(ONE_EB_BI).compareTo(BigInteger.ZERO) > 0) {
             displaySize = size.divide(ONE_EB_BI) + " EB";
         } else if (size.divide(ONE_PB_BI).compareTo(BigInteger.ZERO) > 0) {
             displaySize = size.divide(ONE_PB_BI) + " PB";

src/test/java/org/apache/commons/io/EndianUtilsTest.java

@@ -44,7 +44,7 @@ void testEOFException() {
     }
 
     @Test
-    void testInvalidOffset() throws IOException {
+    void testInvalidOffset() {
         final byte[] bytes = {};
 
         assertThrows(IllegalArgumentException.class, () -> EndianUtils.readSwappedInteger(bytes, 0));

src/test/java/org/apache/commons/io/FileUtilsTest.java

@@ -370,6 +370,10 @@ void testByteCountToDisplaySizeBigInteger() {
         final BigInteger TB1 = GB1.multiply(KB1);
         final BigInteger PB1 = TB1.multiply(KB1);
         final BigInteger EB1 = PB1.multiply(KB1);
+        final BigInteger ZB1 = EB1.multiply(KB1);
+        final BigInteger YB1 = ZB1.multiply(KB1);
+        final BigInteger RB1 = YB1.multiply(KB1);
+        final BigInteger QB1 = RB1.multiply(KB1);
         assertEquals("0 bytes", FileUtils.byteCountToDisplaySize(BigInteger.ZERO));
         assertEquals("1 bytes", FileUtils.byteCountToDisplaySize(BigInteger.ONE));
         assertEquals("1023 bytes", FileUtils.byteCountToDisplaySize(b1023));
@@ -386,6 +390,10 @@ void testByteCountToDisplaySizeBigInteger() {
         assertEquals("1 TB", FileUtils.byteCountToDisplaySize(TB1));
         assertEquals("1 PB", FileUtils.byteCountToDisplaySize(PB1));
         assertEquals("1 EB", FileUtils.byteCountToDisplaySize(EB1));
+        assertEquals("1 ZB", FileUtils.byteCountToDisplaySize(ZB1));
+        assertEquals("1 YB", FileUtils.byteCountToDisplaySize(YB1));
+        assertEquals("1 RB", FileUtils.byteCountToDisplaySize(RB1));
+        assertEquals("1 QB", FileUtils.byteCountToDisplaySize(QB1));
         assertEquals("7 EB", FileUtils.byteCountToDisplaySize(Long.MAX_VALUE));
         // Other MAX_VALUEs
         assertEquals("63 KB", FileUtils.byteCountToDisplaySize(BigInteger.valueOf(Character.MAX_VALUE)));

src/test/java/org/apache/commons/io/channels/FileChannelsTest.java

@@ -59,7 +59,7 @@ enum FileChannelType {
     private static final String CONTENT = StringUtils.repeat("x", SMALL_BUFFER_SIZE);
 
     @SuppressWarnings("resource") // Caller closes
-    private static FileChannel getChannel(final FileInputStream inNotEmpty, final FileChannelType fileChannelType, final int readSize) throws IOException {
+    private static FileChannel getChannel(final FileInputStream inNotEmpty, final FileChannelType fileChannelType, final int readSize) {
         return wrap(inNotEmpty.getChannel(), fileChannelType, readSize);
     }
 
@@ -84,7 +84,7 @@ private static byte reverse(final byte b) {
         return (byte) (~b & 0xff);
     }
 
-    private static FileChannel wrap(final FileChannel fc, final FileChannelType fileChannelType, final int readSize) throws IOException {
+    private static FileChannel wrap(final FileChannel fc, final FileChannelType fileChannelType, final int readSize) {
         switch (fileChannelType) {
         case NON_BLOCKING:
             return new NonBlockingFileChannelProxy(fc);

src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java

@@ -116,6 +116,7 @@ void testConstructorIterable_order() {
         assertTrue(c.compare(moreFile, lessFile) > 0, "more");
     }
 
+    @Override
     @Test
     void testToString() {
         final List<Comparator<File>> list = new ArrayList<>();

src/test/java/org/apache/commons/io/file/CopyDirectoryVisitorTest.java

@@ -107,7 +107,7 @@ void testCopyDirectoryEmptyFolderFilters(final PathCounters pathCounters) throws
     void testCopyDirectoryFilters(final PathCounters pathCounters) throws IOException {
         final Path sourceDir = Paths.get("src/test/resources/org/apache/commons/io/dirs-2-file-size-4");
         final CopyDirectoryVisitor visitFileTree = PathUtils.visitFileTree(new CopyDirectoryVisitor(pathCounters, new NameFileFilter("file-size-1.bin"),
-            new NameFileFilter("dirs-2-file-size-4", "dirs-a-file-size-1"), sourceDir, targetDir, null),
+            new NameFileFilter("dirs-2-file-size-4", "dirs-a-file-size-1"), sourceDir, targetDir, (CopyOption[]) null),
             sourceDir);
         assertCounts(2, 1, 2, visitFileTree);
         assertArrayEquals(PathUtils.EMPTY_COPY_OPTIONS, visitFileTree.getCopyOptions());

src/test/java/org/apache/commons/io/function/IOIterableTest.java

@@ -77,14 +77,14 @@ void testIterator() throws IOException {
     }
 
     @Test
-    void testSpliterator() throws IOException {
+    void testSpliterator() {
         final AtomicInteger ref = new AtomicInteger();
         iterable.spliterator().forEachRemaining(e -> ref.incrementAndGet());
         assertEquals(2, ref.get());
     }
 
     @Test
-    void testUnrwap() throws IOException {
+    void testUnrwap() {
         assertSame(fixture.list, iterable.unwrap());
         assertSame(fixture.unwrap(), iterable.unwrap());
     }

src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTest.java

@@ -504,7 +504,7 @@ private int writeByte(final AbstractByteArrayOutputStream<?> baout, final java.i
         return count;
     }
 
-    private int writeByte(final AbstractByteArrayOutputStream<?> baout, final java.io.ByteArrayOutputStream ref, final int[] instructions) throws IOException {
+    private int writeByte(final AbstractByteArrayOutputStream<?> baout, final java.io.ByteArrayOutputStream ref, final int[] instructions) {
         int written = 0;
         for (final int instruction : instructions) {
             written += writeByte(baout, ref, instruction);