some more flat hierarchy fixes

main/crypto-api/src/main/java/org/cryptomator/crypto/AbstractCryptorDecorator.java

@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.DirectoryStream.Filter;
-import java.nio.file.Path;
 
 import javax.security.auth.DestroyFailedException;
 
@@ -40,13 +38,13 @@ public class AbstractCryptorDecorator implements Cryptor {
 	}
 
 	@Override
-	public String encryptFilename(String cleartextName, CryptorMetadataSupport ioSupport) throws IOException {
-		return cryptor.encryptFilename(cleartextName, ioSupport);
+	public String encryptFilename(String cleartextName) {
+		return cryptor.encryptFilename(cleartextName);
 	}
 
 	@Override
-	public String decryptFilename(String ciphertextName, CryptorMetadataSupport ioSupport) throws IOException, DecryptFailedException {
-		return cryptor.decryptFilename(ciphertextName, ioSupport);
+	public String decryptFilename(String ciphertextName) throws DecryptFailedException {
+		return cryptor.decryptFilename(ciphertextName);
 	}
 
 	@Override
@@ -74,11 +72,6 @@ public class AbstractCryptorDecorator implements Cryptor {
 		return cryptor.encryptFile(plaintextFile, encryptedFile);
 	}
 
-	@Override
-	public Filter<Path> getPayloadFilesFilter() {
-		return cryptor.getPayloadFilesFilter();
-	}
-
 	@Override
 	public void destroy() throws DestroyFailedException {
 		cryptor.destroy();

main/crypto-api/src/main/java/org/cryptomator/crypto/Cryptor.java

@@ -12,8 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.DirectoryStream.Filter;
-import java.nio.file.Path;
 
 import javax.security.auth.Destroyable;
 
@@ -57,22 +55,18 @@ public interface Cryptor extends Destroyable {
 	 * Encrypts the name of a file. See {@link #encryptDirectoryPath(String, char)} for parent dir.
 	 * 
 	 * @param cleartextName A plaintext filename without any preceeding directory paths.
-	 * @param ioSupport Support object allowing the Cryptor to read and write its own metadata to a storage space associated with this support object.
 	 * @return Encrypted filename.
-	 * @throws IOException If ioSupport throws an IOException
 	 */
-	String encryptFilename(String cleartextName, CryptorMetadataSupport ioSupport) throws IOException;
+	String encryptFilename(String cleartextName);
 
 	/**
 	 * Decrypts the name of a file.
 	 * 
 	 * @param ciphertextName A ciphertext filename without any preceeding directory paths.
-	 * @param ioSupport Support object allowing the Cryptor to read and write its own metadata to a storage space associated with this support object.
 	 * @return Decrypted filename.
 	 * @throws DecryptFailedException If the decryption failed for various reasons (including wrong password).
-	 * @throws IOException If ioSupport throws an IOException
 	 */
-	String decryptFilename(String ciphertextName, CryptorMetadataSupport ioSupport) throws IOException, DecryptFailedException;
+	String decryptFilename(String ciphertextName) throws DecryptFailedException;
 
 	/**
 	 * @param metadataSupport Support object allowing the Cryptor to read and write its own metadata to the location of the encrypted file.
@@ -105,9 +99,4 @@ public interface Cryptor extends Destroyable {
 	 */
 	Long encryptFile(InputStream plaintextFile, SeekableByteChannel encryptedFile) throws IOException, EncryptFailedException;
 
-	/**
-	 * @return A filter, that returns <code>true</code> for encrypted files, i.e. if the file is an actual user payload and not a supporting metadata file of the {@link Cryptor}.
-	 */
-	Filter<Path> getPayloadFilesFilter();
-
 }

main/crypto-api/src/main/java/org/cryptomator/crypto/CryptorMetadataSupport.java

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Sebastian Stenzel
- * This file is licensed under the terms of the MIT license.
- * See the LICENSE.txt file for more info.
- * 
- * Contributors:
- *     Sebastian Stenzel - initial API and implementation
- ******************************************************************************/
-package org.cryptomator.crypto;
-
-import java.io.IOException;
-
-/**
- * Methods that may be called by the Cryptor when accessing a path.
- */
-public interface CryptorMetadataSupport {
-
-	/**
-	 * Persists encryptedMetadata in a metadata group.
-	 * 
-	 * @param metadataFilename File relative to
-	 * @throws IOException
-	 */
-	void writeMetadata(String metadataGroup, byte[] encryptedMetadata) throws IOException;
-
-	/**
-	 * @return Previously written metadata stored in the given metadata group or <code>null</code> if no such group exists.
-	 */
-	byte[] readMetadata(String metadataGroup) throws IOException;
-
-}

main/crypto-api/src/main/java/org/cryptomator/crypto/PathCachingCryptorDecorator.java

@@ -1,6 +1,5 @@
 package org.cryptomator.crypto;
 
-import java.io.IOException;
 import java.util.Map;
 
 import org.apache.commons.collections4.BidiMap;
@@ -38,22 +37,22 @@ public class PathCachingCryptorDecorator extends AbstractCryptorDecorator {
 	}
 
 	@Override
-	public String encryptFilename(String cleartextName, CryptorMetadataSupport ioSupport) throws IOException {
+	public String encryptFilename(String cleartextName) {
 		if (nameCache.containsKey(cleartextName)) {
 			return nameCache.get(cleartextName);
 		} else {
-			final String ciphertextName = cryptor.encryptFilename(cleartextName, ioSupport);
+			final String ciphertextName = cryptor.encryptFilename(cleartextName);
 			nameCache.put(cleartextName, ciphertextName);
 			return ciphertextName;
 		}
 	}
 
 	@Override
-	public String decryptFilename(String ciphertextName, CryptorMetadataSupport ioSupport) throws IOException, DecryptFailedException {
+	public String decryptFilename(String ciphertextName) throws DecryptFailedException {
 		if (nameCache.containsValue(ciphertextName)) {
 			return nameCache.getKey(ciphertextName);
 		} else {
-			final String cleartextName = cryptor.decryptFilename(ciphertextName, ioSupport);
+			final String cleartextName = cryptor.decryptFilename(ciphertextName);
 			nameCache.put(cleartextName, ciphertextName);
 			return ciphertextName;
 		}