From 9e00c3d85e6a11a622f0239ec5a021cc92082f2a Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 10 Nov 2014 08:43:31 +0100 Subject: [PATCH] Use extracted NETWORK_INTERFACE_KEY consistently --- src/main/java/io/bitsquare/msg/MessageModule.java | 2 +- .../io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/bitsquare/msg/MessageModule.java b/src/main/java/io/bitsquare/msg/MessageModule.java index f389605173..35792d4f43 100644 --- a/src/main/java/io/bitsquare/msg/MessageModule.java +++ b/src/main/java/io/bitsquare/msg/MessageModule.java @@ -37,7 +37,7 @@ public abstract class MessageModule extends BitsquareModule { bind(MessageFacade.class).to(messageFacade()).asEagerSingleton(); bind(String.class) - .annotatedWith(Names.named("networkInterface")) + .annotatedWith(Names.named(NETWORK_INTERFACE_KEY)) .toInstance(properties.getProperty(NETWORK_INTERFACE_KEY, "")); doConfigure(); diff --git a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java index e463c31fd9..56495c7af6 100644 --- a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java +++ b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java @@ -17,6 +17,7 @@ package io.bitsquare.msg.tomp2p; +import io.bitsquare.msg.MessageModule; import io.bitsquare.network.BootstrapState; import io.bitsquare.network.Node; import io.bitsquare.persistence.Persistence; @@ -68,6 +69,7 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static io.bitsquare.msg.MessageModule.NETWORK_INTERFACE_KEY; /** @@ -95,8 +97,9 @@ class BootstrappedPeerFactory { /////////////////////////////////////////////////////////////////////////////////////////// @Inject - public BootstrappedPeerFactory(Persistence persistence, @Named(BOOTSTRAP_NODE_KEY) Node bootstrapNode, - @Named("networkInterface") String networkInterface) { + public BootstrappedPeerFactory(Persistence persistence, + @Named(BOOTSTRAP_NODE_KEY) Node bootstrapNode, + @Named(NETWORK_INTERFACE_KEY) String networkInterface) { this.persistence = persistence; this.bootstrapNode = bootstrapNode; this.networkInterface = networkInterface;