code quality

Author: overheadhunter

src/main/java/org/cryptomator/cryptofs/AsyncDelegatingFileChannel.java

@@ -110,7 +110,7 @@ public Future<Integer> write(ByteBuffer src, long position) {
 
 	private <T> Future<T> exceptionalFuture(Throwable exception) {
 		CompletableFuture<T> future = new CompletableFuture<>();
-		future.completeExceptionally(new ClosedChannelException());
+		future.completeExceptionally(exception);
 		return future;
 	}
 

src/main/java/org/cryptomator/cryptofs/CryptoFileAttributeProvider.java

@@ -20,10 +20,6 @@
 
 class CryptoFileAttributeProvider {
 
-	private static interface AttributeProvider<A extends BasicFileAttributes> {
-		A provide(A delegate, Path ciphertextPath, FileHeaderCryptor headerCryptor);
-	}
-
 	private final Map<Class<? extends BasicFileAttributes>, AttributeProvider<? extends BasicFileAttributes>> attributeProviders = new HashMap<>();
 	private final FileHeaderCryptor headerCryptor;
 
@@ -45,4 +41,8 @@ public <A extends BasicFileAttributes> A readAttributes(Path ciphertextPath, Cla
 		}
 	}
 
+	private static interface AttributeProvider<A extends BasicFileAttributes> {
+		A provide(A delegate, Path ciphertextPath, FileHeaderCryptor headerCryptor);
+	}
+
 }

src/test/java/org/cryptomator/cryptofs/BasicPathTest.java

@@ -42,14 +42,13 @@ public class BasicPathTest {
 	public final ExpectedException thrown = ExpectedException.none();
 
 	private static final String FS_SCHEME = "MOCK";
-	private FileSystemProvider fsProvider;
 	private BasicFileSystem fs;
 	private BasicPath fsRoot;
 	private BasicPath emptyPath;
 
 	@Before
 	public void setup() {
-		fsProvider = Mockito.mock(FileSystemProvider.class);
+		FileSystemProvider fsProvider = Mockito.mock(FileSystemProvider.class);
 		fs = Mockito.mock(BasicFileSystem.class);
 		fsRoot = new BasicPath(fs, Collections.emptyList(), true);
 		emptyPath = new BasicPath(fs, Collections.emptyList(), false);

src/test/java/org/cryptomator/cryptofs/CryptoFileAttributeProviderTest.java

@@ -26,9 +26,6 @@ public class CryptoFileAttributeProviderTest {
 
 	private FileHeaderCryptor fileHeaderCryptor;
 	private Path ciphertextFilePath;
-	private BasicFileAttributes basicAttr;
-	private PosixFileAttributes posixAttr;
-	private DosFileAttributes dosAttr;
 
 	@Before
 	public void setup() throws IOException {
@@ -38,9 +35,9 @@ public void setup() throws IOException {
 		Mockito.when(ciphertextFilePath.getFileSystem()).thenReturn(fs);
 		FileSystemProvider provider = Mockito.mock(FileSystemProvider.class);
 		Mockito.when(fs.provider()).thenReturn(provider);
-		basicAttr = Mockito.mock(BasicFileAttributes.class);
-		posixAttr = Mockito.mock(PosixFileAttributes.class);
-		dosAttr = Mockito.mock(DosFileAttributes.class);
+		BasicFileAttributes basicAttr = Mockito.mock(BasicFileAttributes.class);
+		PosixFileAttributes posixAttr = Mockito.mock(PosixFileAttributes.class);
+		DosFileAttributes dosAttr = Mockito.mock(DosFileAttributes.class);
 		Mockito.when(provider.readAttributes(Mockito.same(ciphertextFilePath), Mockito.same(BasicFileAttributes.class), Mockito.any())).thenReturn(basicAttr);
 		Mockito.when(provider.readAttributes(Mockito.same(ciphertextFilePath), Mockito.same(PosixFileAttributes.class), Mockito.any())).thenReturn(posixAttr);
 		Mockito.when(provider.readAttributes(Mockito.same(ciphertextFilePath), Mockito.same(DosFileAttributes.class), Mockito.any())).thenReturn(dosAttr);

src/test/java/org/cryptomator/cryptofs/CryptoFileSystemTest.java

@@ -41,14 +41,13 @@ public synchronized void nextBytes(byte[] bytes) {
 	public final ExpectedException thrown = ExpectedException.none();
 
 	private Path tmpPath;
-	private ConcurrentHashMap<Path, CryptoFileSystem> openFileSystems;
 	private CryptoFileSystemProvider provider;
 
 	@Before
 	public void setup() throws IOException, ReflectiveOperationException {
 		tmpPath = Files.createTempDirectory("unit-tests");
-		openFileSystems = new ConcurrentHashMap<>();
 		provider = Mockito.mock(CryptoFileSystemProvider.class);
+		ConcurrentHashMap<Path, CryptoFileSystem> openFileSystems = new ConcurrentHashMap<>();
 		Mockito.when(provider.getFileSystems()).thenReturn(openFileSystems);
 	}