Skip to content
Snippets Groups Projects
Unverified Commit 34d34a75 authored by akwizgran's avatar akwizgran
Browse files

Renamed metadata methods.

parent 640f5484
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
briar-api/src/org/briarproject/api/clients/ClientHelper.java
+ 7
− 7
View file @ 34d34a75
...@@ -30,23 +30,23 @@ public interface ClientHelper { ...@@ -30,23 +30,23 @@ public interface ClientHelper {
BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException, BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
FormatException; FormatException;
BdfDictionary getGroupMetadata(GroupId g) throws DbException, BdfDictionary getGroupMetadataAsDictionary(GroupId g) throws DbException,
FormatException; FormatException;
BdfDictionary getGroupMetadata(Transaction txn, GroupId g) BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g)
throws DbException, FormatException; throws DbException, FormatException;
BdfDictionary getMessageMetadata(MessageId m) throws DbException, BdfDictionary getMessageMetadataAsDictionary(MessageId m) throws DbException,
FormatException; FormatException;
BdfDictionary getMessageMetadata(Transaction txn, MessageId m) BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m)
throws DbException, FormatException; throws DbException, FormatException;
Map<MessageId, BdfDictionary> getMessageMetatata(GroupId g) Map<MessageId, BdfDictionary> getMessageMetatataAsDictionary(GroupId g)
throws DbException, FormatException; throws DbException, FormatException;
Map<MessageId, BdfDictionary> getMessageMetadata(Transaction txn, GroupId g) Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(
throws DbException, FormatException; Transaction txn, GroupId g) throws DbException, FormatException;
void mergeGroupMetadata(GroupId g, BdfDictionary metadata) void mergeGroupMetadata(GroupId g, BdfDictionary metadata)
throws DbException, FormatException; throws DbException, FormatException;
......
briar-core/src/org/briarproject/clients/ClientHelperImpl.java
+ 17
− 17
View file @ 34d34a75
...@@ -86,8 +86,8 @@ class ClientHelperImpl implements ClientHelper { ...@@ -86,8 +86,8 @@ class ClientHelperImpl implements ClientHelper {
} }
@Override @Override
public BdfDictionary getMessageAsDictionary(MessageId m) public BdfDictionary getMessageAsDictionary(MessageId m) throws DbException,
throws DbException, FormatException { FormatException {
BdfDictionary dictionary; BdfDictionary dictionary;
Transaction txn = db.startTransaction(); Transaction txn = db.startTransaction();
try { try {
...@@ -120,8 +120,8 @@ class ClientHelperImpl implements ClientHelper { ...@@ -120,8 +120,8 @@ class ClientHelperImpl implements ClientHelper {
} }
@Override @Override
public BdfList getMessageAsList(MessageId m) public BdfList getMessageAsList(MessageId m) throws DbException,
throws DbException, FormatException { FormatException {
BdfList list; BdfList list;
Transaction txn = db.startTransaction(); Transaction txn = db.startTransaction();
try { try {
...@@ -154,12 +154,12 @@ class ClientHelperImpl implements ClientHelper { ...@@ -154,12 +154,12 @@ class ClientHelperImpl implements ClientHelper {
} }
@Override @Override
public BdfDictionary getGroupMetadata(GroupId g) public BdfDictionary getGroupMetadataAsDictionary(GroupId g)
throws DbException, FormatException { throws DbException, FormatException {
BdfDictionary dictionary; BdfDictionary dictionary;
Transaction txn = db.startTransaction(); Transaction txn = db.startTransaction();
try { try {
dictionary = getGroupMetadata(txn, g); dictionary = getGroupMetadataAsDictionary(txn, g);
txn.setComplete(); txn.setComplete();
} finally { } finally {
db.endTransaction(txn); db.endTransaction(txn);
...@@ -168,19 +168,19 @@ class ClientHelperImpl implements ClientHelper { ...@@ -168,19 +168,19 @@ class ClientHelperImpl implements ClientHelper {
} }
@Override @Override
public BdfDictionary getGroupMetadata(Transaction txn, GroupId g) public BdfDictionary getGroupMetadataAsDictionary(Transaction txn,
throws DbException, FormatException { GroupId g) throws DbException, FormatException {
Metadata metadata = db.getGroupMetadata(txn, g); Metadata metadata = db.getGroupMetadata(txn, g);
return metadataParser.parse(metadata); return metadataParser.parse(metadata);
} }
@Override @Override
public BdfDictionary getMessageMetadata(MessageId m) public BdfDictionary getMessageMetadataAsDictionary(MessageId m)
throws DbException, FormatException { throws DbException, FormatException {
BdfDictionary dictionary; BdfDictionary dictionary;
Transaction txn = db.startTransaction(); Transaction txn = db.startTransaction();
try { try {
dictionary = getMessageMetadata(txn, m); dictionary = getMessageMetadataAsDictionary(txn, m);
txn.setComplete(); txn.setComplete();
} finally { } finally {
db.endTransaction(txn); db.endTransaction(txn);
...@@ -189,19 +189,19 @@ class ClientHelperImpl implements ClientHelper { ...@@ -189,19 +189,19 @@ class ClientHelperImpl implements ClientHelper {
} }
@Override @Override
public BdfDictionary getMessageMetadata(Transaction txn, MessageId m) public BdfDictionary getMessageMetadataAsDictionary(Transaction txn,
throws DbException, FormatException { MessageId m) throws DbException, FormatException {
Metadata metadata = db.getMessageMetadata(txn, m); Metadata metadata = db.getMessageMetadata(txn, m);
return metadataParser.parse(metadata); return metadataParser.parse(metadata);
} }
@Override @Override
public Map<MessageId, BdfDictionary> getMessageMetatata(GroupId g) public Map<MessageId, BdfDictionary> getMessageMetatataAsDictionary(
throws DbException, FormatException { GroupId g) throws DbException, FormatException {
Map<MessageId, BdfDictionary> map; Map<MessageId, BdfDictionary> map;
Transaction txn = db.startTransaction(); Transaction txn = db.startTransaction();
try { try {
map = getMessageMetadata(txn, g); map = getMessageMetadataAsDictionary(txn, g);
txn.setComplete(); txn.setComplete();
} finally { } finally {
db.endTransaction(txn); db.endTransaction(txn);
...@@ -210,8 +210,8 @@ class ClientHelperImpl implements ClientHelper { ...@@ -210,8 +210,8 @@ class ClientHelperImpl implements ClientHelper {
} }
@Override @Override
public Map<MessageId, BdfDictionary> getMessageMetadata(Transaction txn, public Map<MessageId, BdfDictionary> getMessageMetadataAsDictionary(
GroupId g) throws DbException, FormatException { Transaction txn, GroupId g) throws DbException, FormatException {
Map<MessageId, Metadata> raw = db.getMessageMetadata(txn, g); Map<MessageId, Metadata> raw = db.getMessageMetadata(txn, g);
Map<MessageId, BdfDictionary> parsed = Map<MessageId, BdfDictionary> parsed =
new HashMap<MessageId, BdfDictionary>(raw.size()); new HashMap<MessageId, BdfDictionary>(raw.size());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment