JAVA-249: Removed calls to InetAddress.getLocalHost and InetAddress.getAllByName, using InetAddress.getByName instead

Simplified code.  Fixed Javadoc.  Removed unused methods.
Made it thread-safe by making _address volatile

Author: jyemin

src/main/com/mongodb/DBTCPConnector.java

@@ -503,7 +503,7 @@ public String debugString(){
             buf.append( "replica set : " ).append( _allHosts );
         } else {
             ServerAddress master = getAddress();
-            buf.append( master ).append( " " ).append( master != null ? master._addr : null );
+            buf.append( master ).append( " " ).append( master != null ? master.getSocketAddress() : null );
         }
 
         return buf.toString();

src/main/com/mongodb/ReplicaSetStatus.java

@@ -490,7 +490,7 @@ static class UpdatableNode {
 
         private void updateAddr() {
             try {
-                if (_addr.updateInetAddr()) {
+                if (_addr.updateInetAddress()) {
                     // address changed, need to use new ports
                     _port = new DBPort(_addr, null, _mongoOptions);
                     _mongo.getConnector().updatePortPool(_addr);

src/main/com/mongodb/ServerAddress.java

@@ -21,8 +21,6 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * mongo server address
@@ -72,8 +70,7 @@ public ServerAddress( String host , int port )
 
         _host = host;
         _port = port;
-        _all = _getAddress( _host );
-        _addr = new InetSocketAddress( _all[0] , _port );
+        updateInetAddress();
     }
 
     /**
@@ -98,41 +95,11 @@ public ServerAddress( InetAddress addr , int port ){
      * @param addr inet socket address containing hostname and port
      */
     public ServerAddress( InetSocketAddress addr ){
-        _addr = addr;
-        _host = _addr.getHostName();
-        _port = _addr.getPort();
-        _all = null;
+        _address = addr;
+        _host = _address.getHostName();
+        _port = _address.getPort();
     }
 
-    // --------
-    // pairing
-    // --------
-
-    /**
-     * Determines if the database at this address is paired.
-     * @return if this address connects to a set of paired databases
-     */
-    boolean isPaired(){
-        return _all != null && _all.length > 1;
-    }
-
-    /**
-     * If this is the address of a paired database, returns addresses for
-     * all of the databases with which it is paired.
-     * @return the addresses
-     * @throws RuntimeException if this address is not one of a paired database
-     */
-    List<ServerAddress> explode(){
-        if ( _all == null || _all.length <= 1 )
-            throw new RuntimeException( "not replica set mode.  num addresses : " + ((_all == null) ? 0 : _all.length) );
-        
-        List<ServerAddress> s = new ArrayList<ServerAddress>();
-        for ( int i=0; i<_all.length; i++ ){
-            s.add( new ServerAddress( _all[i] , _port ) );
-        }
-        return s;
-    }
-
     // --------
     // equality, etc...
     // --------
@@ -165,7 +132,7 @@ public boolean equals( Object other ){
                 a._host.equals( _host );
         }
         if ( other instanceof InetSocketAddress ){
-            return _addr.equals( other );
+            return _address.equals( other );
         }
         return false;
     }
@@ -177,62 +144,51 @@ public int hashCode(){
 
     /**
      * Gets the hostname
-     * @return
+     * @return hostname
      */
     public String getHost(){
         return _host;
     }
 
     /**
      * Gets the port number
-     * @return
+     * @return port
      */
     public int getPort(){
         return _port;
     }
 
     /**
      * Gets the underlying socket address
-     * @return
+     * @return socket address
      */
     public InetSocketAddress getSocketAddress(){
-        return _addr;
+        return _address;
     }
 
     @Override
     public String toString(){
-        return _host + ":" + _port;
+        return _address.toString();
     }
 
     final String _host;
     final int _port;
-    InetSocketAddress _addr;
-    InetAddress[] _all;
+    volatile InetSocketAddress _address;
 
     // --------
     // static helpers
     // --------
 
-    private static InetAddress[] _getAddress( String host )
-        throws UnknownHostException {
-
-        if ( host.toLowerCase().equals("localhost") ){
-            return new InetAddress[] { InetAddress.getLocalHost()};
-        }
-        
-        return InetAddress.getAllByName( host );
-    }
-    
     /**
-     * Returns the default database host: db_ip environment variable, or "127.0.0.1"
-     * @return
+     * Returns the default database host: "127.0.0.1"
+     * @return IP address of default host.
      */
     public static String defaultHost(){
         return "127.0.0.1";
     }
 
-    /** Returns the default database port: db_port environment variable, or 27017 as a default
-     * @return
+    /** Returns the default database port: 27017
+     * @return the default port
      */
     public static int defaultPort(){
         return DBPort.PORT;
@@ -243,13 +199,9 @@ public static int defaultPort(){
      * @return true if host resolved to a new IP that is different from old one, false otherwise
      * @throws UnknownHostException
      */
-    boolean updateInetAddr() throws UnknownHostException {
-        InetSocketAddress oldaddr = _addr;
-        _all = _getAddress( _host );
-        _addr = new InetSocketAddress( _all[0] , _port );
-        if (!_addr.equals(oldaddr))
-            return true;
-        return false;
+    boolean updateInetAddress() throws UnknownHostException {
+        InetSocketAddress oldAddress = _address;
+        _address = new InetSocketAddress( InetAddress.getByName(_host) , _port );
+        return !_address.equals(oldAddress);
     }
-    
 }

src/test/com/mongodb/DBAddressTest.java

@@ -31,7 +31,6 @@ public void testCTOR()
         DBAddress bar = new DBAddress( foo, "some.other.host" );
         assertEquals( foo.sameHost( "www.10gen.com:1000" ), true );
         assertEquals( foo.getSocketAddress().hashCode(), bar.getSocketAddress().hashCode() );
-        assertEquals( foo.toString(), "www.10gen.com:1000/some-host" );
     }
 
     @Test(groups = {"basic"})
@@ -63,8 +62,6 @@ public void testBasics()
         assertEquals( 27017 , new ServerAddress().getPort() );
         assertEquals( 27017 , new ServerAddress( "localhost" ).getPort() );
         assertEquals( 9999 , new ServerAddress( "localhost:9999" ).getPort() );
-
-        assertEquals( false , new ServerAddress( "localhost:9999" ).isPaired() );
     }
 
     @Test

src/test/com/mongodb/JavaClientTest.java

@@ -35,7 +35,7 @@ public class JavaClientTest extends TestCase {
 
     public JavaClientTest()
         throws IOException , MongoException {
-        _mongo = new Mongo( "127.0.0.1" );
+        _mongo = new Mongo( "localhost" );
 	cleanupMongo = _mongo;
 	cleanupDB = "com_mongodb_unittest_JavaClientTest";
 	_db = cleanupMongo.getDB( cleanupDB );