close executor services on filesystem.close()

Author: infeo

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

@@ -213,9 +213,11 @@ public void close() throws IOException {
 			open = false;
 			finallyUtil.guaranteeInvocationOf( //
 					() -> cryptoFileSystems.remove(this), //
-					() -> openCryptoFiles.close(), //
-					() -> directoryStreamFactory.close(), //
-					() -> cryptor.destroy());
+					openCryptoFiles::close, //
+					directoryStreamFactory::close, //
+					inUseManager::close, //
+					cryptor::destroy //
+			);
 		}
 	}
 

src/main/java/org/cryptomator/cryptofs/inuse/InUseManager.java

@@ -1,5 +1,6 @@
 package org.cryptomator.cryptofs.inuse;
 
+import java.io.Closeable;
 import java.nio.file.Path;
 import java.util.Optional;
 
@@ -11,7 +12,7 @@
  * 	<li>ignore the in-use-file for a ciphertext path</li>
  * </ul>
  */
-public interface InUseManager {
+public interface InUseManager extends Closeable {
 
 	/**
 	 * Checks if the given ciphertext path is used by others.

src/main/java/org/cryptomator/cryptofs/inuse/RealInUseManager.java

@@ -213,6 +213,25 @@ public void ignoreInUse(Path ciphertextPath) {
 		ignoredInUseFiles.put(inUseFilePath, Boolean.TRUE);
 	}
 
+	@Override
+	public void close() throws IOException {
+		tokenRefresher.shutdown();
+		tokenPersistor.shutdown();
+		try {
+			if (!tokenRefresher.awaitTermination(5, TimeUnit.SECONDS)) {
+				tokenRefresher.shutdownNow();
+			}
+			if (!tokenPersistor.awaitTermination(5, TimeUnit.SECONDS)) {
+				tokenPersistor.shutdownNow();
+			}
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+			tokenRefresher.shutdownNow();
+			tokenPersistor.shutdownNow();
+		}
+
+	}
+
 	/**
 	 * @param p a path with a filename ending with {@value Constants#CRYPTOMATOR_FILE_SUFFIX}
 	 * @return a sibling path with the file extension {@value Constants#INUSE_FILE_SUFFIX}

src/main/java/org/cryptomator/cryptofs/inuse/StubInUseManager.java

@@ -1,5 +1,11 @@
 package org.cryptomator.cryptofs.inuse;
 
+import java.io.IOException;
+
 public class StubInUseManager implements InUseManager {
 
+	@Override
+	public void close() throws IOException {
+
+	}
 }

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

@@ -288,7 +288,11 @@ public void setup() {
 					((RunnableThrowingException<?>) runnable).run();
 				}
 				return null;
-			}).when(finallyUtil).guaranteeInvocationOf(any(RunnableThrowingException.class), any(RunnableThrowingException.class), any(RunnableThrowingException.class), any(RunnableThrowingException.class));
+			}).when(finallyUtil).guaranteeInvocationOf(any(RunnableThrowingException.class),
+					any(RunnableThrowingException.class),
+					any(RunnableThrowingException.class),
+					any(RunnableThrowingException.class),
+					any(RunnableThrowingException.class));
 		}
 
 		@Test
@@ -298,6 +302,13 @@ public void testCloseRemovesThisFromCryptoFileSystems() throws IOException {
 			verify(cryptoFileSystems).remove(inTest);
 		}
 
+		@Test
+		public void testClosesInUseManager() throws IOException {
+			inTest.close();
+
+			verify(inUseManager).close();
+		}
+
 		@Test
 		public void testCloseDestroysCryptor() throws IOException {
 			inTest.close();
@@ -353,7 +364,11 @@ public void setup() {
 					((RunnableThrowingException<?>) runnable).run();
 				}
 				return null;
-			}).when(finallyUtil).guaranteeInvocationOf(any(RunnableThrowingException.class), any(RunnableThrowingException.class), any(RunnableThrowingException.class), any(RunnableThrowingException.class));
+			}).when(finallyUtil).guaranteeInvocationOf(any(RunnableThrowingException.class), //
+					any(RunnableThrowingException.class), //
+					any(RunnableThrowingException.class), //
+					any(RunnableThrowingException.class), //
+					any(RunnableThrowingException.class));
 		}
 
 		@Test