merge bug23895 into default (Clients supplying numeric hostnames should not require DNS)

Author: Alexandru Scvortov

src/com/rabbitmq/client/Connection.java

@@ -17,6 +17,7 @@
 package com.rabbitmq.client;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.util.Map;
 
 /**
@@ -46,7 +47,7 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
      * Retrieve the host.
      * @return the hostname of the peer we're connected to.
      */
-    String getHost();
+    InetAddress getAddress();
 
     /**
      * Retrieve the port number.

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -19,6 +19,7 @@
 
 import java.io.EOFException;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
@@ -151,8 +152,8 @@ public void ensureIsOpen()
     public Map<String, Object> _serverProperties;
 
     /** {@inheritDoc} */
-    public String getHost() {
-        return _frameHandler.getHost();
+    public InetAddress getAddress() {
+        return _frameHandler.getAddress();
     }
 
     /** {@inheritDoc} */
@@ -241,7 +242,7 @@ public void start()
 
         // start the main loop going
         Thread ml = new MainLoop();
-        ml.setName("AMQP Connection " + getHost() + ":" + getPort());
+        ml.setName("AMQP Connection " + getHostAddress() + ":" + getPort());
         ml.start();
 
         AMQP.Connection.Start connStart = null;
@@ -559,7 +560,7 @@ public void handleConnectionClose(Command closeCommand) {
         _brokerInitiatedShutdown = true;
         Thread scw = new SocketCloseWait(sse);
         scw.setName("AMQP Connection Closing Monitor " +
-                    getHost() + ":" + getPort());
+                getHostAddress() + ":" + getPort());
         scw.start();
     }
 
@@ -726,6 +727,10 @@ public void close(int closeCode,
     }
 
     @Override public String toString() {
-        return "amqp://" + _factory.getUsername() + "@" + getHost() + ":" + getPort() + _virtualHost;
+        return "amqp://" + _factory.getUsername() + "@" + getHostAddress() + ":" + getPort() + _virtualHost;
+    }
+
+    private String getHostAddress() {
+        return getAddress() == null ? null : getAddress().getHostAddress();
     }
 }

src/com/rabbitmq/client/impl/FrameHandler.java

@@ -17,6 +17,7 @@
 package com.rabbitmq.client.impl;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 
@@ -25,8 +26,8 @@
  */
 
 public interface FrameHandler {
-    /** Retrieve hostname of peer. */
-    public String getHost();
+    /** Retrieve address of peer. */
+    public InetAddress getAddress();
 
     /** Retrieve port number of peer. */
     public int getPort();

src/com/rabbitmq/client/impl/SocketFrameHandler.java

@@ -21,6 +21,7 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 
@@ -55,8 +56,8 @@ public SocketFrameHandler(Socket socket) throws IOException {
         _outputStream = new DataOutputStream(new BufferedOutputStream(_socket.getOutputStream()));
     }
 
-    public String getHost() {
-        return _socket.getInetAddress().getHostName();
+    public InetAddress getAddress() {
+        return _socket.getInetAddress();
     }
 
     public int getPort() {

test/src/com/rabbitmq/client/test/AMQConnectionTest.java

@@ -17,6 +17,7 @@
 package com.rabbitmq.client.test;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
@@ -159,8 +160,8 @@ public int getTimeout() throws SocketException {
             return 0;
         }
 
-        public String getHost() {
-            return "MockFrameHandler";
+        public InetAddress getAddress() {
+            return null;
         }
 
         public int getPort() {

test/src/com/rabbitmq/client/test/BrokenFramesTest.java

@@ -18,6 +18,7 @@
 package com.rabbitmq.client.test;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -145,8 +146,8 @@ public int getTimeout() throws SocketException {
             return 0;
         }
 
-        public String getHost() {
-            return "MyFrameHandler";
+        public InetAddress getAddress() {
+            return null;
         }
 
         public int getPort() {