Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Moved author classes to identity package.

Browse Source
This commit is contained in:
akwizgran
2016-02-08 14:27:27 +00:00
parent 675ce4bfef
commit 2460e1feb0
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-core/src/org/briarproject/sync/AuthorFactoryImpl.java → briar-core/src/org/briarproject/identity/AuthorFactoryImpl.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.sync; package org.briarproject.identity;
import org.briarproject.api.crypto.CryptoComponent; import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.data.BdfWriter; import org.briarproject.api.data.BdfWriter;
@@ -16,7 +16,6 @@ import javax.inject.Inject;
import static org.briarproject.api.db.StorageStatus.ADDING; import static org.briarproject.api.db.StorageStatus.ADDING;
// TODO: Move this class to the identity package
class AuthorFactoryImpl implements AuthorFactory { class AuthorFactoryImpl implements AuthorFactory {
private final CryptoComponent crypto; private final CryptoComponent crypto;

3
briar-core/src/org/briarproject/sync/AuthorReader.java → briar-core/src/org/briarproject/identity/AuthorReader.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.sync; package org.briarproject.identity;
import org.briarproject.api.FormatException; import org.briarproject.api.FormatException;
import org.briarproject.api.data.BdfReader; import org.briarproject.api.data.BdfReader;
@@ -11,7 +11,6 @@ import java.io.IOException;
import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH; import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH; import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
// TODO: Move this class to the identity package
class AuthorReader implements ObjectReader<Author> { class AuthorReader implements ObjectReader<Author> {
private final AuthorFactory authorFactory; private final AuthorFactory authorFactory;

11
briar-core/src/org/briarproject/identity/IdentityModule.java
View File

@@ -1,13 +1,24 @@
package org.briarproject.identity; package org.briarproject.identity;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.identity.IdentityManager; import org.briarproject.api.identity.IdentityManager;
public class IdentityModule extends AbstractModule { public class IdentityModule extends AbstractModule {
@Override @Override
protected void configure() { protected void configure() {
bind(AuthorFactory.class).to(
org.briarproject.identity.AuthorFactoryImpl.class);
bind(IdentityManager.class).to(IdentityManagerImpl.class); bind(IdentityManager.class).to(IdentityManagerImpl.class);
} }
@Provides
ObjectReader<Author> getAuthorReader(AuthorFactory authorFactory) {
return new org.briarproject.identity.AuthorReader(authorFactory);
}
} }

9
briar-core/src/org/briarproject/sync/SyncModule.java
View File

@@ -3,10 +3,7 @@ package org.briarproject.sync;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Provides; import com.google.inject.Provides;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.event.EventBus; 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.lifecycle.LifecycleManager;
import org.briarproject.api.sync.GroupFactory; import org.briarproject.api.sync.GroupFactory;
import org.briarproject.api.sync.MessageFactory; import org.briarproject.api.sync.MessageFactory;
@@ -22,7 +19,6 @@ public class SyncModule extends AbstractModule {
@Override @Override
protected void configure() { protected void configure() {
bind(AuthorFactory.class).to(AuthorFactoryImpl.class);
bind(GroupFactory.class).to(GroupFactoryImpl.class); bind(GroupFactory.class).to(GroupFactoryImpl.class);
bind(MessageFactory.class).to(MessageFactoryImpl.class); bind(MessageFactory.class).to(MessageFactoryImpl.class);
bind(PacketReaderFactory.class).to(PacketReaderFactoryImpl.class); bind(PacketReaderFactory.class).to(PacketReaderFactoryImpl.class);
@@ -32,11 +28,6 @@ public class SyncModule extends AbstractModule {
SyncSessionFactoryImpl.class).in(Singleton.class); SyncSessionFactoryImpl.class).in(Singleton.class);
} }
@Provides
ObjectReader<Author> getAuthorReader(AuthorFactory authorFactory) {
return new AuthorReader(authorFactory);
}
@Provides @Singleton @Provides @Singleton
ValidationManager getValidationManager(LifecycleManager lifecycleManager, ValidationManager getValidationManager(LifecycleManager lifecycleManager,
EventBus eventBus, ValidationManagerImpl validationManager) { EventBus eventBus, ValidationManagerImpl validationManager) {