From 33531b82c9af0b9e653b1bd6a76ebd0f49e290b2 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 16 Dec 2016 18:21:24 -0700 Subject: [PATCH] Remove spring-cloud-kubernetes-compat fixes gh-15 --- pom.xml | 1 - spring-cloud-kubernetes-compat/pom.xml | 45 ------------------- .../cloud/commons/util/InetUtils.java | 45 ------------------- 3 files changed, 91 deletions(-) delete mode 100644 spring-cloud-kubernetes-compat/pom.xml delete mode 100644 spring-cloud-kubernetes-compat/src/main/java/org/springframework/cloud/commons/util/InetUtils.java diff --git a/pom.xml b/pom.xml index 6406fac5..73c4c2d6 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ spring-cloud-kubernetes-discovery spring-cloud-kubernetes-ribbon spring-cloud-kubernetes-zipkin - spring-cloud-kubernetes-compat spring-cloud-kubernetes-hystrix spring-cloud-kubernetes-archaius spring-cloud-starter-kubernetes diff --git a/spring-cloud-kubernetes-compat/pom.xml b/spring-cloud-kubernetes-compat/pom.xml deleted file mode 100644 index ba1bf989..00000000 --- a/spring-cloud-kubernetes-compat/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - spring-cloud-kubernetes - org.springframework.cloud - 0.2.0.BUILD-SNAPSHOT - - 4.0.0 - - org.springframework.cloud - spring-cloud-kubernetes-compat - Spring Cloud Kubernetes :: Compatibility - - Compatibility module to cover for the lack of InetUtils in older version of Spring Cloud Commons. - - - - - org.projectlombok - lombok - 1.16.8 - compile - true - - - diff --git a/spring-cloud-kubernetes-compat/src/main/java/org/springframework/cloud/commons/util/InetUtils.java b/spring-cloud-kubernetes-compat/src/main/java/org/springframework/cloud/commons/util/InetUtils.java deleted file mode 100644 index cb85bccc..00000000 --- a/spring-cloud-kubernetes-compat/src/main/java/org/springframework/cloud/commons/util/InetUtils.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.springframework.cloud.commons.util; - -import lombok.Data; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.nio.ByteBuffer; - -/** - * Copied from spring-cloud-commons as a workaround for version incompatibilities - */ -public class InetUtils { - - public static int getIpAddressAsInt(String host) { - return new HostInfo(host).getIpAddressAsInt(); - } - - @Data - public static final class HostInfo { - public boolean override; - private String ipAddress; - private String hostname; - - HostInfo(String hostname) { - this.hostname = hostname; - } - - HostInfo() { - } - - public int getIpAddressAsInt() { - InetAddress inetAddress = null; - String host = this.ipAddress; - if (host == null) { - host = this.hostname; - } - try { - inetAddress = InetAddress.getByName(host); - } catch (final UnknownHostException e) { - throw new IllegalArgumentException(e); - } - return ByteBuffer.wrap(inetAddress.getAddress()).getInt(); - } - } -} \ No newline at end of file