Added 'addUnrestrictedFiles' property. It is no longer the default, but must be declared explicitly.

'ignoredFiles' can now be removed.

Author: janvanmansum

docs/description.md

@@ -82,7 +82,8 @@ editFiles:
   addRestrictedFiles:
     - 'file4.txt'
     - 'subdirectory/file5.txt'
-  # Unrestricted files are added by default at this point
+  addUnrestrictedFiles:
+    - 'file6.txt'  
   moveFiles:
     - from: 'file6.txt' # Old location in the dataset
       to: 'subdirectory/file6.txt' # New location in the dataset
@@ -92,8 +93,6 @@ editFiles:
       directoryLabel: "subdirectory"
       restricted: false
       categories: [ 'Testlabel' ]
-  ignoreFiles:
-    - 'file7.txt' # This file will NOT be added to the dataset     
   autoRenameFiles:
     - from: "Unsanitize'd/file?" # Local file name
       to: "Sanitize_d/file_" # The file name assigned in the dataset

src/main/java/nl/knaw/dans/dvingest/core/bagprocessor/FileUploadInclusionPredicate.java

@@ -30,12 +30,8 @@ public class FileUploadInclusionPredicate implements Predicate<File> {
 
     @Override
     public boolean evaluate(File file) {
-        if (restrictedFiles) {
-            return editFiles != null && isRestricted(file) && notReplaced(file) && notIgnored(file);
-        }
-        else {
-            return editFiles == null || notRestricted(file) && notReplaced(file) && notIgnored(file);
-        }
+        return editFiles != null && (restrictedFiles ? isRestricted(file) : notRestricted(file))
+            && notReplaced(file) && notIgnored(file);
     }
 
     private boolean notReplaced(File file) {
@@ -47,7 +43,7 @@ private boolean isRestricted(File file) {
     }
 
     private boolean notRestricted(File file) {
-        return !editFiles.getAddRestrictedFiles().contains(dataDir.relativize(file.toPath()).toString());
+        return editFiles.getAddUnrestrictedFiles().contains(dataDir.relativize(file.toPath()).toString());
     }
 
     private boolean notIgnored(File file) {

src/main/java/nl/knaw/dans/dvingest/core/bagprocessor/FilesEditor.java

@@ -91,9 +91,7 @@ public void editFiles(String pid) throws IOException, DataverseException {
             deleteFiles();
             replaceFiles();
             addRestrictedFiles();
-        }
-        addUnrestrictedFiles();
-        if (editFiles != null) {
+            addUnrestrictedFiles();
             moveFiles();
             updateFileMetas();
             addEmbargoes();

src/main/java/nl/knaw/dans/dvingest/core/yaml/EditFiles.java

@@ -24,6 +24,7 @@
 public class EditFiles {
     private List<String> deleteFiles = List.of();
     private List<String> replaceFiles = List.of();
+    private List<String> addUnrestrictedFiles = List.of();
     private List<String> addRestrictedFiles = List.of();
     private List<FromTo> moveFiles = List.of();
     private List<String> ignoreFiles = List.of();

src/test/java/nl/knaw/dans/dvingest/core/bagprocessor/FileUploadInclusionPredicateTest.java

@@ -114,9 +114,10 @@ public void replaced_files_are_skipped_for_restricted_file_upload() throws Excep
     @Test
     public void unrestricted_files_are_included_for_unrestricted_file_upload() throws Exception {
         // Given
-        // Default is unrestricted upload
+        editFiles.setAddUnrestrictedFiles(List.of("file1"));
         var fileUploadInclusionPredicate = new FileUploadInclusionPredicate(editFiles, dataDir.toPath(), false);
 
+
         // When
         var result = fileUploadInclusionPredicate.evaluate(new File("dataDir/file1"));
 
@@ -125,15 +126,15 @@ public void unrestricted_files_are_included_for_unrestricted_file_upload() throw
     }
 
     @Test
-    public void all_files_are_included_if_editFiles_is_null_for_unrestricted_file_upload() throws Exception {
+    public void all_files_are_excluded_if_editFiles_is_null_for_unrestricted_file_upload() throws Exception {
         // Given
         var fileUploadInclusionPredicate = new FileUploadInclusionPredicate(null, dataDir.toPath(), false);
 
         // When
         var result = fileUploadInclusionPredicate.evaluate(new File("dataDir/file1"));
 
         // Then
-        assertThat(result).isTrue();
+        assertThat(result).isFalse();
     }
 
     @Test

src/test/resources/test-deposits/072625c6-c2a8-43a6-9f35-f49b2db9435c/1/edit-files.yml

@@ -2,6 +2,13 @@ editFiles:
   addRestrictedFiles:
     - 'subdir/file2-restricted.txt'
     - 'file4-restricted.txt'
+  addUnrestrictedFiles:
+    - 'problème/<problem>.txt'
+    - 'subdir/file6-to-be-deleted-in-v2.txt'
+    - 'subdir/file7-to-be-moved-to-subdir2-in-v2.txt'
+    - 'file1.txt'
+    - 'file3-desc.txt'
+    - 'file5-to-be-replaced-in-v2.txt'
   updateFileMetas:
     - label: 'file3-desc.txt'
       description: 'Description of file3'

src/test/resources/test-deposits/072625c6-c2a8-43a6-9f35-f49b2db9435c/2/data/ignored-file.txt

@@ -0,0 +1 @@
+Ignored

src/test/resources/test-deposits/072625c6-c2a8-43a6-9f35-f49b2db9435c/2/edit-files.yml

@@ -1,4 +1,7 @@
 editFiles:
+  addUnrestrictedFiles:
+    - 'extra/added/extra-added-1.txt'
+    - 'extra/added/extra-added-2.txt'
   replaceFiles:
     - 'file5-to-be-replaced-in-v2.txt'
   deleteFiles: