refs #99 - fixing fetch files being listed in manifest files

Author: ThomasJejkal

src/main/java/gov/loc/repository/bagit/writer/PayloadWriter.java

@@ -61,7 +61,7 @@ static Path writeVersionDependentPayloadFiles(final Bag bag, final Path outputDi
   */
  public static void writePayloadFiles(final Set<Manifest> payloadManifests, final List<FetchItem> fetchItems, final Path outputDir, final Path bagDataDir) throws IOException{
    logger.info(messages.getString("writing_payload_files"));
-   final Set<Path> fetchPaths = getFetchPaths(fetchItems);
+   final Set<Path> fetchPaths = getFetchPaths(fetchItems, bagDataDir);
 
    for(final Manifest payloadManifest : payloadManifests){
      for(final Path payloadFile : payloadManifest.getFileToChecksumMap().keySet()){
@@ -83,11 +83,14 @@ public static void writePayloadFiles(final Set<Manifest> payloadManifests, final
    }
  }
 
- private static Set<Path> getFetchPaths(final List<FetchItem> fetchItems){
-   final Set<Path> fetchPaths = new HashSet<>();
-   for(final FetchItem fetchItem : fetchItems) {
-     fetchPaths.add(fetchItem.getPath());
-   }
-   return fetchPaths;
+  private static Set<Path> getFetchPaths(final List<FetchItem> fetchItems, final Path bagDataDir) {
+    final Set<Path> fetchPaths = new HashSet<>();
+    for (final FetchItem fetchItem : fetchItems) {
+      final Path parent = bagDataDir.getParent();
+      if(parent != null){
+        fetchPaths.add(bagDataDir.relativize(parent.resolve(fetchItem.getPath())));
+      }
+    }
+    return fetchPaths;
  }
 }

src/test/java/gov/loc/repository/bagit/writer/PayloadWriterTest.java

@@ -58,7 +58,9 @@ public void testWritePayloadFilesMinusFetchFiles() throws IOException, URISyntax
     File copiedFile = new File(outputDir, "data/dir1/test3.txt");
 
     assertFalse(copiedFile.exists() || copiedFile.getParentFile().exists());
-    PayloadWriter.writePayloadFiles(payloadManifests, Arrays.asList(new FetchItem(null, null, Paths.get("data/dir1/test3.txt"))),Paths.get(outputDir.toURI()), rootDir);
+    PayloadWriter.writePayloadFiles(payloadManifests,
+        Arrays.asList(new FetchItem(null, null, Paths.get("data/dir1/test3.txt"))), Paths.get(outputDir.toURI()),
+        rootDir.resolve("data"));
     assertFalse(copiedFile.exists() && copiedFile.getParentFile().exists());
   }
 }