Extract TomP2PNode#USE_DISK_STORAGE_KEY constant

This commit is contained in:
Chris Beams 2014-11-10 08:08:10 +01:00
parent 9f2e9de94f
commit 426ee28b93
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
3 changed files with 11 additions and 7 deletions

View File

@ -44,9 +44,6 @@ public abstract class MessageModule extends BitsquareModule {
protected final void configure() {
bind(MessageFacade.class).to(messageFacade()).asEagerSingleton();
// we will probably later use disk storage instead of memory storage for TomP2P
bind(Boolean.class).annotatedWith(Names.named("useDiskStorage")).toInstance(false);
Node bootstrapNode = Node.at(
properties.getProperty(BOOTSTRAP_NODE_ID_KEY, DEFAULT_BOOTSTRAP_NODE.getId()),
properties.getProperty(BOOTSTRAP_NODE_IP_KEY, DEFAULT_BOOTSTRAP_NODE.getIp()),

View File

@ -20,6 +20,8 @@ package io.bitsquare.msg.tomp2p;
import io.bitsquare.msg.MessageFacade;
import io.bitsquare.msg.MessageModule;
import com.google.inject.name.Names;
import java.util.Properties;
public class TomP2PMessageModule extends MessageModule {
@ -30,6 +32,9 @@ public class TomP2PMessageModule extends MessageModule {
@Override
protected void doConfigure() {
// we will probably later use disk storage instead of memory storage for TomP2P
bind(Boolean.class).annotatedWith(Names.named(TomP2PNode.USE_DISK_STORAGE_KEY)).toInstance(false);
bind(TomP2PNode.class).asEagerSingleton();
bind(BootstrappedPeerFactory.class).asEagerSingleton();
}

View File

@ -78,6 +78,8 @@ import static io.bitsquare.util.tomp2p.BaseFutureUtil.isSuccess;
public class TomP2PNode {
private static final Logger log = LoggerFactory.getLogger(TomP2PNode.class);
static final String USE_DISK_STORAGE_KEY = "useDiskStorage";
private KeyPair keyPair;
private String appName;
private final Boolean useDiskStorage;
@ -96,7 +98,7 @@ public class TomP2PNode {
@Inject
public TomP2PNode(BootstrappedPeerFactory bootstrappedPeerFactory,
@Named("appName") String appName,
@Named("useDiskStorage") Boolean useDiskStorage) {
@Named(USE_DISK_STORAGE_KEY) Boolean useDiskStorage) {
this.bootstrappedPeerFactory = bootstrappedPeerFactory;
this.appName = appName;
this.useDiskStorage = useDiskStorage;
@ -127,7 +129,7 @@ public class TomP2PNode {
}
public void start(int port, BootstrapListener bootstrapListener) {
useDiscStorage(useDiskStorage);
useDiskStorage(useDiskStorage);
bootstrappedPeerFactory.setStorage(storage);
setupTimerForIPCheck();
@ -392,8 +394,8 @@ public class TomP2PNode {
return putDomainProtectedData(locationKey, data);
}
private void useDiscStorage(boolean useDiscStorage) {
if (useDiscStorage) {
private void useDiskStorage(boolean useDiskStorage) {
if (useDiskStorage) {
File path = new File(AppDirectory.dir(appName).toFile() + "/tomP2P");
if (!path.exists()) {
boolean created = path.mkdir();