Add RandomAccessFileMode.io(String)

Author: garydgregory

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

@@ -151,18 +151,18 @@ public static RandomAccessFileMode valueOfMode(final String mode) {
      *
      * @param file the file object
      * @return a random access file
-     * @throws FileNotFoundException See {@link RandomAccessFile#RandomAccessFile(File, String)}.
+     * @throws FileNotFoundException See {@link IORandomAccessFile#IORandomAccessFile(File, String)}.
      */
     public RandomAccessFile create(final File file) throws FileNotFoundException {
-        return new RandomAccessFileAccessor(file, mode);
+        return new IORandomAccessFile(file, mode);
     }
 
     /**
      * Constructs a random access file to read from, and optionally to write to, the file specified by the {@link File} argument.
      *
      * @param file the file object
      * @return a random access file
-     * @throws FileNotFoundException See {@link RandomAccessFile#RandomAccessFile(File, String)}.
+     * @throws FileNotFoundException See {@link IORandomAccessFile#IORandomAccessFile(File, String)}.
      */
     public RandomAccessFile create(final Path file) throws FileNotFoundException {
         return create(Objects.requireNonNull(file.toFile(), "file"));
@@ -171,12 +171,12 @@ public RandomAccessFile create(final Path file) throws FileNotFoundException {
     /**
      * Constructs a random access file to read from, and optionally to write to, the file specified by the {@link File} argument.
      *
-     * @param file the file object
+     * @param name the file object
      * @return a random access file
-     * @throws FileNotFoundException See {@link RandomAccessFile#RandomAccessFile(File, String)}.
+     * @throws FileNotFoundException See {@link IORandomAccessFile#IORandomAccessFile(File, String)}.
      */
-    public RandomAccessFile create(final String file) throws FileNotFoundException {
-        return new RandomAccessFileAccessor(file, mode);
+    public RandomAccessFile create(final String name) throws FileNotFoundException {
+        return new IORandomAccessFile(name, mode);
     }
 
     /**
@@ -230,4 +230,16 @@ public boolean implies(final RandomAccessFileMode other) {
         return getLevel() >= other.getLevel();
     }
 
+    /**
+     * Constructs a random access file to read from, and optionally to write to, the file specified by the {@link File} argument.
+     *
+     * @param name the file object
+     * @return a random access file
+     * @throws FileNotFoundException See {@link IORandomAccessFile#IORandomAccessFile(File, String)}.
+     * @since 2.18.0
+     */
+    public IORandomAccessFile io(final String name) throws FileNotFoundException {
+        return new IORandomAccessFile(name, mode);
+    }
+
 }

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

@@ -40,6 +40,10 @@
  */
 public class RandomAccessFileModeTest {
 
+    private static final byte[] BYTES_FIXTURE = "Foo".getBytes(StandardCharsets.US_ASCII);
+
+    private static final String FIXTURE = "test.txt";
+
     /**
      * Temporary directory.
      */
@@ -53,8 +57,8 @@ private byte[] read(final RandomAccessFile randomAccessFile) throws IOException
     @ParameterizedTest
     @EnumSource(RandomAccessFileMode.class)
     public void testCreateFile(final RandomAccessFileMode randomAccessFileMode) throws IOException {
-        final byte[] expected = "Foo".getBytes(StandardCharsets.US_ASCII);
-        final Path fixture = Files.write(tempDir.resolve("test.txt"), expected);
+        final byte[] expected = BYTES_FIXTURE;
+        final Path fixture = writeFixture(expected);
         try (RandomAccessFile randomAccessFile = randomAccessFileMode.create(fixture.toFile())) {
             assertArrayEquals(expected, read(randomAccessFile));
         }
@@ -63,8 +67,8 @@ public void testCreateFile(final RandomAccessFileMode randomAccessFileMode) thro
     @ParameterizedTest
     @EnumSource(RandomAccessFileMode.class)
     public void testCreatePath(final RandomAccessFileMode randomAccessFileMode) throws IOException {
-        final byte[] expected = "Foo".getBytes(StandardCharsets.US_ASCII);
-        final Path fixture = Files.write(tempDir.resolve("test.txt"), expected);
+        final byte[] expected = BYTES_FIXTURE;
+        final Path fixture = writeFixture(expected);
         try (RandomAccessFile randomAccessFile = randomAccessFileMode.create(fixture)) {
             assertArrayEquals(expected, read(randomAccessFile));
         }
@@ -73,8 +77,8 @@ public void testCreatePath(final RandomAccessFileMode randomAccessFileMode) thro
     @ParameterizedTest
     @EnumSource(RandomAccessFileMode.class)
     public void testCreateString(final RandomAccessFileMode randomAccessFileMode) throws IOException {
-        final byte[] expected = "Foo".getBytes(StandardCharsets.US_ASCII);
-        final Path fixture = Files.write(tempDir.resolve("test.txt"), expected);
+        final byte[] expected = BYTES_FIXTURE;
+        final Path fixture = writeFixture(expected);
         try (RandomAccessFile randomAccessFile = randomAccessFileMode.create(fixture.toString())) {
             assertArrayEquals(expected, read(randomAccessFile));
         }
@@ -96,6 +100,16 @@ public void testImplies() {
         assertFalse(RandomAccessFileMode.READ_ONLY.implies(RandomAccessFileMode.READ_WRITE_SYNC_ALL));
     }
 
+    @ParameterizedTest
+    @EnumSource(RandomAccessFileMode.class)
+    public void testIoString(final RandomAccessFileMode randomAccessFileMode) throws IOException {
+        final byte[] expected = BYTES_FIXTURE;
+        final Path fixture = writeFixture(expected);
+        try (IORandomAccessFile randomAccessFile = randomAccessFileMode.io(fixture.toString())) {
+            assertArrayEquals(expected, read(randomAccessFile));
+        }
+    }
+
     /**
      * Tests the standard {@link Enum#toString()} behavior.
      */
@@ -145,4 +159,8 @@ public void testValueOfOpenOptions() {
         assertEquals(RandomAccessFileMode.READ_WRITE_SYNC_ALL,
                 RandomAccessFileMode.valueOf(StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.SYNC));
     }
+
+    private Path writeFixture(final byte[] bytes) throws IOException {
+        return Files.write(tempDir.resolve(FIXTURE), bytes, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+    }
 }