Switched Roboguice/Guice out for Dagger 2

briar-core/src/org/briarproject/sync/MessageFactoryImpl.java

@@ -1,6 +1,5 @@
 package org.briarproject.sync;
 
-import com.google.inject.Inject;
 
 import org.briarproject.api.UniqueId;
 import org.briarproject.api.crypto.CryptoComponent;
@@ -10,6 +9,8 @@ import org.briarproject.api.sync.MessageFactory;
 import org.briarproject.api.sync.MessageId;
 import org.briarproject.util.ByteUtils;
 
+import javax.inject.Inject;
+
 import static org.briarproject.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
 import static org.briarproject.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 

briar-core/src/org/briarproject/sync/SyncModule.java

@@ -1,32 +1,84 @@
 package org.briarproject.sync;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-
+import org.briarproject.api.crypto.CryptoComponent;
+import org.briarproject.api.data.BdfWriterFactory;
+import org.briarproject.api.data.ObjectReader;
+import org.briarproject.api.db.DatabaseComponent;
+import org.briarproject.api.db.DatabaseExecutor;
 import org.briarproject.api.event.EventBus;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
 import org.briarproject.api.lifecycle.LifecycleManager;
+import org.briarproject.api.sync.Group;
 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;
+import org.briarproject.api.system.Clock;
+
+import java.util.concurrent.Executor;
 
 import javax.inject.Singleton;
 
-public class SyncModule extends AbstractModule {
+import dagger.Module;
+import dagger.Provides;
 
-	@Override
-	protected void configure() {
-		bind(GroupFactory.class).to(GroupFactoryImpl.class);
-		bind(MessageFactory.class).to(MessageFactoryImpl.class);
-		bind(PacketReaderFactory.class).to(PacketReaderFactoryImpl.class);
-		bind(PacketWriterFactory.class).to(PacketWriterFactoryImpl.class);
-		bind(SyncSessionFactory.class).to(
-				SyncSessionFactoryImpl.class).in(Singleton.class);
+@Module
+public class SyncModule {
+
+	@Provides
+	AuthorFactory provideAuthFactory(CryptoComponent crypto,
+			BdfWriterFactory bdfWriterFactory, Clock clock) {
+		return new AuthorFactoryImpl(crypto, bdfWriterFactory, clock);
 	}
 
-	@Provides @Singleton
+	@Provides
+	GroupFactory provideGroupFactory(CryptoComponent crypto) {
+		return new GroupFactoryImpl(crypto);
+	}
+
+	@Provides
+	MessageFactory provideMessageFactory(CryptoComponent crypto) {
+		return new MessageFactoryImpl(crypto);
+	}
+
+	@Provides
+	PacketReaderFactory providePacketReaderFactory(CryptoComponent crypto) {
+		return new PacketReaderFactoryImpl(crypto);
+	}
+
+	@Provides
+	PacketWriterFactory providePacketWriterFactory() {
+		return new PacketWriterFactoryImpl();
+	}
+
+	@Provides
+	PrivateGroupFactory providePrivateGroupFactory(GroupFactory groupFactory,
+			BdfWriterFactory bdfWriterFactory) {
+		return new PrivateGroupFactoryImpl(groupFactory, bdfWriterFactory);
+	}
+
+	@Provides
+	@Singleton
+	SyncSessionFactory provideSyncSessionFactory(DatabaseComponent db,
+			@DatabaseExecutor Executor dbExecutor, EventBus eventBus,
+			Clock clock, PacketReaderFactory packetReaderFactory,
+			PacketWriterFactory packetWriterFactory) {
+		return new SyncSessionFactoryImpl(db, dbExecutor, eventBus, clock,
+				packetReaderFactory, packetWriterFactory);
+	}
+
+
+	@Provides
+	ObjectReader<Author> getAuthorReader(AuthorFactory authorFactory) {
+		return new AuthorReader(authorFactory);
+	}
+
+	@Provides
+	@Singleton
 	ValidationManager getValidationManager(LifecycleManager lifecycleManager,
 			EventBus eventBus, ValidationManagerImpl validationManager) {
 		lifecycleManager.register(validationManager);

briar-core/src/org/briarproject/sync/ValidationManagerImpl.java

@@ -1,7 +1,5 @@
 package org.briarproject.sync;
 
-import com.google.inject.Inject;
-
 import org.briarproject.api.UniqueId;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.db.DatabaseComponent;
@@ -30,6 +28,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
+import javax.inject.Inject;
+
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;