Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-26 08:25:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use #ofType in commandline parsing for type safety

Browse source 
- Remove Node#getPortAsString; it is now no longer necessary
This commit is contained in:
Chris Beams 2014-11-13 10:25:50 +01:00
parent 0e167bed6c
commit 8d70e23ba5
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
5 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/io/bitsquare/app/cli/BootstrapNodeMain.java
View file

@ -32,8 +32,8 @@ public class BootstrapNodeMain extends BitsquareExecutable {
protected void customizeOptionParsing(OptionParser parser) { protected void customizeOptionParsing(OptionParser parser) {
parser.accepts(Node.NAME_KEY, "Name of this node").withRequiredArg().isRequired(); parser.accepts(Node.NAME_KEY, "Name of this node").withRequiredArg().isRequired();
parser.accepts(Node.PORT_KEY, "Port to listen on").withRequiredArg() parser.accepts(Node.PORT_KEY, "Port to listen on").withRequiredArg().ofType(int.class)
.defaultsTo(String.valueOf(Node.DEFAULT_PORT)); .defaultsTo(Node.DEFAULT_PORT);
} }
protected void doExecute(OptionSet options) { protected void doExecute(OptionSet options) {

5
src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
View file

@ -44,11 +44,12 @@ public class BitsquareAppMain extends BitsquareExecutable {
parser.accepts(APP_DATA_DIR_KEY, "Application data directory").withRequiredArg() parser.accepts(APP_DATA_DIR_KEY, "Application data directory").withRequiredArg()
.defaultsTo(DEFAULT_APP_DATA_DIR); .defaultsTo(DEFAULT_APP_DATA_DIR);
parser.accepts(NAME_KEY, "Name of this node").withRequiredArg(); parser.accepts(NAME_KEY, "Name of this node").withRequiredArg();
parser.accepts(PORT_KEY, "Port to listen on").withRequiredArg().defaultsTo(String.valueOf(Node.DEFAULT_PORT));
parser.accepts(BITCOIN_NETWORK_KEY).withRequiredArg().defaultsTo(BitcoinModule.DEFAULT_BITCOIN_NETWORK); parser.accepts(BITCOIN_NETWORK_KEY).withRequiredArg().defaultsTo(BitcoinModule.DEFAULT_BITCOIN_NETWORK);
parser.accepts(PORT_KEY, "Port to listen on").withRequiredArg().ofType(int.class).defaultsTo(Node.DEFAULT_PORT);
parser.accepts(BOOTSTRAP_NODE_NAME_KEY).withRequiredArg().defaultsTo(BootstrapNodes.DEFAULT.getName()); parser.accepts(BOOTSTRAP_NODE_NAME_KEY).withRequiredArg().defaultsTo(BootstrapNodes.DEFAULT.getName());
parser.accepts(BOOTSTRAP_NODE_IP_KEY).withRequiredArg().defaultsTo(BootstrapNodes.DEFAULT.getIp()); parser.accepts(BOOTSTRAP_NODE_IP_KEY).withRequiredArg().defaultsTo(BootstrapNodes.DEFAULT.getIp());
parser.accepts(BOOTSTRAP_NODE_PORT_KEY).withRequiredArg().defaultsTo(BootstrapNodes.DEFAULT.getPortAsString()); parser.accepts(BOOTSTRAP_NODE_PORT_KEY).withRequiredArg().ofType(int.class)
.defaultsTo(BootstrapNodes.DEFAULT.getPort());
parser.accepts(NETWORK_INTERFACE_KEY, "Network interface").withRequiredArg(); parser.accepts(NETWORK_INTERFACE_KEY, "Network interface").withRequiredArg();
} }

2
src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
View file

@ -53,7 +53,7 @@ public class TomP2PMessageModule extends MessageModule {
Node.at( Node.at(
env.getProperty(BOOTSTRAP_NODE_NAME_KEY, BootstrapNodes.DEFAULT.getName()), env.getProperty(BOOTSTRAP_NODE_NAME_KEY, BootstrapNodes.DEFAULT.getName()),
env.getProperty(BOOTSTRAP_NODE_IP_KEY, BootstrapNodes.DEFAULT.getIp()), env.getProperty(BOOTSTRAP_NODE_IP_KEY, BootstrapNodes.DEFAULT.getIp()),
env.getProperty(BOOTSTRAP_NODE_PORT_KEY, BootstrapNodes.DEFAULT.getPortAsString()) env.getProperty(BOOTSTRAP_NODE_PORT_KEY, int.class, BootstrapNodes.DEFAULT.getPort())
) )
); );
bindConstant().annotatedWith(Names.named(NETWORK_INTERFACE_KEY)).to( bindConstant().annotatedWith(Names.named(NETWORK_INTERFACE_KEY)).to(

4
src/main/java/io/bitsquare/network/Node.java
View file

@ -64,10 +64,6 @@ public final class Node {
return port; return port;
} }
public String getPortAsString() {
return String.valueOf(port);
}
/** /**
* Return a copy of this node with the port updated to the given value. * Return a copy of this node with the port updated to the given value.
*/ */

1
src/test/java/io/bitsquare/network/NodeTests.java
View file

@ -46,7 +46,6 @@ public class NodeTests {
assertThat(node1a.hashCode(), not(equalTo(node2.hashCode()))); assertThat(node1a.hashCode(), not(equalTo(node2.hashCode())));
assertThat(node1a.getPort(), equalTo(Node.DEFAULT_PORT)); assertThat(node1a.getPort(), equalTo(Node.DEFAULT_PORT));
assertThat(node1a.getPortAsString(), equalTo(String.valueOf(Node.DEFAULT_PORT)));
Node node3a = Node.at("bitsquare3.example.com", "203.0.113.3", 1234); Node node3a = Node.at("bitsquare3.example.com", "203.0.113.3", 1234);
Node node3b = Node.at("bitsquare3.example.com", "203.0.113.3", "1234"); Node node3b = Node.at("bitsquare3.example.com", "203.0.113.3", "1234");