- DEFAULT_MOUNT_POINT

+ MOUNT_TO_SYSTEM_CHOSEN_PATH
+ VOLUME_ID

Author: overheadhunter

src/main/java/org/cryptomator/integrations/mount/MountBuilder.java

@@ -15,13 +15,16 @@ public interface MountBuilder {
 
 	/**
 	 * Sets the mount point.
+	 * <p>
+	 * Unless the mount provide supports {@link MountFeature#MOUNT_TO_SYSTEM_CHOSEN_PATH}, setting a mount point is required.
 	 *
 	 * @param mountPoint Where to mount the volume
 	 * @return <code>this</code>
-	 * @see MountProvider#getDefaultMountPoint(String)
 	 */
 	@Contract("_ -> this")
-	MountBuilder setMountpoint(Path mountPoint);
+	default MountBuilder setMountpoint(Path mountPoint) {
+		throw new UnsupportedOperationException();
+	}
 
 	/**
 	 * Sets mount flags.
@@ -36,6 +39,18 @@ default MountBuilder setMountFlags(String mountFlags) {
 		throw new UnsupportedOperationException();
 	}
 
+	/**
+	 * Use the given TCP port.
+	 *
+	 * @param port Fixed TCP port or 0 to use a system-assigned port
+	 * @return <code>this</code>
+	 * @throws UnsupportedOperationException If {@link MountFeature#PORT} is not supported
+	 */
+	@Contract("_ -> this")
+	default MountBuilder setPort(@Range(from = 0, to = Short.MAX_VALUE) int port) {
+		throw new UnsupportedOperationException();
+	}
+
 	/**
 	 * Instructs the mount to be read-only.
 	 *
@@ -49,18 +64,17 @@ default MountBuilder setReadOnly(boolean mountReadOnly) {
 	}
 
 	/**
-	 * Use the given TCP port.
+	 * Sets a unique volume id.
 	 *
-	 * @param port fixed TCP port or 0 to use a system-assigned port
+	 * @param volumeId Volume id
 	 * @return <code>this</code>
-	 * @throws UnsupportedOperationException If {@link MountFeature#PORT} is not supported
+	 * @throws UnsupportedOperationException If {@link MountFeature#VOLUME_ID} is not supported
 	 */
 	@Contract("_ -> this")
-	default MountBuilder setPort(@Range(from = 0, to = Short.MAX_VALUE) int port) {
+	default MountBuilder setVolumeId(String volumeId) {
 		throw new UnsupportedOperationException();
 	}
 
-
 	/**
 	 * Mounts the file system.
 	 *

src/main/java/org/cryptomator/integrations/mount/MountFeature.java

@@ -1,5 +1,7 @@
 package org.cryptomator.integrations.mount;
 
+import java.nio.file.Path;
+
 /**
  * Describes what aspects of the mount implementation can or should be used.
  * <p>
@@ -17,7 +19,7 @@ public enum MountFeature {
 	 * <p>
 	 * This option is mutually exclusive with {@link #MOUNT_WITHIN_EXISTING_PARENT}.
 	 *
-	 * @see #DEFAULT_MOUNT_POINT
+	 * @see #MOUNT_TO_SYSTEM_CHOSEN_PATH
 	 */
 	MOUNT_TO_EXISTING_DIR,
 
@@ -27,7 +29,7 @@ public enum MountFeature {
 	 * <p>
 	 * This option is mutually exclusive with {@link #MOUNT_TO_EXISTING_DIR}.
 	 *
-	 * @see #DEFAULT_MOUNT_POINT
+	 * @see #MOUNT_TO_SYSTEM_CHOSEN_PATH
 	 */
 	MOUNT_WITHIN_EXISTING_PARENT,
 
@@ -36,18 +38,23 @@ public enum MountFeature {
 	 *
 	 * @see #MOUNT_TO_EXISTING_DIR
 	 * @see #MOUNT_WITHIN_EXISTING_PARENT
+	 * @see #MOUNT_TO_SYSTEM_CHOSEN_PATH
 	 */
 	MOUNT_AS_DRIVE_LETTER,
 
 	/**
-	 * The provider supports suggesting a default mount point via {@link MountProvider#getDefaultMountPoint(String)}.
-	 * <p>
-	 * The default mount point is guaranteed to be supported by the mount builder, regardless of its normal restrictions.
+	 * The provider supports suggesting a default mount point, if no mount point is set via {@link MountBuilder#setMountpoint(Path)}.
 	 */
-	DEFAULT_MOUNT_POINT,
+	MOUNT_TO_SYSTEM_CHOSEN_PATH,
 
 	/**
-	 * The builder supports {@link MountBuilder#setReadOnly(boolean)}
+	 * The provider supports {@link MountProvider#getDefaultPort()}
+	 * and the builder requires {@link MountBuilder#setPort(int)}.
+	 */
+	PORT,
+
+	/**
+	 * The builder supports {@link MountBuilder#setReadOnly(boolean)}.
 	 */
 	READ_ONLY,
 
@@ -57,8 +64,7 @@ public enum MountFeature {
 	UNMOUNT_FORCED,
 
 	/**
-	 * The provider supports {@link MountProvider#getDefaultPort()}
-	 * and the builder requires {@link MountBuilder#setPort(int)}.
+	 * The builder requires {@link MountBuilder#setVolumeId(String)}.
 	 */
-	PORT
+	VOLUME_ID
 }

src/main/java/org/cryptomator/integrations/mount/MountProvider.java

@@ -40,21 +40,6 @@ static Stream<MountProvider> get() {
 	 */
 	boolean isSupported();
 
-	/**
-	 * A suitable mount point suggested by this provider.
-	 * <p>
-	 * Other than caller-provided mount points, the mount point suggested by this method can be
-	 * passed to {@link MountBuilder#setMountpoint(Path)} and is guaranteed to fulfill the builder's requirements
-	 * without further ado.
-	 *
-	 * @param mountPointSuffix String used in the generation of a mount point.
-	 * @return A path to a possible mount point.
-	 * @throws UnsupportedOperationException If {@link MountFeature#DEFAULT_MOUNT_POINT} is not supported
-	 */
-	default Path getDefaultMountPoint(String mountPointSuffix) {
-		throw new UnsupportedOperationException();
-	}
-
 	/**
 	 * Default mount flags. May be empty.
 	 *
@@ -84,6 +69,16 @@ default int getDefaultPort() {
 	 */
 	Set<MountFeature> supportedFeatures();
 
+	/**
+	 * Tests whether this provider supports the given feature.
+	 *
+	 * @param feature The feature
+	 * @return {@code true} if supported
+	 */
+	default boolean supportsFeature(MountFeature feature) {
+		return supportedFeatures().contains(feature);
+	}
+
 
 	/**
 	 * Creates a new mount builder.