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

Code cleanup: remove unnecessary annotations, moved some API constants.

Browse Source
This commit is contained in:
akwizgran
2013-03-31 19:25:24 +01:00
parent a1dc154c1b
commit 84c07a2b9c
39 changed files with 84 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-api/src/net/sf/briar/api/AuthorConstants.java Normal file
View File

@@ -0,0 +1,13 @@
package net.sf.briar.api;
public interface AuthorConstants {
/** The maximum length of an author's name in UTF-8 bytes. */
int MAX_AUTHOR_NAME_LENGTH = 50;
/** The maximum length of a public key in bytes. */
int MAX_PUBLIC_KEY_LENGTH = 97;
/** The maximum length of a signature in bytes. */
int MAX_SIGNATURE_LENGTH = 104;
}

10
briar-api/src/net/sf/briar/api/TransportPropertyConstants.java Normal file
View File

@@ -0,0 +1,10 @@
package net.sf.briar.api;
public interface TransportPropertyConstants {
/** The maximum number of properties per transport. */
int MAX_PROPERTIES_PER_TRANSPORT = 100;
/** The maximum length of a property's key or value in UTF-8 bytes. */
int MAX_PROPERTY_LENGTH = 100;
}

2
briar-api/src/net/sf/briar/api/plugins/InvitationConstants.java → briar-api/src/net/sf/briar/api/invitation/InvitationConstants.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.plugins;
package net.sf.briar.api.invitation;
public interface InvitationConstants {

15
briar-api/src/net/sf/briar/api/messaging/MessagingConstants.java
View File

@@ -14,21 +14,9 @@ public interface MessagingConstants {
/** The maximum number of groups a user may subscribe to. */
int MAX_SUBSCRIPTIONS = 3000;
/** The maximum number of properties per transport. */
int MAX_PROPERTIES_PER_TRANSPORT = 100;
/** The maximum length of a property's key or value in UTF-8 bytes. */
int MAX_PROPERTY_LENGTH = 100;
/** The maximum length of a group's name in UTF-8 bytes. */
int MAX_GROUP_NAME_LENGTH = 50;
/** The maximum length of a public key in bytes. */
int MAX_PUBLIC_KEY_LENGTH = 97;
/** The maximum length of an author's name in UTF-8 bytes. */
int MAX_AUTHOR_NAME_LENGTH = 50;
/**
* The maximum length of a message body in bytes. To allow for future
* changes in the protocol, this is smaller than the maximum packet length
@@ -42,9 +30,6 @@ public interface MessagingConstants {
/** The maximum length of a message's subject line in UTF-8 bytes. */
int MAX_SUBJECT_LENGTH = 100;
/** The maximum length of a signature in bytes. */
int MAX_SIGNATURE_LENGTH = 120;
/** The length of a message's random salt in bytes. */
int SALT_LENGTH = 8;

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

@@ -2,7 +2,7 @@ package net.sf.briar.crypto;
import static javax.crypto.Cipher.DECRYPT_MODE;
import static javax.crypto.Cipher.ENCRYPT_MODE;
import static net.sf.briar.api.plugins.InvitationConstants.CODE_BITS;
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.util.ByteUtils.MAX_32_BIT_UNSIGNED;

2
briar-core/src/net/sf/briar/invitation/AliceConnector.java
View File

@@ -2,7 +2,7 @@ package net.sf.briar.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.plugins.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import java.io.IOException;
import java.io.InputStream;

2
briar-core/src/net/sf/briar/invitation/BobConnector.java
View File

@@ -2,7 +2,7 @@ package net.sf.briar.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.plugins.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import java.io.IOException;
import java.io.InputStream;

15
briar-core/src/net/sf/briar/invitation/Connector.java
View File

@@ -2,12 +2,13 @@ package net.sf.briar.invitation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.plugins.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.plugins.InvitationConstants.HASH_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.HASH_LENGTH;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -259,6 +260,8 @@ abstract class Connector extends Thread {
r.setMaxStringLength(MAX_PROPERTY_LENGTH);
Map<String, String> p = r.readMap(String.class, String.class);
r.resetMaxStringLength();
if(p.size() > MAX_PROPERTIES_PER_TRANSPORT)
throw new FormatException();
remoteProps.put(id, new TransportProperties(p));
}
r.readListEnd();

2
briar-core/src/net/sf/briar/invitation/ConnectorGroup.java
View File

@@ -2,7 +2,7 @@ package net.sf.briar.invitation;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.WARNING;
import static net.sf.briar.api.plugins.InvitationConstants.CONFIRMATION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.CONFIRMATION_TIMEOUT;
import java.util.ArrayList;
import java.util.Collection;

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

@@ -1,7 +1,7 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.Types.AUTHOR;
import java.io.IOException;

2
briar-core/src/net/sf/briar/messaging/GroupReader.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.Types.GROUP;
import java.io.IOException;

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

@@ -1,9 +1,9 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBJECT_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.SALT_LENGTH;
import static net.sf.briar.api.messaging.Types.AUTHOR;

2
briar-core/src/net/sf/briar/messaging/MessageReader.java
View File

@@ -1,9 +1,9 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBJECT_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.SALT_LENGTH;
import static net.sf.briar.api.messaging.Types.MESSAGE;

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

@@ -1,8 +1,8 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.Types.ACK;
import static net.sf.briar.api.messaging.Types.MESSAGE;
import static net.sf.briar.api.messaging.Types.OFFER;

5
briar-core/src/net/sf/briar/messaging/duplex/DuplexConnection.java
View File

@@ -24,9 +24,7 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseEvent;
@@ -97,8 +95,7 @@ abstract class DuplexConnection implements DatabaseListener {
private volatile PacketWriter writer = null;
DuplexConnection(@DatabaseExecutor Executor dbExecutor,
@CryptoExecutor Executor cryptoExecutor,
DuplexConnection(Executor dbExecutor, Executor cryptoExecutor,
MessageVerifier messageVerifier, DatabaseComponent db,
ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory,

5
briar-core/src/net/sf/briar/messaging/duplex/IncomingDuplexConnection.java
View File

@@ -3,9 +3,7 @@ package net.sf.briar.messaging.duplex;
import java.io.IOException;
import java.util.concurrent.Executor;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
@@ -19,8 +17,7 @@ import net.sf.briar.api.transport.ConnectionWriterFactory;
class IncomingDuplexConnection extends DuplexConnection {
IncomingDuplexConnection(@DatabaseExecutor Executor dbExecutor,
@CryptoExecutor Executor cryptoExecutor,
IncomingDuplexConnection(Executor dbExecutor, Executor cryptoExecutor,
MessageVerifier messageVerifier, DatabaseComponent db,
ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory,

5
briar-core/src/net/sf/briar/messaging/duplex/OutgoingDuplexConnection.java
View File

@@ -3,9 +3,7 @@ package net.sf.briar.messaging.duplex;
import java.io.IOException;
import java.util.concurrent.Executor;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.messaging.MessageVerifier;
import net.sf.briar.api.messaging.PacketReaderFactory;
import net.sf.briar.api.messaging.PacketWriterFactory;
@@ -19,8 +17,7 @@ import net.sf.briar.api.transport.ConnectionWriterFactory;
class OutgoingDuplexConnection extends DuplexConnection {
OutgoingDuplexConnection(@DatabaseExecutor Executor dbExecutor,
@CryptoExecutor Executor cryptoExecutor,
OutgoingDuplexConnection(Executor dbExecutor, Executor cryptoExecutor,
MessageVerifier messageVerifier, DatabaseComponent db,
ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory,

5
briar-core/src/net/sf/briar/messaging/simplex/IncomingSimplexConnection.java
View File

@@ -11,9 +11,7 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.crypto.CryptoExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseExecutor;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.messaging.Ack;
import net.sf.briar.api.messaging.Message;
@@ -50,8 +48,7 @@ class IncomingSimplexConnection {
private final ContactId contactId;
private final TransportId transportId;
IncomingSimplexConnection(@DatabaseExecutor Executor dbExecutor,
@CryptoExecutor Executor cryptoExecutor,
IncomingSimplexConnection(Executor dbExecutor, Executor cryptoExecutor,
MessageVerifier messageVerifier, DatabaseComponent db,
ConnectionRegistry connRegistry,
ConnectionReaderFactory connReaderFactory,

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

@@ -33,9 +33,9 @@ public class PluginsModule extends AbstractModule {
@Override
protected void configure() {
// The executor is unbounded, so tasks can be dependent or long-lived
ExecutorService e = Executors.newCachedThreadPool();
bind(ExecutorService.class).annotatedWith(
PluginExecutor.class).toInstance(
Executors.newCachedThreadPool());
PluginExecutor.class).toInstance(e);
bind(PluginManager.class).to(
PluginManagerImpl.class).in(Singleton.class);
bind(Poller.class).to(PollerImpl.class);

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

@@ -30,7 +30,6 @@ import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
@@ -64,7 +63,7 @@ class BluetoothPlugin implements DuplexPlugin {
// Non-null if running has ever been true
private volatile LocalDevice localDevice = null;
BluetoothPlugin(@PluginExecutor Executor pluginExecutor, Clock clock,
BluetoothPlugin(Executor pluginExecutor, Clock clock,
SecureRandom secureRandom, DuplexPluginCallback callback,
long maxLatency, long pollingInterval) {
this.pluginExecutor = pluginExecutor;

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

@@ -6,7 +6,6 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
@@ -20,7 +19,7 @@ public class BluetoothPluginFactory implements DuplexPluginFactory {
private final SecureRandom secureRandom;
private final Clock clock;
public BluetoothPluginFactory(@PluginExecutor Executor pluginExecutor,
public BluetoothPluginFactory(Executor pluginExecutor,
SecureRandom secureRandom) {
this.pluginExecutor = pluginExecutor;
this.secureRandom = secureRandom;

9
briar-core/src/net/sf/briar/plugins/droidtooth/DroidtoothPlugin.java
View File

@@ -28,7 +28,6 @@ import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
@@ -70,10 +69,10 @@ class DroidtoothPlugin implements DuplexPlugin {
// Non-null if running has ever been true
private volatile BluetoothAdapter adapter = null;
DroidtoothPlugin(@PluginExecutor Executor pluginExecutor,
AndroidExecutor androidExecutor, Context appContext,
SecureRandom secureRandom, DuplexPluginCallback callback,
long maxLatency, long pollingInterval) {
DroidtoothPlugin(Executor pluginExecutor, AndroidExecutor androidExecutor,
Context appContext, SecureRandom secureRandom,
DuplexPluginCallback callback, long maxLatency,
long pollingInterval) {
this.pluginExecutor = pluginExecutor;
this.androidExecutor = androidExecutor;
this.appContext = appContext;

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

@@ -5,7 +5,6 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.android.AndroidExecutor;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
@@ -21,7 +20,7 @@ public class DroidtoothPluginFactory implements DuplexPluginFactory {
private final Context appContext;
private final SecureRandom secureRandom;
public DroidtoothPluginFactory(@PluginExecutor Executor pluginExecutor,
public DroidtoothPluginFactory(Executor pluginExecutor,
AndroidExecutor androidExecutor, Context appContext,
SecureRandom secureRandom) {
this.pluginExecutor = pluginExecutor;

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

@@ -13,7 +13,6 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexTransportReader;
@@ -37,7 +36,7 @@ public abstract class FilePlugin implements SimplexPlugin {
protected abstract void writerFinished(File f);
protected abstract void readerFinished(File f);
protected FilePlugin(@PluginExecutor Executor pluginExecutor,
protected FilePlugin(Executor pluginExecutor,
SimplexPluginCallback callback, long maxLatency) {
this.pluginExecutor = pluginExecutor;
this.callback = callback;

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

@@ -8,8 +8,6 @@ import java.util.Collection;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.api.plugins.PluginExecutor;
class PollingRemovableDriveMonitor implements RemovableDriveMonitor, Runnable {
private static final Logger LOG =
@@ -23,7 +21,7 @@ class PollingRemovableDriveMonitor implements RemovableDriveMonitor, Runnable {
private volatile boolean running = false;
private volatile Callback callback = null;
public PollingRemovableDriveMonitor(@PluginExecutor Executor pluginExecutor,
public PollingRemovableDriveMonitor(Executor pluginExecutor,
RemovableDriveFinder finder, long pollingInterval) {
this.pluginExecutor = pluginExecutor;
this.finder = finder;

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

@@ -13,7 +13,6 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.util.StringUtils;
@@ -32,7 +31,7 @@ implements RemovableDriveMonitor.Callback {
private final RemovableDriveFinder finder;
private final RemovableDriveMonitor monitor;
RemovableDrivePlugin(@PluginExecutor Executor pluginExecutor,
RemovableDrivePlugin(Executor pluginExecutor,
SimplexPluginCallback callback, RemovableDriveFinder finder,
RemovableDriveMonitor monitor, long maxLatency) {
super(pluginExecutor, callback, maxLatency);

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

@@ -3,7 +3,6 @@ package net.sf.briar.plugins.file;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.simplex.SimplexPlugin;
import net.sf.briar.api.plugins.simplex.SimplexPluginCallback;
import net.sf.briar.api.plugins.simplex.SimplexPluginFactory;
@@ -17,8 +16,7 @@ public class RemovableDrivePluginFactory implements SimplexPluginFactory {
private final Executor pluginExecutor;
public RemovableDrivePluginFactory(
@PluginExecutor Executor pluginExecutor) {
public RemovableDrivePluginFactory(Executor pluginExecutor) {
this.pluginExecutor = pluginExecutor;
}

8
briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
View File

@@ -20,7 +20,6 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
@@ -47,10 +46,9 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
private volatile boolean running = false;
private volatile Modem modem = null;
ModemPlugin(@PluginExecutor Executor pluginExecutor,
ModemFactory modemFactory, SerialPortList serialPortList,
DuplexPluginCallback callback, long maxLatency,
long pollingInterval, boolean shuffle) {
ModemPlugin(Executor pluginExecutor, ModemFactory modemFactory,
SerialPortList serialPortList, DuplexPluginCallback callback,
long maxLatency, long pollingInterval, boolean shuffle) {
this.pluginExecutor = pluginExecutor;
this.modemFactory = modemFactory;
this.serialPortList = serialPortList;

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

@@ -3,7 +3,6 @@ package net.sf.briar.plugins.modem;
import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
@@ -19,7 +18,7 @@ public class ModemPluginFactory implements DuplexPluginFactory {
private final ModemFactory modemFactory;
private final SerialPortList serialPortList;
public ModemPluginFactory(@PluginExecutor Executor pluginExecutor,
public ModemPluginFactory(Executor pluginExecutor,
ReliabilityLayerFactory reliabilityFactory) {
this.pluginExecutor = pluginExecutor;
modemFactory = new ModemFactoryImpl(pluginExecutor, reliabilityFactory);

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

@@ -25,7 +25,6 @@ import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.util.ByteUtils;
@@ -45,7 +44,7 @@ class LanTcpPlugin extends TcpPlugin {
private final Clock clock;
LanTcpPlugin(@PluginExecutor Executor pluginExecutor, Clock clock,
LanTcpPlugin(Executor pluginExecutor, Clock clock,
DuplexPluginCallback callback, long maxLatency,
long pollingInterval) {
super(pluginExecutor, callback, maxLatency, pollingInterval);

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

@@ -5,7 +5,6 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
@@ -18,7 +17,7 @@ public class LanTcpPluginFactory implements DuplexPluginFactory {
private final Executor pluginExecutor;
private final Clock clock;
public LanTcpPluginFactory(@PluginExecutor Executor pluginExecutor) {
public LanTcpPluginFactory(Executor pluginExecutor) {
this.pluginExecutor = pluginExecutor;
clock = new SystemClock();
}

6
briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
View File

@@ -18,7 +18,6 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
@@ -42,9 +41,8 @@ abstract class TcpPlugin implements DuplexPlugin {
*/
protected abstract List<SocketAddress> getLocalSocketAddresses();
protected TcpPlugin(@PluginExecutor Executor pluginExecutor,
DuplexPluginCallback callback, long maxLatency,
long pollingInterval) {
protected TcpPlugin(Executor pluginExecutor, DuplexPluginCallback callback,
long maxLatency, long pollingInterval) {
this.pluginExecutor = pluginExecutor;
this.callback = callback;
this.maxLatency = maxLatency;

6
briar-core/src/net/sf/briar/plugins/tcp/WanTcpPlugin.java
View File

@@ -17,7 +17,6 @@ import java.util.logging.Logger;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.TransportProperties;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.util.StringUtils;
@@ -37,9 +36,8 @@ class WanTcpPlugin extends TcpPlugin {
private volatile MappingResult mappingResult;
WanTcpPlugin(@PluginExecutor Executor pluginExecutor,
DuplexPluginCallback callback, long maxLatency,
long pollingInterval, PortMapper portMapper) {
WanTcpPlugin(Executor pluginExecutor, DuplexPluginCallback callback,
long maxLatency, long pollingInterval, PortMapper portMapper) {
super(pluginExecutor, callback, maxLatency, pollingInterval);
this.portMapper = portMapper;
}

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

@@ -4,7 +4,6 @@ import java.util.concurrent.Executor;
import net.sf.briar.api.TransportId;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
@@ -17,7 +16,7 @@ public class WanTcpPluginFactory implements DuplexPluginFactory {
private final Executor pluginExecutor;
private final ShutdownManager shutdownManager;
public WanTcpPluginFactory(@PluginExecutor Executor pluginExecutor,
public WanTcpPluginFactory(Executor pluginExecutor,
ShutdownManager shutdownManager) {
this.pluginExecutor = pluginExecutor;
this.shutdownManager = shutdownManager;

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

@@ -13,9 +13,9 @@ public class ReliabilityModule extends AbstractModule {
@Override
protected void configure() {
// The executor is unbounded - tasks are expected to be long-lived
Executor e = Executors.newCachedThreadPool();
bind(Executor.class).annotatedWith(
ReliabilityExecutor.class).toInstance(
Executors.newCachedThreadPool());
ReliabilityExecutor.class).toInstance(e);
bind(ReliabilityLayerFactory.class).to(
ReliabilityLayerFactoryImpl.class);
}

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

@@ -27,9 +27,9 @@ public class TransportModule extends AbstractModule {
bind(ConnectionWriterFactory.class).to(
ConnectionWriterFactoryImpl.class);
// The executor is unbounded, so tasks can be dependent or long-lived
Executor e = Executors.newCachedThreadPool();
bind(Executor.class).annotatedWith(
IncomingConnectionExecutor.class).toInstance(
Executors.newCachedThreadPool());
IncomingConnectionExecutor.class).toInstance(e);
bind(KeyManager.class).to(KeyManagerImpl.class).in(Singleton.class);
}
}

12
briar-tests/src/net/sf/briar/messaging/ConstantsTest.java
View File

@@ -1,14 +1,14 @@
package net.sf.briar.messaging;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_BODY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_CONTENT_TYPE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_GROUP_NAME_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PACKET_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTIES_PER_TRANSPORT;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PROPERTY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_PUBLIC_KEY_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SIGNATURE_LENGTH;
import static net.sf.briar.api.messaging.MessagingConstants.MAX_SUBSCRIPTIONS;
import java.io.ByteArrayOutputStream;
@@ -88,7 +88,7 @@ public class ConstantsTest extends BriarTestCase {
byte[] publicKey = keyPair.getPublic().getEncoded();
assertTrue(publicKey.length <= MAX_PUBLIC_KEY_LENGTH);
// Sign some random data and check the length of the signature
byte[] toBeSigned = new byte[100];
byte[] toBeSigned = new byte[1000];
random.nextBytes(toBeSigned);
sig.initSign(keyPair.getPrivate());
sig.update(toBeSigned);

2
briar-tests/src/net/sf/briar/plugins/DuplexClientTest.java
View File

@@ -1,6 +1,6 @@
package net.sf.briar.plugins;
import static net.sf.briar.api.plugins.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import java.io.IOException;
import java.util.Map;

2
briar-tests/src/net/sf/briar/plugins/DuplexServerTest.java
View File

@@ -1,7 +1,7 @@
package net.sf.briar.plugins;
import static java.util.concurrent.TimeUnit.SECONDS;
import static net.sf.briar.api.plugins.InvitationConstants.CONNECTION_TIMEOUT;
import static net.sf.briar.api.invitation.InvitationConstants.CONNECTION_TIMEOUT;
import java.util.Map;
import java.util.concurrent.CountDownLatch;