Rename to Mailbox update

bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java

@@ -9,7 +9,7 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.mailbox.MailboxPropertiesUpdate;
+import org.briarproject.bramble.api.mailbox.MailboxUpdate;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
@@ -125,14 +125,14 @@ public interface ClientHelper {
 			BdfDictionary properties) throws FormatException;
 
 	/**
-	 * Parse and validate the elements of a Mailbox property update message.
+	 * Parse and validate the elements of a Mailbox update message.
 	 *
 	 * @return the parsed update message
 	 * @throws FormatException if the message elements are invalid
 	 */
-	MailboxPropertiesUpdate parseAndValidateMailboxPropertiesUpdate(
-			BdfList clientSupports, BdfList serverSupports,
-			BdfDictionary properties) throws FormatException;
+	MailboxUpdate parseAndValidateMailboxUpdate(BdfList clientSupports,
+			BdfList serverSupports, BdfDictionary properties)
+			throws FormatException;
 
 	/**
 	 * Retrieves the contact ID from the group metadata of the given contact

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdate.java

@@ -8,12 +8,12 @@ import javax.annotation.concurrent.Immutable;
 
 @Immutable
 @NotNullByDefault
-public class MailboxPropertiesUpdate {
+public class MailboxUpdate {
 
 	boolean hasMailbox;
 	private final List<MailboxVersion> clientSupports;
 
-	public MailboxPropertiesUpdate(List<MailboxVersion> clientSupports) {
+	public MailboxUpdate(List<MailboxVersion> clientSupports) {
 		this.hasMailbox = false;
 		this.clientSupports = clientSupports;
 	}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateManager.java

@@ -9,31 +9,31 @@ import org.briarproject.bramble.api.sync.ClientId;
 import javax.annotation.Nullable;
 
 @NotNullByDefault
-public interface MailboxPropertyManager {
+public interface MailboxUpdateManager {
 
 	/**
-	 * The unique ID of the mailbox property client.
+	 * The unique ID of the mailbox update (properties) client.
 	 */
 	ClientId CLIENT_ID =
 			new ClientId("org.briarproject.bramble.mailbox.properties");
 
 	/**
-	 * The current major version of the mailbox property client.
+	 * The current major version of the mailbox update (properties) client.
 	 */
 	int MAJOR_VERSION = 1;
 
 	/**
-	 * The current minor version of the mailbox property client.
+	 * The current minor version of the mailbox update (properties) client.
 	 */
 	int MINOR_VERSION = 0;
 
 	/**
-	 * The number of properties required for a (non-empty) update message.
+	 * The number of properties required for an update message with a mailbox.
 	 */
 	int PROP_COUNT = 4;
 
 	/**
-	 * The required properties of a non-empty update message.
+	 * The required properties of an update message with a mailbox.
 	 */
 	String PROP_KEY_ONION = "onion";
 	String PROP_KEY_AUTHTOKEN = "authToken";
