Refactoring cloud configuration:

* Removing NetworkTimeouts class from API package
* adding config class to vaultformat8provider and webdav package (with own system properties!)
* vaultformat8provider configurable

Author: infeo

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/NetworkTimeouts.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 {

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

@@ -349,8 +349,8 @@ private enum PropfindDepth {
 
 	static class WebDavAuthenticator {
 
-		static WebDavClient createAuthenticatedWebDavClient(final WebDavCredential webDavCredential) throws ServerNotWebdavCompatibleException, UnauthorizedException {
-			final var webDavClient = new WebDavClient(new WebDavCompatibleHttpClient(webDavCredential), webDavCredential);
+		static WebDavClient createAuthenticatedWebDavClient(final WebDavCredential webDavCredential, WebDavProviderConfig config) throws ServerNotWebdavCompatibleException, UnauthorizedException {
+			final var webDavClient = new WebDavClient(new WebDavCompatibleHttpClient(webDavCredential, config), webDavCredential);
 
 			webDavClient.checkServerCompatibility();
 			webDavClient.tryAuthenticatedRequest();

src/main/java/org/cryptomator/cloudaccess/webdav/WebDavClient.java

@@ -16,9 +16,11 @@
 public class WebDavCloudProvider implements CloudProvider {
 
 	private final WebDavClient webDavClient;
+	private final WebDavProviderConfig config;
 
 	private WebDavCloudProvider(final WebDavCredential webDavCredential) {
-		webDavClient = WebDavClient.WebDavAuthenticator.createAuthenticatedWebDavClient(webDavCredential);
+		config = WebDavProviderConfig.createFromSystemPropertiesOrDefaults();
+		webDavClient = WebDavClient.WebDavAuthenticator.createAuthenticatedWebDavClient(webDavCredential, config);
 	}
 
 	public static WebDavCloudProvider from(final WebDavCredential webDavCredential) throws UnauthorizedException, ServerNotWebdavCompatibleException {

src/main/java/org/cryptomator/cloudaccess/webdav/WebDavCloudProvider.java

@@ -11,38 +11,36 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.cryptomator.cloudaccess.api.NetworkTimeouts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 class WebDavCompatibleHttpClient {
 
 	private static final Logger LOG = LoggerFactory.getLogger(WebDavCompatibleHttpClient.class);
 
 	private final WebDavRedirectHandler webDavRedirectHandler;
 
-	WebDavCompatibleHttpClient(final WebDavCredential webDavCredential) {
-		this.webDavRedirectHandler = new WebDavRedirectHandler(httpClientFor(webDavCredential));
+	WebDavCompatibleHttpClient(final WebDavCredential webDavCredential, WebDavProviderConfig config) {
+		this.webDavRedirectHandler = new WebDavRedirectHandler(httpClientFor(webDavCredential, config));
 	}
 
-	private static OkHttpClient httpClientFor(final WebDavCredential webDavCredential) {
+	private static OkHttpClient httpClientFor(final WebDavCredential webDavCredential, WebDavProviderConfig config) {
 		final Map<String, CachingAuthenticator> authCache = new ConcurrentHashMap<>();
-		var networkTimeouts = NetworkTimeouts.createBySystemPropertiesOrDefaults();
 		final var builder = new OkHttpClient()
 				.newBuilder()
-				.connectTimeout(networkTimeouts.connection().getTimeout(), networkTimeouts.connection().getUnit())
-				.readTimeout(networkTimeouts.read().getTimeout(), networkTimeouts.read().getUnit())
-				.writeTimeout(networkTimeouts.write().getTimeout(), networkTimeouts.write().getUnit())
+				.connectTimeout(config.getConnectionTimeoutSeconds(), TimeUnit.SECONDS)
+				.readTimeout(config.getReadTimeoutSeconds(), TimeUnit.SECONDS)
+				.writeTimeout(config.getWriteTimeoutSeconds(), TimeUnit.SECONDS)
 				.followRedirects(false)
 				.addInterceptor(new HttpLoggingInterceptor(LOG::trace))
 				.authenticator(httpAuthenticator(webDavCredential.getUsername(), webDavCredential.getPassword(), authCache))
 				.addInterceptor(new AuthenticationCacheInterceptor(authCache));
-
 		return builder.build();
 	}
 

src/main/java/org/cryptomator/cloudaccess/webdav/WebDavCompatibleHttpClient.java

@@ -0,0 +1,34 @@
+package org.cryptomator.cloudaccess.webdav;
+
+public class WebDavProviderConfig {
+
+	private static final int DEFAULT_CONNECTION_TIMEOUT = 30;
+	private static final int DEFAULT_READ_TIMEOUT = 30;
+	private static final int DEFAULT_WRITE_TIMEOUT = 30;
+
+	private final int connectionTimeoutSeconds;
+	private final int readTimeoutSeconds;
+	private final int writeTimeoutSeconds;
+
+	WebDavProviderConfig() {
+		this.connectionTimeoutSeconds = Integer.getInteger("org.cryptomator.cloudaccess.webdav.connectionTimeoutSeconds", DEFAULT_CONNECTION_TIMEOUT);
+		this.readTimeoutSeconds = Integer.getInteger("org.cryptomator.cloudaccess.webdav.readTimeoutSeconds", DEFAULT_READ_TIMEOUT);
+		this.writeTimeoutSeconds = Integer.getInteger("org.cryptomator.cloudaccess.webdav.writeTimeoutSeconds", DEFAULT_WRITE_TIMEOUT);
+	}
+
+	public static WebDavProviderConfig createFromSystemPropertiesOrDefaults() {
+		return new WebDavProviderConfig();
+	}
+
+	int getConnectionTimeoutSeconds() {
+		return connectionTimeoutSeconds;
+	}
+
+	int getReadTimeoutSeconds() {
+		return readTimeoutSeconds;
+	}
+
+	int getWriteTimeoutSeconds() {
+		return writeTimeoutSeconds;
+	}
+}