Fixed directory moving (severe dir id caching issues), corrected vault version number

Author: overheadhunter

src/main/java/org/cryptomator/cryptofs/Constants.java

@@ -16,7 +16,7 @@ final class Constants {
 	public static final String METADATA_DIR_NAME = "m";
 	public static final String DIR_PREFIX = "0";
 	public static final int NAME_SHORTENING_THRESHOLD = 129;
-	public static final int VAULT_VERSION = 4;
+	public static final int VAULT_VERSION = 5;
 
 	public static final String SEPARATOR = "/";
 

src/main/java/org/cryptomator/cryptofs/CryptoFileSystem.java

@@ -322,7 +322,7 @@ void createDirectory(CryptoPath cleartextDir, FileAttribute<?>... attrs) throws
 		} finally {
 			if (!success) {
 				Files.delete(ciphertextDirFile);
-				dirIdProvider.invalidate(ciphertextDirFile);
+				dirIdProvider.delete(ciphertextDirFile);
 			}
 		}
 	}
@@ -350,7 +350,7 @@ void delete(CryptoPath cleartextPath) throws IOException {
 					// should not happen. Nevertheless this is a valid state, so who no big deal...
 					LOG.warn("Successfully deleted dir {}, but didn't find corresponding dir file {}", ciphertextDir, ciphertextDirFile);
 				}
-				dirIdProvider.invalidate(ciphertextDirFile);
+				dirIdProvider.delete(ciphertextDirFile);
 			} catch (NoSuchFileException e) {
 				// translate ciphertext path to cleartext path
 				throw new NoSuchFileException(cleartextPath.toString());
@@ -458,11 +458,10 @@ void move(CryptoPath cleartextSource, CryptoPath cleartextTarget, CopyOption...
 						}
 					}
 					Files.delete(ciphertextTargetDir);
-					dirIdProvider.invalidate(ciphertextTargetDirFile);
 				}
 				Files.move(ciphertextSourceDirFile, ciphertextTargetDirFile, options);
 			}
-			dirIdProvider.invalidate(ciphertextSourceDirFile);
+			dirIdProvider.move(ciphertextSourceDirFile, ciphertextTargetDirFile);
 		} else {
 			throw new NoSuchFileException(cleartextSource.toString());
 		}

src/main/java/org/cryptomator/cryptofs/DirectoryIdProvider.java

@@ -54,8 +54,29 @@ public String load(Path dirFilePath) throws IOException {
 		}
 	}
 
-	public void invalidate(Path dirFilePath) {
+	/**
+	 * Removes the id currently associated with <code>dirFilePath</code> from cache. Useful during folder delete operations.
+	 * This method has no effect if the content of the given dirFile is not currently cached.
+	 * 
+	 * @param dirFilePath The dirFile for which the cache should be deleted.
+	 */
+	public void delete(Path dirFilePath) {
 		ids.invalidate(dirFilePath);
 	}
 
+	/**
+	 * Transfers ownership from the id currently associated with <code>srcDirFilePath</code> to <code>dstDirFilePath</code>. Usefule during folder move operations.
+	 * This method has no effect if the content of the source dirFile is not currently cached.
+	 * 
+	 * @param srcDirFilePath The dirFile that contained the cached id until now.
+	 * @param dstDirFilePath The dirFile that will contain the id from now on.
+	 */
+	public void move(Path srcDirFilePath, Path dstDirFilePath) {
+		String id = ids.getIfPresent(srcDirFilePath);
+		if (id != null) {
+			ids.put(dstDirFilePath, id);
+			ids.invalidate(srcDirFilePath);
+		}
+	}
+
 }

src/test/java/org/cryptomator/cryptofs/CryptoFileSystemTest.java

@@ -241,7 +241,7 @@ public void testDeleteExistingDirectory() throws IOException {
 			inTest.delete(cleartextPath);
 			verify(physicalFsProv).delete(ciphertextDirPath);
 			verify(physicalFsProv).deleteIfExists(ciphertextDirFilePath);
-			verify(dirIdProvider).invalidate(ciphertextDirFilePath);
+			verify(dirIdProvider).delete(ciphertextDirFilePath);
 		}
 
 		@Test
@@ -332,7 +332,7 @@ public void moveDirectoryDontReplaceExisting() throws IOException {
 				CopyOption option2 = mock(CopyOption.class);
 				inTest.move(cleartextSource, cleartextTarget, option1, option2);
 				verify(physicalFsProv).move(ciphertextSourceDirFile, ciphertextTargetDirFile, option1, option2);
-				verify(dirIdProvider).invalidate(ciphertextSourceDirFile);
+				verify(dirIdProvider).move(ciphertextSourceDirFile, ciphertextTargetDirFile);
 			}
 
 			@Test
@@ -348,8 +348,7 @@ public void moveDirectoryReplaceExisting() throws IOException {
 				inTest.move(cleartextSource, cleartextTarget, StandardCopyOption.REPLACE_EXISTING);
 				verify(physicalFsProv).delete(ciphertextTargetDir);
 				verify(physicalFsProv).move(ciphertextSourceDirFile, ciphertextTargetDirFile, StandardCopyOption.REPLACE_EXISTING);
-				verify(dirIdProvider).invalidate(ciphertextSourceDirFile);
-				verify(dirIdProvider).invalidate(ciphertextTargetDirFile);
+				verify(dirIdProvider).move(ciphertextSourceDirFile, ciphertextTargetDirFile);
 			}
 
 			@Test
@@ -444,7 +443,7 @@ public void copyDirectory() throws IOException {
 				inTest.copy(cleartextSource, cleartextTarget);
 				verify(ciphertextTargetDirFileChannel).write(any(ByteBuffer.class));
 				verify(physicalFsProv).createDirectory(ciphertextTargetDir);
-				verify(dirIdProvider, Mockito.never()).invalidate(Mockito.any());
+				verify(dirIdProvider, Mockito.never()).delete(Mockito.any());
 			}
 
 			@Test
@@ -461,7 +460,7 @@ public void copyDirectoryReplaceExisting() throws IOException {
 				inTest.copy(cleartextSource, cleartextTarget, StandardCopyOption.REPLACE_EXISTING);
 				verify(ciphertextTargetDirFileChannel, Mockito.never()).write(any(ByteBuffer.class));
 				verify(physicalFsProv, Mockito.never()).createDirectory(Mockito.any());
-				verify(dirIdProvider, Mockito.never()).invalidate(Mockito.any());
+				verify(dirIdProvider, Mockito.never()).delete(Mockito.any());
 			}
 
 			@Test
@@ -562,7 +561,7 @@ public void moveDirectoryReplaceExistingNonEmpty() throws IOException {
 				} finally {
 					verify(ciphertextTargetDirFileChannel, Mockito.never()).write(any(ByteBuffer.class));
 					verify(physicalFsProv, Mockito.never()).createDirectory(Mockito.any());
-					verify(dirIdProvider, Mockito.never()).invalidate(Mockito.any());
+					verify(dirIdProvider, Mockito.never()).delete(Mockito.any());
 				}
 			}