Remove usages of Guava Objects/MoreObjects from opencensus-api (issue #1081).

7 files changed, 53 insertions, 29 deletions

diff --git a/api/src/main/java/io/opencensus/internal/Utils.java b/api/src/main/java/io/opencensus/internal/Utils.java
index 044529fa..0b27511d 100644
--- a/api/src/main/java/io/opencensus/internal/Utils.java
+++ b/api/src/main/java/io/opencensus/internal/Utils.java
@@ -17,6 +17,7 @@
 package io.opencensus.internal;
 
 import java.math.BigInteger;
+import javax.annotation.Nullable;
 
 /*>>>
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -87,6 +88,14 @@ public final class Utils {
   }
 
   /**
+   * Compares two Objects for equality. This functionality is provided by {@code
+   * Objects.equal(Object, Object)} in Java 7.
+   */
+  public static boolean equalsObjects(@Nullable Object x, @Nullable Object y) {
+    return x == null ? y == null : x.equals(y);
+  }
+
+  /**
    * Compares two longs. This functionality is provided by {@code Long.compare(long, long)} in Java
    * 7.
    */
diff --git a/api/src/main/java/io/opencensus/trace/SpanContext.java b/api/src/main/java/io/opencensus/trace/SpanContext.java
index cdc74886..66a6bfbc 100644
--- a/api/src/main/java/io/opencensus/trace/SpanContext.java
+++ b/api/src/main/java/io/opencensus/trace/SpanContext.java
@@ -16,8 +16,7 @@
 
 package io.opencensus.trace;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
+import java.util.Arrays;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
@@ -114,16 +113,18 @@ public final class SpanContext {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(traceId, spanId, traceOptions);
+    return Arrays.hashCode(new Object[] {traceId, spanId, traceOptions});
   }
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("traceId", traceId)
-        .add("spanId", spanId)
-        .add("traceOptions", traceOptions)
-        .toString();
+    return "SpanContext{traceId="
+        + traceId
+        + ", spanId="
+        + spanId
+        + ", traceOptions="
+        + traceOptions
+        + "}";
   }
 
   private SpanContext(TraceId traceId, SpanId spanId, TraceOptions traceOptions) {
diff --git a/api/src/main/java/io/opencensus/trace/SpanId.java b/api/src/main/java/io/opencensus/trace/SpanId.java
index 859950c7..1556bde0 100644
--- a/api/src/main/java/io/opencensus/trace/SpanId.java
+++ b/api/src/main/java/io/opencensus/trace/SpanId.java
@@ -16,7 +16,6 @@
 
 package io.opencensus.trace;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.io.BaseEncoding;
 import io.opencensus.internal.Utils;
 import java.util.Arrays;
@@ -178,6 +177,10 @@ public final class SpanId implements Comparable<SpanId> {
    * @since 0.11
    */
   public String toLowerBase16() {
+    return toLowerBase16(bytes);
+  }
+
+  private static String toLowerBase16(byte[] bytes) {
     return BaseEncoding.base16().lowerCase().encode(bytes);
   }
 
@@ -202,9 +205,7 @@ public final class SpanId implements Comparable<SpanId> {
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("spanId", BaseEncoding.base16().lowerCase().encode(bytes))
-        .toString();
+    return "SpanId{spanId=" + toLowerBase16(bytes) + "}";
   }
 
   @Override
diff --git a/api/src/main/java/io/opencensus/trace/Status.java b/api/src/main/java/io/opencensus/trace/Status.java
index 5296541c..61f33dc7 100644
--- a/api/src/main/java/io/opencensus/trace/Status.java
+++ b/api/src/main/java/io/opencensus/trace/Status.java
@@ -16,11 +16,10 @@
 
 package io.opencensus.trace;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import io.opencensus.internal.PublicForTesting;
 import io.opencensus.internal.Utils;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.TreeMap;
@@ -397,7 +396,7 @@ public final class Status {
    * @since 0.5
    */
   public Status withDescription(String description) {
-    if (Objects.equal(this.description, description)) {
+    if (Utils.equalsObjects(this.description, description)) {
       return this;
     }
     return new Status(this.canonicalCode, description);
@@ -451,7 +450,8 @@ public final class Status {
     }
 
     Status that = (Status) obj;
-    return canonicalCode == that.canonicalCode && Objects.equal(description, that.description);
+    return canonicalCode == that.canonicalCode
+        && Utils.equalsObjects(description, that.description);
   }
 
   /**
@@ -461,14 +461,11 @@ public final class Status {
    */
   @Override
   public int hashCode() {
-    return Objects.hashCode(canonicalCode, description);
+    return Arrays.hashCode(new Object[] {canonicalCode, description});
   }
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("canonicalCode", canonicalCode)
-        .add("description", description)
-        .toString();
+    return "Status{canonicalCode=" + canonicalCode + ", description=" + description + "}";
   }
 }
diff --git a/api/src/main/java/io/opencensus/trace/TraceId.java b/api/src/main/java/io/opencensus/trace/TraceId.java
index 5683d750..a02a4e05 100644
--- a/api/src/main/java/io/opencensus/trace/TraceId.java
+++ b/api/src/main/java/io/opencensus/trace/TraceId.java
@@ -16,7 +16,6 @@
 
 package io.opencensus.trace;
 
-import com.google.common.base.MoreObjects;
 import com.google.common.io.BaseEncoding;
 import io.opencensus.common.Internal;
 import io.opencensus.internal.Utils;
@@ -179,6 +178,10 @@ public final class TraceId implements Comparable<TraceId> {
    * @since 0.11
    */
   public String toLowerBase16() {
+    return toLowerBase16(bytes);
+  }
+
+  private static String toLowerBase16(byte[] bytes) {
     return BaseEncoding.base16().lowerCase().encode(bytes);
   }
 
@@ -224,9 +227,7 @@ public final class TraceId implements Comparable<TraceId> {
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("traceId", BaseEncoding.base16().lowerCase().encode(bytes))
-        .toString();
+    return "TraceId{traceId=" + toLowerBase16(bytes) + "}";
   }
 
   @Override
diff --git a/api/src/main/java/io/opencensus/trace/TraceOptions.java b/api/src/main/java/io/opencensus/trace/TraceOptions.java
index c5d44f45..cdae92b3 100644
--- a/api/src/main/java/io/opencensus/trace/TraceOptions.java
+++ b/api/src/main/java/io/opencensus/trace/TraceOptions.java
@@ -16,10 +16,9 @@
 
 package io.opencensus.trace;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import io.opencensus.internal.DefaultVisibilityForTesting;
 import io.opencensus.internal.Utils;
+import java.util.Arrays;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
@@ -182,12 +181,12 @@ public final class TraceOptions {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(options);
+    return Arrays.hashCode(new byte[] {options});
   }
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this).add("sampled", isSampled()).toString();
+    return "TraceOptions{sampled=" + isSampled() + "}";
   }
 
   /**
diff --git a/api/src/test/java/io/opencensus/internal/UtilsTest.java b/api/src/test/java/io/opencensus/internal/UtilsTest.java
index 3313c1fd..dea7c843 100644
--- a/api/src/test/java/io/opencensus/internal/UtilsTest.java
+++ b/api/src/test/java/io/opencensus/internal/UtilsTest.java
@@ -17,7 +17,10 @@
 package io.opencensus.internal;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import java.util.Date;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -89,6 +92,19 @@ public final class UtilsTest {
   }
 
   @Test
+  public void equalsObjects_Equal() {
+    assertTrue(Utils.equalsObjects(null, null));
+    assertTrue(Utils.equalsObjects(new Date(1L), new Date(1L)));
+  }
+
+  @Test
+  public void equalsObjects_Unequal() {
+    assertFalse(Utils.equalsObjects(null, new Object()));
+    assertFalse(Utils.equalsObjects(new Object(), null));
+    assertFalse(Utils.equalsObjects(new Object(), new Object()));
+  }
+
+  @Test
   public void compareLongs() {
     assertThat(Utils.compareLongs(-1L, 1L)).isLessThan(0);
     assertThat(Utils.compareLongs(10L, 10L)).isEqualTo(0);