SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dependency mgmt of Guava.

Browse Source 
Happens in s-c-netflix

see gh-12
This commit is contained in:
Spencer Gibb
2016-12-16 18:16:37 -07:00
parent 99e4364364
commit 9891a64c86
3 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-cloud-kubernetes-archaius/pom.xml
View File

@@ -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>

1
spring-cloud-kubernetes-ribbon/pom.xml
View File

@@ -95,7 +95,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<optional>true</optional>
</dependency>
<dependency>

12
spring-cloud-kubernetes-ribbon/src/main/java/org/springframework/cloud/kubernetes/ribbon/KubernetesConfigKey.java
View File

@@ -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();
}