Don't choke on directories

swissquote · Feb 8, 2024 · c1a107a · c1a107a
1 parent 9c938a8
commit c1a107a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/core/src/main/java/com/github/swissquote/carnotzet/core/maven/ResourcesManager.java b/core/src/main/java/com/github/swissquote/carnotzet/core/maven/ResourcesManager.java
@@ -63,7 +63,11 @@ private static void copyDirectory(String sourceDirectoryLocation, String destina
 			for (Path source : (Iterable<Path>) walk::iterator) {
 				Path destination = Paths.get(destinationDirectoryLocation, source.toString()
 						.substring(sourceDirectoryLocation.length()));
-				Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+
+				// Don't try to overwrite directories that already exist
+				if (!(Files.isDirectory(source) && Files.exists(destination))) {
+					Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+				}
 			}
 		}
 	}

diff --git a/core/src/test/java/com/github/swissquote/carnotzet/core/maven/ResourcesManagerTest.java b/core/src/test/java/com/github/swissquote/carnotzet/core/maven/ResourcesManagerTest.java
@@ -34,7 +34,11 @@ private static void copyDirectory(String sourceDirectoryLocation, String destina
 			for (Path source : (Iterable<Path>) walk::iterator) {
 				Path destination = Paths.get(destinationDirectoryLocation, source.toString()
 						.substring(sourceDirectoryLocation.length()));
-				Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+
+				// Don't try to overwrite directories that already exist
+				if (!(Files.isDirectory(source) && Files.exists(destination))) {
+					Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+				}
 			}
 		}
 	}

diff --git a/.../src/test/java/com/github/swissquote/carnotzet/file/merger/json/ResourcesManagerTest.java b/.../src/test/java/com/github/swissquote/carnotzet/file/merger/json/ResourcesManagerTest.java
@@ -34,7 +34,11 @@ private static void copyDirectory(String sourceDirectoryLocation, String destina
 			for (Path source : (Iterable<Path>) walk::iterator) {
 				Path destination = Paths.get(destinationDirectoryLocation, source.toString()
 						.substring(sourceDirectoryLocation.length()));
-				Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+
+				// Don't try to overwrite directories that already exist
+				if (!(Files.isDirectory(source) && Files.exists(destination))) {
+					Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+				}
 			}
 		}
 	}