Merge branch 'main' into release/set-version-to-0.3.1

qbicsoftware · May 29, 2024 · 981b8ef · 981b8ef
2 parents c63d9f2 + 037a27a
commit 981b8ef
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/life/qbic/data/processing/scanner/Scanner.java b/src/main/java/life/qbic/data/processing/scanner/Scanner.java
@@ -104,8 +104,16 @@ private List<RegistrationRequest> detectDataForRegistration() {
         .map(Path::toFile)
         .filter(this::matchesAccessRightsCriteria)
         .filter(this::matchesRegistrationCriteria)
-        .map(file -> createRequests(file.listFiles(), file.toPath())).flatMap(
-            Collection::stream).toList();
+        .map(processDir -> createRequests(
+            applyFilterForProcessDir(processDir.listFiles()),
+            processDir.toPath()))
+        .flatMap(Collection::stream).toList();
+  }
+
+  private File[] applyFilterForProcessDir(File[] processDirContent) {
+    return Arrays.stream(Objects.requireNonNull(processDirContent))
+        .filter(this::matchesAccessRightsCriteria)
+        .filter(this::matchesRegistrationCriteria).toArray(File[]::new);
   }
 
   private boolean matchesAccessRightsCriteria(File file) {