- Pull in only relevant pieces of Guava to android libraries.

mehmetf · ejona86 · commit 0fea3dccf32e · 2016-03-03T18:06:37.000-08:00
- Get rid of guava collect dependency and instead use splitToList(). Collect brings in 6000 methods which counts towards Android dex limit. Until Guava can be broken into smaller pieces and proguard well, this should be avoided. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=114826400
diff --git a/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java b/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java
@@ -20,7 +20,6 @@
 import com.google.api.client.util.Types;
 import com.google.api.client.util.escape.CharEscapers;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -303,7 +302,7 @@ public static String expand(String pathUri, Object parameters,
       String templates = pathUri.substring(next + 1, close);
       CompositeOutput compositeOutput = getCompositeOutput(templates);
       ListIterator<String> templateIterator =
-          ImmutableList.copyOf(Splitter.on(',').split(templates)).listIterator();
+          Splitter.on(',').splitToList(templates).listIterator();
       boolean isFirstParameter = true;
       while (templateIterator.hasNext()) {
         String template = templateIterator.next();
