IO-375 FilenameUtils.splitOnTokens(String text) check for '**' could be simplified

sebbASF · sebbASF · commit 13367815a956 · 2013-04-07T23:10:05.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1465505 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -47,7 +47,10 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <!-- The release date is the date RC is cut -->
     <release version="2.5" date="2013-??-??" description="New features and bug fixes.">    
-      <action issue="IO-374" dev="sebb" type="fix">
+      <action issue="IO-375" dev="sebb" type="update">
+        FilenameUtils.splitOnTokens(String text) check for '**' could be simplified 
+      </action>            
+      <action issue="IO-374" dev="sebb" type="update">
         WildcardFileFilter ctors should not use null to mean IOCase.SENSITIVE when delegating to other ctors
       </action>            
       <action issue="IO-362" dev="ggregory" type="fix" due-to="mmadson, ggregory">
diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java
@@ -1375,6 +1375,7 @@ static String[] splitOnTokens(final String text) {
         final char[] array = text.toCharArray();
         final ArrayList<String> list = new ArrayList<String>();
         final StringBuilder buffer = new StringBuilder();
+        char prevChar = 0;
         for (int i = 0; i < array.length; i++) {
             final char ch = array[i];
             if (ch == '?' || ch == '*') {
@@ -1384,13 +1385,13 @@ static String[] splitOnTokens(final String text) {
                 }
                 if (ch == '?') {
                     list.add("?");
-                } else if (list.isEmpty() || // ch == '*' here; check if previous char was '*'
-                        i > 0 && list.get(list.size() - 1).equals("*") == false) {
+                } else if (prevChar != '*' ) {// ch == '*' here; check if previous char was '*'
                     list.add("*");
                 }
             } else {
                 buffer.append(ch);
             }
+            prevChar = ch;
         }
         if (buffer.length() != 0) {
             list.add(buffer.toString());
diff --git a/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java b/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java
@@ -123,6 +123,7 @@ public void testSplitOnTokens() {
         assertArrayEquals( new String[] { "*" }, FilenameUtils.splitOnTokens("****") );
         assertArrayEquals( new String[] { "*", "?", "?", "*" }, FilenameUtils.splitOnTokens("*??*") );
         assertArrayEquals( new String[] { "*", "?", "*", "?", "*" }, FilenameUtils.splitOnTokens("*?**?*") );
+        assertArrayEquals( new String[] { "*", "?", "*", "?", "*" }, FilenameUtils.splitOnTokens("*?***?*") );
         assertArrayEquals( new String[] { "h", "?", "?", "*" }, FilenameUtils.splitOnTokens("h??*") );
         assertArrayEquals( new String[] { "" }, FilenameUtils.splitOnTokens("") );
     }

Original file line number	Diff line number	Diff line change
`@@ -1375,6 +1375,7 @@ static String[] splitOnTokens(final String text) {`
`1375`	`1375`	`final char[] array = text.toCharArray();`
`1376`	`1376`	`final ArrayList<String> list = new ArrayList<String>();`
`1377`	`1377`	`final StringBuilder buffer = new StringBuilder();`
	`1378`	`+ char prevChar = 0;`
`1378`	`1379`	`for (int i = 0; i < array.length; i++) {`
`1379`	`1380`	`final char ch = array[i];`
`1380`	`1381`	`if (ch == '?' \|\| ch == '*') {`
`@@ -1384,13 +1385,13 @@ static String[] splitOnTokens(final String text) {`
`1384`	`1385`	`}`
`1385`	`1386`	`if (ch == '?') {`
`1386`	`1387`	`list.add("?");`
`1387`		`- } else if (list.isEmpty() \|\| // ch == '' here; check if previous char was ''`
`1388`		`- i > 0 && list.get(list.size() - 1).equals("*") == false) {`
	`1388`	`+ } else if (prevChar != '' ) {// ch == '' here; check if previous char was '*'`
`1389`	`1389`	`list.add("*");`
`1390`	`1390`	`}`
`1391`	`1391`	`} else {`
`1392`	`1392`	`buffer.append(ch);`
`1393`	`1393`	`}`
	`1394`	`+ prevChar = ch;`
`1394`	`1395`	`}`
`1395`	`1396`	`if (buffer.length() != 0) {`
`1396`	`1397`	`list.add(buffer.toString());`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ public void testSplitOnTokens() {`
`123`	`123`	`assertArrayEquals( new String[] { "" }, FilenameUtils.splitOnTokens("***") );`
`124`	`124`	`assertArrayEquals( new String[] { "", "?", "?", "" }, FilenameUtils.splitOnTokens("??") );`
`125`	`125`	`assertArrayEquals( new String[] { "", "?", "", "?", "" }, FilenameUtils.splitOnTokens("?*?") );`
	`126`	`+ assertArrayEquals( new String[] { "", "?", "", "?", "" }, FilenameUtils.splitOnTokens("?**?") );`
`126`	`127`	`assertArrayEquals( new String[] { "h", "?", "?", "" }, FilenameUtils.splitOnTokens("h??") );`
`127`	`128`	`assertArrayEquals( new String[] { "" }, FilenameUtils.splitOnTokens("") );`
`128`	`129`	`}`