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

Use javax.inject annotations rather than the Guice versions.

Browse Source
This commit is contained in:
akwizgran
2013-11-29 14:12:39 +00:00
parent 418b3c9a9d
commit 766b6f067a
57 changed files with 105 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java
View File

@@ -4,8 +4,8 @@ import static javax.crypto.Cipher.DECRYPT_MODE;
import static javax.crypto.Cipher.ENCRYPT_MODE;
import static net.sf.briar.api.invitation.InvitationConstants.CODE_BITS;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import static net.sf.briar.crypto.EllipticCurveConstants.PARAMETERS;
import static net.sf.briar.crypto.EllipticCurveConstants.P;
import static net.sf.briar.crypto.EllipticCurveConstants.PARAMETERS;
import static net.sf.briar.util.ByteUtils.MAX_32_BIT_UNSIGNED;
import java.io.ByteArrayOutputStream;

3
briar-core/src/net/sf/briar/crypto/CryptoModule.java
View File

@@ -9,13 +9,14 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.lifecycle.LifecycleManager;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
public class CryptoModule extends AbstractModule {

4
briar-core/src/net/sf/briar/db/DatabaseCleanerImpl.java
View File

@@ -6,12 +6,12 @@ import static java.util.logging.Level.WARNING;
import java.util.TimerTask;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.clock.Timer;
import net.sf.briar.api.db.DbClosedException;
import net.sf.briar.api.db.DbException;
import com.google.inject.Inject;
class DatabaseCleanerImpl extends TimerTask implements DatabaseCleaner {
private static final Logger LOG =

4
briar-core/src/net/sf/briar/db/DatabaseComponentImpl.java
View File

@@ -22,6 +22,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.Contact;
@@ -76,8 +78,6 @@ import net.sf.briar.api.messaging.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
import com.google.inject.Inject;
/**
* An implementation of DatabaseComponent using reentrant read-write locks.
* Depending on the JVM's lock implementation, this implementation may allow

3
briar-core/src/net/sf/briar/db/DatabaseModule.java
View File

@@ -10,6 +10,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.db.DatabaseComponent;
@@ -21,7 +23,6 @@ import net.sf.briar.api.os.FileUtils;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
public class DatabaseModule extends AbstractModule {

4
briar-core/src/net/sf/briar/db/H2Database.java
View File

@@ -8,14 +8,14 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
import javax.inject.Inject;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.os.FileUtils;
import net.sf.briar.util.StringUtils;
import com.google.inject.Inject;
/** Contains all the H2-specific code for the database. */
class H2Database extends JdbcDatabase {

3
briar-core/src/net/sf/briar/invitation/InvitationModule.java
View File

@@ -1,9 +1,10 @@
package net.sf.briar.invitation;
import javax.inject.Singleton;
import net.sf.briar.api.invitation.InvitationTaskFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class InvitationModule extends AbstractModule {

4
briar-core/src/net/sf/briar/invitation/InvitationTaskFactoryImpl.java
View File

@@ -1,5 +1,7 @@
package net.sf.briar.invitation;
import javax.inject.Inject;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.AuthorId;
import net.sf.briar.api.clock.Clock;
@@ -15,8 +17,6 @@ import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import com.google.inject.Inject;
class InvitationTaskFactoryImpl implements InvitationTaskFactory {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/lifecycle/LifecycleManagerImpl.java
View File

@@ -10,13 +10,13 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.Service;
import com.google.inject.Inject;
class LifecycleManagerImpl implements LifecycleManager {
private static final Logger LOG =

3
briar-core/src/net/sf/briar/lifecycle/LifecycleModule.java
View File

@@ -1,10 +1,11 @@
package net.sf.briar.lifecycle;
import javax.inject.Singleton;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.lifecycle.ShutdownManager;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class LifecycleModule extends AbstractModule {

4
briar-core/src/net/sf/briar/messaging/AuthorFactoryImpl.java
View File

@@ -5,6 +5,8 @@ import static net.sf.briar.api.messaging.Types.AUTHOR;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.AuthorFactory;
import net.sf.briar.api.AuthorId;
@@ -14,8 +16,6 @@ import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import com.google.inject.Inject;
class AuthorFactoryImpl implements AuthorFactory {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/messaging/GroupFactoryImpl.java
View File

@@ -6,6 +6,8 @@ import static net.sf.briar.api.messaging.Types.GROUP;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import javax.inject.Inject;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.MessageDigest;
import net.sf.briar.api.messaging.Group;
@@ -14,8 +16,6 @@ import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import com.google.inject.Inject;
class GroupFactoryImpl implements GroupFactory {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/messaging/MessageFactoryImpl.java
View File

@@ -18,6 +18,8 @@ import java.nio.charset.CharsetDecoder;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.CryptoComponent;
@@ -35,8 +37,6 @@ import net.sf.briar.api.serial.SigningConsumer;
import net.sf.briar.api.serial.Writer;
import net.sf.briar.api.serial.WriterFactory;
import com.google.inject.Inject;
class MessageFactoryImpl implements MessageFactory {
private final Signature signature;

4
briar-core/src/net/sf/briar/messaging/MessageVerifierImpl.java
View File

@@ -2,6 +2,8 @@ package net.sf.briar.messaging;
import java.security.GeneralSecurityException;
import javax.inject.Inject;
import net.sf.briar.api.Author;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.KeyParser;
@@ -13,8 +15,6 @@ import net.sf.briar.api.messaging.MessageId;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.UnverifiedMessage;
import com.google.inject.Inject;
class MessageVerifierImpl implements MessageVerifier {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/messaging/PacketReaderFactoryImpl.java
View File

@@ -2,6 +2,8 @@ package net.sf.briar.messaging;
import java.io.InputStream;
import javax.inject.Inject;
import net.sf.briar.api.messaging.PacketReader;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.SubscriptionUpdate;
@@ -9,8 +11,6 @@ import net.sf.briar.api.messaging.UnverifiedMessage;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.StructReader;
import com.google.inject.Inject;
class PacketReaderFactoryImpl implements PacketReaderFactory {
private final ReaderFactory readerFactory;

4
briar-core/src/net/sf/briar/messaging/PacketWriterFactoryImpl.java
View File

@@ -2,13 +2,13 @@ package net.sf.briar.messaging;
import java.io.OutputStream;
import javax.inject.Inject;
import net.sf.briar.api.messaging.PacketWriter;
import net.sf.briar.api.messaging.PacketWriterFactory;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.WriterFactory;
import com.google.inject.Inject;
class PacketWriterFactoryImpl implements PacketWriterFactory {
private final SerialComponent serial;

4
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnectionFactoryImpl.java
View File

@@ -5,6 +5,8 @@ import static java.util.logging.Level.WARNING;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
@@ -21,8 +23,6 @@ import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import com.google.inject.Inject;
class DuplexConnectionFactoryImpl implements DuplexConnectionFactory {
private static final Logger LOG =

3
briar-core/src/net/sf/briar/messaging/duplex/DuplexMessagingModule.java
View File

@@ -1,9 +1,10 @@
package net.sf.briar.messaging.duplex;
import javax.inject.Singleton;
import net.sf.briar.api.messaging.duplex.DuplexConnectionFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class DuplexMessagingModule extends AbstractModule {

4
briar-core/src/net/sf/briar/messaging/simplex/SimplexConnectionFactoryImpl.java
View File

@@ -5,6 +5,8 @@ import static java.util.logging.Level.WARNING;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
@@ -22,8 +24,6 @@ import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionRegistry;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import com.google.inject.Inject;
class SimplexConnectionFactoryImpl implements SimplexConnectionFactory {
private static final Logger LOG =

3
briar-core/src/net/sf/briar/messaging/simplex/SimplexMessagingModule.java
View File

@@ -1,9 +1,10 @@
package net.sf.briar.messaging.simplex;
import javax.inject.Singleton;
import net.sf.briar.api.messaging.simplex.SimplexConnectionFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class SimplexMessagingModule extends AbstractModule {

4
briar-core/src/net/sf/briar/plugins/PluginManagerImpl.java
View File

@@ -14,6 +14,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportId;
@@ -38,8 +40,6 @@ import net.sf.briar.api.plugins.simplex.SimplexTransportWriter;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.ui.UiCallback;
import com.google.inject.Inject;
// FIXME: Don't make alien calls with a lock held (that includes waiting on a
// latch that depends on an alien call)
class PluginManagerImpl implements PluginManager {

3
briar-core/src/net/sf/briar/plugins/PluginsModule.java
View File

@@ -9,13 +9,14 @@ import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.PluginManager;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
public class PluginsModule extends AbstractModule {

4
briar-core/src/net/sf/briar/plugins/PollerImpl.java
View File

@@ -8,14 +8,14 @@ import java.util.TreeSet;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.plugins.Plugin;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.transport.ConnectionRegistry;
import com.google.inject.Inject;
class PollerImpl implements Poller, Runnable {
private static final Logger LOG =

4
briar-core/src/net/sf/briar/reliability/ReliabilityLayerFactoryImpl.java
View File

@@ -2,6 +2,8 @@ package net.sf.briar.reliability;
import java.util.concurrent.Executor;
import javax.inject.Inject;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.reliability.ReliabilityExecutor;
@@ -9,8 +11,6 @@ import net.sf.briar.api.reliability.ReliabilityLayer;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import net.sf.briar.api.reliability.WriteHandler;
import com.google.inject.Inject;
class ReliabilityLayerFactoryImpl implements ReliabilityLayerFactory {
private final Executor executor;

3
briar-core/src/net/sf/briar/reliability/ReliabilityModule.java
View File

@@ -9,13 +9,14 @@ import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.reliability.ReliabilityExecutor;
import net.sf.briar.api.reliability.ReliabilityLayerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
public class ReliabilityModule extends AbstractModule {

3
briar-core/src/net/sf/briar/serial/SerialModule.java
View File

@@ -1,11 +1,12 @@
package net.sf.briar.serial;
import javax.inject.Singleton;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.SerialComponent;
import net.sf.briar.api.serial.WriterFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Singleton;
public class SerialModule extends AbstractModule {

4
briar-core/src/net/sf/briar/transport/ConnectionDispatcherImpl.java
View File

@@ -9,6 +9,8 @@ import java.io.InputStream;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.db.DbException;
@@ -22,8 +24,6 @@ import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.IncomingConnectionExecutor;
import com.google.inject.Inject;
class ConnectionDispatcherImpl implements ConnectionDispatcher {
private static final Logger LOG =

4
briar-core/src/net/sf/briar/transport/ConnectionReaderFactoryImpl.java
View File

@@ -2,14 +2,14 @@ package net.sf.briar.transport;
import java.io.InputStream;
import javax.inject.Inject;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReader;
import net.sf.briar.api.transport.ConnectionReaderFactory;
import com.google.inject.Inject;
class ConnectionReaderFactoryImpl implements ConnectionReaderFactory {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/transport/ConnectionRecogniserImpl.java
View File

@@ -3,6 +3,8 @@ package net.sf.briar.transport;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoComponent;
@@ -12,8 +14,6 @@ import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.TemporarySecret;
import com.google.inject.Inject;
class ConnectionRecogniserImpl implements ConnectionRecogniser {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/transport/ConnectionWriterFactoryImpl.java
View File

@@ -4,14 +4,14 @@ import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
import java.io.OutputStream;
import javax.inject.Inject;
import net.sf.briar.api.crypto.CryptoComponent;
import net.sf.briar.api.crypto.SecretKey;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.api.transport.ConnectionWriterFactory;
import com.google.inject.Inject;
class ConnectionWriterFactoryImpl implements ConnectionWriterFactory {
private final CryptoComponent crypto;

4
briar-core/src/net/sf/briar/transport/KeyManagerImpl.java
View File

@@ -14,6 +14,8 @@ import java.util.Map.Entry;
import java.util.TimerTask;
import java.util.logging.Logger;
import javax.inject.Inject;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
@@ -33,8 +35,6 @@ import net.sf.briar.api.transport.Endpoint;
import net.sf.briar.api.transport.TemporarySecret;
import net.sf.briar.util.ByteUtils;
import com.google.inject.Inject;
// FIXME: Don't make alien calls with a lock held
class KeyManagerImpl extends TimerTask implements KeyManager, DatabaseListener {

3
briar-core/src/net/sf/briar/transport/TransportModule.java
View File

@@ -9,6 +9,8 @@ import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import javax.inject.Singleton;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.transport.ConnectionDispatcher;
@@ -20,7 +22,6 @@ import net.sf.briar.api.transport.IncomingConnectionExecutor;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
public class TransportModule extends AbstractModule {