Using switch expressions

main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java

@@ -58,46 +58,22 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		while (in.hasNext()) {
 			String name = in.nextName();
 			switch (name) {
-				case "directories":
-					settings.getDirectories().addAll(readVaultSettingsArray(in));
-					break;
-				case "askedForUpdateCheck":
-					settings.askedForUpdateCheck().set(in.nextBoolean());
-					break;
-				case "checkForUpdatesEnabled":
-					settings.checkForUpdates().set(in.nextBoolean());
-					break;
-				case "startHidden":
-					settings.startHidden().set(in.nextBoolean());
-					break;
-				case "port":
-					settings.port().set(in.nextInt());
-					break;
-				case "numTrayNotifications":
-					settings.numTrayNotifications().set(in.nextInt());
-					break;
-				case "preferredGvfsScheme":
-					settings.preferredGvfsScheme().set(parseWebDavUrlSchemePrefix(in.nextString()));
-					break;
-				case "debugMode":
-					settings.debugMode().set(in.nextBoolean());
-					break;
-				case "preferredVolumeImpl":
-					settings.preferredVolumeImpl().set(parsePreferredVolumeImplName(in.nextString()));
-					break;
-				case "theme":
-					settings.theme().set(parseUiTheme(in.nextString()));
-					break;
-				case "uiOrientation":
-					settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString()));
-					break;
-				case "licenseKey":
-					settings.licenseKey().set(in.nextString());
-					break;
-				default:
+				case "directories" -> settings.getDirectories().addAll(readVaultSettingsArray(in));
+				case "askedForUpdateCheck" -> settings.askedForUpdateCheck().set(in.nextBoolean());
+				case "checkForUpdatesEnabled" -> settings.checkForUpdates().set(in.nextBoolean());
+				case "startHidden" -> settings.startHidden().set(in.nextBoolean());
+				case "port" -> settings.port().set(in.nextInt());
+				case "numTrayNotifications" -> settings.numTrayNotifications().set(in.nextInt());
+				case "preferredGvfsScheme" -> settings.preferredGvfsScheme().set(parseWebDavUrlSchemePrefix(in.nextString()));
+				case "debugMode" -> settings.debugMode().set(in.nextBoolean());
+				case "preferredVolumeImpl" -> settings.preferredVolumeImpl().set(parsePreferredVolumeImplName(in.nextString()));
+				case "theme" -> settings.theme().set(parseUiTheme(in.nextString()));
+				case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString()));
+				case "licenseKey" -> settings.licenseKey().set(in.nextString());
+				default -> {
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
-					break;
+				}
 			}
 		}
 		in.endObject();

main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java

@@ -52,48 +52,22 @@ class VaultSettingsJsonAdapter {
 		while (in.hasNext()) {
 			String name = in.nextName();
 			switch (name) {
-				case "id":
-					id = in.nextString();
-					break;
-				case "path":
-					path = in.nextString();
-					break;
-				case "mountName":
-					mountName = in.nextString();
-					break;
-				case "winDriveLetter":
-					winDriveLetter = in.nextString();
-					break;
-				case "unlockAfterStartup":
-					unlockAfterStartup = in.nextBoolean();
-					break;
-				case "revealAfterMount":
-					revealAfterMount = in.nextBoolean();
-					break;
-				case "usesIndividualMountPath":
-				case "useCustomMountPath":
-					useCustomMountPath = in.nextBoolean();
-					break;
-				case "individualMountPath":
-				case "customMountPath":
-					customMountPath = in.nextString();
-					break;
-				case "usesReadOnlyMode":
-					usesReadOnlyMode = in.nextBoolean();
-					break;
-				case "mountFlags":
-					mountFlags = in.nextString();
-					break;
-				case "filenameLengthLimit":
-					filenameLengthLimit = in.nextInt();
-					break;
-				case "actionAfterUnlock":
-					actionAfterUnlock = parseActionAfterUnlock(in.nextString());
-					break;
-				default:
+				case "id" -> id = in.nextString();
+				case "path" -> path = in.nextString();
+				case "mountName" -> mountName = in.nextString();
+				case "winDriveLetter" -> winDriveLetter = in.nextString();
+				case "unlockAfterStartup" -> unlockAfterStartup = in.nextBoolean();
+				case "revealAfterMount" -> revealAfterMount = in.nextBoolean();
+				case "usesIndividualMountPath", "useCustomMountPath" -> useCustomMountPath = in.nextBoolean();
+				case "individualMountPath", "customMountPath" -> customMountPath = in.nextString();
+				case "usesReadOnlyMode" -> usesReadOnlyMode = in.nextBoolean();
+				case "mountFlags" -> mountFlags = in.nextString();
+				case "filenameLengthLimit" -> filenameLengthLimit = in.nextInt();
+				case "actionAfterUnlock" -> actionAfterUnlock = parseActionAfterUnlock(in.nextString());
+				default -> {
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
-					break;
+				}
 			}
 		}
 		in.endObject();

main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

@@ -121,15 +121,14 @@ public class FxApplication extends Application {
 	private void loadSelectedStyleSheet(UiTheme desiredTheme) {
 		UiTheme theme = licenseHolder.isValidLicense() ? desiredTheme : UiTheme.LIGHT;
 		switch (theme) {
-			case DARK:
+			case DARK -> {
 				Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString());
 				macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToDarkAqua));
-				break;
-			case LIGHT:
-			default:
+			}
+			case LIGHT -> {
 				Application.setUserAgentStylesheet(getClass().getResource("/css/light_theme.css").toString());
 				macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToAqua));
-				break;
+			}
 		}
 	}
 

main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java

@@ -52,19 +52,13 @@ class AppLaunchEventHandler {
 
 	private void handleLaunchEvent(boolean hasTrayIcon, AppLaunchEvent event) {
 		switch (event.getType()) {
-			case REVEAL_APP:
-				fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);
-				break;
-			case OPEN_FILE:
-				fxApplicationStarter.get(hasTrayIcon).thenRun(() -> {
+			case REVEAL_APP -> fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);
+			case OPEN_FILE -> fxApplicationStarter.get(hasTrayIcon).thenRun(() -> {
 					Platform.runLater(() -> {
 						event.getPathsToOpen().forEach(this::addVault);
 					});
 				});
-				break;
-			default:
-				LOG.warn("Unsupported event type: {}", event.getType());
-				break;
+			default -> LOG.warn("Unsupported event type: {}", event.getType());
 		}
 	}
 

main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java

@@ -66,7 +66,7 @@ public class VaultListController implements FxController {
 		}
 		VaultState reportedState = newValue.getState();
 		switch (reportedState) {
-			case LOCKED, NEEDS_MIGRATION, MISSING:
+			case LOCKED, NEEDS_MIGRATION, MISSING -> {
 				try {
 					VaultState determinedState = VaultListManager.determineVaultState(newValue.getPath());
 					newValue.setState(determinedState);
@@ -75,9 +75,8 @@ public class VaultListController implements FxController {
 					newValue.setState(VaultState.ERROR);
 					newValue.setLastKnownException(e);
 				}
-				break;
-			case ERROR, UNLOCKED, PROCESSING:
-				break; // no-op
+			}
+			case ERROR, UNLOCKED, PROCESSING -> {}
 		}
 	}