From caf5f34828a9fabe80f511c8b7053629a7ce4ba4 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 8 Dec 2011 15:06:50 +0000
Subject: [PATCH] Refactoring: moved high-level connection classes to protocol
package.
---
.../batch}/BatchConnectionFactory.java | 5 ++++-
.../stream}/StreamConnectionFactory.java | 4 +++-
.../batch/BatchConnectionFactoryImpl.java | 4 ++--
.../batch/IncomingBatchConnection.java | 2 +-
.../batch/OutgoingBatchConnection.java | 2 +-
.../batch/ProtocolBatchModule.java} | 6 +++---
.../stream/IncomingStreamConnection.java | 2 +-
.../stream/OutgoingStreamConnection.java | 2 +-
.../stream/ProtocolStreamModule.java} | 6 +++---
.../stream/StreamConnection.java | 2 +-
.../stream/StreamConnectionFactoryImpl.java | 4 ++--
.../sf/briar/transport/ConnectionDispatcherImpl.java | 4 ++--
test/build.xml | 2 +-
test/net/sf/briar/ProtocolIntegrationTest.java | 8 ++++----
test/net/sf/briar/db/H2DatabaseTest.java | 8 ++++----
.../batch/BatchConnectionReadWriteTest.java | 11 +++++++----
test/net/sf/briar/transport/ConnectionWriterTest.java | 8 ++++----
17 files changed, 44 insertions(+), 36 deletions(-)
rename api/net/sf/briar/api/{transport => protocol/batch}/BatchConnectionFactory.java (60%)
rename api/net/sf/briar/api/{transport => protocol/stream}/StreamConnectionFactory.java (67%)
rename components/net/sf/briar/{transport => protocol}/batch/BatchConnectionFactoryImpl.java (96%)
rename components/net/sf/briar/{transport => protocol}/batch/IncomingBatchConnection.java (99%)
rename components/net/sf/briar/{transport => protocol}/batch/OutgoingBatchConnection.java (99%)
rename components/net/sf/briar/{transport/batch/TransportBatchModule.java => protocol/batch/ProtocolBatchModule.java} (58%)
rename components/net/sf/briar/{transport => protocol}/stream/IncomingStreamConnection.java (97%)
rename components/net/sf/briar/{transport => protocol}/stream/OutgoingStreamConnection.java (98%)
rename components/net/sf/briar/{transport/stream/TransportStreamModule.java => protocol/stream/ProtocolStreamModule.java} (58%)
rename components/net/sf/briar/{transport => protocol}/stream/StreamConnection.java (99%)
rename components/net/sf/briar/{transport => protocol}/stream/StreamConnectionFactoryImpl.java (96%)
rename test/net/sf/briar/{transport => protocol}/batch/BatchConnectionReadWriteTest.java (95%)
diff --git a/api/net/sf/briar/api/transport/BatchConnectionFactory.java b/api/net/sf/briar/api/protocol/batch/BatchConnectionFactory.java
similarity index 60%
rename from api/net/sf/briar/api/transport/BatchConnectionFactory.java
rename to api/net/sf/briar/api/protocol/batch/BatchConnectionFactory.java
index eab7395aab..8f7bca029b 100644
--- a/api/net/sf/briar/api/transport/BatchConnectionFactory.java
+++ b/api/net/sf/briar/api/protocol/batch/BatchConnectionFactory.java
@@ -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.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 {
diff --git a/api/net/sf/briar/api/transport/StreamConnectionFactory.java b/api/net/sf/briar/api/protocol/stream/StreamConnectionFactory.java
similarity index 67%
rename from api/net/sf/briar/api/transport/StreamConnectionFactory.java
rename to api/net/sf/briar/api/protocol/stream/StreamConnectionFactory.java
index 1cabf37e33..5cf78317e9 100644
--- a/api/net/sf/briar/api/transport/StreamConnectionFactory.java
+++ b/api/net/sf/briar/api/protocol/stream/StreamConnectionFactory.java
@@ -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.protocol.TransportIndex;
+import net.sf.briar.api.transport.ConnectionContext;
+import net.sf.briar.api.transport.StreamTransportConnection;
public interface StreamConnectionFactory {
diff --git a/components/net/sf/briar/transport/batch/BatchConnectionFactoryImpl.java b/components/net/sf/briar/protocol/batch/BatchConnectionFactoryImpl.java
similarity index 96%
rename from components/net/sf/briar/transport/batch/BatchConnectionFactoryImpl.java
rename to components/net/sf/briar/protocol/batch/BatchConnectionFactoryImpl.java
index 3afe1a4fa3..6fba90348f 100644
--- a/components/net/sf/briar/transport/batch/BatchConnectionFactoryImpl.java
+++ b/components/net/sf/briar/protocol/batch/BatchConnectionFactoryImpl.java
@@ -1,4 +1,4 @@
-package net.sf.briar.transport.batch;
+package net.sf.briar.protocol.batch;
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.TransportIndex;
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.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
diff --git a/components/net/sf/briar/transport/batch/IncomingBatchConnection.java b/components/net/sf/briar/protocol/batch/IncomingBatchConnection.java
similarity index 99%
rename from components/net/sf/briar/transport/batch/IncomingBatchConnection.java
rename to components/net/sf/briar/protocol/batch/IncomingBatchConnection.java
index 074245db4a..09fca52731 100644
--- a/components/net/sf/briar/transport/batch/IncomingBatchConnection.java
+++ b/components/net/sf/briar/protocol/batch/IncomingBatchConnection.java
@@ -1,4 +1,4 @@
-package net.sf.briar.transport.batch;
+package net.sf.briar.protocol.batch;
import java.io.IOException;
import java.io.InputStream;
diff --git a/components/net/sf/briar/transport/batch/OutgoingBatchConnection.java b/components/net/sf/briar/protocol/batch/OutgoingBatchConnection.java
similarity index 99%
rename from components/net/sf/briar/transport/batch/OutgoingBatchConnection.java
rename to components/net/sf/briar/protocol/batch/OutgoingBatchConnection.java
index 57b45b3fa3..e9811587fd 100644
--- a/components/net/sf/briar/transport/batch/OutgoingBatchConnection.java
+++ b/components/net/sf/briar/protocol/batch/OutgoingBatchConnection.java
@@ -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;
diff --git a/components/net/sf/briar/transport/batch/TransportBatchModule.java b/components/net/sf/briar/protocol/batch/ProtocolBatchModule.java
similarity index 58%
rename from components/net/sf/briar/transport/batch/TransportBatchModule.java
rename to components/net/sf/briar/protocol/batch/ProtocolBatchModule.java
index 633b4a67e1..e5ce39b198 100644
--- a/components/net/sf/briar/transport/batch/TransportBatchModule.java
+++ b/components/net/sf/briar/protocol/batch/ProtocolBatchModule.java
@@ -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.Singleton;
-public class TransportBatchModule extends AbstractModule {
+public class ProtocolBatchModule extends AbstractModule {
@Override
protected void configure() {
diff --git a/components/net/sf/briar/transport/stream/IncomingStreamConnection.java b/components/net/sf/briar/protocol/stream/IncomingStreamConnection.java
similarity index 97%
rename from components/net/sf/briar/transport/stream/IncomingStreamConnection.java
rename to components/net/sf/briar/protocol/stream/IncomingStreamConnection.java
index 6fcf17e6a2..e7229ab7ac 100644
--- a/components/net/sf/briar/transport/stream/IncomingStreamConnection.java
+++ b/components/net/sf/briar/protocol/stream/IncomingStreamConnection.java
@@ -1,4 +1,4 @@
-package net.sf.briar.transport.stream;
+package net.sf.briar.protocol.stream;
import java.io.IOException;
import java.util.concurrent.Executor;
diff --git a/components/net/sf/briar/transport/stream/OutgoingStreamConnection.java b/components/net/sf/briar/protocol/stream/OutgoingStreamConnection.java
similarity index 98%
rename from components/net/sf/briar/transport/stream/OutgoingStreamConnection.java
rename to components/net/sf/briar/protocol/stream/OutgoingStreamConnection.java
index d7c41336da..c27724f142 100644
--- a/components/net/sf/briar/transport/stream/OutgoingStreamConnection.java
+++ b/components/net/sf/briar/protocol/stream/OutgoingStreamConnection.java
@@ -1,4 +1,4 @@
-package net.sf.briar.transport.stream;
+package net.sf.briar.protocol.stream;
import java.io.IOException;
import java.util.concurrent.Executor;
diff --git a/components/net/sf/briar/transport/stream/TransportStreamModule.java b/components/net/sf/briar/protocol/stream/ProtocolStreamModule.java
similarity index 58%
rename from components/net/sf/briar/transport/stream/TransportStreamModule.java
rename to components/net/sf/briar/protocol/stream/ProtocolStreamModule.java
index fb55479faf..d870d248b9 100644
--- a/components/net/sf/briar/transport/stream/TransportStreamModule.java
+++ b/components/net/sf/briar/protocol/stream/ProtocolStreamModule.java
@@ -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.Singleton;
-public class TransportStreamModule extends AbstractModule {
+public class ProtocolStreamModule extends AbstractModule {
@Override
protected void configure() {
diff --git a/components/net/sf/briar/transport/stream/StreamConnection.java b/components/net/sf/briar/protocol/stream/StreamConnection.java
similarity index 99%
rename from components/net/sf/briar/transport/stream/StreamConnection.java
rename to components/net/sf/briar/protocol/stream/StreamConnection.java
index a3af59c873..f91714c46b 100644
--- a/components/net/sf/briar/transport/stream/StreamConnection.java
+++ b/components/net/sf/briar/protocol/stream/StreamConnection.java
@@ -1,4 +1,4 @@
-package net.sf.briar.transport.stream;
+package net.sf.briar.protocol.stream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/components/net/sf/briar/transport/stream/StreamConnectionFactoryImpl.java b/components/net/sf/briar/protocol/stream/StreamConnectionFactoryImpl.java
similarity index 96%
rename from components/net/sf/briar/transport/stream/StreamConnectionFactoryImpl.java
rename to components/net/sf/briar/protocol/stream/StreamConnectionFactoryImpl.java
index b6c100996b..2b27c91eaa 100644
--- a/components/net/sf/briar/transport/stream/StreamConnectionFactoryImpl.java
+++ b/components/net/sf/briar/protocol/stream/StreamConnectionFactoryImpl.java
@@ -1,4 +1,4 @@
-package net.sf.briar.transport.stream;
+package net.sf.briar.protocol.stream;
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.TransportIndex;
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.ConnectionReaderFactory;
import net.sf.briar.api.transport.ConnectionWriterFactory;
-import net.sf.briar.api.transport.StreamConnectionFactory;
import net.sf.briar.api.transport.StreamTransportConnection;
import com.google.inject.Inject;
diff --git a/components/net/sf/briar/transport/ConnectionDispatcherImpl.java b/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
index 1415e242e8..b35d48d5c8 100644
--- a/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
+++ b/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
@@ -9,14 +9,14 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.protocol.TransportId;
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.BatchTransportWriter;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionDispatcher;
import net.sf.briar.api.transport.ConnectionRecogniser;
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.TransportConstants;
diff --git a/test/build.xml b/test/build.xml
index ddb7c805fb..62fc80685c 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -44,6 +44,7 @@
<test name='net.sf.briar.protocol.ProtocolWriterImplTest'/>
<test name='net.sf.briar.protocol.RequestReaderTest'/>
<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.WriterImplTest'/>
<test name='net.sf.briar.setup.SetupWorkerTest'/>
@@ -55,7 +56,6 @@
<test name='net.sf.briar.transport.ConnectionWriterImplTest'/>
<test name='net.sf.briar.transport.ConnectionWriterTest'/>
<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.FileUtilsTest'/>
<test name='net.sf.briar.util.StringUtilsTest'/>
diff --git a/test/net/sf/briar/ProtocolIntegrationTest.java b/test/net/sf/briar/ProtocolIntegrationTest.java
index ca726f7a86..8d22479fe7 100644
--- a/test/net/sf/briar/ProtocolIntegrationTest.java
+++ b/test/net/sf/briar/ProtocolIntegrationTest.java
@@ -52,10 +52,10 @@ import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule;
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.transport.TransportModule;
-import net.sf.briar.transport.batch.TransportBatchModule;
-import net.sf.briar.transport.stream.TransportStreamModule;
import org.junit.Test;
@@ -97,8 +97,8 @@ public class ProtocolIntegrationTest extends TestCase {
Injector i = Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(),
- new TestDatabaseModule(), new TransportBatchModule(),
- new TransportModule(), new TransportStreamModule());
+ new TestDatabaseModule(), new ProtocolBatchModule(),
+ new TransportModule(), new ProtocolStreamModule());
connectionReaderFactory = i.getInstance(ConnectionReaderFactory.class);
connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class);
protocolReaderFactory = i.getInstance(ProtocolReaderFactory.class);
diff --git a/test/net/sf/briar/db/H2DatabaseTest.java b/test/net/sf/briar/db/H2DatabaseTest.java
index 5dbaea4a21..56e441b097 100644
--- a/test/net/sf/briar/db/H2DatabaseTest.java
+++ b/test/net/sf/briar/db/H2DatabaseTest.java
@@ -46,10 +46,10 @@ import net.sf.briar.api.transport.ConnectionWindowFactory;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.lifecycle.LifecycleModule;
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.transport.TransportModule;
-import net.sf.briar.transport.batch.TransportBatchModule;
-import net.sf.briar.transport.stream.TransportStreamModule;
import org.apache.commons.io.FileSystemUtils;
import org.junit.After;
@@ -107,8 +107,8 @@ public class H2DatabaseTest extends TestCase {
Injector i = Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(),
- new TransportBatchModule(), new TransportModule(),
- new TransportStreamModule(), new TestDatabaseModule(testDir));
+ new ProtocolBatchModule(), new TransportModule(),
+ new ProtocolStreamModule(), new TestDatabaseModule(testDir));
connectionContextFactory =
i.getInstance(ConnectionContextFactory.class);
connectionWindowFactory = i.getInstance(ConnectionWindowFactory.class);
diff --git a/test/net/sf/briar/transport/batch/BatchConnectionReadWriteTest.java b/test/net/sf/briar/protocol/batch/BatchConnectionReadWriteTest.java
similarity index 95%
rename from test/net/sf/briar/transport/batch/BatchConnectionReadWriteTest.java
rename to test/net/sf/briar/protocol/batch/BatchConnectionReadWriteTest.java
index 6895b52a48..10af1dcb99 100644
--- a/test/net/sf/briar/transport/batch/BatchConnectionReadWriteTest.java
+++ b/test/net/sf/briar/protocol/batch/BatchConnectionReadWriteTest.java
@@ -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;
@@ -43,9 +43,12 @@ import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.plugins.ImmediateExecutor;
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.transport.TransportModule;
-import net.sf.briar.transport.stream.TransportStreamModule;
import org.junit.After;
import org.junit.Before;
@@ -97,8 +100,8 @@ public class BatchConnectionReadWriteTest extends TestCase {
return Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(),
- new TestDatabaseModule(dir), new TransportBatchModule(),
- new TransportModule(), new TransportStreamModule());
+ new TestDatabaseModule(dir), new ProtocolBatchModule(),
+ new TransportModule(), new ProtocolStreamModule());
}
@Test
diff --git a/test/net/sf/briar/transport/ConnectionWriterTest.java b/test/net/sf/briar/transport/ConnectionWriterTest.java
index d4aa42103a..9e01fd3c08 100644
--- a/test/net/sf/briar/transport/ConnectionWriterTest.java
+++ b/test/net/sf/briar/transport/ConnectionWriterTest.java
@@ -16,9 +16,9 @@ import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.db.DatabaseModule;
import net.sf.briar.lifecycle.LifecycleModule;
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.transport.batch.TransportBatchModule;
-import net.sf.briar.transport.stream.TransportStreamModule;
import org.junit.Test;
@@ -44,8 +44,8 @@ public class ConnectionWriterTest extends TestCase {
Injector i = Guice.createInjector(testModule, new CryptoModule(),
new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(),
- new TestDatabaseModule(), new TransportBatchModule(),
- new TransportModule(), new TransportStreamModule());
+ new TestDatabaseModule(), new ProtocolBatchModule(),
+ new TransportModule(), new ProtocolStreamModule());
connectionWriterFactory = i.getInstance(ConnectionWriterFactory.class);
secret = new byte[32];
new Random().nextBytes(secret);
--
GitLab