Merge branch 'develop' into release/1.1.0

Author: tobihagemann

src/main/java/org/cryptomator/cloudaccess/MetadataCachingProviderDecorator.java

@@ -4,6 +4,7 @@
 import com.google.common.cache.CacheBuilder;
 import org.cryptomator.cloudaccess.api.CloudItemList;
 import org.cryptomator.cloudaccess.api.CloudItemMetadata;
+import org.cryptomator.cloudaccess.api.CloudItemType;
 import org.cryptomator.cloudaccess.api.CloudPath;
 import org.cryptomator.cloudaccess.api.CloudProvider;
 import org.cryptomator.cloudaccess.api.ProgressListener;
@@ -17,18 +18,19 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
 
 public class MetadataCachingProviderDecorator implements CloudProvider {
 
 	private final static int DEFAULT_CACHE_TIMEOUT_SECONDS = 10;
 
-	final Cache<CloudPath, Optional<CloudItemMetadata>> itemMetadataCache;
-	final Cache<CloudPath, Optional<Quota>> quotaCache;
+	final Cache<CloudPath, CompletionStage<CloudItemMetadata>> itemMetadataCache;
+	final Cache<CloudPath, CompletionStage<Quota>> quotaCache;
 	private final CloudProvider delegate;
 
 	public MetadataCachingProviderDecorator(CloudProvider delegate) {
 		this(delegate, Duration.ofSeconds( //
-				Integer.getInteger("org.cryptomator.cloudaccess.metadatacachingprovider.timeoutSeconds", DEFAULT_CACHE_TIMEOUT_SECONDS)
+				Integer.getInteger("org.cryptomator.cloudaccess.metadatacachingprovider.timeoutSeconds", DEFAULT_CACHE_TIMEOUT_SECONDS) //
 		));
 	}
 
@@ -40,45 +42,29 @@ public MetadataCachingProviderDecorator(CloudProvider delegate, Duration cacheEn
 
 	@Override
 	public CompletionStage<CloudItemMetadata> itemMetadata(CloudPath node) {
-		var cachedMetadata = itemMetadataCache.getIfPresent(node);
-		if (cachedMetadata != null) {
-			return cachedMetadata //
-					.map(CompletableFuture::completedFuture) //
-					.orElseGet(() -> CompletableFuture.failedFuture(new NotFoundException()));
-		} else {
-			return delegate.itemMetadata(node) //
-					.whenComplete((metadata, exception) -> {
-						if (exception == null) {
-							assert metadata != null;
-							itemMetadataCache.put(node, Optional.of(metadata));
-						} else if (exception instanceof NotFoundException) {
-							itemMetadataCache.put(node, Optional.empty());
-						} else {
-							itemMetadataCache.invalidate(node);
-						}
-					});
+		try {
+			return itemMetadataCache.get(node, () -> delegate.itemMetadata(node).whenComplete((metadata, throwable) -> {
+				// immediately invalidate cache in case of exceptions (except for NOT FOUND):
+				if (throwable != null && !(throwable instanceof NotFoundException)) {
+					itemMetadataCache.invalidate(node);
+				}
+			}));
+		} catch (ExecutionException e) {
+			return CompletableFuture.failedFuture(e);
 		}
 	}
 
 	@Override
 	public CompletionStage<Quota> quota(CloudPath folder) {
-		var cachedMetadata = quotaCache.getIfPresent(folder);
-		if (cachedMetadata != null) {
-			return cachedMetadata //
-					.map(CompletableFuture::completedFuture) //
-					.orElseGet(() -> CompletableFuture.failedFuture(new QuotaNotAvailableException()));
-		} else {
-			return delegate.quota(folder) //
-					.whenComplete((quota, exception) -> {
-						if (exception == null) {
-							assert quota != null;
-							quotaCache.put(folder, Optional.of(quota));
-						} else if (exception instanceof NotFoundException || exception instanceof QuotaNotAvailableException) {
-							quotaCache.put(folder, Optional.empty());
-						} else {
-							quotaCache.invalidate(folder);
-						}
-					});
+		try {
+			return quotaCache.get(folder, () -> delegate.quota(folder).whenComplete((metadata, throwable) -> {
+				// immediately invalidate cache in case of exceptions (except for NOT FOUND and QUOTA NOT AVAILABLE):
+				if (throwable != null && !(throwable instanceof NotFoundException) && !(throwable instanceof QuotaNotAvailableException)) {
+					quotaCache.invalidate(folder);
+				}
+			}));
+		} catch (ExecutionException e) {
+			return CompletableFuture.failedFuture(e);
 		}
 	}
 
@@ -89,7 +75,7 @@ public CompletionStage<CloudItemList> list(CloudPath folder, Optional<String> pa
 					evictIncludingDescendants(folder);
 					if (exception == null) {
 						assert cloudItemList != null;
-						cloudItemList.getItems().forEach(metadata -> itemMetadataCache.put(metadata.getPath(), Optional.of(metadata)));
+						cloudItemList.getItems().forEach(metadata -> itemMetadataCache.put(metadata.getPath(), CompletableFuture.completedFuture(metadata)));
 					}
 				});
 	}
@@ -118,9 +104,11 @@ public CompletionStage<InputStream> read(CloudPath file, long offset, long count
 	public CompletionStage<Void> write(CloudPath file, boolean replace, InputStream data, long size, Optional<Instant> lastModified, ProgressListener progressListener) {
 		return delegate.write(file, replace, data, size, lastModified, progressListener) //
 				.whenComplete((nullReturn, exception) -> {
-					if (exception != null) {
-						itemMetadataCache.invalidate(file);
+					if (exception == null) {
+						itemMetadataCache.put(file, CompletableFuture.completedFuture(new CloudItemMetadata(file.getFileName().toString(), file, CloudItemType.FILE, lastModified, Optional.of(size))));
 						quotaCache.invalidateAll();
+					} else {
+						itemMetadataCache.invalidate(file);
 					}
 				});
 	}
@@ -130,14 +118,16 @@ public CompletionStage<CloudPath> createFolder(CloudPath folder) {
 		return delegate.createFolder(folder) //
 				.whenComplete((metadata, exception) -> {
 					itemMetadataCache.invalidate(folder);
+					quotaCache.invalidateAll();
 				});
 	}
 
 	@Override
 	public CompletionStage<Void> deleteFile(CloudPath file) {
 		return delegate.deleteFile(file) //
 				.whenComplete((nullReturn, exception) -> {
-					itemMetadataCache.put(file, Optional.empty());
+					CompletionStage<CloudItemMetadata> future = CompletableFuture.failedFuture(new NotFoundException());
+					itemMetadataCache.put(file, future);
 					quotaCache.invalidateAll();
 				});
 	}
@@ -147,7 +137,8 @@ public CompletionStage<Void> deleteFolder(CloudPath folder) {
 		return delegate.deleteFolder(folder) //
 				.whenComplete((nullReturn, exception) -> {
 					evictIncludingDescendants(folder);
-					itemMetadataCache.put(folder, Optional.empty());
+					CompletionStage<CloudItemMetadata> future = CompletableFuture.failedFuture(new NotFoundException());
+					itemMetadataCache.put(folder, future);
 					quotaCache.invalidateAll();
 				});
 	}
@@ -156,8 +147,8 @@ public CompletionStage<Void> deleteFolder(CloudPath folder) {
 	public CompletionStage<CloudPath> move(CloudPath source, CloudPath target, boolean replace) {
 		return delegate.move(source, target, replace) //
 				.whenComplete((path, exception) -> {
-					itemMetadataCache.invalidate(source);
-					itemMetadataCache.invalidate(target);
+					evictIncludingDescendants(source);
+					evictIncludingDescendants(target);
 					quotaCache.invalidateAll();
 				});
 	}