diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousConstants.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousConstants.java similarity index 89% rename from bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousConstants.java rename to bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousConstants.java index df48858459825ff98ef54dc7401674c5a74cd3a7..6a8c7d836d4fdd11c9718c3973b2745b610c102c 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/rendezvous/RendezvousConstants.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousConstants.java @@ -1,9 +1,9 @@ -package org.briarproject.bramble.api.rendezvous; +package org.briarproject.bramble.rendezvous; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.MINUTES; -public interface RendezvousConstants { +interface RendezvousConstants { /** * The current version of the rendezvous protocol. 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 a8cea4be7400a407f0b3e4d6cbf5bd69ac0ed434..9d66fdbeea95bda65c71b1074243cac176a2d069 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 @@ -10,8 +10,8 @@ import org.briarproject.bramble.api.rendezvous.RendezvousCrypto; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; -import static org.briarproject.bramble.api.rendezvous.RendezvousConstants.KEY_MATERIAL_LABEL; -import static org.briarproject.bramble.api.rendezvous.RendezvousConstants.RENDEZVOUS_KEY_LABEL; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.KEY_MATERIAL_LABEL; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.RENDEZVOUS_KEY_LABEL; import static org.briarproject.bramble.util.StringUtils.toUtf8; @Immutable 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 7f851126357e59d01fac86b9bb77b246f6193d91..3697f12cc59cece166ec1b31049a1eb53ceb8265 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 @@ -59,8 +59,8 @@ import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNull; -import static org.briarproject.bramble.api.rendezvous.RendezvousConstants.POLLING_INTERVAL_MS; -import static org.briarproject.bramble.api.rendezvous.RendezvousConstants.RENDEZVOUS_TIMEOUT_MS; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.POLLING_INTERVAL_MS; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.RENDEZVOUS_TIMEOUT_MS; import static org.briarproject.bramble.util.IoUtils.tryToClose; import static org.briarproject.bramble.util.LogUtils.logException; 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 06ad7a3c8c3ee78b424fe201afdfa23a9f844a53..071f2c347aa111be0678a629ecad9c681a576248 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 @@ -37,8 +37,8 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Collections.singletonList; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.briarproject.bramble.api.rendezvous.RendezvousConstants.POLLING_INTERVAL_MS; -import static org.briarproject.bramble.api.rendezvous.RendezvousConstants.RENDEZVOUS_TIMEOUT_MS; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.POLLING_INTERVAL_MS; +import static org.briarproject.bramble.rendezvous.RendezvousConstants.RENDEZVOUS_TIMEOUT_MS; import static org.briarproject.bramble.test.CollectionMatcher.collectionOf; import static org.briarproject.bramble.test.PairMatcher.pairOf; import static org.briarproject.bramble.test.TestUtils.getAgreementPrivateKey;