From 4f3cd2f47cb5424813f5926d6cc99fbb87c1c87f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 18 Jun 2021 15:16:57 +0200
Subject: [PATCH] replace JSR-305 Nullable annotation

---
 src/main/java/module-info.java                            | 1 -
 src/main/java/org/cryptomator/common/Nullable.java        | 8 ++++++++
 .../org/cryptomator/common/settings/VaultSettings.java    | 2 +-
 .../org/cryptomator/common/vaults/VaultComponent.java     | 2 +-
 .../java/org/cryptomator/common/vaults/VaultModule.java   | 2 +-
 .../java/org/cryptomator/ui/common/ErrorComponent.java    | 2 +-
 .../java/org/cryptomator/ui/common/ErrorController.java   | 3 ++-
 7 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/common/Nullable.java

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 5825e5b15..f0d61b987 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -25,7 +25,6 @@ module org.cryptomator.desktop {
 	/* TODO: filename-based modules: */
 	requires dagger;
 	requires static javax.inject; /* ugly dagger/guava crap */
-	requires static jsr305; /* ugly dagger/guava crap */
 	requires java.jwt;
 	requires com.fasterxml.jackson.databind; // TODO: tmp fix, waiting for https://github.com/auth0/java-jwt/pull/484
 	requires zxcvbn;
diff --git a/src/main/java/org/cryptomator/common/Nullable.java b/src/main/java/org/cryptomator/common/Nullable.java
new file mode 100644
index 000000000..cb0d9e887
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/Nullable.java
@@ -0,0 +1,8 @@
+package org.cryptomator.common;
+
+/**
+ * Replacement for JSR-305 to avoid runtime dependencies. Used in Dagger components.
+ */
+public @interface Nullable {
+
+}
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 10a023806..b3d4bb674 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -43,7 +43,7 @@ public class VaultSettings {
 	private static final Random RNG = new Random();
 
 	private final String id;
-	private final ObjectProperty<Path> path = new SimpleObjectProperty();
+	private final ObjectProperty<Path> path = new SimpleObjectProperty<>();
 	private final StringProperty displayName = new SimpleStringProperty();
 	private final StringProperty winDriveLetter = new SimpleStringProperty();
 	private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP);
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultComponent.java b/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
index 47be62520..588ff64cd 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
@@ -7,10 +7,10 @@ package org.cryptomator.common.vaults;
 
 import dagger.BindsInstance;
 import dagger.Subcomponent;
+import org.cryptomator.common.Nullable;
 import org.cryptomator.common.mountpoint.MountPointChooserModule;
 import org.cryptomator.common.settings.VaultSettings;
 
-import javax.annotation.Nullable;
 import javax.inject.Named;
 
 @PerVault
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 756fa5aa8..55ba2e020 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -8,6 +8,7 @@ package org.cryptomator.common.vaults;
 import dagger.Module;
 import dagger.Provides;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Nullable;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.settings.VolumeImpl;
@@ -15,7 +16,6 @@ import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.StringBinding;
diff --git a/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
index 285270b4c..92276f5bd 100644
--- a/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
+++ b/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
@@ -2,8 +2,8 @@ package org.cryptomator.ui.common;
 
 import dagger.BindsInstance;
 import dagger.Subcomponent;
+import org.cryptomator.common.Nullable;
 
-import javax.annotation.Nullable;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
diff --git a/src/main/java/org/cryptomator/ui/common/ErrorController.java b/src/main/java/org/cryptomator/ui/common/ErrorController.java
index c7f19a9e6..85b335b15 100644
--- a/src/main/java/org/cryptomator/ui/common/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/common/ErrorController.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.common;
 
-import javax.annotation.Nullable;
+import org.cryptomator.common.Nullable;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.fxml.FXML;