From 4452dacc94538f0be73589f711b6dc0d25b0e966 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 5 Jun 2019 11:01:28 +0100
Subject: [PATCH] Make RendezvousCrypto package-private.

---
 .../briarproject/bramble}/rendezvous/RendezvousCrypto.java   | 5 +++--
 .../bramble/rendezvous/RendezvousCryptoImpl.java             | 1 -
 .../briarproject/bramble/rendezvous/RendezvousModule.java    | 1 -
 .../bramble/rendezvous/RendezvousPollerImpl.java             | 1 -
 .../bramble/rendezvous/RendezvousPollerImplTest.java         | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)
 rename {bramble-api/src/main/java/org/briarproject/bramble/api => bramble-core/src/main/java/org/briarproject/bramble}/rendezvous/RendezvousCrypto.java (71%)

diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousCrypto.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java
similarity index 71%
rename from bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousCrypto.java
rename to bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java
index 268b80579..0fcd84417 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousCrypto.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCrypto.java
@@ -1,11 +1,12 @@
-package org.briarproject.bramble.api.rendezvous;
+package org.briarproject.bramble.rendezvous;
 
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
 
 @NotNullByDefault
-public interface RendezvousCrypto {
+interface RendezvousCrypto {
 
 	SecretKey deriveRendezvousKey(SecretKey staticMasterKey);
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java
index f2f0b2ca4..c0cf89f94 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousCryptoImpl.java
@@ -5,7 +5,6 @@ import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
-import org.briarproject.bramble.api.rendezvous.RendezvousCrypto;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousModule.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousModule.java
index f1693816d..41bf14f66 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousModule.java
@@ -2,7 +2,6 @@ package org.briarproject.bramble.rendezvous;
 
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.rendezvous.RendezvousCrypto;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java
index 3697f12cc..421d216ff 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java
@@ -33,7 +33,6 @@ import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent;
 import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
-import org.briarproject.bramble.api.rendezvous.RendezvousCrypto;
 import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousFailedEvent;
 import org.briarproject.bramble.api.system.Clock;
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java
index 071f2c347..d88ff47d3 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java
@@ -19,7 +19,6 @@ import org.briarproject.bramble.api.plugin.event.TransportDisabledEvent;
 import org.briarproject.bramble.api.plugin.event.TransportEnabledEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
-import org.briarproject.bramble.api.rendezvous.RendezvousCrypto;
 import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
 import org.briarproject.bramble.api.rendezvous.event.RendezvousFailedEvent;
 import org.briarproject.bramble.api.system.Clock;