From e5fc91b6202c460d9dff05df25f41c0c5c76f168 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 3 May 2019 13:49:26 +0100 Subject: [PATCH] Rename exceptions and events. --- ...tion.java => NoSuchIdentityException.java} | 4 ++-- ...ddedEvent.java => IdentityAddedEvent.java} | 6 ++--- ...edEvent.java => IdentityRemovedEvent.java} | 6 ++--- .../bramble/db/DatabaseComponentImpl.java | 22 +++++++++---------- .../bramble/db/DatabaseComponentImplTest.java | 18 +++++++-------- 5 files changed, 28 insertions(+), 28 deletions(-) rename bramble-api/src/main/java/org/briarproject/bramble/api/db/{NoSuchLocalAuthorException.java => NoSuchIdentityException.java} (58%) rename bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/{LocalAuthorAddedEvent.java => IdentityAddedEvent.java} (72%) rename bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/{LocalAuthorRemovedEvent.java => IdentityRemovedEvent.java} (71%) diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchIdentityException.java similarity index 58% rename from bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchIdentityException.java index 3ce99c1db..c09d8ae28 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchIdentityException.java @@ -1,9 +1,9 @@ package org.briarproject.bramble.api.db; /** - * Thrown when a database operation is attempted for a pseudonym that is not in + * Thrown when a database operation is attempted for an identity that is not in * the database. This exception may occur due to concurrent updates and does * not indicate a database error. */ -public class NoSuchLocalAuthorException extends DbException { +public class NoSuchIdentityException extends DbException { } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java similarity index 72% rename from bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java index a12d232f2..d6f09697e 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityAddedEvent.java @@ -7,15 +7,15 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; /** - * An event that is broadcast when a local pseudonym is added. + * An event that is broadcast when an identity is added. */ @Immutable @NotNullByDefault -public class LocalAuthorAddedEvent extends Event { +public class IdentityAddedEvent extends Event { private final AuthorId authorId; - public LocalAuthorAddedEvent(AuthorId authorId) { + public IdentityAddedEvent(AuthorId authorId) { this.authorId = authorId; } diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java similarity index 71% rename from bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java rename to bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java index 31c93c300..1c232c642 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/IdentityRemovedEvent.java @@ -7,15 +7,15 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import javax.annotation.concurrent.Immutable; /** - * An event that is broadcast when a local pseudonym is removed. + * An event that is broadcast when an identity is removed. */ @Immutable @NotNullByDefault -public class LocalAuthorRemovedEvent extends Event { +public class IdentityRemovedEvent extends Event { private final AuthorId authorId; - public LocalAuthorRemovedEvent(AuthorId authorId) { + public IdentityRemovedEvent(AuthorId authorId) { this.authorId = authorId; } 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 48597320b..475e9da5a 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 @@ -20,7 +20,7 @@ import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.MigrationListener; import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.db.NoSuchGroupException; -import org.briarproject.bramble.api.db.NoSuchLocalAuthorException; +import org.briarproject.bramble.api.db.NoSuchIdentityException; import org.briarproject.bramble.api.db.NoSuchMessageException; import org.briarproject.bramble.api.db.NoSuchPendingContactException; import org.briarproject.bramble.api.db.NoSuchTransportException; @@ -33,8 +33,8 @@ import org.briarproject.bramble.api.event.EventExecutor; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.AuthorId; import org.briarproject.bramble.api.identity.Identity; -import org.briarproject.bramble.api.identity.event.LocalAuthorAddedEvent; -import org.briarproject.bramble.api.identity.event.LocalAuthorRemovedEvent; +import org.briarproject.bramble.api.identity.event.IdentityAddedEvent; +import org.briarproject.bramble.api.identity.event.IdentityRemovedEvent; import org.briarproject.bramble.api.lifecycle.ShutdownManager; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; @@ -238,7 +238,7 @@ class DatabaseComponentImpl implements DatabaseComponent { if (transaction.isReadOnly()) throw new IllegalArgumentException(); T txn = unbox(transaction); if (!db.containsIdentity(txn, local)) - throw new NoSuchLocalAuthorException(); + throw new NoSuchIdentityException(); if (db.containsIdentity(txn, remote.getId())) throw new ContactExistsException(); if (db.containsContact(txn, remote.getId(), local)) @@ -289,7 +289,7 @@ class DatabaseComponentImpl implements DatabaseComponent { T txn = unbox(transaction); if (!db.containsIdentity(txn, i.getId())) { db.addIdentity(txn, i); - transaction.attach(new LocalAuthorAddedEvent(i.getId())); + transaction.attach(new IdentityAddedEvent(i.getId())); } } @@ -346,7 +346,7 @@ class DatabaseComponentImpl implements DatabaseComponent { AuthorId local) throws DbException { T txn = unbox(transaction); if (!db.containsIdentity(txn, local)) - throw new NoSuchLocalAuthorException(); + throw new NoSuchIdentityException(); return db.containsContact(txn, remote, local); } @@ -506,7 +506,7 @@ class DatabaseComponentImpl implements DatabaseComponent { AuthorId a) throws DbException { T txn = unbox(transaction); if (!db.containsIdentity(txn, a)) - throw new NoSuchLocalAuthorException(); + throw new NoSuchIdentityException(); return db.getContacts(txn, a); } @@ -558,7 +558,7 @@ class DatabaseComponentImpl implements DatabaseComponent { throws DbException { T txn = unbox(transaction); if (!db.containsIdentity(txn, a)) - throw new NoSuchLocalAuthorException(); + throw new NoSuchIdentityException(); return db.getIdentity(txn, a); } @@ -910,9 +910,9 @@ class DatabaseComponentImpl implements DatabaseComponent { if (transaction.isReadOnly()) throw new IllegalArgumentException(); T txn = unbox(transaction); if (!db.containsIdentity(txn, a)) - throw new NoSuchLocalAuthorException(); + throw new NoSuchIdentityException(); db.removeIdentity(txn, a); - transaction.attach(new LocalAuthorRemovedEvent(a)); + transaction.attach(new IdentityRemovedEvent(a)); } @Override @@ -1041,7 +1041,7 @@ class DatabaseComponentImpl implements DatabaseComponent { if (transaction.isReadOnly()) throw new IllegalArgumentException(); T txn = unbox(transaction); if (!db.containsIdentity(txn, local)) - throw new NoSuchLocalAuthorException(); + throw new NoSuchIdentityException(); db.setHandshakeKeyPair(txn, local, publicKey, privateKey); } 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 c609bf2a0..4968bf81e 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 @@ -11,7 +11,7 @@ import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.db.Metadata; import org.briarproject.bramble.api.db.NoSuchContactException; import org.briarproject.bramble.api.db.NoSuchGroupException; -import org.briarproject.bramble.api.db.NoSuchLocalAuthorException; +import org.briarproject.bramble.api.db.NoSuchIdentityException; import org.briarproject.bramble.api.db.NoSuchMessageException; import org.briarproject.bramble.api.db.NoSuchPendingContactException; import org.briarproject.bramble.api.db.NoSuchTransportException; @@ -20,8 +20,8 @@ import org.briarproject.bramble.api.event.EventBus; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.LocalAuthor; -import org.briarproject.bramble.api.identity.event.LocalAuthorAddedEvent; -import org.briarproject.bramble.api.identity.event.LocalAuthorRemovedEvent; +import org.briarproject.bramble.api.identity.event.IdentityAddedEvent; +import org.briarproject.bramble.api.identity.event.IdentityRemovedEvent; import org.briarproject.bramble.api.lifecycle.ShutdownManager; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.settings.Settings; @@ -166,7 +166,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { oneOf(database).containsIdentity(txn, localAuthor.getId()); will(returnValue(false)); oneOf(database).addIdentity(txn, identity); - oneOf(eventBus).broadcast(with(any(LocalAuthorAddedEvent.class))); + oneOf(eventBus).broadcast(with(any(IdentityAddedEvent.class))); // addContact() oneOf(database).containsIdentity(txn, localAuthor.getId()); will(returnValue(true)); @@ -210,7 +210,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { oneOf(database).containsIdentity(txn, localAuthor.getId()); will(returnValue(true)); oneOf(database).removeIdentity(txn, localAuthor.getId()); - oneOf(eventBus).broadcast(with(any(LocalAuthorRemovedEvent.class))); + oneOf(eventBus).broadcast(with(any(IdentityRemovedEvent.class))); // endTransaction() oneOf(database).commitTransaction(txn); // close() @@ -455,7 +455,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { db.addContact(transaction, author, localAuthor.getId(), true)); fail(); - } catch (NoSuchLocalAuthorException expected) { + } catch (NoSuchIdentityException expected) { // Expected } @@ -463,7 +463,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { db.transaction(false, transaction -> db.getIdentity(transaction, localAuthor.getId())); fail(); - } catch (NoSuchLocalAuthorException expected) { + } catch (NoSuchIdentityException expected) { // Expected } @@ -471,7 +471,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { db.transaction(false, transaction -> db.removeIdentity(transaction, localAuthor.getId())); fail(); - } catch (NoSuchLocalAuthorException expected) { + } catch (NoSuchIdentityException expected) { // Expected } @@ -482,7 +482,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase { db.setHandshakeKeyPair(transaction, localAuthor.getId(), publicKey, privateKey)); fail(); - } catch (NoSuchLocalAuthorException expected) { + } catch (NoSuchIdentityException expected) { // Expected } }