Commit da3b2c15 authored 6 years ago by akwizgran

Merge branch '41-alias-backend' into 'master'

Add backend support for contact aliases

See merge request briar/briar!963

parents db11dad6 ca700d8d

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java 18 additions, 1 deletion

...in/java/org/briarproject/bramble/api/contact/Contact.java
bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java 8 additions, 0 deletions

.../org/briarproject/bramble/api/contact/ContactManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java 6 additions, 0 deletions

...va/org/briarproject/bramble/api/db/DatabaseComponent.java
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java 15 additions, 0 deletions

.../org/briarproject/bramble/contact/ContactManagerImpl.java
bramble-core/src/main/java/org/briarproject/bramble/db/Database.java 6 additions, 0 deletions

...e/src/main/java/org/briarproject/bramble/db/Database.java
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java 10 additions, 0 deletions

...va/org/briarproject/bramble/db/DatabaseComponentImpl.java
bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java 34 additions, 0 deletions

.../main/java/org/briarproject/bramble/db/DatabaseTypes.java
bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java 3 additions, 2 deletions

...src/main/java/org/briarproject/bramble/db/H2Database.java
bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java 4 additions, 3 deletions

...in/java/org/briarproject/bramble/db/HyperSqlDatabase.java
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java 70 additions, 56 deletions

...c/main/java/org/briarproject/bramble/db/JdbcDatabase.java
bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java 56 additions, 0 deletions

...main/java/org/briarproject/bramble/db/Migration40_41.java
bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java 24 additions, 2 deletions

.../briarproject/bramble/contact/ContactManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java 17 additions, 4 deletions

...rg/briarproject/bramble/db/DatabaseComponentImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java 35 additions, 0 deletions

...st/java/org/briarproject/bramble/db/JdbcDatabaseTest.java
bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java 3 additions, 2 deletions

...riarproject/bramble/identity/IdentityManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java 2 additions, 1 deletion

.../bramble/properties/TransportPropertyManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/test/DbExpectations.java 16 additions, 0 deletions

...st/java/org/briarproject/bramble/test/DbExpectations.java
bramble-core/src/test/java/org/briarproject/bramble/test/RunTransactionAction.java 30 additions, 0 deletions

...a/org/briarproject/bramble/test/RunTransactionAction.java
bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java 4 additions, 3 deletions

...rg/briarproject/bramble/transport/KeyManagerImplTest.java
bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java 3 additions, 1 deletion

...t/bramble/versioning/ClientVersioningManagerImplTest.java

with 364 additions and 75 deletions

Please register or to comment