From 9f26415df935d198458f826ad8206cb46e427507 Mon Sep 17 00:00:00 2001
From: Thomas <3169-thomas@users.noreply.code.briarproject.org>
Date: Tue, 8 Nov 2022 22:44:47 +0100
Subject: [PATCH] Fix NullSafety change

---
 .../briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java    | 2 +-
 .../bramble/plugin/lora/AbstractLoRaPluginFactory.java          | 2 +-
 .../org/briarproject/bramble/plugin/lora/L2PTagManager.java     | 2 +-
 .../org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java    | 2 +-
 .../briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java
index 7bd852d6a0..73eab6ba9e 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPlugin.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.plugin.lora.L2PWriter;
 import org.briarproject.bramble.plugin.lora.L2PReader;
 import org.briarproject.bramble.plugin.lora.L2PReaderFactory;
 import org.briarproject.bramble.api.Pair;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.Backoff;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java
index d78e6234a2..9d97885b5b 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/AbstractLoRaPluginFactory.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java
index f904152e6e..e9f3b9e1b4 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/lora/L2PTagManager.java
@@ -33,7 +33,7 @@ import org.bouncycastle.crypto.digests.Blake2bDigest;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireExactlyOneNull;
+import static org.briarproject.nullsafety.NullSafety.requireExactlyOneNull;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
 import static org.briarproject.bramble.api.transport.TransportConstants.PROTOCOL_VERSION;
 import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java
index 0ec2e705ab..24fb5417b9 100644
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPlugin.java
@@ -5,7 +5,7 @@ import com.sun.jna.Native;
 
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.system.Clock;
diff --git a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java
index 7721580fd1..81645650ef 100644
--- a/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java
+++ b/bramble-java/src/main/java/org/briarproject/bramble/plugin/lora/UnixLoRaPluginFactory.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
-- 
GitLab