From cb3026959a6b3e5c6cc5563601d7996186617353 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 24 Aug 2018 16:49:39 +0100 Subject: [PATCH] Remove raw messages from SyncRecordWriter interface. --- .../org/briarproject/bramble/api/sync/SyncRecordWriter.java | 2 +- .../org/briarproject/bramble/sync/DuplexOutgoingSession.java | 2 +- .../briarproject/bramble/sync/SimplexOutgoingSession.java | 2 +- .../org/briarproject/bramble/sync/SyncRecordWriterImpl.java | 5 +++-- .../bramble/sync/SimplexOutgoingSessionTest.java | 2 +- .../org/briarproject/bramble/sync/SyncIntegrationTest.java | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java index 7a091544a..1c2600ad7 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java @@ -9,7 +9,7 @@ public interface SyncRecordWriter { void writeAck(Ack a) throws IOException; - void writeMessage(byte[] raw) throws IOException; + void writeMessage(Message m) throws IOException; void writeOffer(Offer o) throws IOException; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java index 3031116b5..462be735b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java @@ -307,7 +307,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener { @Override public void run() throws IOException { if (interrupted) return; - for (Message m : batch) recordWriter.writeMessage(m.getRaw()); + for (Message m : batch) recordWriter.writeMessage(m); LOG.info("Sent batch"); generateBatch(); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java index 259939e25..7f12065a8 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java @@ -204,7 +204,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener { @Override public void run() throws IOException { if (interrupted) return; - for (Message m : batch) recordWriter.writeMessage(m.getRaw()); + for (Message m : batch) recordWriter.writeMessage(m); LOG.info("Sent batch"); dbExecutor.execute(new GenerateBatch()); } diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java index d5e59f78d..3714df6d2 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java @@ -4,6 +4,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.record.Record; import org.briarproject.bramble.api.record.RecordWriter; import org.briarproject.bramble.api.sync.Ack; +import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.Offer; import org.briarproject.bramble.api.sync.Request; @@ -44,8 +45,8 @@ class SyncRecordWriterImpl implements SyncRecordWriter { } @Override - public void writeMessage(byte[] raw) throws IOException { - writer.writeRecord(new Record(PROTOCOL_VERSION, MESSAGE, raw)); + public void writeMessage(Message m) throws IOException { + writer.writeRecord(new Record(PROTOCOL_VERSION, MESSAGE, m.getRaw())); } @Override diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java index 6bb7e77a1..3440621a4 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java @@ -102,7 +102,7 @@ public class SimplexOutgoingSessionTest extends BrambleMockTestCase { will(returnValue(singletonList(message))); oneOf(db).commitTransaction(msgTxn); oneOf(db).endTransaction(msgTxn); - oneOf(recordWriter).writeMessage(message.getRaw()); + oneOf(recordWriter).writeMessage(message); // No more acks oneOf(db).startTransaction(false); will(returnValue(noAckTxn)); diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java index d3f1eb905..a46f74459 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java @@ -108,8 +108,8 @@ public class SyncIntegrationTest extends BrambleTestCase { streamWriter.getOutputStream()); recordWriter.writeAck(new Ack(messageIds)); - recordWriter.writeMessage(message.getRaw()); - recordWriter.writeMessage(message1.getRaw()); + recordWriter.writeMessage(message); + recordWriter.writeMessage(message1); recordWriter.writeOffer(new Offer(messageIds)); recordWriter.writeRequest(new Request(messageIds));