From 0bc07cd0c100cb02ccea35e238dce1f045c2216b Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 24 Aug 2018 16:55:35 +0100 Subject: [PATCH] Rename message length method. --- .../main/java/org/briarproject/bramble/api/sync/Message.java | 2 +- .../main/java/org/briarproject/bramble/db/JdbcDatabase.java | 2 +- .../java/org/briarproject/bramble/db/JdbcDatabaseTest.java | 4 ++-- .../org/briarproject/bramble/sync/SyncIntegrationTest.java | 2 +- .../briar/messaging/MessageSizeIntegrationTest.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java index da13796a0..c032e744e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java @@ -50,7 +50,7 @@ public class Message { /** * Returns the length of the raw message in bytes. */ - public int getLength() { + public int getRawLength() { return raw.length; } 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 c0096d651..865db95b5 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 @@ -741,7 +741,7 @@ abstract class JdbcDatabase implements Database { boolean offered = removeOfferedMessage(txn, c, m.getId()); boolean seen = offered || (sender != null && c.equals(sender)); addStatus(txn, m.getId(), c, m.getGroupId(), m.getTimestamp(), - m.getLength(), state, e.getValue(), messageShared, + m.getRawLength(), state, e.getValue(), messageShared, false, seen); } // Update denormalised column in messageDependencies if dependency 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 01ca372ec..790a27cb0 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 @@ -355,11 +355,11 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase { // The message is sendable, but too large to send Collection ids = db.getMessagesToSend(txn, contactId, - message.getLength() - 1); + message.getRawLength() - 1); assertTrue(ids.isEmpty()); // The message is just the right size to send - ids = db.getMessagesToSend(txn, contactId, message.getLength()); + ids = db.getMessagesToSend(txn, contactId, message.getRawLength()); assertEquals(singletonList(messageId), ids); db.commitTransaction(txn); 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 a46f74459..ef106c97b 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 @@ -169,7 +169,7 @@ public class SyncIntegrationTest extends BrambleTestCase { assertArrayEquals(m1.getGroupId().getBytes(), m2.getGroupId().getBytes()); assertEquals(m1.getTimestamp(), m2.getTimestamp()); - assertEquals(m1.getLength(), m2.getLength()); + assertEquals(m1.getRawLength(), m2.getRawLength()); assertArrayEquals(m1.getRaw(), m2.getRaw()); } } diff --git a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java index 4ecdb21c8..a3f6c1bc4 100644 --- a/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/messaging/MessageSizeIntegrationTest.java @@ -60,7 +60,7 @@ public class MessageSizeIntegrationTest extends BriarTestCase { PrivateMessage message = privateMessageFactory.createPrivateMessage( groupId, timestamp, body); // Check the size of the serialised message - int length = message.getMessage().getLength(); + int length = message.getMessage().getRawLength(); assertTrue(length > UniqueId.LENGTH + 8 + MAX_PRIVATE_MESSAGE_BODY_LENGTH); assertTrue(length <= MAX_RECORD_PAYLOAD_BYTES); @@ -83,7 +83,7 @@ public class MessageSizeIntegrationTest extends BriarTestCase { ForumPost post = forumPostFactory.createPost(groupId, timestamp, parent, author, body); // Check the size of the serialised message - int length = post.getMessage().getLength(); + int length = post.getMessage().getRawLength(); assertTrue(length > UniqueId.LENGTH + 8 + UniqueId.LENGTH + 4 + MAX_AUTHOR_NAME_LENGTH + MAX_PUBLIC_KEY_LENGTH + MAX_FORUM_POST_BODY_LENGTH);