Merge branch 'release/1.0.0' into develop

Author: tobihagemann

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cryptomator</groupId>
     <artifactId>cloud-access</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <name>Cryptomator CloudAccess in Java</name>
     <description>CloudAccess is used in e.g. Cryptomator for Android to access different cloud providers.</description>

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

@@ -60,7 +60,7 @@ public static CloudProvider vaultFormat8GCMCloudAccess(CloudProvider cloudProvid
 
 			VaultFormat8ProviderDecorator provider = new VaultFormat8ProviderDecorator(cloudProvider, pathToVault.resolve("d"), cryptor);
 			provider.initialize();
-			return new MetadataCachingProviderDecorator(provider, Duration.ofSeconds(Long.getLong("org.cryptomator.cloudaccess.cryptometadatatimeout", 10L)));
+			return new MetadataCachingProviderDecorator(provider);
 		} catch (NoSuchAlgorithmException e) {
 			throw new IllegalStateException("JVM doesn't supply a CSPRNG", e);
 		} catch (InterruptedException e) {

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

@@ -26,7 +26,9 @@ public class MetadataCachingProviderDecorator implements CloudProvider {
 	private final CloudProvider delegate;
 
 	public MetadataCachingProviderDecorator(CloudProvider delegate) {
-		this(delegate, Duration.ofSeconds(DEFAULT_CACHE_TIMEOUT_SECONDS));
+		this(delegate, Duration.ofSeconds( //
+				Integer.getInteger("org.cryptomator.cloudaccess.metadatacachingprovider.timeoutSeconds", DEFAULT_CACHE_TIMEOUT_SECONDS)
+		));
 	}
 
 	public MetadataCachingProviderDecorator(CloudProvider delegate, Duration cacheEntryMaxAge) {

src/main/java/org/cryptomator/cloudaccess/api/CloudProvider.java

@@ -130,6 +130,7 @@ default CompletionStage<InputStream> read(CloudPath file, ProgressListener progr
 	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.NotFoundException} If the parent directory of this file doesn't exist</li>
 	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.TypeMismatchException} If the path points to a node that isn't a file</li>
 	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.AlreadyExistsException} If a node with the given path already exists and <code>replace</code> is false</li>
+	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.ParentFolderDoesNotExistException} If the parent folder of a node doesn't exists</li>
 	 *     <li>{@link CloudProviderException} in case of generic I/O errors</li>
 	 * </ul>
 	 *
@@ -200,6 +201,7 @@ default CompletionStage<CloudPath> createFolderIfNonExisting(CloudPath folder) {
 	 * <ul>
 	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.NotFoundException} If no item exists for the given source path</li>
 	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.AlreadyExistsException} If a node with the given target path already exists and <code>replace</code> is false</li>
+	 *     <li>{@link org.cryptomator.cloudaccess.api.exceptions.ParentFolderDoesNotExistException} If the parent folder of a node doesn't exists</li>
 	 *     <li>{@link CloudProviderException} in case of generic I/O errors</li>
 	 * </ul>
 	 *

src/main/java/org/cryptomator/cloudaccess/api/NetworkTimeouts.java

@@ -0,0 +1,4 @@
+package org.cryptomator.cloudaccess.api.exceptions;
+
+public class ParentFolderDoesNotExistException extends CloudProviderException {
+}

src/main/java/org/cryptomator/cloudaccess/api/exceptions/ParentFolderDoesNotExistException.java

@@ -14,10 +14,14 @@
 
 class FileHeaderCache {
 
-	private static final Duration TIMEOUT = Duration.ofMillis(1000);
 	private static final Logger LOG = LoggerFactory.getLogger(FileHeaderCache.class);
 
-	private final Cache<CloudPath, FileHeader> cache = CacheBuilder.newBuilder().expireAfterAccess(TIMEOUT).build();
+	private final Cache<CloudPath, FileHeader> cache;
+
+	FileHeaderCache(int timeoutMillis) {
+		this.cache = CacheBuilder.newBuilder().expireAfterAccess(Duration.ofMillis(timeoutMillis)).build();
+	}
+
 
 	public CompletionStage<FileHeader> get(CloudPath ciphertextPath, Function<CloudPath, CompletionStage<FileHeader>> onMiss) {
 		var cached = cache.getIfPresent(ciphertextPath);

src/main/java/org/cryptomator/cloudaccess/vaultformat8/FileHeaderCache.java

@@ -0,0 +1,20 @@
+package org.cryptomator.cloudaccess.vaultformat8;
+
+public class VaultFormat8ProviderConfig {
+
+	private static final int DEFAULT_FILEHEADER_TIMEOUT = 1000;
+
+	private final int fileHeaderCacheTimeoutMillis;
+
+	private VaultFormat8ProviderConfig(){
+		this.fileHeaderCacheTimeoutMillis = Integer.getInteger("org.cryptomator.cloudaccess.vaultformat8.fileheadertimeoutMillis", DEFAULT_FILEHEADER_TIMEOUT);
+	}
+
+	public static VaultFormat8ProviderConfig createFromSystemProperties(){
+		return new VaultFormat8ProviderConfig();
+	}
+
+	int getFileHeaderCacheTimeoutMillis() {
+		return fileHeaderCacheTimeoutMillis;
+	}
+}

src/main/java/org/cryptomator/cloudaccess/vaultformat8/VaultFormat8ProviderConfig.java

@@ -47,13 +47,15 @@ public class VaultFormat8ProviderDecorator implements CloudProvider {
 	private final Cryptor cryptor;
 	private final DirectoryIdCache dirIdCache;
 	private final FileHeaderCache fileHeaderCache;
+	private final VaultFormat8ProviderConfig config;
 
 	public VaultFormat8ProviderDecorator(CloudProvider delegate, CloudPath dataDir, Cryptor cryptor) {
 		this.delegate = delegate;
 		this.dataDir = dataDir;
 		this.cryptor = cryptor;
+		this.config = VaultFormat8ProviderConfig.createFromSystemProperties();
 		this.dirIdCache = new DirectoryIdCache();
-		this.fileHeaderCache = new FileHeaderCache();
+		this.fileHeaderCache = new FileHeaderCache(config.getFileHeaderCacheTimeoutMillis());
 	}
 
 	public void initialize() throws InterruptedException, CloudProviderException {