From 8d70e23ba54fe6231071cfcdde9774b400bb8db7 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 13 Nov 2014 10:25:50 +0100 Subject: [PATCH] Use #ofType in commandline parsing for type safety - Remove Node#getPortAsString; it is now no longer necessary --- src/main/java/io/bitsquare/app/cli/BootstrapNodeMain.java | 4 ++-- src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java | 5 +++-- .../java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java | 2 +- src/main/java/io/bitsquare/network/Node.java | 4 ---- src/test/java/io/bitsquare/network/NodeTests.java | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/bitsquare/app/cli/BootstrapNodeMain.java b/src/main/java/io/bitsquare/app/cli/BootstrapNodeMain.java index b45849e4f6..c3ff1d1d7e 100644 --- a/src/main/java/io/bitsquare/app/cli/BootstrapNodeMain.java +++ b/src/main/java/io/bitsquare/app/cli/BootstrapNodeMain.java @@ -32,8 +32,8 @@ public class BootstrapNodeMain extends BitsquareExecutable { protected void customizeOptionParsing(OptionParser parser) { parser.accepts(Node.NAME_KEY, "Name of this node").withRequiredArg().isRequired(); - parser.accepts(Node.PORT_KEY, "Port to listen on").withRequiredArg() - .defaultsTo(String.valueOf(Node.DEFAULT_PORT)); + parser.accepts(Node.PORT_KEY, "Port to listen on").withRequiredArg().ofType(int.class) + .defaultsTo(Node.DEFAULT_PORT); } protected void doExecute(OptionSet options) { diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java index 0681871f1f..67ef050693 100644 --- a/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java +++ b/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java @@ -44,11 +44,12 @@ public class BitsquareAppMain extends BitsquareExecutable { parser.accepts(APP_DATA_DIR_KEY, "Application data directory").withRequiredArg() .defaultsTo(DEFAULT_APP_DATA_DIR); 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(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_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(); } diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java index a0deb0514d..3acb58a457 100644 --- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java +++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java @@ -53,7 +53,7 @@ public class TomP2PMessageModule extends MessageModule { Node.at( env.getProperty(BOOTSTRAP_NODE_NAME_KEY, BootstrapNodes.DEFAULT.getName()), 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( diff --git a/src/main/java/io/bitsquare/network/Node.java b/src/main/java/io/bitsquare/network/Node.java index 08252e8e0a..c0c113438b 100644 --- a/src/main/java/io/bitsquare/network/Node.java +++ b/src/main/java/io/bitsquare/network/Node.java @@ -64,10 +64,6 @@ public final class Node { return port; } - public String getPortAsString() { - return String.valueOf(port); - } - /** * Return a copy of this node with the port updated to the given value. */ diff --git a/src/test/java/io/bitsquare/network/NodeTests.java b/src/test/java/io/bitsquare/network/NodeTests.java index ad2083d079..cf31902d8e 100644 --- a/src/test/java/io/bitsquare/network/NodeTests.java +++ b/src/test/java/io/bitsquare/network/NodeTests.java @@ -46,7 +46,6 @@ public class NodeTests { assertThat(node1a.hashCode(), not(equalTo(node2.hashCode()))); 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 node3b = Node.at("bitsquare3.example.com", "203.0.113.3", "1234");