Github user eribeiro commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/150#discussion_r98265031
--- Diff: src/java/main/org/apache/zookeeper/client/StaticHostProvider.java
---
@@ -87,15 +75,104 @@ public
StaticHostProvider(Collection<InetSocketAddress> serverAddresses)
Collections.shuffle(this.serverAddresses);
}
+ /**
+ * Evaluate to a hostname if one is available and otherwise it returns
the
+ * string representation of the IP address.
+ *
+ * In Java 7, we have a method getHostString, but earlier versions do
not support it.
+ * This method is to provide a replacement for
InetSocketAddress.getHostString().
+ *
+ * @param addr
+ * @return Hostname string of address parameter
+ */
+ private String getHostString(InetSocketAddress addr) {
+ String hostString = "";
+
+ if(addr == null) {
+ return hostString;
+ }
+ if (!addr.isUnresolved()) {
+ InetAddress ia = addr.getAddress();
+
+ // If the string starts with '/', then it has no hostname
+ // and we want to avoid the reverse lookup, so we return
+ // the string representation of the address.
+ if (ia.toString().startsWith("/")) {
+ hostString = ia.getHostAddress();
+ } else {
+ hostString = addr.getHostName();
+ }
+ } else {
+ // According to the Java 6 documentation, if the hostname is
+ // unresolved, then the string before the colon is the
hostname.
+ String addrString = addr.toString();
+ hostString = addrString.substring(0,
addrString.lastIndexOf(':'));
+ }
+
+ return hostString;
+ }
+
public int size() {
return serverAddresses.size();
}
+ // Counts the number of addresses added and removed during
+ // the last call to next. Used mainly for test purposes.
+ // See StasticHostProviderTest.
+ private int nextAdded = 0;
+ private int nextRemoved = 0;
+
+ public int getNextAdded() {
--- End diff --
okay, just me being pedant here, but it's a sincere question: would it be
*worth* to move this class to
`src/java/test/org/apache/zookeeper/client/StaticHostProvider.java` and then
remove the `public` modifier so that `getNextAdded()` and `getNextRemoved()`
can be package protected as they are used for tests?
At first, I think it doesn't see worth this kind of change, but I am
uncomfortable with leaving those methods as public if they are used for tests
by now. :thinking:
Wdyt?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
