From 640f5484e05a89fd77f7883bf5b2d348ddd346dc Mon Sep 17 00:00:00 2001 From: akwizgran <akwizgran@users.sourceforge.net> Date: Mon, 29 Feb 2016 14:07:30 +0000 Subject: [PATCH] Moved PrivateGroupFactory to clients package. --- .../api/{sync => clients}/PrivateGroupFactory.java | 4 +++- .../src/org/briarproject/clients/ClientsModule.java | 2 ++ .../{sync => clients}/PrivateGroupFactoryImpl.java | 4 ++-- .../briarproject/forum/ForumSharingManagerImpl.java | 2 +- .../briarproject/messaging/MessagingManagerImpl.java | 2 +- .../properties/TransportPropertyManagerImpl.java | 2 +- briar-core/src/org/briarproject/sync/SyncModule.java | 2 -- .../src/org/briarproject/sync/ConstantsTest.java | 9 +++++---- .../sync/SimplexMessagingIntegrationTest.java | 10 ++++++---- 9 files changed, 21 insertions(+), 16 deletions(-) rename briar-api/src/org/briarproject/api/{sync => clients}/PrivateGroupFactory.java (65%) rename briar-core/src/org/briarproject/{sync => clients}/PrivateGroupFactoryImpl.java (94%) diff --git a/briar-api/src/org/briarproject/api/sync/PrivateGroupFactory.java b/briar-api/src/org/briarproject/api/clients/PrivateGroupFactory.java similarity index 65% rename from briar-api/src/org/briarproject/api/sync/PrivateGroupFactory.java rename to briar-api/src/org/briarproject/api/clients/PrivateGroupFactory.java index 0de62ebc96..3a87775724 100644 --- a/briar-api/src/org/briarproject/api/sync/PrivateGroupFactory.java +++ b/briar-api/src/org/briarproject/api/clients/PrivateGroupFactory.java @@ -1,6 +1,8 @@ -package org.briarproject.api.sync; +package org.briarproject.api.clients; import org.briarproject.api.contact.Contact; +import org.briarproject.api.sync.ClientId; +import org.briarproject.api.sync.Group; public interface PrivateGroupFactory { diff --git a/briar-core/src/org/briarproject/clients/ClientsModule.java b/briar-core/src/org/briarproject/clients/ClientsModule.java index 39f9528562..4f3a1d4a9f 100644 --- a/briar-core/src/org/briarproject/clients/ClientsModule.java +++ b/briar-core/src/org/briarproject/clients/ClientsModule.java @@ -3,11 +3,13 @@ package org.briarproject.clients; import com.google.inject.AbstractModule; import org.briarproject.api.clients.ClientHelper; +import org.briarproject.api.clients.PrivateGroupFactory; public class ClientsModule extends AbstractModule { @Override protected void configure() { bind(ClientHelper.class).to(ClientHelperImpl.class); + bind(PrivateGroupFactory.class).to(PrivateGroupFactoryImpl.class); } } diff --git a/briar-core/src/org/briarproject/sync/PrivateGroupFactoryImpl.java b/briar-core/src/org/briarproject/clients/PrivateGroupFactoryImpl.java similarity index 94% rename from briar-core/src/org/briarproject/sync/PrivateGroupFactoryImpl.java rename to briar-core/src/org/briarproject/clients/PrivateGroupFactoryImpl.java index 424f8b3281..c1842e6ba6 100644 --- a/briar-core/src/org/briarproject/sync/PrivateGroupFactoryImpl.java +++ b/briar-core/src/org/briarproject/clients/PrivateGroupFactoryImpl.java @@ -1,8 +1,9 @@ -package org.briarproject.sync; +package org.briarproject.clients; import com.google.inject.Inject; import org.briarproject.api.Bytes; +import org.briarproject.api.clients.PrivateGroupFactory; import org.briarproject.api.contact.Contact; import org.briarproject.api.data.BdfWriter; import org.briarproject.api.data.BdfWriterFactory; @@ -10,7 +11,6 @@ import org.briarproject.api.identity.AuthorId; import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupFactory; -import org.briarproject.api.sync.PrivateGroupFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java b/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java index 872bd92990..c80de0a21a 100644 --- a/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java +++ b/briar-core/src/org/briarproject/forum/ForumSharingManagerImpl.java @@ -3,6 +3,7 @@ package org.briarproject.forum; import com.google.inject.Inject; import org.briarproject.api.FormatException; +import org.briarproject.api.clients.PrivateGroupFactory; import org.briarproject.api.contact.Contact; import org.briarproject.api.contact.ContactId; import org.briarproject.api.contact.ContactManager.AddContactHook; @@ -28,7 +29,6 @@ import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageFactory; import org.briarproject.api.sync.MessageId; -import org.briarproject.api.sync.PrivateGroupFactory; import org.briarproject.api.sync.ValidationManager.ValidationHook; import org.briarproject.api.system.Clock; import org.briarproject.util.StringUtils; diff --git a/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java b/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java index 2d4bf9c959..64a0a6c434 100644 --- a/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java +++ b/briar-core/src/org/briarproject/messaging/MessagingManagerImpl.java @@ -3,6 +3,7 @@ package org.briarproject.messaging; import com.google.inject.Inject; import org.briarproject.api.FormatException; +import org.briarproject.api.clients.PrivateGroupFactory; import org.briarproject.api.contact.Contact; import org.briarproject.api.contact.ContactId; import org.briarproject.api.contact.ContactManager.AddContactHook; @@ -24,7 +25,6 @@ import org.briarproject.api.sync.Group; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.MessageId; import org.briarproject.api.sync.MessageStatus; -import org.briarproject.api.sync.PrivateGroupFactory; import org.briarproject.util.StringUtils; import java.io.ByteArrayInputStream; diff --git a/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java b/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java index 60dbc96d5a..38400d1913 100644 --- a/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java +++ b/briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java @@ -5,6 +5,7 @@ import com.google.inject.Inject; import org.briarproject.api.DeviceId; import org.briarproject.api.FormatException; import org.briarproject.api.TransportId; +import org.briarproject.api.clients.PrivateGroupFactory; import org.briarproject.api.contact.Contact; import org.briarproject.api.contact.ContactId; import org.briarproject.api.contact.ContactManager.AddContactHook; @@ -30,7 +31,6 @@ import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.Message; import org.briarproject.api.sync.MessageFactory; import org.briarproject.api.sync.MessageId; -import org.briarproject.api.sync.PrivateGroupFactory; import org.briarproject.api.system.Clock; import org.briarproject.util.StringUtils; diff --git a/briar-core/src/org/briarproject/sync/SyncModule.java b/briar-core/src/org/briarproject/sync/SyncModule.java index 83c8f86ec5..64ed5d5053 100644 --- a/briar-core/src/org/briarproject/sync/SyncModule.java +++ b/briar-core/src/org/briarproject/sync/SyncModule.java @@ -9,7 +9,6 @@ import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.sync.MessageFactory; import org.briarproject.api.sync.PacketReaderFactory; import org.briarproject.api.sync.PacketWriterFactory; -import org.briarproject.api.sync.PrivateGroupFactory; import org.briarproject.api.sync.SyncSessionFactory; import org.briarproject.api.sync.ValidationManager; @@ -23,7 +22,6 @@ public class SyncModule extends AbstractModule { bind(MessageFactory.class).to(MessageFactoryImpl.class); bind(PacketReaderFactory.class).to(PacketReaderFactoryImpl.class); bind(PacketWriterFactory.class).to(PacketWriterFactoryImpl.class); - bind(PrivateGroupFactory.class).to(PrivateGroupFactoryImpl.class); bind(SyncSessionFactory.class).to( SyncSessionFactoryImpl.class).in(Singleton.class); } diff --git a/briar-tests/src/org/briarproject/sync/ConstantsTest.java b/briar-tests/src/org/briarproject/sync/ConstantsTest.java index f3af582b87..bac9995415 100644 --- a/briar-tests/src/org/briarproject/sync/ConstantsTest.java +++ b/briar-tests/src/org/briarproject/sync/ConstantsTest.java @@ -23,6 +23,7 @@ import org.briarproject.api.messaging.PrivateMessage; import org.briarproject.api.messaging.PrivateMessageFactory; import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.MessageId; +import org.briarproject.clients.ClientsModule; import org.briarproject.contact.ContactModule; import org.briarproject.crypto.CryptoModule; import org.briarproject.data.DataModule; @@ -56,10 +57,10 @@ public class ConstantsTest extends BriarTestCase { public ConstantsTest() throws Exception { Injector i = Guice.createInjector(new TestDatabaseModule(), new TestLifecycleModule(), new TestSystemModule(), - new ContactModule(), new CryptoModule(), new DatabaseModule(), - new DataModule(), new EventModule(), new ForumModule(), - new IdentityModule(), new MessagingModule(), new SyncModule(), - new TransportModule()); + new ClientsModule(), new ContactModule(), new CryptoModule(), + new DatabaseModule(), new DataModule(), new EventModule(), + new ForumModule(), new IdentityModule(), new MessagingModule(), + new SyncModule(), new TransportModule()); crypto = i.getInstance(CryptoComponent.class); authorFactory = i.getInstance(AuthorFactory.class); privateMessageFactory = i.getInstance(PrivateMessageFactory.class); diff --git a/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java b/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java index 87abf08f1d..1b366cc4f8 100644 --- a/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java +++ b/briar-tests/src/org/briarproject/sync/SimplexMessagingIntegrationTest.java @@ -35,6 +35,7 @@ import org.briarproject.api.transport.KeyManager; import org.briarproject.api.transport.StreamContext; import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamWriterFactory; +import org.briarproject.clients.ClientsModule; import org.briarproject.contact.ContactModule; import org.briarproject.crypto.CryptoModule; import org.briarproject.data.DataModule; @@ -86,10 +87,11 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase { private Injector createInjector(File dir) { return Guice.createInjector(new TestDatabaseModule(dir), - new TestSystemModule(), new ContactModule(), new CryptoModule(), - new DatabaseModule(), new DataModule(), new EventModule(), - new IdentityModule(), new LifecycleModule(), - new MessagingModule(), new SyncModule(), new TransportModule()); + new TestSystemModule(), new ClientsModule(), + new ContactModule(), new CryptoModule(), new DatabaseModule(), + new DataModule(), new EventModule(), new IdentityModule(), + new LifecycleModule(), new MessagingModule(), new SyncModule(), + new TransportModule()); } @Test -- GitLab