@@ -57,10 +57,10 @@ public interface MailboxPropertyManager {
 	 */
 	String MSG_KEY_LOCAL = "local";
 
-	MailboxPropertiesUpdate getLocalProperties(Transaction txn, ContactId c)
+	MailboxUpdate getLocalUpdate(Transaction txn, ContactId c)
 			throws DbException;
 
 	@Nullable
-	MailboxPropertiesUpdate getRemoteProperties(Transaction txn, ContactId c)
+	MailboxUpdate getRemoteUpdate(Transaction txn, ContactId c)
 			throws DbException;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/MailboxUpdateWithMailbox.java

@@ -8,14 +8,14 @@ import javax.annotation.concurrent.Immutable;
 
 @Immutable
 @NotNullByDefault
-public class MailboxPropertiesUpdateMailbox extends MailboxPropertiesUpdate {
+public class MailboxUpdateWithMailbox extends MailboxUpdate {
 	private final List<MailboxVersion> serverSupports;
 	private final String onion;
 	private final MailboxAuthToken authToken;
 	private final MailboxFolderId inboxId;
 	private final MailboxFolderId outboxId;
 
-	public MailboxPropertiesUpdateMailbox(List<MailboxVersion> clientSupports,
+	public MailboxUpdateWithMailbox(List<MailboxVersion> clientSupports,
 			List<MailboxVersion> serverSupports, String onion,
 			MailboxAuthToken authToken, MailboxFolderId inboxId,
 			MailboxFolderId outboxId

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/RemoteMailboxPropertiesUpdateEvent.java

@@ -1,33 +0,0 @@
-package org.briarproject.bramble.api.mailbox;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when {@link MailboxPropertiesUpdate} are received
- * from a contact.
- */
-@Immutable
-@NotNullByDefault
-public class RemoteMailboxPropertiesUpdateEvent extends Event {
-
-	private final ContactId contactId;
-	private final MailboxPropertiesUpdate mailboxPropertiesUpdate;
-
-	public RemoteMailboxPropertiesUpdateEvent(ContactId contactId,
-			MailboxPropertiesUpdate mailboxPropertiesUpdate) {
-		this.contactId = contactId;
-		this.mailboxPropertiesUpdate = mailboxPropertiesUpdate;
-	}
-
-	public ContactId getContact() {
-		return contactId;
-	}
-
-	public MailboxPropertiesUpdate getMailboxPropertiesUpdate() {
-		return mailboxPropertiesUpdate;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/mailbox/RemoteMailboxUpdateEvent.java

@@ -0,0 +1,33 @@
+package org.briarproject.bramble.api.mailbox;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that is broadcast when {@link MailboxUpdate} are received
+ * from a contact.
+ */
+@Immutable
+@NotNullByDefault
+public class RemoteMailboxUpdateEvent extends Event {
+
+	private final ContactId contactId;
+	private final MailboxUpdate mailboxUpdate;
+
+	public RemoteMailboxUpdateEvent(ContactId contactId,
+			MailboxUpdate mailboxUpdate) {
+		this.contactId = contactId;
+		this.mailboxUpdate = mailboxUpdate;
+	}
+
+	public ContactId getContact() {
+		return contactId;
+	}
+
+	public MailboxUpdate getMailboxUpdate() {
+		return mailboxUpdate;
+	}
+}

bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java

@@ -21,8 +21,8 @@ import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.Identity;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.mailbox.MailboxProperties;
-import org.briarproject.bramble.api.mailbox.MailboxPropertiesUpdate;
-import org.briarproject.bramble.api.mailbox.MailboxPropertiesUpdateMailbox;
+import org.briarproject.bramble.api.mailbox.MailboxUpdate;
+import org.briarproject.bramble.api.mailbox.MailboxUpdateWithMailbox;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.ClientId;
@@ -281,19 +281,16 @@ public class TestUtils {
 				asList(optionalTests.split(",")).contains(testClass.getName());
 	}
 
-	public static boolean mailboxPropertiesUpdateEqual(
-			@Nullable MailboxPropertiesUpdate a,
-			@Nullable MailboxPropertiesUpdate b) {
+	public static boolean mailboxUpdateEqual(@Nullable MailboxUpdate a,
+			@Nullable MailboxUpdate b) {
 		if (a == null || b == null) {
 			return a == b;
 		}
 		if (!a.hasMailbox() && !b.hasMailbox()) {
 			return a.getClientSupports().equals(b.getClientSupports());
 		} else if (a.hasMailbox() && b.hasMailbox()) {
-			MailboxPropertiesUpdateMailbox am =
-					(MailboxPropertiesUpdateMailbox) a;
-			MailboxPropertiesUpdateMailbox bm =
-					(MailboxPropertiesUpdateMailbox) b;
+			MailboxUpdateWithMailbox am = (MailboxUpdateWithMailbox) a;
+			MailboxUpdateWithMailbox bm = (MailboxUpdateWithMailbox) b;
 			return am.getClientSupports().equals(bm.getClientSupports()) &&
 					am.getServerSupports().equals(bm.getServerSupports()) &&
 					am.getOnion().equals(bm.getOnion()) &&
@@ -304,8 +301,7 @@ public class TestUtils {
 		return false;
 	}
 
-	public static boolean mailboxPropertiesEqual(
-			@Nullable MailboxProperties a,
+	public static boolean mailboxPropertiesEqual(@Nullable MailboxProperties a,
 			@Nullable MailboxProperties b) {
 		if (a == null || b == null) {
 			return a == b;