From 151ef6c7b26dd21709df98f9b63bbae19291e49f Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 8 May 2023 19:12:35 +0200
Subject: [PATCH] upgrade to jdk20

* use pattern matching preview feature
* bump fuse-nio-adapter
---
 .idea/misc.xml                                |  2 +-
 pom.xml                                       |  9 ++++---
 .../cryptomator/ipc/IpcMessageListener.java   |  8 +++---
 .../ui/health/StartController.java            | 18 +++++++------
 .../ui/traymenu/AwtTrayMenuController.java    | 25 ++++++++++---------
 .../UnlockInvalidMountPointController.java    | 13 +++++-----
 6 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e5d629592..891096945 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_20_PREVIEW" project-jdk-name="20" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 084ceeb7e..433a89f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>19</project.jdk.version>
+		<project.jdk.version>20</project.jdk.version>
 
 		<!-- Group IDs of jars that need to stay on the class path for now -->
 		<!-- Once hypfvieh, swiesend, purejava and integrations-linux have module-info, remove them-->
@@ -38,7 +38,7 @@
 		<cryptomator.integrations.win.version>1.2.0</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.2.0</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>1.2.0</cryptomator.integrations.linux.version>
-		<cryptomator.fuse.version>2.0.5</cryptomator.fuse.version>
+		<cryptomator.fuse.version>3.0.0</cryptomator.fuse.version>
 		<cryptomator.dokany.version>2.0.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>2.0.2</cryptomator.webdav.version>
 
@@ -64,7 +64,7 @@
 		<!-- build-time dependencies -->
 		<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
 		<dependency-check.version>8.1.0</dependency-check.version>
-		<jacoco.version>0.8.8</jacoco.version>
+		<jacoco.version>0.8.9</jacoco.version>
 	</properties>
 
 	<dependencies>
@@ -332,6 +332,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>--enable-preview</argLine>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java
index f49275824..f2e76dc2a 100644
--- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java
+++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java
@@ -5,10 +5,10 @@ import java.util.List;
 public interface IpcMessageListener {
 
 	default void handleMessage(IpcMessage message) {
-		if (message instanceof RevealRunningAppMessage) {
-			revealRunningApp();
-		} else if (message instanceof HandleLaunchArgsMessage m) {
-			handleLaunchArgs(m.args());
+		switch (message) {
+			case RevealRunningAppMessage x -> revealRunningApp();
+			case HandleLaunchArgsMessage hlam -> handleLaunchArgs(hlam.args());
+			default -> {}
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java
index fa41a7fdc..4e95b6b0f 100644
--- a/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -102,14 +102,16 @@ public class StartController implements FxController {
 	}
 
 	private void loadingKeyFailed(Throwable e) {
-		if (e instanceof UnlockCancelledException) {
-			// ok
-		} else if (e instanceof VaultKeyInvalidException) {
-			LOG.error("Invalid key"); //TODO: specific error screen
-			appWindows.showErrorWindow(e, window, null);
-		} else {
-			LOG.error("Failed to load key.", e);
-			appWindows.showErrorWindow(e, window, null);
+		switch (e) {
+			case UnlockCancelledException uce -> {} //ok
+			case VaultKeyInvalidException vkie -> {
+				LOG.error("Invalid key"); //TODO: specific error screen
+				appWindows.showErrorWindow(e, window, null);
+			}
+			default -> {
+				LOG.error("Failed to load key.", e);
+				appWindows.showErrorWindow(e, window, null);
+			}
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
index 704ffa9ab..2f1d4e620 100644
--- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
+++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
@@ -84,18 +84,19 @@ public class AwtTrayMenuController implements TrayMenuController {
 
 	private void addChildren(Menu menu, List<TrayMenuItem> items) {
 		for (var item : items) {
-			// TODO: use Pattern Matching for switch, once available
-			if (item instanceof ActionItem a) {
-				var menuItem = new MenuItem(a.title());
-				menuItem.addActionListener(evt -> a.action().run());
-				menuItem.setEnabled(a.enabled());
-				menu.add(menuItem);
-			} else if (item instanceof SeparatorItem) {
-				menu.addSeparator();
-			} else if (item instanceof SubMenuItem s) {
-				var submenu = new Menu(s.title());
-				addChildren(submenu, s.items());
-				menu.add(submenu);
+			switch (item) {
+				case ActionItem a -> {
+					var menuItem = new MenuItem(a.title());
+					menuItem.addActionListener(evt -> a.action().run());
+					menuItem.setEnabled(a.enabled());
+					menu.add(menuItem);
+				}
+				case SeparatorItem si -> menu.addSeparator();
+				case SubMenuItem smi -> {
+					var submenu = new Menu(smi.title());
+					addChildren(submenu, smi.items());
+					menu.add(submenu);
+				}
 			}
 		}
 	}
diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index aeb4a9166..22a1b1eec 100644
--- a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -38,13 +38,12 @@ public class UnlockInvalidMountPointController implements FxController {
 	@FXML
 	public void initialize() {
 		var e = unlockException.get();
-		String translationKey = "unlock.error.customPath.description.generic";
-		if (e instanceof MountPointNotSupportedException) {
-			translationKey = "unlock.error.customPath.description.notSupported";
-		} else if (e instanceof MountPointNotExistsException) {
-			translationKey = "unlock.error.customPath.description.notExists";
-		}
-		dialogDescription.setFormat(resourceBundle.getString(translationKey));
+		var translationKeySuffix = switch (e) {
+			case MountPointNotSupportedException x -> "notSupported";
+			case MountPointNotExistsException x -> "notExists";
+			default -> "generic";
+		};
+		dialogDescription.setFormat(resourceBundle.getString("unlock.error.customPath.description." + translationKeySuffix));
 		dialogDescription.setArg1(e.getMessage());
 	}