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

Refactoring: moved high-level connection classes to protocol package.

Browse Source
This commit is contained in:
akwizgran
2011-12-08 15:06:50 +00:00
parent 1886609bef
commit caf5f34828
17 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/net/sf/briar/api/transport/BatchConnectionFactory.java → api/net/sf/briar/api/protocol/batch/BatchConnectionFactory.java
View File

@@ -1,7 +1,10 @@
package net.sf.briar.api.transport; package net.sf.briar.api.protocol.batch;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.protocol.TransportIndex; import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.transport.BatchTransportReader;
import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
public interface BatchConnectionFactory { public interface BatchConnectionFactory {

4
api/net/sf/briar/api/transport/StreamConnectionFactory.java → api/net/sf/briar/api/protocol/stream/StreamConnectionFactory.java
View File

@@ -1,7 +1,9 @@
package net.sf.briar.api.transport; package net.sf.briar.api.protocol.stream;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.protocol.TransportIndex; import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.StreamTransportConnection;
public interface StreamConnectionFactory { public interface StreamConnectionFactory {

4
components/net/sf/briar/transport/batch/BatchConnectionFactoryImpl.java → components/net/sf/briar/protocol/batch/BatchConnectionFactoryImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.batch; package net.sf.briar.protocol.batch;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -9,7 +9,7 @@ import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriterFactory; import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.TransportIndex; import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.protocol.VerificationExecutor; import net.sf.briar.api.protocol.VerificationExecutor;
import net.sf.briar.api.transport.BatchConnectionFactory; import net.sf.briar.api.protocol.batch.BatchConnectionFactory;
import net.sf.briar.api.transport.BatchTransportReader; import net.sf.briar.api.transport.BatchTransportReader;
import net.sf.briar.api.transport.BatchTransportWriter; import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext; import net.sf.briar.api.transport.ConnectionContext;

2
components/net/sf/briar/transport/batch/IncomingBatchConnection.java → components/net/sf/briar/protocol/batch/IncomingBatchConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.batch; package net.sf.briar.protocol.batch;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

2
components/net/sf/briar/transport/batch/OutgoingBatchConnection.java → components/net/sf/briar/protocol/batch/OutgoingBatchConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.batch; package net.sf.briar.protocol.batch;
import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH; import static net.sf.briar.api.protocol.ProtocolConstants.MAX_PACKET_LENGTH;

6
components/net/sf/briar/transport/batch/TransportBatchModule.java → components/net/sf/briar/protocol/batch/ProtocolBatchModule.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.transport.batch; package net.sf.briar.protocol.batch;
import net.sf.briar.api.transport.BatchConnectionFactory; import net.sf.briar.api.protocol.batch.BatchConnectionFactory;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Singleton; import com.google.inject.Singleton;
public class TransportBatchModule extends AbstractModule { public class ProtocolBatchModule extends AbstractModule {
@Override @Override
protected void configure() { protected void configure() {

2
components/net/sf/briar/transport/stream/IncomingStreamConnection.java → components/net/sf/briar/protocol/stream/IncomingStreamConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream; package net.sf.briar.protocol.stream;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;

2
components/net/sf/briar/transport/stream/OutgoingStreamConnection.java → components/net/sf/briar/protocol/stream/OutgoingStreamConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream; package net.sf.briar.protocol.stream;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;

6
components/net/sf/briar/transport/stream/TransportStreamModule.java → components/net/sf/briar/protocol/stream/ProtocolStreamModule.java
View File

@@ -1,11 +1,11 @@
package net.sf.briar.transport.stream; package net.sf.briar.protocol.stream;
import net.sf.briar.api.transport.StreamConnectionFactory; import net.sf.briar.api.protocol.stream.StreamConnectionFactory;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
import com.google.inject.Singleton; import com.google.inject.Singleton;
public class TransportStreamModule extends AbstractModule { public class ProtocolStreamModule extends AbstractModule {
@Override @Override
protected void configure() { protected void configure() {

2
components/net/sf/briar/transport/stream/StreamConnection.java → components/net/sf/briar/protocol/stream/StreamConnection.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream; package net.sf.briar.protocol.stream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

4
components/net/sf/briar/transport/stream/StreamConnectionFactoryImpl.java → components/net/sf/briar/protocol/stream/StreamConnectionFactoryImpl.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.stream; package net.sf.briar.protocol.stream;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -9,10 +9,10 @@ import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriterFactory; import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.TransportIndex; import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.protocol.VerificationExecutor; import net.sf.briar.api.protocol.VerificationExecutor;
import net.sf.briar.api.protocol.stream.StreamConnectionFactory;
import net.sf.briar.api.transport.ConnectionContext; import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionReaderFactory; import net.sf.briar.api.transport.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory; import net.sf.briar.api.transport.ConnectionWriterFactory;
import net.sf.briar.api.transport.StreamConnectionFactory;
import net.sf.briar.api.transport.StreamTransportConnection; import net.sf.briar.api.transport.StreamTransportConnection;
import com.google.inject.Inject; import com.google.inject.Inject;

4
components/net/sf/briar/transport/ConnectionDispatcherImpl.java
View File

@@ -9,14 +9,14 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.db.DbException; import net.sf.briar.api.db.DbException;
import net.sf.briar.api.protocol.TransportId; import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportIndex; import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.transport.BatchConnectionFactory; import net.sf.briar.api.protocol.batch.BatchConnectionFactory;
import net.sf.briar.api.protocol.stream.StreamConnectionFactory;
import net.sf.briar.api.transport.BatchTransportReader; import net.sf.briar.api.transport.BatchTransportReader;
import net.sf.briar.api.transport.BatchTransportWriter; import net.sf.briar.api.transport.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext; import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionDispatcher; import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionRecogniser; import net.sf.briar.api.transport.ConnectionRecogniser;
import net.sf.briar.api.transport.ConnectionRecogniser.Callback; import net.sf.briar.api.transport.ConnectionRecogniser.Callback;
import net.sf.briar.api.transport.StreamConnectionFactory;
import net.sf.briar.api.transport.StreamTransportConnection; import net.sf.briar.api.transport.StreamTransportConnection;
import net.sf.briar.api.transport.TransportConstants; import net.sf.briar.api.transport.TransportConstants;

2
test/build.xml
View File

@@ -44,6 +44,7 @@
<test name='net.sf.briar.protocol.ProtocolWriterImplTest'/> <test name='net.sf.briar.protocol.ProtocolWriterImplTest'/>
<test name='net.sf.briar.protocol.RequestReaderTest'/> <test name='net.sf.briar.protocol.RequestReaderTest'/>
<test name='net.sf.briar.protocol.UnverifiedBatchImplTest'/> <test name='net.sf.briar.protocol.UnverifiedBatchImplTest'/>
<test name='net.sf.briar.protocol.batch.BatchConnectionReadWriteTest'/>
<test name='net.sf.briar.serial.ReaderImplTest'/> <test name='net.sf.briar.serial.ReaderImplTest'/>
<test name='net.sf.briar.serial.WriterImplTest'/> <test name='net.sf.briar.serial.WriterImplTest'/>
<test name='net.sf.briar.setup.SetupWorkerTest'/> <test name='net.sf.briar.setup.SetupWorkerTest'/>
@@ -55,7 +56,6 @@
<test name='net.sf.briar.transport.ConnectionWriterImplTest'/> <test name='net.sf.briar.transport.ConnectionWriterImplTest'/>
<test name='net.sf.briar.transport.ConnectionWriterTest'/> <test name='net.sf.briar.transport.ConnectionWriterTest'/>
<test name='net.sf.briar.transport.FrameReadWriteTest'/> <test name='net.sf.briar.transport.FrameReadWriteTest'/>
<test name='net.sf.briar.transport.batch.BatchConnectionReadWriteTest'/>
<test name='net.sf.briar.util.ByteUtilsTest'/> <test name='net.sf.briar.util.ByteUtilsTest'/>
<test name='net.sf.briar.util.FileUtilsTest'/> <test name='net.sf.briar.util.FileUtilsTest'/>
<test name='net.sf.briar.util.StringUtilsTest'/> <test name='net.sf.briar.util.StringUtilsTest'/>

8
test/net/sf/briar/ProtocolIntegrationTest.java
View File

@@ -52,10 +52,10 @@ import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule; import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule; import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.protocol.ProtocolModule; import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.batch.ProtocolBatchModule;
import net.sf.briar.protocol.stream.ProtocolStreamModule;
import net.sf.briar.serial.SerialModule; import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.TransportModule; import net.sf.briar.transport.TransportModule;
import net.sf.briar.transport.batch.TransportBatchModule;
import net.sf.briar.transport.stream.TransportStreamModule;
import org.junit.Test; import org.junit.Test;
@@ -97,8 +97,8 @@ public class ProtocolIntegrationTest extends TestCase {
Injector i = Guice.createInjector(testModule, new CryptoModule(), Injector i = Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(), new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(), new ProtocolModule(), new SerialModule(),
new TestDatabaseModule(), new TransportBatchModule(), new TestDatabaseModule(), new ProtocolBatchModule(),
new TransportModule(), new TransportStreamModule()); new TransportModule(), new ProtocolStreamModule());
connectionReaderFactory = i.getInstance(ConnectionReaderFactory.class); connectionReaderFactory = i.getInstance(ConnectionReaderFactory.class);
connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class); connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class);
protocolReaderFactory = i.getInstance(ProtocolReaderFactory.class); protocolReaderFactory = i.getInstance(ProtocolReaderFactory.class);

8
test/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -46,10 +46,10 @@ import net.sf.briar.api.transport.ConnectionWindowFactory;
import net.sf.briar.crypto.CryptoModule; import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.lifecycle.LifecycleModule; import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.protocol.ProtocolModule; import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.batch.ProtocolBatchModule;
import net.sf.briar.protocol.stream.ProtocolStreamModule;
import net.sf.briar.serial.SerialModule; import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.TransportModule; import net.sf.briar.transport.TransportModule;
import net.sf.briar.transport.batch.TransportBatchModule;
import net.sf.briar.transport.stream.TransportStreamModule;
import org.apache.commons.io.FileSystemUtils; import org.apache.commons.io.FileSystemUtils;
import org.junit.After; import org.junit.After;
@@ -107,8 +107,8 @@ public class H2DatabaseTest extends TestCase {
Injector i = Guice.createInjector(testModule, new CryptoModule(), Injector i = Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(), new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(), new ProtocolModule(), new SerialModule(),
new TransportBatchModule(), new TransportModule(), new ProtocolBatchModule(), new TransportModule(),
new TransportStreamModule(), new TestDatabaseModule(testDir)); new ProtocolStreamModule(), new TestDatabaseModule(testDir));
connectionContextFactory = connectionContextFactory =
i.getInstance(ConnectionContextFactory.class); i.getInstance(ConnectionContextFactory.class);
connectionWindowFactory = i.getInstance(ConnectionWindowFactory.class); connectionWindowFactory = i.getInstance(ConnectionWindowFactory.class);

11
test/net/sf/briar/transport/batch/BatchConnectionReadWriteTest.java → test/net/sf/briar/protocol/batch/BatchConnectionReadWriteTest.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.transport.batch; package net.sf.briar.protocol.batch;
import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH; import static net.sf.briar.api.transport.TransportConstants.TAG_LENGTH;
@@ -43,9 +43,12 @@ import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule; import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.plugins.ImmediateExecutor; import net.sf.briar.plugins.ImmediateExecutor;
import net.sf.briar.protocol.ProtocolModule; import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.batch.IncomingBatchConnection;
import net.sf.briar.protocol.batch.OutgoingBatchConnection;
import net.sf.briar.protocol.batch.ProtocolBatchModule;
import net.sf.briar.protocol.stream.ProtocolStreamModule;
import net.sf.briar.serial.SerialModule; import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.TransportModule; import net.sf.briar.transport.TransportModule;
import net.sf.briar.transport.stream.TransportStreamModule;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -97,8 +100,8 @@ public class BatchConnectionReadWriteTest extends TestCase {
return Guice.createInjector(testModule, new CryptoModule(), return Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(), new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(), new ProtocolModule(), new SerialModule(),
new TestDatabaseModule(dir), new TransportBatchModule(), new TestDatabaseModule(dir), new ProtocolBatchModule(),
new TransportModule(), new TransportStreamModule()); new TransportModule(), new ProtocolStreamModule());
} }
@Test @Test

8
test/net/sf/briar/transport/ConnectionWriterTest.java
View File

@@ -16,9 +16,9 @@ import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule; import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule; import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.protocol.ProtocolModule; import net.sf.briar.protocol.ProtocolModule;
import net.sf.briar.protocol.batch.ProtocolBatchModule;
import net.sf.briar.protocol.stream.ProtocolStreamModule;
import net.sf.briar.serial.SerialModule; import net.sf.briar.serial.SerialModule;
import net.sf.briar.transport.batch.TransportBatchModule;
import net.sf.briar.transport.stream.TransportStreamModule;
import org.junit.Test; import org.junit.Test;
@@ -44,8 +44,8 @@ public class ConnectionWriterTest extends TestCase {
Injector i = Guice.createInjector(testModule, new CryptoModule(), Injector i = Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(), new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(), new ProtocolModule(), new SerialModule(),
new TestDatabaseModule(), new TransportBatchModule(), new TestDatabaseModule(), new ProtocolBatchModule(),
new TransportModule(), new TransportStreamModule()); new TransportModule(), new ProtocolStreamModule());
connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class); connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class);
secret = new byte[32]; secret = new byte[32];
new Random().nextBytes(secret); new Random().nextBytes(secret);