Improving of method validateFilename + calling it from different places

sparkoo · Aug 4, 2017 · 3144f30 · 3144f30
1 parent 335bc71
commit 3144f30
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/cz/sparko/boxitory/service/FilesystemBoxRepository.java b/src/main/java/cz/sparko/boxitory/service/FilesystemBoxRepository.java
@@ -83,8 +83,9 @@ private Map<String, List<File>> groupBoxFilesByVersion(File boxDir) {
 
     private boolean validateFilename(File boxFile) {
         String filename = boxFile.getName();
-        List<String> parsedFilename = Arrays.asList(filename.split("_"));
-        if (parsedFilename.size() != 3) {
+        File parentDir = boxFile.getParentFile();
+
+        if (!filename.matches(parentDir.getName() + "_(\\d+)_(\\w+)\\.box")) {
             LOG.warn("box file [{}] has wrong name. must be in format ${name}_${version}_${provider}.box", filename);
             return false;
         }
@@ -135,7 +136,7 @@ private BoxProvider createBoxProviderFromFile(File file) {
     }
 
     private boolean containsValidBoxFile(File file) {
-        File[] files = file.listFiles((dir, name) -> name.matches(dir.getName() + "_(\\d+)_(\\w+)\\.box"));
+        File[] files = file.listFiles(this::validateFilename);
         return files.length > 0;
     }
 }