diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java index df68d7933..e0ba5a388 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java @@ -35,24 +35,24 @@ public interface ClientHelper { Message createMessageForStoringMetadata(GroupId g); - Message getMessage(MessageId m) throws DbException; + Message getSmallMessage(MessageId m) throws DbException; - Message getMessage(Transaction txn, MessageId m) throws DbException; + Message getSmallMessage(Transaction txn, MessageId m) throws DbException; - BdfList getMessageAsList(MessageId m) throws DbException, FormatException; + BdfList getSmallMessageAsList(MessageId m) + throws DbException, FormatException; - BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException, - FormatException; + BdfList getSmallMessageAsList(Transaction txn, MessageId m) + throws DbException, FormatException; - BdfDictionary getGroupMetadataAsDictionary(GroupId g) throws DbException, - FormatException; + BdfDictionary getGroupMetadataAsDictionary(GroupId g) + throws DbException, FormatException; BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g) throws DbException, FormatException; BdfDictionary getMessageMetadataAsDictionary(MessageId m) - throws DbException, - FormatException; + throws DbException, FormatException; BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m) throws DbException, FormatException; @@ -67,8 +67,8 @@ public interface ClientHelper { BdfDictionary query) throws DbException, FormatException; Map getMessageMetadataAsDictionary( - Transaction txn, GroupId g, BdfDictionary query) throws DbException, - FormatException; + Transaction txn, GroupId g, BdfDictionary query) + throws DbException, FormatException; void mergeGroupMetadata(GroupId g, BdfDictionary metadata) throws DbException, FormatException; diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java index d22a29fa2..e86939991 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java @@ -276,13 +276,14 @@ public interface DatabaseComponent extends TransactionManager { Collection getIdentities(Transaction txn) throws DbException; /** - * Returns the message with the given ID. + * Returns the single-block message with the given ID. *

* Read-only. * * @throws MessageDeletedException if the message has been deleted + * @throws MessageTooLargeException if the message has more than one block */ - Message getMessage(Transaction txn, MessageId m) throws DbException; + Message getSmallMessage(Transaction txn, MessageId m) throws DbException; /** * Returns the IDs of all delivered messages in the given group. diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/MessageTooLargeException.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/MessageTooLargeException.java new file mode 100644 index 000000000..5b47855d0 --- /dev/null +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/MessageTooLargeException.java @@ -0,0 +1,8 @@ +package org.briarproject.bramble.api.db; + +/** + * Thrown when a multi-block message is requested from the database via a + * method that is only suitable for requesting single-block messages. + */ +public class MessageTooLargeException extends DbException { +} diff --git a/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java index 604570aee..0e1092288 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java @@ -116,25 +116,27 @@ class ClientHelperImpl implements ClientHelper { } @Override - public Message getMessage(MessageId m) throws DbException { - return db.transactionWithResult(true, txn -> getMessage(txn, m)); + public Message getSmallMessage(MessageId m) throws DbException { + return db.transactionWithResult(true, txn -> getSmallMessage(txn, m)); } @Override - public Message getMessage(Transaction txn, MessageId m) throws DbException { - return db.getMessage(txn, m); + public Message getSmallMessage(Transaction txn, MessageId m) + throws DbException { + return db.getSmallMessage(txn, m); } @Override - public BdfList getMessageAsList(MessageId m) throws DbException, - FormatException { - return db.transactionWithResult(true, txn -> getMessageAsList(txn, m)); - } - - @Override - public BdfList getMessageAsList(Transaction txn, MessageId m) + public BdfList getSmallMessageAsList(MessageId m) throws DbException, FormatException { - return toList(db.getMessage(txn, m).getBody()); + return db.transactionWithResult(true, txn -> + getSmallMessageAsList(txn, m)); + } + + @Override + public BdfList getSmallMessageAsList(Transaction txn, MessageId m) + throws DbException, FormatException { + return toList(db.getSmallMessage(txn, m).getBody()); } @Override diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java b/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java index 26f69a4c3..9a4bf3f21 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/Database.java @@ -12,6 +12,7 @@ import org.briarproject.bramble.api.db.DataTooOldException; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.MessageDeletedException; +import org.briarproject.bramble.api.db.MessageTooLargeException; import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.MigrationListener; import org.briarproject.bramble.api.identity.Author; @@ -332,13 +333,14 @@ interface Database { Collection getIdentities(T txn) throws DbException; /** - * Returns the message with the given ID. + * Returns the single-block message with the given ID. *

* Read-only. * * @throws MessageDeletedException if the message has been deleted + * @throws MessageTooLargeException if the message has more than one block */ - Message getMessage(T txn, MessageId m) throws DbException; + Message getSmallMessage(T txn, MessageId m) throws DbException; /** * Returns the IDs and states of all dependencies of the given message. diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java index dc89c05a4..be4088607 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java @@ -418,7 +418,7 @@ class DatabaseComponentImpl implements DatabaseComponent { else ids = db.getMessagesToSend(txn, c, maxLength, maxLatency); List messages = new ArrayList<>(ids.size()); for (MessageId m : ids) { - messages.add(db.getMessage(txn, m)); + messages.add(db.getSmallMessage(txn, m)); db.updateExpiryTimeAndEta(txn, c, m, maxLatency); } if (ids.isEmpty()) return null; @@ -472,7 +472,7 @@ class DatabaseComponentImpl implements DatabaseComponent { db.getRequestedMessagesToSend(txn, c, maxLength, maxLatency); List messages = new ArrayList<>(ids.size()); for (MessageId m : ids) { - messages.add(db.getMessage(txn, m)); + messages.add(db.getSmallMessage(txn, m)); db.updateExpiryTimeAndEta(txn, c, m, maxLatency); } if (ids.isEmpty()) return null; @@ -564,12 +564,12 @@ class DatabaseComponentImpl implements DatabaseComponent { } @Override - public Message getMessage(Transaction transaction, MessageId m) + public Message getSmallMessage(Transaction transaction, MessageId m) throws DbException { T txn = unbox(transaction); if (!db.containsMessage(txn, m)) throw new NoSuchMessageException(); - return db.getMessage(txn, m); + return db.getSmallMessage(txn, m); } @Override diff --git a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java index 5e8b5fec5..61628fa83 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java @@ -16,6 +16,7 @@ import org.briarproject.bramble.api.db.DataTooOldException; import org.briarproject.bramble.api.db.DbClosedException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.db.MessageDeletedException; +import org.briarproject.bramble.api.db.MessageTooLargeException; import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.MigrationListener; import org.briarproject.bramble.api.identity.Author; @@ -1716,11 +1717,13 @@ abstract class JdbcDatabase implements Database { } @Override - public Message getMessage(Connection txn, MessageId m) throws DbException { + public Message getSmallMessage(Connection txn, MessageId m) + throws DbException { PreparedStatement ps = null; ResultSet rs = null; try { - String sql = "SELECT groupId, timestamp, deleted FROM messages" + String sql = "SELECT groupId, timestamp, deleted, blockCount" + + " FROM messages" + " WHERE messageId = ?"; ps = txn.prepareStatement(sql); ps.setBytes(1, m.getBytes()); @@ -1729,10 +1732,12 @@ abstract class JdbcDatabase implements Database { GroupId g = new GroupId(rs.getBytes(1)); long timestamp = rs.getLong(2); boolean deleted = rs.getBoolean(3); + int blockCount = rs.getInt(4); if (rs.next()) throw new DbStateException(); rs.close(); ps.close(); if (deleted) throw new MessageDeletedException(); + if (blockCount > 1) throw new MessageTooLargeException(); sql = "SELECT data FROM blocks" + " WHERE messageId = ? AND blockNumber = 0"; ps = txn.prepareStatement(sql); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java index d5f2d4212..cc989d594 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java @@ -199,7 +199,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager, Map latest = findLatestLocal(txn); // Retrieve and parse the latest local properties for (Entry e : latest.entrySet()) { - BdfList message = clientHelper.getMessageAsList(txn, + BdfList message = clientHelper.getSmallMessageAsList(txn, e.getValue().messageId); local.put(e.getKey(), parseProperties(message)); } @@ -220,7 +220,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager, true); if (latest != null) { // Retrieve and parse the latest local properties - BdfList message = clientHelper.getMessageAsList(txn, + BdfList message = clientHelper.getSmallMessageAsList(txn, latest.messageId); p = parseProperties(message); } @@ -250,7 +250,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager, if (latest == null) { local = new TransportProperties(); } else { - BdfList message = clientHelper.getMessageAsList(txn, + BdfList message = clientHelper.getSmallMessageAsList(txn, latest.messageId); local = parseProperties(message); } @@ -271,8 +271,8 @@ class TransportPropertyManagerImpl implements TransportPropertyManager, remote = new TransportProperties(); } else { // Retrieve and parse the latest remote properties - BdfList message = - clientHelper.getMessageAsList(txn, latest.messageId); + BdfList message = clientHelper.getSmallMessageAsList(txn, + latest.messageId); remote = parseProperties(message); } // Merge in any discovered properties @@ -315,7 +315,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager, } changed = true; } else { - BdfList message = clientHelper.getMessageAsList(txn, + BdfList message = clientHelper.getSmallMessageAsList(txn, latest.messageId); TransportProperties old = parseProperties(message); merged = new TransportProperties(old); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java index d0d583195..da31148e3 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/sync/validation/ValidationManagerImpl.java @@ -120,7 +120,7 @@ class ValidationManagerImpl implements ValidationManager, Service, Pair mg = db.transactionWithResult(true, txn -> { MessageId id = unvalidated.poll(); if (id == null) throw new AssertionError(); - Message m = db.getMessage(txn, id); + Message m = db.getSmallMessage(txn, id); Group g = db.getGroup(txn, m.getGroupId()); return new Pair<>(m, g); }); @@ -179,7 +179,7 @@ class ValidationManagerImpl implements ValidationManager, Service, invalidateMessage(txn, id); addDependentsToInvalidate(txn, id, invalidate); } else if (allDelivered) { - Message m = db.getMessage(txn, id); + Message m = db.getSmallMessage(txn, id); Group g = db.getGroup(txn, m.getGroupId()); ClientId c = g.getClientId(); int majorVersion = g.getMajorVersion(); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java index b334f3bea..cd2ad23e0 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java @@ -298,7 +298,8 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, private List loadClientVersions(Transaction txn, MessageId m) throws DbException { try { - return parseClientVersions(clientHelper.getMessageAsList(txn, m)); + return parseClientVersions( + clientHelper.getSmallMessageAsList(txn, m)); } catch (FormatException e) { throw new DbException(e); } @@ -391,7 +392,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, private Update loadUpdate(Transaction txn, MessageId m) throws DbException { try { - return parseUpdate(clientHelper.getMessageAsList(txn, m)); + return parseUpdate(clientHelper.getSmallMessageAsList(txn, m)); } catch (FormatException e) { throw new DbException(e); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java index a79c18752..c23dc5361 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java @@ -122,11 +122,11 @@ public class ClientHelperImplTest extends BrambleTestCase { expectToList(true); context.checking(new DbExpectations() {{ oneOf(db).transactionWithResult(with(true), withDbCallable(txn)); - oneOf(db).getMessage(txn, messageId); + oneOf(db).getSmallMessage(txn, messageId); will(returnValue(message)); }}); - clientHelper.getMessageAsList(messageId); + clientHelper.getSmallMessageAsList(messageId); context.assertIsSatisfied(); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java index 244f3bc48..e0cf8be88 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java @@ -624,7 +624,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { try { db.transaction(false, transaction -> - db.getMessage(transaction, messageId)); + db.getSmallMessage(transaction, messageId)); fail(); } catch (NoSuchMessageException expected) { // Expected @@ -868,11 +868,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { oneOf(database).getSmallMessagesToSend(txn, contactId, MAX_MESSAGE_LENGTH * 2, maxLatency); will(returnValue(ids)); - oneOf(database).getMessage(txn, messageId); + oneOf(database).getSmallMessage(txn, messageId); will(returnValue(message)); oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId, maxLatency); - oneOf(database).getMessage(txn, messageId1); + oneOf(database).getSmallMessage(txn, messageId1); will(returnValue(message1)); oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId1, maxLatency); @@ -953,11 +953,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { oneOf(database).getRequestedMessagesToSend(txn, contactId, MAX_MESSAGE_LENGTH * 2, maxLatency); will(returnValue(ids)); - oneOf(database).getMessage(txn, messageId); + oneOf(database).getSmallMessage(txn, messageId); will(returnValue(message)); oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId, maxLatency); - oneOf(database).getMessage(txn, messageId1); + oneOf(database).getSmallMessage(txn, messageId1); will(returnValue(message1)); oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId1, maxLatency); diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java index 3e76c794f..6cdb4e155 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java @@ -507,11 +507,11 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase { } @Test - public void testGetMessage() throws Exception { - String name = "getMessage(T, MessageId)"; + public void testGetSmallMessage() throws Exception { + String name = "getSmallMessage(T, MessageId)"; benchmark(name, db -> { Connection txn = db.startTransaction(); - db.getMessage(txn, pickRandom(messages).getId()); + db.getSmallMessage(txn, pickRandom(messages).getId()); db.commitTransaction(txn); }); } diff --git a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java b/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java index ac4231216..d21db95f8 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java @@ -166,7 +166,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase { assertTrue(db.containsGroup(txn, groupId)); assertTrue(db.containsMessage(txn, messageId)); assertArrayEquals(message.getBody(), - db.getMessage(txn, messageId).getBody()); + db.getSmallMessage(txn, messageId).getBody()); // Delete the records db.removeMessage(txn, messageId); @@ -1929,7 +1929,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase { assertEquals(singletonList(messageId), ids); // The message should be available - Message m = db.getMessage(txn, messageId); + Message m = db.getSmallMessage(txn, messageId); assertEquals(messageId, m.getId()); assertEquals(groupId, m.getGroupId()); assertEquals(message.getTimestamp(), m.getTimestamp()); @@ -1949,7 +1949,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase { // Requesting the message should throw an exception try { - db.getMessage(txn, messageId); + db.getSmallMessage(txn, messageId); fail(); } catch (MessageDeletedException expected) { // Expected @@ -2087,7 +2087,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase { Connection txn = db.startTransaction(); try { // Ask for a nonexistent message - an exception should be thrown - db.getMessage(txn, messageId); + db.getSmallMessage(txn, messageId); fail(); } catch (DbException expected) { // It should be possible to abort the transaction without error diff --git a/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java index 9073917a2..76fb96495 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java @@ -402,7 +402,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, localGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, fooUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, fooUpdateId); will(returnValue(fooUpdate)); oneOf(clientHelper).parseAndValidateTransportProperties( fooPropertiesDict); @@ -469,7 +469,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup2.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, fooUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, fooUpdateId); will(returnValue(fooUpdate)); oneOf(clientHelper).parseAndValidateTransportProperties( fooPropertiesDict); @@ -524,7 +524,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, updateId); + oneOf(clientHelper).getSmallMessageAsList(txn, updateId); will(returnValue(update)); oneOf(clientHelper).parseAndValidateTransportProperties( fooPropertiesDict); @@ -562,7 +562,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, localGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, updateId); + oneOf(clientHelper).getSmallMessageAsList(txn, updateId); will(returnValue(update)); oneOf(clientHelper).parseAndValidateTransportProperties( fooPropertiesDict); @@ -693,7 +693,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, localGroup.getId()); will(returnValue(localGroupMessageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, localGroupUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localGroupUpdateId); will(returnValue(oldUpdate)); oneOf(clientHelper).parseAndValidateTransportProperties( oldPropertiesDict); @@ -758,7 +758,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, localGroup.getId()); will(returnValue(localGroupMessageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, localGroupUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localGroupUpdateId); will(returnValue(oldUpdate)); oneOf(clientHelper).parseAndValidateTransportProperties( oldPropertiesDict); @@ -817,12 +817,12 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase { localGroup.getId()); will(returnValue(messageMetadata)); // Retrieve and parse the latest local properties - oneOf(clientHelper).getMessageAsList(txn, fooVersion999); + oneOf(clientHelper).getSmallMessageAsList(txn, fooVersion999); will(returnValue(fooUpdate)); oneOf(clientHelper).parseAndValidateTransportProperties( fooPropertiesDict); will(returnValue(fooProperties)); - oneOf(clientHelper).getMessageAsList(txn, barVersion3); + oneOf(clientHelper).getSmallMessageAsList(txn, barVersion3); will(returnValue(barUpdate)); oneOf(clientHelper).parseAndValidateTransportProperties( barPropertiesDict); diff --git a/bramble-core/src/test/java/org/briarproject/bramble/sync/validation/ValidationManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/sync/validation/ValidationManagerImplTest.java index 09018c36e..43480de25 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/sync/validation/ValidationManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/sync/validation/ValidationManagerImplTest.java @@ -99,7 +99,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { context.checking(new DbExpectations() {{ // Load the first raw message and group oneOf(db).transactionWithResult(with(true), withDbCallable(txn)); - oneOf(db).getMessage(txn, messageId); + oneOf(db).getSmallMessage(txn, messageId); will(returnValue(message)); oneOf(db).getGroup(txn, groupId); will(returnValue(group)); @@ -118,7 +118,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { will(returnValue(emptyMap())); // Load the second raw message and group oneOf(db).transactionWithResult(with(true), withDbCallable(txn2)); - oneOf(db).getMessage(txn2, messageId1); + oneOf(db).getSmallMessage(txn2, messageId1); will(returnValue(message1)); oneOf(db).getGroup(txn2, groupId); will(returnValue(group)); @@ -159,7 +159,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { oneOf(db).getMessageDependencies(txn, messageId); will(returnValue(singletonMap(messageId1, DELIVERED))); // Get the message and its metadata to deliver - oneOf(db).getMessage(txn, messageId); + oneOf(db).getSmallMessage(txn, messageId); will(returnValue(message)); oneOf(db).getGroup(txn, groupId); will(returnValue(group)); @@ -179,7 +179,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { oneOf(db).getMessageDependencies(txn1, messageId2); will(returnValue(singletonMap(messageId1, DELIVERED))); // Get the dependent and its metadata to deliver - oneOf(db).getMessage(txn1, messageId2); + oneOf(db).getSmallMessage(txn1, messageId2); will(returnValue(message2)); oneOf(db).getGroup(txn1, groupId); will(returnValue(group)); @@ -276,11 +276,11 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { context.checking(new DbExpectations() {{ // Load the first raw message - *gasp* it's gone! oneOf(db).transactionWithResult(with(true), withDbCallable(txn)); - oneOf(db).getMessage(txn, messageId); + oneOf(db).getSmallMessage(txn, messageId); will(throwException(new NoSuchMessageException())); // Load the second raw message and group oneOf(db).transactionWithResult(with(true), withDbCallable(txn1)); - oneOf(db).getMessage(txn1, messageId1); + oneOf(db).getSmallMessage(txn1, messageId1); will(returnValue(message1)); oneOf(db).getGroup(txn1, groupId); will(returnValue(group)); @@ -317,14 +317,14 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { context.checking(new DbExpectations() {{ // Load the first raw message oneOf(db).transactionWithResult(with(true), withDbCallable(txn)); - oneOf(db).getMessage(txn, messageId); + oneOf(db).getSmallMessage(txn, messageId); will(returnValue(message)); // Load the group - *gasp* it's gone! oneOf(db).getGroup(txn, groupId); will(throwException(new NoSuchGroupException())); // Load the second raw message and group oneOf(db).transactionWithResult(with(true), withDbCallable(txn1)); - oneOf(db).getMessage(txn1, messageId1); + oneOf(db).getSmallMessage(txn1, messageId1); will(returnValue(message1)); oneOf(db).getGroup(txn1, groupId); will(returnValue(group)); @@ -614,7 +614,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { oneOf(db).getMessageDependencies(txn2, messageId1); will(returnValue(singletonMap(messageId, DELIVERED))); // Get message 1 and its metadata - oneOf(db).getMessage(txn2, messageId1); + oneOf(db).getSmallMessage(txn2, messageId1); will(returnValue(message1)); oneOf(db).getGroup(txn2, groupId); will(returnValue(group)); @@ -634,7 +634,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { oneOf(db).getMessageDependencies(txn3, messageId2); will(returnValue(singletonMap(messageId, DELIVERED))); // Get message 2 and its metadata - oneOf(db).getMessage(txn3, messageId2); + oneOf(db).getSmallMessage(txn3, messageId2); will(returnValue(message2)); oneOf(db).getGroup(txn3, groupId); will(returnValue(group)); @@ -654,7 +654,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { oneOf(db).getMessageDependencies(txn4, messageId3); will(returnValue(twoDependencies)); // Get message 3 and its metadata - oneOf(db).getMessage(txn4, messageId3); + oneOf(db).getSmallMessage(txn4, messageId3); will(returnValue(message3)); oneOf(db).getGroup(txn4, groupId); will(returnValue(group)); @@ -677,7 +677,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase { oneOf(db).getMessageDependencies(txn6, messageId4); will(returnValue(singletonMap(messageId3, DELIVERED))); // Get message 4 and its metadata - oneOf(db).getMessage(txn6, messageId4); + oneOf(db).getSmallMessage(txn6, messageId4); will(returnValue(message4)); oneOf(db).getGroup(txn6, groupId); will(returnValue(group)); diff --git a/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java index 93cf97dcc..f059bc979 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java @@ -184,7 +184,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { contactGroup.getId()); will(returnValue(singletonMap(localUpdateId, localUpdateMeta))); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, localUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localUpdateId); will(returnValue(localUpdateBody)); // Latest local update is up-to-date, no visibilities have changed }}); @@ -206,7 +206,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { // Load the old client versions oneOf(db).getMessageIds(txn, localGroup.getId()); will(returnValue(singletonList(localVersionsId))); - oneOf(clientHelper).getMessageAsList(txn, localVersionsId); + oneOf(clientHelper).getSmallMessageAsList(txn, localVersionsId); will(returnValue(localVersionsBody)); // Client versions are up-to-date }}); @@ -248,7 +248,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { // Load the old client versions oneOf(db).getMessageIds(txn, localGroup.getId()); will(returnValue(singletonList(oldLocalVersionsId))); - oneOf(clientHelper).getMessageAsList(txn, oldLocalVersionsId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalVersionsId); will(returnValue(oldLocalVersionsBody)); // Delete the old client versions oneOf(db).removeMessage(txn, oldLocalVersionsId); @@ -272,7 +272,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { will(returnValue(singletonMap(oldLocalUpdateId, oldLocalUpdateMeta))); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); // Delete the latest local update oneOf(db).deleteMessage(txn, oldLocalUpdateId); @@ -344,7 +344,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { // Load the old client versions oneOf(db).getMessageIds(txn, localGroup.getId()); will(returnValue(singletonList(oldLocalVersionsId))); - oneOf(clientHelper).getMessageAsList(txn, oldLocalVersionsId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalVersionsId); will(returnValue(oldLocalVersionsBody)); // Delete the old client versions oneOf(db).removeMessage(txn, oldLocalVersionsId); @@ -367,10 +367,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { contactGroup.getId()); will(returnValue(messageMetadata)); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); // Load the latest remote update - oneOf(clientHelper).getMessageAsList(txn, oldRemoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldRemoteUpdateId); will(returnValue(oldRemoteUpdateBody)); // Delete the latest local update oneOf(db).deleteMessage(txn, oldLocalUpdateId); @@ -451,10 +451,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { contactGroup.getId()); will(returnValue(messageMetadata)); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); // Load the latest remote update - oneOf(clientHelper).getMessageAsList(txn, oldRemoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldRemoteUpdateId); will(returnValue(oldRemoteUpdateBody)); // Delete the old remote update oneOf(db).deleteMessage(txn, oldRemoteUpdateId); @@ -490,7 +490,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { will(returnValue(singletonMap(oldLocalUpdateId, oldLocalUpdateMeta))); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); // Get client ID oneOf(clientHelper).getGroupMetadataAsDictionary(txn, @@ -557,10 +557,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { contactGroup.getId()); will(returnValue(messageMetadata)); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); // Load the latest remote update - oneOf(clientHelper).getMessageAsList(txn, oldRemoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldRemoteUpdateId); will(returnValue(oldRemoteUpdateBody)); // Delete the old remote update oneOf(db).deleteMessage(txn, oldRemoteUpdateId); @@ -630,10 +630,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { contactGroup.getId()); will(returnValue(messageMetadata)); // Load the latest local update - oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldLocalUpdateId); will(returnValue(oldLocalUpdateBody)); // Load the latest remote update - oneOf(clientHelper).getMessageAsList(txn, oldRemoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, oldRemoteUpdateId); will(returnValue(oldRemoteUpdateBody)); // Delete the old remote update oneOf(db).deleteMessage(txn, oldRemoteUpdateId); @@ -734,9 +734,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, localUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localUpdateId); will(returnValue(localUpdateBody)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); @@ -769,9 +769,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, localUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localUpdateId); will(returnValue(localUpdateBody)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); @@ -804,9 +804,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, localUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localUpdateId); will(returnValue(localUpdateBody)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); @@ -839,9 +839,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, localUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, localUpdateId); will(returnValue(localUpdateBody)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); @@ -901,7 +901,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); @@ -933,7 +933,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); @@ -965,7 +965,7 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase { oneOf(clientHelper).getMessageMetadataAsDictionary(txn, contactGroup.getId()); will(returnValue(messageMetadata)); - oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId); + oneOf(clientHelper).getSmallMessageAsList(txn, remoteUpdateId); will(returnValue(remoteUpdateBody)); }}); diff --git a/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java index 009b5030d..9874d29e7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java @@ -317,7 +317,7 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager, } // Get body of message to be wrapped - BdfList body = clientHelper.getMessageAsList(txn, header.getId()); + BdfList body = clientHelper.getSmallMessageAsList(txn, header.getId()); long timestamp = header.getTimestamp(); Message wrappedMessage; @@ -465,7 +465,7 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager, @Override public String getPostText(MessageId m) throws DbException { try { - return getPostText(clientHelper.getMessageAsList(m)); + return getPostText(clientHelper.getSmallMessageAsList(m)); } catch (FormatException e) { throw new DbException(e); } diff --git a/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java index ee9c578ec..8e95b892e 100644 --- a/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java @@ -179,7 +179,7 @@ class ForumManagerImpl extends BdfIncomingMessageHook implements ForumManager { @Override public String getPostText(MessageId m) throws DbException { try { - return getPostText(clientHelper.getMessageAsList(m)); + return getPostText(clientHelper.getSmallMessageAsList(m)); } catch (FormatException e) { throw new DbException(e); } diff --git a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java index 2ee085969..303380f82 100644 --- a/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/introduction/IntroductionManagerImpl.java @@ -448,7 +448,7 @@ class IntroductionManagerImpl extends ConversationClientImpl MessageStatus status, SessionId sessionId, Map authorInfos) throws DbException, FormatException { - Message msg = clientHelper.getMessage(txn, m); + Message msg = clientHelper.getSmallMessage(txn, m); BdfList body = clientHelper.toList(msg); RequestMessage rm = messageParser.parseRequestMessage(msg, body); String text = rm.getText(); diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java index c048e0034..034db8465 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java @@ -392,7 +392,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook, @Override public String getMessageText(MessageId m) throws DbException { try { - BdfList body = clientHelper.getMessageAsList(m); + BdfList body = clientHelper.getSmallMessageAsList(m); if (body.size() == 1) return body.getString(0); // Legacy format else return body.getOptionalString(1); } catch (FormatException e) { @@ -404,7 +404,7 @@ class MessagingManagerImpl implements MessagingManager, IncomingMessageHook, public Attachment getAttachment(AttachmentHeader h) throws DbException { // TODO: Support large messages MessageId m = h.getMessageId(); - byte[] body = clientHelper.getMessage(m).getBody(); + byte[] body = clientHelper.getSmallMessage(m).getBody(); try { BdfDictionary meta = clientHelper.getMessageMetadataAsDictionary(m); Long messageType = meta.getOptionalLong(MSG_KEY_MSG_TYPE); diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java index 27f5fd649..056d0ccdf 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java @@ -304,7 +304,7 @@ class PrivateGroupManagerImpl extends BdfIncomingMessageHook @Override public String getMessageText(MessageId m) throws DbException { try { - return getMessageText(clientHelper.getMessageAsList(m)); + return getMessageText(clientHelper.getSmallMessageAsList(m)); } catch (FormatException e) { throw new DbException(e); } diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java index cd850f949..dc4e673c7 100644 --- a/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/invitation/MessageParserImpl.java @@ -89,7 +89,7 @@ class MessageParserImpl implements MessageParser { @Override public InviteMessage getInviteMessage(Transaction txn, MessageId m) throws DbException, FormatException { - Message message = clientHelper.getMessage(txn, m); + Message message = clientHelper.getSmallMessage(txn, m); BdfList body = clientHelper.toList(message); return parseInviteMessage(message, body); } diff --git a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java index 48a001c4a..ba50200a6 100644 --- a/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/sharing/MessageParserImpl.java @@ -77,7 +77,7 @@ abstract class MessageParserImpl @Override public InviteMessage getInviteMessage(Transaction txn, MessageId m) throws DbException, FormatException { - Message message = clientHelper.getMessage(txn, m); + Message message = clientHelper.getSmallMessage(txn, m); BdfList body = clientHelper.toList(message); return parseInviteMessage(message, body); } diff --git a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java index 6922337fc..45da98c6b 100644 --- a/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java @@ -498,7 +498,7 @@ public class BlogManagerImplTest extends BriarTestCase { oneOf(db).startTransaction(false); will(returnValue(txn)); // Wrap the original post for blog 2 - oneOf(clientHelper).getMessageAsList(txn, messageId); + oneOf(clientHelper).getSmallMessageAsList(txn, messageId); will(returnValue(originalPostBody)); oneOf(db).getGroup(txn, blog1.getId()); will(returnValue(blog1.getGroup())); @@ -609,7 +609,7 @@ public class BlogManagerImplTest extends BriarTestCase { oneOf(db).startTransaction(false); will(returnValue(txn)); // Wrap the original post for blog 1 - oneOf(clientHelper).getMessageAsList(txn, rssMessageId); + oneOf(clientHelper).getSmallMessageAsList(txn, rssMessageId); will(returnValue(originalPostBody)); oneOf(db).getGroup(txn, rssBlog.getId()); will(returnValue(rssBlog.getGroup())); @@ -734,7 +734,7 @@ public class BlogManagerImplTest extends BriarTestCase { oneOf(db).startTransaction(false); will(returnValue(txn)); // Rewrap the wrapped post for blog 2 - oneOf(clientHelper).getMessageAsList(txn, wrappedPostId); + oneOf(clientHelper).getSmallMessageAsList(txn, wrappedPostId); will(returnValue(wrappedPostBody)); oneOf(blogPostFactory).rewrapWrappedPost(blog2.getId(), wrappedPostBody); @@ -745,7 +745,7 @@ public class BlogManagerImplTest extends BriarTestCase { oneOf(clientHelper).addLocalMessage(txn, rewrappedPostMsg, rewrappedPostMeta, true, false); // Wrap the original comment for blog 2 - oneOf(clientHelper).getMessageAsList(txn, originalCommentId); + oneOf(clientHelper).getSmallMessageAsList(txn, originalCommentId); will(returnValue(originalCommentBody)); oneOf(clientHelper).getMessageMetadataAsDictionary(txn, wrappedPostId); diff --git a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java index cee9a8bba..6ef864956 100644 --- a/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/introduction/IntroductionIntegrationTest.java @@ -1870,8 +1870,8 @@ public class IntroductionIntegrationTest ch.getMessageMetadataAsDictionary(g.getId(), query); assertEquals(1, map.size()); MessageId id = map.entrySet().iterator().next().getKey(); - Message m = ch.getMessage(id); - BdfList body = ch.getMessageAsList(id); + Message m = ch.getSmallMessage(id); + BdfList body = ch.getSmallMessageAsList(id); if (type == ACCEPT) { return c0.getMessageParser().parseAcceptMessage(m, body); } else if (type == DECLINE) { diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java index 352154e7b..ea8f8ec3b 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessagingManagerIntegrationTest.java @@ -247,8 +247,10 @@ public class MessagingManagerIntegrationTest sendMessage(c0, c1, getRandomString(42), singletonList(h)); // attachment exists on both devices - db0.transaction(true, txn -> db0.getMessage(txn, h.getMessageId())); - db1.transaction(true, txn -> db1.getMessage(txn, h.getMessageId())); + db0.transaction(true, txn -> + db0.getSmallMessage(txn, h.getMessageId())); + db1.transaction(true, txn -> + db1.getSmallMessage(txn, h.getMessageId())); // delete message on both sides (deletes all, because returns true) assertTrue(db0.transactionWithResult(false, @@ -260,13 +262,15 @@ public class MessagingManagerIntegrationTest // attachment was deleted on both devices try { - db0.transaction(true, txn -> db0.getMessage(txn, h.getMessageId())); + db0.transaction(true, txn -> + db0.getSmallMessage(txn, h.getMessageId())); fail(); } catch (MessageDeletedException e) { // expected } try { - db1.transaction(true, txn -> db1.getMessage(txn, h.getMessageId())); + db1.transaction(true, txn -> + db1.getSmallMessage(txn, h.getMessageId())); fail(); } catch (MessageDeletedException e) { // expected @@ -282,7 +286,7 @@ public class MessagingManagerIntegrationTest // attachment exists on both devices, state set to PENDING for receiver db1.transaction(false, txn -> { - db1.getMessage(txn, h.getMessageId()); + db1.getSmallMessage(txn, h.getMessageId()); db1.setMessageState(txn, h.getMessageId(), PENDING); }); @@ -310,13 +314,15 @@ public class MessagingManagerIntegrationTest // attachment was deleted on both devices try { - db0.transaction(true, txn -> db0.getMessage(txn, h.getMessageId())); + db0.transaction(true, txn -> + db0.getSmallMessage(txn, h.getMessageId())); fail(); } catch (MessageDeletedException e) { // expected } try { - db1.transaction(true, txn -> db1.getMessage(txn, h.getMessageId())); + db1.transaction(true, txn -> + db1.getSmallMessage(txn, h.getMessageId())); fail(); } catch (MessageDeletedException e) { // expected diff --git a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java index 30ce6dbb1..1ea44d380 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/BriarIntegrationTest.java @@ -242,7 +242,7 @@ public abstract class BriarIntegrationTest { if (DEBUG) { try { - BdfList body = clientHelper.getMessageAsList(id); + BdfList body = clientHelper.getSmallMessageAsList(id); LOG.info("Contents of " + id + ":\n" + BdfStringUtils.toString(body)); } catch (DbException | FormatException e) {