From 6706738be91ba5f3fa6f04da31cfcc8b7f8bdbc6 Mon Sep 17 00:00:00 2001
From: Rafael Zanella <rafzane@gmail.com>
Date: Wed, 16 Dec 2015 16:24:34 -0200
Subject: [PATCH] Use getFirstNonLoopbackAddress() from cloud commons

---
 .../discovery/ConsulDiscoveryProperties.java  |  2 +-
 .../consul/discovery/IpAddressUtils.java      | 23 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
index 57093141..c8d62a5f 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.consul.discovery;
 
-import static org.springframework.cloud.consul.discovery.IpAddressUtils.getFirstNonLoopbackAddress;
+import static org.springframework.cloud.util.InetUtils.getFirstNonLoopbackAddress;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/IpAddressUtils.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/IpAddressUtils.java
index 758ec297..1c600476 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/IpAddressUtils.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/IpAddressUtils.java
@@ -43,27 +43,4 @@ public class IpAddressUtils {
 		}
 		return service.getNode();
 	}
-
-	@SneakyThrows
-	public static InetAddress getFirstNonLoopbackAddress() {
-		try {
-			for (Enumeration<NetworkInterface> enumNic = NetworkInterface.getNetworkInterfaces();
-				 enumNic.hasMoreElements(); ) {
-				NetworkInterface ifc = enumNic.nextElement();
-				if (ifc.isUp()) {
-					for (Enumeration<InetAddress> enumAddr = ifc.getInetAddresses();
-						 enumAddr.hasMoreElements(); ) {
-						InetAddress address = enumAddr.nextElement();
-						if (address instanceof Inet4Address && !address.isLoopbackAddress()) {
-							return address;
-						}
-					}
-				}
-			}
-		}
-		catch (IOException ex) {
-			log.error("Cannot get host info", ex);
-		}
-		return InetAddress.getLocalHost();
-	}
 }