Merge pull request #501 from norbertdalecker/master

Guava 2x compatibility in archaius-etcd project
Netflix · Nov 11, 2017 · 06a02fb · 06a02fb
2 parents 8fa8499 + fff4ef1
commit 06a02fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/archaius-etcd/src/main/java/com/netflix/config/source/EtcdConfigurationSource.java b/archaius-etcd/src/main/java/com/netflix/config/source/EtcdConfigurationSource.java
@@ -1,6 +1,6 @@
 package com.netflix.config.source;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -57,7 +57,7 @@ public class EtcdConfigurationSource implements WatchedConfigurationSource {
      */
     public EtcdConfigurationSource(Etcd etcd, String configPath) {
         this.etcd = etcd;
-        this.configPath = Objects.firstNonNull(configPath, "").replaceAll("^/+","");
+        this.configPath = MoreObjects.firstNonNull(configPath, "").replaceAll("^/+","");
         init();
     }
 

diff --git a/build.gradle b/build.gradle
@@ -104,6 +104,7 @@ project(':archaius-etcd') {
 
     dependencies {
         compile project(':archaius-core')
+        compile 'com.google.guava:guava:19.0'
         compile 'io.fastjson:etcd-client:0.33'
         testCompile 'junit:junit:4.11'
         testCompile 'org.mockito:mockito-all:1.9.5'