IO-475: Address all review comments from Grigory

Author: MiriamCohenDev

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

@@ -16,7 +16,6 @@
  */
 package org.apache.commons.io;
 
-import java.io.Console;
 import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -931,7 +930,6 @@ public static int getPrefixLength(final String fileName) {
         if (!isSeparator(ch0) || !isSeparator(ch1)) {
             return isSeparator(ch0) ? 1 : 0;
         }
-
         // UNC path: //hostname or //hostname/...
         int posUnix = fileName.indexOf(UNIX_NAME_SEPARATOR, 2);
         int posWin = fileName.indexOf(WINDOWS_NAME_SEPARATOR, 2);
@@ -1696,3 +1694,4 @@ public FilenameUtils() {
         // empty
     }
 }
+

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

@@ -70,31 +70,31 @@ public void setUp() throws Exception {
                     + " as the parent directory does not exist");
         }
         try (BufferedOutputStream output3 =
-                     new BufferedOutputStream(Files.newOutputStream(testFile1))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile1))) {
             TestUtils.generateTestData(output3, testFile1Size);
         }
         if (!Files.exists(testFile2.getParent())) {
             throw new IOException("Cannot create file " + testFile2
                     + " as the parent directory does not exist");
         }
         try (BufferedOutputStream output2 =
-                     new BufferedOutputStream(Files.newOutputStream(testFile2))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile2))) {
             TestUtils.generateTestData(output2, testFile2Size);
         }
         if (!Files.exists(testFile1.getParent())) {
             throw new IOException("Cannot create file " + testFile1
                     + " as the parent directory does not exist");
         }
         try (BufferedOutputStream output1 =
-                     new BufferedOutputStream(Files.newOutputStream(testFile1))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile1))) {
             TestUtils.generateTestData(output1, testFile1Size);
         }
         if (!Files.exists(testFile2.getParent())) {
             throw new IOException("Cannot create file " + testFile2
                     + " as the parent directory does not exist");
         }
         try (BufferedOutputStream output =
-                     new BufferedOutputStream(Files.newOutputStream(testFile2))) {
+                new BufferedOutputStream(Files.newOutputStream(testFile2))) {
             TestUtils.generateTestData(output, testFile2Size);
         }
     }
@@ -274,6 +274,7 @@ void testGetFullPath() {
         assertNull(FilenameUtils.getFullPath("1:"));
         assertNull(FilenameUtils.getFullPath("1:a"));
         assertNull(FilenameUtils.getFullPath("///a/b/c.txt"));
+        assertEquals("//a", FilenameUtils.getFullPath("//a"));
 
         assertEquals("", FilenameUtils.getFullPath(""));
 
@@ -286,7 +287,6 @@ void testGetFullPath() {
 
         assertEquals("C:/", FilenameUtils.getFullPath("C:/"));
         assertEquals("//server/", FilenameUtils.getFullPath("//server/"));
-        assertEquals("//server", FilenameUtils.getFullPath("//server"));
         assertEquals("~/", FilenameUtils.getFullPath("~"));
         assertEquals("~/", FilenameUtils.getFullPath("~/"));
         assertEquals("~user/", FilenameUtils.getFullPath("~user"));
@@ -407,12 +407,12 @@ void testGetPath() {
         assertNull(FilenameUtils.getPath("1:"));
         assertNull(FilenameUtils.getPath("1:a"));
         assertNull(FilenameUtils.getPath("///a/b/c.txt"));
+        assertEquals("",FilenameUtils.getPath("//a"));
 
         assertEquals("", FilenameUtils.getPath(""));
         assertEquals("", FilenameUtils.getPath(DRIVE_C));
         assertEquals("", FilenameUtils.getPath("C:/"));
         assertEquals("", FilenameUtils.getPath("//server/"));
-        assertEquals("",FilenameUtils.getPath("//server"));
         assertEquals("", FilenameUtils.getPath("~"));
         assertEquals("", FilenameUtils.getPath("~/"));
         assertEquals("", FilenameUtils.getPath("~user"));
@@ -923,7 +923,7 @@ void testNormalize() {
         assertEquals(SEP + SEP + "1::" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\\\1::\\a\\b\\c.txt"));
         assertEquals(SEP + SEP + "server.example.org" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\\\server.example.org\\a\\b\\c.txt"));
         assertEquals(SEP + SEP + "server.sub.example.org" + SEP + "a" + SEP + "b" + SEP + "c.txt",
-                FilenameUtils.normalize("\\\\server.sub.example.org\\a\\b\\c.txt"));
+            FilenameUtils.normalize("\\\\server.sub.example.org\\a\\b\\c.txt"));
         assertEquals(SEP + SEP + "server." + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\\\server.\\a\\b\\c.txt"));
         assertEquals(SEP + SEP + "1::127.0.0.1" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\\\1::127.0.0.1\\a\\b\\c.txt"));
 
@@ -1211,4 +1211,5 @@ void testSeparatorsToWindows() {
         assertEquals("\\a\\b\\c", FilenameUtils.separatorsToWindows("/a/b/c"));
         assertEquals("D:\\a\\b\\c", FilenameUtils.separatorsToWindows("D:/a/b/c"));
     }
+
 }