Merge pull request #581 from schlosna/ds/file-filter-regex

ceki · web-flow · commit cbb1e3dd188b · 2022-08-22T17:40:15.000+02:00
[LOGBACK-1409] FileFilterUtil.filesInFolderMatchingStemRegex resuses compiled pattern
diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java
@@ -79,11 +79,9 @@ public static File[] filesInFolderMatchingStemRegex(File file, final String stem
         if (!file.exists() || !file.isDirectory()) {
             return new File[0];
         }
-        return file.listFiles(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                return name.matches(stemRegex);
-            }
-        });
+
+        Pattern regex = Pattern.compile(stemRegex);
+        return file.listFiles((dir, name) -> regex.matcher(name).matches());
     }
 
     static public int findHighestCounter(File[] matchingFileArray, final String stemRegex) {

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,9 @@ public static File[] filesInFolderMatchingStemRegex(File file, final String stem`
`79`	`79`	`if (!file.exists() \|\| !file.isDirectory()) {`
`80`	`80`	`return new File[0];`
`81`	`81`	`}`
`82`		`- return file.listFiles(new FilenameFilter() {`
`83`		`- public boolean accept(File dir, String name) {`
`84`		`- return name.matches(stemRegex);`
`85`		`- }`
`86`		`- });`
	`82`	`+`
	`83`	`+ Pattern regex = Pattern.compile(stemRegex);`
	`84`	`+ return file.listFiles((dir, name) -> regex.matcher(name).matches());`
`87`	`85`	`}`
`88`	`86`
`89`	`87`	`static public int findHighestCounter(File[] matchingFileArray, final String stemRegex) {`