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

Renamed serial component to data, moved consumers to briar-core.

Browse Source
This commit is contained in:
akwizgran
2015-05-02 20:39:24 +01:00
parent 416719e3d9
commit b8e37a5421
42 changed files with 129 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/org/briarproject/api/serial/Consumer.java → briar-api/src/org/briarproject/api/data/Consumer.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import java.io.IOException;

4
briar-api/src/org/briarproject/api/serial/SerialConstants.java → briar-api/src/org/briarproject/api/data/DataConstants.java
View File

@@ -1,8 +1,8 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import org.briarproject.api.UniqueId;
public interface SerialConstants {
public interface DataConstants {
int LIST_START_LENGTH = 1;

2
briar-api/src/org/briarproject/api/serial/ObjectReader.java → briar-api/src/org/briarproject/api/data/ObjectReader.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import java.io.IOException;

2
briar-api/src/org/briarproject/api/serial/Reader.java → briar-api/src/org/briarproject/api/data/Reader.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import java.io.IOException;

2
briar-api/src/org/briarproject/api/serial/ReaderFactory.java → briar-api/src/org/briarproject/api/data/ReaderFactory.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import java.io.InputStream;

2
briar-api/src/org/briarproject/api/serial/Writer.java → briar-api/src/org/briarproject/api/data/Writer.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import java.io.IOException;
import java.util.Collection;

2
briar-api/src/org/briarproject/api/serial/WriterFactory.java → briar-api/src/org/briarproject/api/data/WriterFactory.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.api.serial;
package org.briarproject.api.data;
import java.io.OutputStream;

6
briar-core/src/org/briarproject/serial/ReaderFactoryImpl.java → briar-core/src/org/briarproject/data/ReaderFactoryImpl.java
View File

@@ -1,9 +1,9 @@
package org.briarproject.serial;
package org.briarproject.data;
import java.io.InputStream;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.data.Reader;
import org.briarproject.api.data.ReaderFactory;
class ReaderFactoryImpl implements ReaderFactory {

38
briar-core/src/org/briarproject/serial/ReaderImpl.java → briar-core/src/org/briarproject/data/ReaderImpl.java
View File

@@ -1,20 +1,20 @@
package org.briarproject.serial;
package org.briarproject.data;
import static org.briarproject.serial.ObjectTypes.END;
import static org.briarproject.serial.ObjectTypes.FLOAT_64;
import static org.briarproject.serial.ObjectTypes.INT_16;
import static org.briarproject.serial.ObjectTypes.INT_32;
import static org.briarproject.serial.ObjectTypes.INT_64;
import static org.briarproject.serial.ObjectTypes.INT_8;
import static org.briarproject.serial.ObjectTypes.LIST;
import static org.briarproject.serial.ObjectTypes.MAP;
import static org.briarproject.serial.ObjectTypes.NULL;
import static org.briarproject.serial.ObjectTypes.RAW_16;
import static org.briarproject.serial.ObjectTypes.RAW_32;
import static org.briarproject.serial.ObjectTypes.RAW_8;
import static org.briarproject.serial.ObjectTypes.STRING_16;
import static org.briarproject.serial.ObjectTypes.STRING_32;
import static org.briarproject.serial.ObjectTypes.STRING_8;
import static org.briarproject.data.Types.END;
import static org.briarproject.data.Types.FLOAT_64;
import static org.briarproject.data.Types.INT_16;
import static org.briarproject.data.Types.INT_32;
import static org.briarproject.data.Types.INT_64;
import static org.briarproject.data.Types.INT_8;
import static org.briarproject.data.Types.LIST;
import static org.briarproject.data.Types.MAP;
import static org.briarproject.data.Types.NULL;
import static org.briarproject.data.Types.RAW_16;
import static org.briarproject.data.Types.RAW_32;
import static org.briarproject.data.Types.RAW_8;
import static org.briarproject.data.Types.STRING_16;
import static org.briarproject.data.Types.STRING_32;
import static org.briarproject.data.Types.STRING_8;
import java.io.IOException;
import java.io.InputStream;
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.Collection;
import org.briarproject.api.FormatException;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.data.Consumer;
import org.briarproject.api.data.Reader;
// This class is not thread-safe
class ReaderImpl implements Reader {
@@ -133,7 +133,7 @@ class ReaderImpl implements Reader {
public boolean hasBoolean() throws IOException {
if(!hasLookahead) readLookahead();
if(eof) return false;
return next == ObjectTypes.BOOLEAN;
return next == Types.BOOLEAN;
}
public boolean readBoolean() throws IOException {

6
briar-core/src/org/briarproject/serial/SerialModule.java → briar-core/src/org/briarproject/data/SerialModule.java
View File

@@ -1,7 +1,7 @@
package org.briarproject.serial;
package org.briarproject.data;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.WriterFactory;
import com.google.inject.AbstractModule;

4
briar-core/src/org/briarproject/serial/ObjectTypes.java → briar-core/src/org/briarproject/data/Types.java
View File

@@ -1,6 +1,6 @@
package org.briarproject.serial;
package org.briarproject.data;
interface ObjectTypes {
interface Types {
byte NULL = 0x00;
byte BOOLEAN = 0x11;

6
briar-core/src/org/briarproject/serial/WriterFactoryImpl.java → briar-core/src/org/briarproject/data/WriterFactoryImpl.java
View File

@@ -1,9 +1,9 @@
package org.briarproject.serial;
package org.briarproject.data;
import java.io.OutputStream;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
class WriterFactoryImpl implements WriterFactory {

42
briar-core/src/org/briarproject/serial/WriterImpl.java → briar-core/src/org/briarproject/data/WriterImpl.java
View File

@@ -1,21 +1,21 @@
package org.briarproject.serial;
package org.briarproject.data;
import static org.briarproject.serial.ObjectTypes.BOOLEAN;
import static org.briarproject.serial.ObjectTypes.END;
import static org.briarproject.serial.ObjectTypes.FLOAT_64;
import static org.briarproject.serial.ObjectTypes.INT_16;
import static org.briarproject.serial.ObjectTypes.INT_32;
import static org.briarproject.serial.ObjectTypes.INT_64;
import static org.briarproject.serial.ObjectTypes.INT_8;
import static org.briarproject.serial.ObjectTypes.LIST;
import static org.briarproject.serial.ObjectTypes.MAP;
import static org.briarproject.serial.ObjectTypes.NULL;
import static org.briarproject.serial.ObjectTypes.RAW_16;
import static org.briarproject.serial.ObjectTypes.RAW_32;
import static org.briarproject.serial.ObjectTypes.RAW_8;
import static org.briarproject.serial.ObjectTypes.STRING_16;
import static org.briarproject.serial.ObjectTypes.STRING_32;
import static org.briarproject.serial.ObjectTypes.STRING_8;
import static org.briarproject.data.Types.BOOLEAN;
import static org.briarproject.data.Types.END;
import static org.briarproject.data.Types.FLOAT_64;
import static org.briarproject.data.Types.INT_16;
import static org.briarproject.data.Types.INT_32;
import static org.briarproject.data.Types.INT_64;
import static org.briarproject.data.Types.INT_8;
import static org.briarproject.data.Types.LIST;
import static org.briarproject.data.Types.MAP;
import static org.briarproject.data.Types.NULL;
import static org.briarproject.data.Types.RAW_16;
import static org.briarproject.data.Types.RAW_32;
import static org.briarproject.data.Types.RAW_8;
import static org.briarproject.data.Types.STRING_16;
import static org.briarproject.data.Types.STRING_32;
import static org.briarproject.data.Types.STRING_8;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,8 +26,8 @@ import java.util.Map;
import java.util.Map.Entry;
import org.briarproject.api.Bytes;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.data.Consumer;
import org.briarproject.api.data.Writer;
// This class is not thread-safe
class WriterImpl implements Writer {
@@ -139,9 +139,9 @@ class WriterImpl implements Writer {
}
public void writeList(Collection<?> c) throws IOException {
write(ObjectTypes.LIST);
write(Types.LIST);
for(Object o : c) writeObject(o);
write(ObjectTypes.END);
write(Types.END);
}
private void writeObject(Object o) throws IOException {

8
briar-core/src/org/briarproject/invitation/AliceConnector.java
View File

@@ -18,16 +18,16 @@ import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.data.Reader;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;

8
briar-core/src/org/briarproject/invitation/BobConnector.java
View File

@@ -18,16 +18,16 @@ import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.data.Reader;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;

8
briar-core/src/org/briarproject/invitation/Connector.java
View File

@@ -36,6 +36,10 @@ import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.crypto.Signature;
import org.briarproject.api.data.Reader;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchTransportException;
@@ -44,10 +48,6 @@ import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.transport.Endpoint;
import org.briarproject.api.transport.StreamReaderFactory;

4
briar-core/src/org/briarproject/invitation/ConnectorGroup.java
View File

@@ -23,6 +23,8 @@ import org.briarproject.api.TransportProperties;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.crypto.PseudoRandom;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.invitation.InvitationListener;
@@ -32,8 +34,6 @@ import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.plugins.duplex.DuplexPlugin;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;

4
briar-core/src/org/briarproject/invitation/InvitationTaskFactoryImpl.java
View File

@@ -6,14 +6,14 @@ import org.briarproject.api.AuthorFactory;
import org.briarproject.api.AuthorId;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.KeyManager;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.invitation.InvitationTask;
import org.briarproject.api.invitation.InvitationTaskFactory;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.plugins.ConnectionManager;
import org.briarproject.api.plugins.PluginManager;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.system.Clock;
import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;

4
briar-core/src/org/briarproject/messaging/AuthorFactoryImpl.java
View File

@@ -11,8 +11,8 @@ import org.briarproject.api.AuthorId;
import org.briarproject.api.LocalAuthor;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.system.Clock;
class AuthorFactoryImpl implements AuthorFactory {

5
briar-core/src/org/briarproject/messaging/AuthorReader.java
View File

@@ -10,9 +10,8 @@ import org.briarproject.api.AuthorId;
import org.briarproject.api.FormatException;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ObjectReader;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.data.Reader;
class AuthorReader implements ObjectReader<Author> {

6
briar-api/src/org/briarproject/api/serial/CopyingConsumer.java → briar-core/src/org/briarproject/messaging/CopyingConsumer.java
View File

@@ -1,10 +1,12 @@
package org.briarproject.api.serial;
package org.briarproject.messaging;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.briarproject.api.data.Consumer;
/** A consumer that makes a copy of the bytes consumed. */
public class CopyingConsumer implements Consumer {
class CopyingConsumer implements Consumer {
private final ByteArrayOutputStream out = new ByteArrayOutputStream();

5
briar-api/src/org/briarproject/api/serial/CountingConsumer.java → briar-core/src/org/briarproject/messaging/CountingConsumer.java
View File

@@ -1,14 +1,15 @@
package org.briarproject.api.serial;
package org.briarproject.messaging;
import java.io.IOException;
import org.briarproject.api.FormatException;
import org.briarproject.api.data.Consumer;
/**
* A consumer that counts the number of bytes consumed and throws a
* FormatException if the count exceeds a given limit.
*/
public class CountingConsumer implements Consumer {
class CountingConsumer implements Consumer {
private final long limit;
private long count = 0;

5
briar-api/src/org/briarproject/api/serial/DigestingConsumer.java → briar-core/src/org/briarproject/messaging/DigestingConsumer.java
View File

@@ -1,9 +1,10 @@
package org.briarproject.api.serial;
package org.briarproject.messaging;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.data.Consumer;
/** A consumer that passes its input through a message digest. */
public class DigestingConsumer implements Consumer {
class DigestingConsumer implements Consumer {
private final MessageDigest messageDigest;

4
briar-core/src/org/briarproject/messaging/GroupFactoryImpl.java
View File

@@ -9,11 +9,11 @@ import javax.inject.Inject;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
class GroupFactoryImpl implements GroupFactory {

5
briar-core/src/org/briarproject/messaging/GroupReader.java
View File

@@ -8,11 +8,10 @@ import java.io.IOException;
import org.briarproject.api.FormatException;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.data.Reader;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ObjectReader;
class GroupReader implements ObjectReader<Group> {

9
briar-core/src/org/briarproject/messaging/MessageFactoryImpl.java
View File

@@ -18,16 +18,13 @@ import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.crypto.PrivateKey;
import org.briarproject.api.crypto.Signature;
import org.briarproject.api.data.Consumer;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.Message;
import org.briarproject.api.messaging.MessageFactory;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.DigestingConsumer;
import org.briarproject.api.serial.SigningConsumer;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.util.StringUtils;
class MessageFactoryImpl implements MessageFactory {

6
briar-core/src/org/briarproject/messaging/MessageReader.java
View File

@@ -11,13 +11,11 @@ import java.io.IOException;
import org.briarproject.api.Author;
import org.briarproject.api.FormatException;
import org.briarproject.api.UniqueId;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.data.Reader;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.CopyingConsumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.ObjectReader;
import org.briarproject.api.serial.Reader;
class MessageReader implements ObjectReader<UnverifiedMessage> {

2
briar-core/src/org/briarproject/messaging/MessagingModule.java
View File

@@ -5,6 +5,7 @@ import javax.inject.Singleton;
import org.briarproject.api.Author;
import org.briarproject.api.AuthorFactory;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupFactory;
import org.briarproject.api.messaging.MessageFactory;
@@ -14,7 +15,6 @@ import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.ObjectReader;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

4
briar-core/src/org/briarproject/messaging/PacketReaderFactoryImpl.java
View File

@@ -4,12 +4,12 @@ import java.io.InputStream;
import javax.inject.Inject;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.messaging.PacketReader;
import org.briarproject.api.messaging.PacketReaderFactory;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.ObjectReader;
class PacketReaderFactoryImpl implements PacketReaderFactory {

6
briar-core/src/org/briarproject/messaging/PacketReaderImpl.java
View File

@@ -30,6 +30,9 @@ import org.briarproject.api.FormatException;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.UniqueId;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.data.Reader;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.MessageId;
import org.briarproject.api.messaging.Offer;
@@ -42,9 +45,6 @@ import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.TransportAck;
import org.briarproject.api.messaging.TransportUpdate;
import org.briarproject.api.messaging.UnverifiedMessage;
import org.briarproject.api.serial.Reader;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.ObjectReader;
import org.briarproject.util.ByteUtils;
// This class is not thread-safe

2
briar-core/src/org/briarproject/messaging/PacketWriterFactoryImpl.java
View File

@@ -4,9 +4,9 @@ import java.io.OutputStream;
import javax.inject.Inject;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.messaging.PacketWriter;
import org.briarproject.api.messaging.PacketWriterFactory;
import org.briarproject.api.serial.WriterFactory;
class PacketWriterFactoryImpl implements PacketWriterFactory {

10
briar-core/src/org/briarproject/messaging/PacketWriterImpl.java
View File

@@ -1,5 +1,8 @@
package org.briarproject.messaging;
import static org.briarproject.api.data.DataConstants.LIST_END_LENGTH;
import static org.briarproject.api.data.DataConstants.LIST_START_LENGTH;
import static org.briarproject.api.data.DataConstants.UNIQUE_ID_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.HEADER_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PAYLOAD_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.PROTOCOL_VERSION;
@@ -12,14 +15,13 @@ import static org.briarproject.api.messaging.PacketTypes.SUBSCRIPTION_ACK;
import static org.briarproject.api.messaging.PacketTypes.SUBSCRIPTION_UPDATE;
import static org.briarproject.api.messaging.PacketTypes.TRANSPORT_ACK;
import static org.briarproject.api.messaging.PacketTypes.TRANSPORT_UPDATE;
import static org.briarproject.api.serial.SerialConstants.LIST_END_LENGTH;
import static org.briarproject.api.serial.SerialConstants.LIST_START_LENGTH;
import static org.briarproject.api.serial.SerialConstants.UNIQUE_ID_LENGTH;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.api.messaging.Ack;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.MessageId;
@@ -33,8 +35,6 @@ import org.briarproject.api.messaging.SubscriptionAck;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.TransportAck;
import org.briarproject.api.messaging.TransportUpdate;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.util.ByteUtils;
// This class is not thread-safe

5
briar-api/src/org/briarproject/api/serial/SigningConsumer.java → briar-core/src/org/briarproject/messaging/SigningConsumer.java
View File

@@ -1,9 +1,10 @@
package org.briarproject.api.serial;
package org.briarproject.messaging;
import org.briarproject.api.crypto.Signature;
import org.briarproject.api.data.Consumer;
/** A consumer that passes its input through a signature. */
public class SigningConsumer implements Consumer {
class SigningConsumer implements Consumer {
private final Signature signature;

7
briar-core/src/org/briarproject/messaging/SubscriptionUpdateReader.java
View File

@@ -11,13 +11,12 @@ import java.util.List;
import java.util.Set;
import org.briarproject.api.FormatException;
import org.briarproject.api.data.Consumer;
import org.briarproject.api.data.ObjectReader;
import org.briarproject.api.data.Reader;
import org.briarproject.api.messaging.Group;
import org.briarproject.api.messaging.GroupId;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.serial.Consumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.ObjectReader;
import org.briarproject.api.serial.Reader;
class SubscriptionUpdateReader implements ObjectReader<SubscriptionUpdate> {

4
briar-tests/build.xml
View File

@@ -103,6 +103,8 @@
<test name="org.briarproject.crypto.PasswordStrengthEstimatorImplTest"/>
<test name='org.briarproject.crypto.StreamDecrypterImplTest'/>
<test name='org.briarproject.crypto.StreamEncrypterImplTest'/>
<test name='org.briarproject.data.ReaderImplTest'/>
<test name='org.briarproject.data.WriterImplTest'/>
<test name='org.briarproject.db.BasicH2Test'/>
<test name='org.briarproject.db.DatabaseCleanerImplTest'/>
<test name='org.briarproject.db.DatabaseComponentImplTest'/>
@@ -124,8 +126,6 @@
<test name='org.briarproject.plugins.modem.CountryCodesTest'/>
<test name='org.briarproject.plugins.modem.ModemPluginTest'/>
<test name='org.briarproject.plugins.tcp.LanTcpPluginTest'/>
<test name='org.briarproject.serial.ReaderImplTest'/>
<test name='org.briarproject.serial.WriterImplTest'/>
<test name='org.briarproject.system.LinuxSeedProviderTest'/>
<test name='org.briarproject.transport.KeyManagerImplTest'/>
<test name='org.briarproject.transport.KeyRotationIntegrationTest'/>

2
briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
View File

@@ -39,10 +39,10 @@ import org.briarproject.api.transport.StreamContext;
import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.SerialModule;
import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.briarproject.messaging.MessagingModule;
import org.briarproject.serial.SerialModule;
import org.briarproject.transport.TransportModule;
import org.junit.Test;

2
briar-tests/src/org/briarproject/serial/ReaderImplTest.java → briar-tests/src/org/briarproject/data/ReaderImplTest.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.serial;
package org.briarproject.data;
import static org.junit.Assert.assertArrayEquals;

2
briar-tests/src/org/briarproject/serial/WriterImplTest.java → briar-tests/src/org/briarproject/data/WriterImplTest.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.serial;
package org.briarproject.data;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

2
briar-tests/src/org/briarproject/messaging/ConstantsTest.java
View File

@@ -44,9 +44,9 @@ import org.briarproject.api.messaging.Request;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.TransportUpdate;
import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.SerialModule;
import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.briarproject.serial.SerialModule;
import org.junit.Test;
import com.google.inject.Guice;

3
briar-tests/src/org/briarproject/messaging/ConsumersTest.java
View File

@@ -8,9 +8,6 @@ import java.util.Random;
import org.briarproject.BriarTestCase;
import org.briarproject.api.FormatException;
import org.briarproject.api.crypto.MessageDigest;
import org.briarproject.api.serial.CopyingConsumer;
import org.briarproject.api.serial.CountingConsumer;
import org.briarproject.api.serial.DigestingConsumer;
import org.junit.Test;
public class ConsumersTest extends BriarTestCase {

12
briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
View File

@@ -1,12 +1,12 @@
package org.briarproject.messaging;
import static org.briarproject.api.data.DataConstants.LIST_END_LENGTH;
import static org.briarproject.api.data.DataConstants.UNIQUE_ID_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.HEADER_LENGTH;
import static org.briarproject.api.messaging.MessagingConstants.MAX_PAYLOAD_LENGTH;
import static org.briarproject.api.messaging.PacketTypes.ACK;
import static org.briarproject.api.messaging.PacketTypes.OFFER;
import static org.briarproject.api.messaging.PacketTypes.REQUEST;
import static org.briarproject.api.serial.SerialConstants.LIST_END_LENGTH;
import static org.briarproject.api.serial.SerialConstants.UNIQUE_ID_LENGTH;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -14,10 +14,10 @@ import java.io.ByteArrayOutputStream;
import org.briarproject.BriarTestCase;
import org.briarproject.TestUtils;
import org.briarproject.api.FormatException;
import org.briarproject.api.serial.ReaderFactory;
import org.briarproject.api.serial.Writer;
import org.briarproject.api.serial.WriterFactory;
import org.briarproject.serial.SerialModule;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
import org.briarproject.data.SerialModule;
import org.briarproject.util.ByteUtils;
import org.junit.Test;

2
briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
View File

@@ -44,10 +44,10 @@ import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.api.transport.TagRecogniser;
import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.SerialModule;
import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.briarproject.plugins.ImmediateExecutor;
import org.briarproject.serial.SerialModule;
import org.briarproject.transport.TransportModule;
import org.junit.After;
import org.junit.Before;