Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Renamed Latest to LatestUpdate for clarity.

Browse Source
This commit is contained in:
akwizgran
2016-01-28 14:49:35 +00:00
parent d63f997813
commit 9ce39f3f21
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
briar-core/src/org/briarproject/properties/TransportPropertyManagerImpl.java
View File

@@ -74,8 +74,9 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@Inject @Inject
TransportPropertyManagerImpl(DatabaseComponent db, GroupFactory groupFactory, TransportPropertyManagerImpl(DatabaseComponent db,
MessageFactory messageFactory, BdfReaderFactory bdfReaderFactory, GroupFactory groupFactory, MessageFactory messageFactory,
BdfReaderFactory bdfReaderFactory,
BdfWriterFactory bdfWriterFactory, MetadataEncoder metadataEncoder, BdfWriterFactory bdfWriterFactory, MetadataEncoder metadataEncoder,
MetadataParser metadataParser, Clock clock) { MetadataParser metadataParser, Clock clock) {
this.db = db; this.db = db;
@@ -192,12 +193,12 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
lock.readLock().lock(); lock.readLock().lock();
try { try {
// Find the latest local version for each transport // Find the latest local version for each transport
Map<TransportId, Latest> latest = Map<TransportId, LatestUpdate> latest =
findLatest(localGroup.getId(), true); findLatest(localGroup.getId(), true);
// Retrieve and decode the latest local properties // Retrieve and decode the latest local properties
Map<TransportId, TransportProperties> local = Map<TransportId, TransportProperties> local =
new HashMap<TransportId, TransportProperties>(); new HashMap<TransportId, TransportProperties>();
for (Entry<TransportId, Latest> e : latest.entrySet()) { for (Entry<TransportId, LatestUpdate> e : latest.entrySet()) {
byte[] raw = db.getRawMessage(e.getValue().messageId); byte[] raw = db.getRawMessage(e.getValue().messageId);
local.put(e.getKey(), decodeProperties(raw)); local.put(e.getKey(), decodeProperties(raw));
} }
@@ -212,21 +213,22 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
} }
} }
private Map<TransportId, Latest> findLatest(GroupId g, boolean local) private Map<TransportId, LatestUpdate> findLatest(GroupId g, boolean local)
throws DbException, FormatException { throws DbException, FormatException {
// TODO: Use metadata queries // TODO: Use metadata queries
Map<TransportId, Latest> latest = new HashMap<TransportId, Latest>(); Map<TransportId, LatestUpdate> latestUpdates =
new HashMap<TransportId, LatestUpdate>();
Map<MessageId, Metadata> metadata = db.getMessageMetadata(g); Map<MessageId, Metadata> metadata = db.getMessageMetadata(g);
for (Entry<MessageId, Metadata> e : metadata.entrySet()) { for (Entry<MessageId, Metadata> e : metadata.entrySet()) {
BdfDictionary mm = metadataParser.parse(e.getValue()); BdfDictionary d = metadataParser.parse(e.getValue());
if (mm.getBoolean("local") != local) continue; if (d.getBoolean("local") != local) continue;
TransportId t = new TransportId(mm.getString("transportId")); TransportId t = new TransportId(d.getString("transportId"));
long version = mm.getInteger("version"); long version = d.getInteger("version");
Latest l = latest.get(t); LatestUpdate latest = latestUpdates.get(t);
if (l == null || version > l.version) if (latest == null || version > latest.version)
latest.put(t, new Latest(e.getKey(), version)); latestUpdates.put(t, new LatestUpdate(e.getKey(), version));
} }
return latest; return latestUpdates;
} }
private TransportProperties decodeProperties(byte[] raw) private TransportProperties decodeProperties(byte[] raw)
@@ -254,7 +256,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
lock.readLock().lock(); lock.readLock().lock();
try { try {
// Find the latest local version // Find the latest local version
Latest latest = findLatest(localGroup.getId(), true).get(t); LatestUpdate latest = findLatest(localGroup.getId(), true).get(t);
if (latest == null) return null; if (latest == null) return null;
// Retrieve and decode the latest local properties // Retrieve and decode the latest local properties
return decodeProperties(db.getRawMessage(latest.messageId)); return decodeProperties(db.getRawMessage(latest.messageId));
@@ -278,7 +280,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
for (Contact c : db.getContacts()) { for (Contact c : db.getContacts()) {
Group g = getContactGroup(c); Group g = getContactGroup(c);
// Find the latest remote version // Find the latest remote version
Latest latest = findLatest(g.getId(), false).get(t); LatestUpdate latest = findLatest(g.getId(), false).get(t);
if (latest != null) { if (latest != null) {
// Retrieve and decode the latest remote properties // Retrieve and decode the latest remote properties
byte[] raw = db.getRawMessage(latest.messageId); byte[] raw = db.getRawMessage(latest.messageId);
@@ -302,7 +304,7 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
db.addGroup(localGroup); db.addGroup(localGroup);
// Merge the new properties with any existing properties // Merge the new properties with any existing properties
TransportProperties merged; TransportProperties merged;
Latest latest = findLatest(localGroup.getId(), true).get(t); LatestUpdate latest = findLatest(localGroup.getId(), true).get(t);
if (latest == null) { if (latest == null) {
merged = p; merged = p;
} else { } else {
@@ -330,12 +332,12 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
} }
} }
private static class Latest { private static class LatestUpdate {
private final MessageId messageId; private final MessageId messageId;
private final long version; private final long version;
private Latest(MessageId messageId, long version) { private LatestUpdate(MessageId messageId, long version) {
this.messageId = messageId; this.messageId = messageId;
this.version = version; this.version = version;
} }