mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring: Rename PersistedEntryMap to PersistableEntryMap

Browse source
This commit is contained in:
Manfred Karrer 2017-10-15 11:35:01 -05:00
parent 6056912a00
commit 5d6d457622
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/io/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
View file

@ -22,7 +22,7 @@ import io.bisq.core.user.PreferencesPayload;
import io.bisq.core.user.UserPayload;
import io.bisq.generated.protobuffer.PB;
import io.bisq.network.p2p.peers.peerexchange.PeerList;
import io.bisq.network.p2p.storage.PersistedEntryMap;
import io.bisq.network.p2p.storage.PersistableEntryMap;
import io.bisq.network.p2p.storage.SequenceNumberMap;
import lombok.extern.slf4j.Slf4j;
@ -53,7 +53,7 @@ public class CorePersistenceProtoResolver extends CoreProtoResolver implements P
case SEQUENCE_NUMBER_MAP:
return SequenceNumberMap.fromProto(proto.getSequenceNumberMap());
case PERSISTED_ENTRY_MAP:
return PersistedEntryMap.fromProto(proto.getPersistedEntryMap().getPersistedEntryMapMap(),
return PersistableEntryMap.fromProto(proto.getPersistedEntryMap().getPersistedEntryMapMap(),
networkProtoResolver);
case PEER_LIST:
return PeerList.fromProto(proto.getPeerList());

16
network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
View file

@ -63,8 +63,8 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
private Timer removeExpiredEntriesTimer;
private final SequenceNumberMap sequenceNumberMap = new SequenceNumberMap();
private final Storage<SequenceNumberMap> sequenceNumberMapStorage;
private final Storage<PersistedEntryMap> persistedEntryMapStorage;
private PersistedEntryMap persistedEntryMap;
private final Storage<PersistableEntryMap> persistedEntryMapStorage;
private PersistableEntryMap persistableEntryMap;
///////////////////////////////////////////////////////////////////////////////////////////
@ -121,10 +121,10 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
log.debug(storageFileName + " file exists already.");
}
// takes about 4 seconds with PB! :-(
persistedEntryMap = persistedEntryMapStorage.<HashMap<ByteArray, MapValue>>initAndGetPersistedWithFileName(storageFileName);
persistableEntryMap = persistedEntryMapStorage.<HashMap<ByteArray, MapValue>>initAndGetPersistedWithFileName(storageFileName);
if (persistedEntryMap != null) {
map.putAll(persistedEntryMap.getMap());
if (persistableEntryMap != null) {
map.putAll(persistableEntryMap.getMap());
log.info("persistedEntryMap size=" + map.size());
// In case another object is already listening...
@ -132,7 +132,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
map.values().stream()
.forEach(protectedStorageEntry -> hashMapChangedListeners.stream().forEach(e -> e.onAdded(protectedStorageEntry)));
} else {
persistedEntryMap = new PersistedEntryMap();
persistableEntryMap = new PersistableEntryMap();
}
}
@ -296,8 +296,8 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
// If we get a PersistedStoragePayload we save to disc
if (protectedStoragePayload instanceof PersistableNetworkPayload) {
persistedEntryMap.put(hashOfPayload, protectedStorageEntry);
persistedEntryMapStorage.queueUpForSave(persistedEntryMap, 2000);
persistableEntryMap.put(hashOfPayload, protectedStorageEntry);
persistedEntryMapStorage.queueUpForSave(persistableEntryMap, 2000);
}
hashMapChangedListeners.stream().forEach(e -> e.onAdded(protectedStorageEntry));

8
network/src/main/java/io/bisq/network/p2p/storage/PersistedEntryMap.java → network/src/main/java/io/bisq/network/p2p/storage/PersistableEntryMap.java
View file

@ -31,14 +31,14 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@Slf4j
public class PersistedEntryMap implements PersistableEnvelope {
public class PersistableEntryMap implements PersistableEnvelope {
@Getter
private Map<P2PDataStorage.ByteArray, ProtectedStorageEntry> map = new ConcurrentHashMap<>();
public PersistedEntryMap() {
public PersistableEntryMap() {
}
public PersistedEntryMap(Map<P2PDataStorage.ByteArray, ProtectedStorageEntry> map) {
public PersistableEntryMap(Map<P2PDataStorage.ByteArray, ProtectedStorageEntry> map) {
this.map.putAll(map);
}
@ -64,7 +64,7 @@ public class PersistedEntryMap implements PersistableEnvelope {
e -> new P2PDataStorage.ByteArray(e.getKey()),
e -> ProtectedStorageEntry.fromProto(e.getValue(), networkProtoResolver)
));
return new PersistedEntryMap(new HashMap<>(map));
return new PersistableEntryMap(new HashMap<>(map));
}
public void put(P2PDataStorage.ByteArray key, ProtectedStorageEntry value) {