chore:SP-2103 Avoids repeated lowercase conversion of filenames in filter

Author: agustingroh

src/main/java/com/scanoss/filters/FileFilter.java

@@ -60,23 +60,28 @@ public Predicate<Path> get() {
         // First call super's build to initialize base filters
         Predicate<Path> baseFilter = this.baseSkipFilter;
 
+        if(config.getAllExtensions()){
+            return p -> false;
+        }
+
         if (!config.getHiddenFilesFolders()) {
             Predicate<Path> skipHiddenFilter = p -> p.getFileName().toString().startsWith(".");
             baseFilter = baseFilter
                     .or(skipHiddenFilter);
         }
 
-        if(config.getAllExtensions()){
-            Predicate <Path> allExtensionsFilter = p -> false;
-            baseFilter = baseFilter.or(allExtensionsFilter);
-        }
-
-       Predicate<Path> filterFiles = p -> ScanossConstants.FILTERED_FILES.stream()
-              .anyMatch(d -> p.getFileName().toString().toLowerCase().equals(d));
+        Predicate<Path> filterFiles = p -> {
+            String fileNameToLower = p.getFileName().toString().toLowerCase();
+            return ScanossConstants.FILTERED_FILES.stream()
+                    .anyMatch(fileNameToLower::equals);
+        };
         baseFilter = baseFilter.or(filterFiles);
 
-        Predicate<Path> filterExtensions = p -> ScanossConstants.FILTERED_EXTENSIONS.stream()
-                .anyMatch(d -> p.getFileName().toString().toLowerCase().endsWith(d));
+        Predicate<Path> filterExtensions = p ->{
+            String fileNameToLower = p.getFileName().toString().toLowerCase();
+            return ScanossConstants.FILTERED_EXTENSIONS.stream()
+                    .anyMatch(fileNameToLower::endsWith);
+        };
         baseFilter = baseFilter.or(filterExtensions);
 
         return baseFilter;

src/main/java/com/scanoss/filters/FolderFilter.java

@@ -72,11 +72,18 @@ public Predicate<Path> get() {
         }
 
         if (!config.getAllFolders()) {
-            Predicate<Path> filterDirs = p -> FILTERED_DIRS.stream()
-                    .anyMatch(d -> p.getFileName().toString().toLowerCase().equals(d));
-            Predicate<Path> filterDirExt = p -> FILTERED_DIR_EXT.stream()
-                    .anyMatch(d -> p.getFileName().toString().toLowerCase().endsWith(d));
+            Predicate<Path> filterDirs = p -> {
+              String fileNameToLower = p.getFileName().toString().toLowerCase();
+               return FILTERED_DIRS.stream()
+                        .anyMatch(fileNameToLower::equals);
+            };
+            baseFilter = baseFilter.or(filterDirs);
 
+            Predicate<Path> filterDirExt = p -> {
+                String fileNameToLower = p.getFileName().toString().toLowerCase();
+                return FILTERED_DIR_EXT.stream()
+                        .anyMatch(fileNameToLower::endsWith);
+            };
             baseFilter = baseFilter.or(filterDirs).or(filterDirExt);
         }
 

src/test/java/com/scanoss/TestSettings.java

@@ -116,6 +116,7 @@ public void testEmptySettingsInitialization() {
         assertNotNull("Ignore list should not be null", emptySettings.getBom().getIgnore());
         assertNotNull("Remove list should not be null", emptySettings.getBom().getRemove());
         assertNotNull("Replace list should not be null", emptySettings.getBom().getReplace());
+        assertNotNull("Settings should not be null", emptySettings.getSettings());
 
         assertTrue("Include list should be empty", emptySettings.getBom().getInclude().isEmpty());
         assertTrue("Ignore list should be empty", emptySettings.getBom().getIgnore().isEmpty());