Change from commons-lang3 to guava

Change-Id: I1a18e06af7bf2d65228f1491663b6e096a9538ed

10 files changed, 26 insertions, 28 deletions

diff --git a/compiler/build.gradle b/compiler/build.gradle
index 964a8d8f..8a9e9919 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -36,7 +36,6 @@ dependencies {
     compile project(':dataBinding:compilerCommon')
     compile project(':dataBinding:baseLibrary')
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'org.apache.commons:commons-lang3:3.3.2'
     compile 'commons-io:commons-io:2.4'
     compile 'commons-codec:commons-codec:1.10'
     compile 'com.tunnelvisionlabs:antlr4:4.5'
diff --git a/compiler/src/main/java/android/databinding/annotationprocessor/ProcessExpressions.java b/compiler/src/main/java/android/databinding/annotationprocessor/ProcessExpressions.java
index 9c65f5c1..e1c447c9 100644
--- a/compiler/src/main/java/android/databinding/annotationprocessor/ProcessExpressions.java
+++ b/compiler/src/main/java/android/databinding/annotationprocessor/ProcessExpressions.java
@@ -16,10 +16,10 @@
 
 package android.databinding.annotationprocessor;
 
+import com.google.common.base.Joiner;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
 
 import android.databinding.BindingBuildInfo;
 import android.databinding.tool.CompilerChef;
@@ -29,6 +29,7 @@ import android.databinding.tool.store.ResourceBundle;
 import android.databinding.tool.util.GenerationalClassUtil;
 import android.databinding.tool.util.L;
 import android.databinding.tool.util.Preconditions;
+import android.databinding.tool.util.StringUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -158,7 +159,7 @@ public class ProcessExpressions extends ProcessDataBinding.ProcessingStep {
         }
         if (forLibraryModule) {
             Set<String> classNames = compilerChef.getWrittenClassNames();
-            String out = StringUtils.join(classNames, SystemUtils.LINE_SEPARATOR);
+            String out = Joiner.on(StringUtils.LINE_SEPARATOR).join(classNames);
             L.d("Writing list of classes to %s . \nList:%s", exportClassNamesTo, out);
             try {
                 //noinspection ConstantConditions
diff --git a/compiler/src/main/java/android/databinding/tool/ExpressionParser.java b/compiler/src/main/java/android/databinding/tool/ExpressionParser.java
index 27168a63..5468c936 100644
--- a/compiler/src/main/java/android/databinding/tool/ExpressionParser.java
+++ b/compiler/src/main/java/android/databinding/tool/ExpressionParser.java
@@ -27,7 +27,6 @@ import org.antlr.v4.runtime.misc.Nullable;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 import org.antlr.v4.runtime.tree.TerminalNode;
-import org.apache.commons.lang3.StringUtils;
 
 import android.databinding.parser.BindingExpressionLexer;
 import android.databinding.parser.BindingExpressionParser;
diff --git a/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java b/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java
index 75078901..08e67443 100644
--- a/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java
+++ b/compiler/src/main/java/android/databinding/tool/ExpressionVisitor.java
@@ -16,12 +16,13 @@
 
 package android.databinding.tool;
 
+import com.google.common.base.Objects;
+
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 import org.antlr.v4.runtime.tree.TerminalNode;
-import org.apache.commons.lang3.ObjectUtils;
 
 import android.databinding.parser.BindingExpressionBaseVisitor;
 import android.databinding.parser.BindingExpressionParser;
@@ -218,7 +219,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> {
             List<Expr> args = new ArrayList<Expr>();
             if (ctx.args != null) {
                 for (ParseTree item : ctx.args.children) {
-                    if (ObjectUtils.equals(item.getText(), ",")) {
+                    if (Objects.equal(item.getText(), ",")) {
                         continue;
                     }
                     args.add(item.accept(this));
@@ -298,7 +299,7 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> {
             final List<Expr> args = new ArrayList<Expr>();
             if (ctx.resourceParameters() != null) {
                 for (ParseTree item : ctx.resourceParameters().expressionList().children) {
-                    if (ObjectUtils.equals(item.getText(), ",")) {
+                    if (Objects.equal(item.getText(), ",")) {
                         continue;
                     }
                     args.add(item.accept(this));
diff --git a/compiler/src/main/java/android/databinding/tool/reflection/ModelClass.java b/compiler/src/main/java/android/databinding/tool/reflection/ModelClass.java
index fb8e4bf6..1dd14892 100644
--- a/compiler/src/main/java/android/databinding/tool/reflection/ModelClass.java
+++ b/compiler/src/main/java/android/databinding/tool/reflection/ModelClass.java
@@ -15,10 +15,9 @@
  */
 package android.databinding.tool.reflection;
 
-import org.apache.commons.lang3.StringUtils;
-
 import android.databinding.tool.reflection.Callable.Type;
 import android.databinding.tool.util.L;
+import android.databinding.tool.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler/src/main/java/android/databinding/tool/store/SetterStore.java b/compiler/src/main/java/android/databinding/tool/store/SetterStore.java
index 45592c4d..ffeb06b6 100644
--- a/compiler/src/main/java/android/databinding/tool/store/SetterStore.java
+++ b/compiler/src/main/java/android/databinding/tool/store/SetterStore.java
@@ -15,14 +15,13 @@
  */
 package android.databinding.tool.store;
 
-import org.apache.commons.lang3.StringUtils;
-
 import android.databinding.tool.reflection.ModelAnalyzer;
 import android.databinding.tool.reflection.ModelClass;
 import android.databinding.tool.reflection.ModelMethod;
 import android.databinding.tool.util.GenerationalClassUtil;
 import android.databinding.tool.util.L;
 import android.databinding.tool.util.Preconditions;
+import android.databinding.tool.util.StringUtils;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt
index 6c1290c5..261025d4 100644
--- a/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt
+++ b/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt
@@ -16,11 +16,11 @@
 
 package android.databinding.tool.writer
 
-import org.apache.commons.lang3.SystemUtils
+import android.databinding.tool.util.StringUtils
 
 class BRWriter(properties: Set<String>, val useFinal : Boolean) {
     val indexedProps = properties.sorted().withIndex()
-    public fun write(pkg : String): String = "package $pkg;${SystemUtils.LINE_SEPARATOR}$klass"
+    public fun write(pkg : String): String = "package $pkg;${StringUtils.LINE_SEPARATOR}$klass"
     val klass: String by lazy {
         kcode("") {
             val prefix = if (useFinal) "final " else "";
@@ -32,4 +32,4 @@ class BRWriter(properties: Set<String>, val useFinal : Boolean) {
             } nl ("}")
         }.generate()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt
index fe961b49..2ef78732 100644
--- a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt
+++ b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt
@@ -13,14 +13,14 @@
 
 package android.databinding.tool.writer
 
-import org.apache.commons.lang3.SystemUtils
+import android.databinding.tool.util.StringUtils
 import java.util.BitSet
 
 class KCode (private val s : String? = null){
 
     private var sameLine = false
 
-    private val lineSeparator = SystemUtils.LINE_SEPARATOR
+    private val lineSeparator = StringUtils.LINE_SEPARATOR
 
     class Appendix(val glue : String, val code : KCode)
 
@@ -167,4 +167,4 @@ fun kcode(s : String?, init : (KCode.() -> Unit)? = null) : KCode {
         c.init()
     }
     return c
-}
\ No newline at end of file
+}
diff --git a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
index 92b6b3fa..a9ba2e92 100644
--- a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
+++ b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java
@@ -16,7 +16,6 @@
 
 package android.databinding.tool.expr;
 
-import org.apache.commons.lang3.ArrayUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -965,7 +964,7 @@ public class ExprModelTest {
         i = 0;
         for (Expr expr : iterable) {
             assertTrue((i++) + ":must be expected " + expr.getUniqueKey() + "\n" + log,
-                    ArrayUtils.contains(exprs, expr));
+                    Arrays.asList(exprs).contains(expr));
         }
     }
 
diff --git a/compiler/src/test/java/android/databinding/tool/reflection/java/JavaAnalyzer.java b/compiler/src/test/java/android/databinding/tool/reflection/java/JavaAnalyzer.java
index ee2b0e5e..1b97cd9f 100644
--- a/compiler/src/test/java/android/databinding/tool/reflection/java/JavaAnalyzer.java
+++ b/compiler/src/test/java/android/databinding/tool/reflection/java/JavaAnalyzer.java
@@ -13,16 +13,16 @@
 
 package android.databinding.tool.reflection.java;
 
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import android.databinding.tool.reflection.ModelAnalyzer;
 import android.databinding.tool.reflection.ModelClass;
 import android.databinding.tool.reflection.SdkUtil;
 import android.databinding.tool.reflection.TypeUtil;
 import android.databinding.tool.util.L;
-import android.databinding.tool.util.Preconditions;
 
 import java.io.File;
 import java.io.IOException;
@@ -30,6 +30,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class JavaAnalyzer extends ModelAnalyzer {
@@ -145,11 +146,11 @@ public class JavaAnalyzer extends ModelAnalyzer {
             if (f.exists() && f.canRead()) {
                 try {
                     for (String line : FileUtils.readLines(f)) {
-                        String[] keyValue = StringUtils.split(line, '=');
-                        if (keyValue.length == 2) {
-                            String key = keyValue[0].trim();
+                        List<String> keyValue = Splitter.on('=').splitToList(line);
+                        if (keyValue.size() == 2) {
+                            String key = keyValue.get(0).trim();
                             if (key.equals("sdk.dir")) {
-                                return keyValue[1].trim();
+                                return keyValue.get(1).trim();
                             }
                         }
                     }
@@ -163,7 +164,7 @@ public class JavaAnalyzer extends ModelAnalyzer {
 
     public static void initForTests() {
         String androidHome = loadAndroidHome();
-        if (StringUtils.isEmpty(androidHome) || !new File(androidHome).exists()) {
+        if (Strings.isNullOrEmpty(androidHome) || !new File(androidHome).exists()) {
             throw new IllegalStateException(
                     "you need to have ANDROID_HOME set in your environment"
                             + " to run compiler tests");