From 9891a64c86b20c0d35b8959052e718c518bceb4e Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 16 Dec 2016 18:16:37 -0700
Subject: [PATCH] Remove dependency mgmt of Guava.

Happens in s-c-netflix

see gh-12
---
 spring-cloud-kubernetes-archaius/pom.xml      | 26 +------------------
 spring-cloud-kubernetes-ribbon/pom.xml        |  1 -
 .../ribbon/KubernetesConfigKey.java           | 12 ++++-----
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/spring-cloud-kubernetes-archaius/pom.xml b/spring-cloud-kubernetes-archaius/pom.xml
index 8e69c15b..1956a5ae 100644
--- a/spring-cloud-kubernetes-archaius/pom.xml
+++ b/spring-cloud-kubernetes-archaius/pom.xml
@@ -39,34 +39,10 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-commons</artifactId>
+            <artifactId>spring-cloud-starter-archaius</artifactId>
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-netflix-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.netflix.archaius</groupId>
-            <artifactId>archaius-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <optional>true</optional>
-      </dependency>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
index 1f3b3c11..37a47ea3 100644
--- a/spring-cloud-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -95,7 +95,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
diff --git a/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java
index 307e1590..37c98957 100644
--- a/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java
+++ b/spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java
@@ -17,9 +17,6 @@
 
 package org.springframework.cloud.kubernetes.ribbon;
 
-import com.google.common.reflect.TypeToken;
-import com.netflix.client.config.IClientConfigKey;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
@@ -27,7 +24,10 @@ import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import org.springframework.util.Assert;
+
+import com.google.common.reflect.TypeToken;
+import com.netflix.client.config.IClientConfigKey;
 
 public abstract class KubernetesConfigKey<T> implements IClientConfigKey<T> {
 
@@ -90,8 +90,8 @@ public abstract class KubernetesConfigKey<T> implements IClientConfigKey<T> {
     protected KubernetesConfigKey(String configKey) {
         this.configKey = configKey;
         Type superclass = getClass().getGenericSuperclass();
-        checkArgument(superclass instanceof ParameterizedType,
-                "%s isn't parameterized", superclass);
+        Assert.isTrue(superclass instanceof ParameterizedType,
+                superclass + " isn't parameterized");
         Type runtimeType = ((ParameterizedType) superclass).getActualTypeArguments()[0];
         type = (Class<T>) TypeToken.of(runtimeType).getRawType();
     }