From df86f2f25893c58a0067d7acf0df1f1fd184d3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Mon, 3 Oct 2022 15:25:35 +0200
Subject: [PATCH] Fix imports for null-safety annotations

---
 .../test/java/org/briarproject/bramble/test/FakeTorPlugin.java  | 2 +-
 .../briarproject/bramble/test/FakeTorPluginConfigModule.java    | 2 +-
 .../org/briarproject/bramble/test/FakeTorPluginFactory.java     | 2 +-
 .../java/org/briarproject/bramble/mailbox/TestUrlConverter.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java
index 3cffa75031..8e68f4f35a 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPlugin.java
@@ -3,7 +3,6 @@ package org.briarproject.bramble.test;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionHandler;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TorConstants;
@@ -13,6 +12,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
 import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 import java.util.logging.Logger;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java
index e65b39b053..49b9048ad8 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginConfigModule.java
@@ -1,10 +1,10 @@
 package org.briarproject.bramble.test;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java
index 70123aa5ed..32ea3139d4 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/test/FakeTorPluginFactory.java
@@ -1,11 +1,11 @@
 package org.briarproject.bramble.test;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
diff --git a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java
index d95a3eca0a..5841e7cc97 100644
--- a/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java
+++ b/mailbox-integration-tests/src/test/java/org/briarproject/bramble/mailbox/TestUrlConverter.java
@@ -1,6 +1,6 @@
 package org.briarproject.bramble.mailbox;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.nullsafety.NotNullByDefault;
 
 import static org.briarproject.bramble.mailbox.MailboxIntegrationTestUtils.URL_BASE;
 
-- 
GitLab