Rename "Util" classes to "Utils", for consistency with public "Utils" classes.

This commit adds an "s" to TimeUtil, StringUtil, and BaseMessageEventUtil, for
consistency with utility classes that have been made public, such as
ContextUtils.

14 files changed, 41 insertions, 41 deletions

diff --git a/api/src/main/java/io/opencensus/common/Duration.java b/api/src/main/java/io/opencensus/common/Duration.java
index c03fecad..c20bbda7 100644
--- a/api/src/main/java/io/opencensus/common/Duration.java
+++ b/api/src/main/java/io/opencensus/common/Duration.java
@@ -16,10 +16,10 @@
 
 package io.opencensus.common;
 
-import static io.opencensus.common.TimeUtil.MAX_NANOS;
-import static io.opencensus.common.TimeUtil.MAX_SECONDS;
-import static io.opencensus.common.TimeUtil.MILLIS_PER_SECOND;
-import static io.opencensus.common.TimeUtil.NANOS_PER_MILLI;
+import static io.opencensus.common.TimeUtils.MAX_NANOS;
+import static io.opencensus.common.TimeUtils.MAX_SECONDS;
+import static io.opencensus.common.TimeUtils.MILLIS_PER_SECOND;
+import static io.opencensus.common.TimeUtils.NANOS_PER_MILLI;
 
 import com.google.auto.value.AutoValue;
 import com.google.common.primitives.Longs;
diff --git a/api/src/main/java/io/opencensus/common/TimeUtil.java b/api/src/main/java/io/opencensus/common/TimeUtils.java
index 09b3ddf9..2429cc90 100644
--- a/api/src/main/java/io/opencensus/common/TimeUtil.java
+++ b/api/src/main/java/io/opencensus/common/TimeUtils.java
@@ -17,12 +17,12 @@
 package io.opencensus.common;
 
 /** Util class for {@link Timestamp} and {@link Duration}. */
-final class TimeUtil {
+final class TimeUtils {
   static final long MAX_SECONDS = 315576000000L;
   static final int MAX_NANOS = 999999999;
   static final long MILLIS_PER_SECOND = 1000L;
   static final long NANOS_PER_MILLI = 1000 * 1000;
   static final long NANOS_PER_SECOND = NANOS_PER_MILLI * MILLIS_PER_SECOND;
 
-  private TimeUtil() {}
+  private TimeUtils() {}
 }
diff --git a/api/src/main/java/io/opencensus/common/Timestamp.java b/api/src/main/java/io/opencensus/common/Timestamp.java
index b6ba1316..970a0031 100644
--- a/api/src/main/java/io/opencensus/common/Timestamp.java
+++ b/api/src/main/java/io/opencensus/common/Timestamp.java
@@ -16,11 +16,11 @@
 
 package io.opencensus.common;
 
-import static io.opencensus.common.TimeUtil.MAX_NANOS;
-import static io.opencensus.common.TimeUtil.MAX_SECONDS;
-import static io.opencensus.common.TimeUtil.MILLIS_PER_SECOND;
-import static io.opencensus.common.TimeUtil.NANOS_PER_MILLI;
-import static io.opencensus.common.TimeUtil.NANOS_PER_SECOND;
+import static io.opencensus.common.TimeUtils.MAX_NANOS;
+import static io.opencensus.common.TimeUtils.MAX_SECONDS;
+import static io.opencensus.common.TimeUtils.MILLIS_PER_SECOND;
+import static io.opencensus.common.TimeUtils.NANOS_PER_MILLI;
+import static io.opencensus.common.TimeUtils.NANOS_PER_SECOND;
 
 import com.google.auto.value.AutoValue;
 import com.google.common.math.LongMath;
diff --git a/api/src/main/java/io/opencensus/internal/StringUtil.java b/api/src/main/java/io/opencensus/internal/StringUtils.java
index 70f5299e..717e333c 100644
--- a/api/src/main/java/io/opencensus/internal/StringUtil.java
+++ b/api/src/main/java/io/opencensus/internal/StringUtils.java
@@ -17,7 +17,7 @@
 package io.opencensus.internal;
 
 /** Internal utility methods for working with tag keys, tag values, and metric names. */
-public final class StringUtil {
+public final class StringUtils {
 
   /**
    * Determines whether the {@code String} contains only printable characters.
@@ -38,5 +38,5 @@ public final class StringUtil {
     return ch >= ' ' && ch <= '~';
   }
 
-  private StringUtil() {}
+  private StringUtils() {}
 }
diff --git a/api/src/main/java/io/opencensus/stats/Measure.java b/api/src/main/java/io/opencensus/stats/Measure.java
index c0e3033e..7b9b833e 100644
--- a/api/src/main/java/io/opencensus/stats/Measure.java
+++ b/api/src/main/java/io/opencensus/stats/Measure.java
@@ -21,7 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import io.opencensus.common.Function;
-import io.opencensus.internal.StringUtil;
+import io.opencensus.internal.StringUtils;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -105,7 +105,7 @@ public abstract class Measure {
      */
     public static MeasureDouble create(String name, String description, String unit) {
       checkArgument(
-          StringUtil.isPrintableString(name) && name.length() <= NAME_MAX_LENGTH,
+          StringUtils.isPrintableString(name) && name.length() <= NAME_MAX_LENGTH,
           "Name should be a ASCII string with a length no greater than "
               + NAME_MAX_LENGTH
               + " characters.");
@@ -152,7 +152,7 @@ public abstract class Measure {
      */
     public static MeasureLong create(String name, String description, String unit) {
       checkArgument(
-          StringUtil.isPrintableString(name) && name.length() <= NAME_MAX_LENGTH,
+          StringUtils.isPrintableString(name) && name.length() <= NAME_MAX_LENGTH,
           "Name should be a ASCII string with a length no greater than "
               + NAME_MAX_LENGTH
               + " characters.");
diff --git a/api/src/main/java/io/opencensus/stats/View.java b/api/src/main/java/io/opencensus/stats/View.java
index fc0579e9..e3d4540d 100644
--- a/api/src/main/java/io/opencensus/stats/View.java
+++ b/api/src/main/java/io/opencensus/stats/View.java
@@ -22,7 +22,7 @@ import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import io.opencensus.common.Duration;
 import io.opencensus.common.Function;
-import io.opencensus.internal.StringUtil;
+import io.opencensus.internal.StringUtils;
 import io.opencensus.tags.TagKey;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -188,7 +188,7 @@ public abstract class View {
      */
     public static Name create(String name) {
       checkArgument(
-          StringUtil.isPrintableString(name) && name.length() <= NAME_MAX_LENGTH,
+          StringUtils.isPrintableString(name) && name.length() <= NAME_MAX_LENGTH,
           "Name should be a ASCII string with a length no greater than 255 characters.");
       return new AutoValue_View_Name(name);
     }
diff --git a/api/src/main/java/io/opencensus/tags/TagKey.java b/api/src/main/java/io/opencensus/tags/TagKey.java
index ceaa1b80..ba0b91ed 100644
--- a/api/src/main/java/io/opencensus/tags/TagKey.java
+++ b/api/src/main/java/io/opencensus/tags/TagKey.java
@@ -19,7 +19,7 @@ package io.opencensus.tags;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.auto.value.AutoValue;
-import io.opencensus.internal.StringUtil;
+import io.opencensus.internal.StringUtils;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -80,6 +80,6 @@ public abstract class TagKey {
    * @return whether the name is valid.
    */
   private static boolean isValid(String name) {
-    return !name.isEmpty() && name.length() <= MAX_LENGTH && StringUtil.isPrintableString(name);
+    return !name.isEmpty() && name.length() <= MAX_LENGTH && StringUtils.isPrintableString(name);
   }
 }
diff --git a/api/src/main/java/io/opencensus/tags/TagValue.java b/api/src/main/java/io/opencensus/tags/TagValue.java
index 5ba71959..95e13002 100644
--- a/api/src/main/java/io/opencensus/tags/TagValue.java
+++ b/api/src/main/java/io/opencensus/tags/TagValue.java
@@ -18,7 +18,7 @@ package io.opencensus.tags;
 
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
-import io.opencensus.internal.StringUtil;
+import io.opencensus.internal.StringUtils;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -74,6 +74,6 @@ public abstract class TagValue {
    * @return whether the value is valid.
    */
   private static boolean isValid(String value) {
-    return value.length() <= MAX_LENGTH && StringUtil.isPrintableString(value);
+    return value.length() <= MAX_LENGTH && StringUtils.isPrintableString(value);
   }
 }
diff --git a/api/src/main/java/io/opencensus/trace/Span.java b/api/src/main/java/io/opencensus/trace/Span.java
index c24a495b..523b9517 100644
--- a/api/src/main/java/io/opencensus/trace/Span.java
+++ b/api/src/main/java/io/opencensus/trace/Span.java
@@ -19,7 +19,7 @@ package io.opencensus.trace;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import io.opencensus.trace.internal.BaseMessageEventUtil;
+import io.opencensus.trace.internal.BaseMessageEventUtils;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Map;
@@ -165,7 +165,7 @@ public abstract class Span {
    */
   @Deprecated
   public void addNetworkEvent(NetworkEvent networkEvent) {
-    addMessageEvent(BaseMessageEventUtil.asMessageEvent(networkEvent));
+    addMessageEvent(BaseMessageEventUtils.asMessageEvent(networkEvent));
   }
 
   /**
@@ -182,7 +182,7 @@ public abstract class Span {
   public void addMessageEvent(MessageEvent messageEvent) {
     // Default implementation by invoking addNetworkEvent() so that any existing derived classes,
     // including implementation and the mocked ones, do not need to override this method explicitly.
-    addNetworkEvent(BaseMessageEventUtil.asNetworkEvent(messageEvent));
+    addNetworkEvent(BaseMessageEventUtils.asNetworkEvent(messageEvent));
   }
 
   /**
diff --git a/api/src/main/java/io/opencensus/trace/export/SpanData.java b/api/src/main/java/io/opencensus/trace/export/SpanData.java
index f93193b5..34a0920d 100644
--- a/api/src/main/java/io/opencensus/trace/export/SpanData.java
+++ b/api/src/main/java/io/opencensus/trace/export/SpanData.java
@@ -28,7 +28,7 @@ import io.opencensus.trace.Span;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.Status;
-import io.opencensus.trace.internal.BaseMessageEventUtil;
+import io.opencensus.trace.internal.BaseMessageEventUtils;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -101,7 +101,7 @@ public abstract class SpanData {
       } else {
         messageEventsList.add(
             TimedEvent.<MessageEvent>create(
-                timedEvent.getTimestamp(), BaseMessageEventUtil.asMessageEvent(event)));
+                timedEvent.getTimestamp(), BaseMessageEventUtils.asMessageEvent(event)));
       }
     }
     TimedEvents<MessageEvent> messageEvents =
@@ -200,7 +200,7 @@ public abstract class SpanData {
       networkEventsList.add(
           TimedEvent.<io.opencensus.trace.NetworkEvent>create(
               timedEvent.getTimestamp(),
-              BaseMessageEventUtil.asNetworkEvent(timedEvent.getEvent())));
+              BaseMessageEventUtils.asNetworkEvent(timedEvent.getEvent())));
     }
     return TimedEvents.<io.opencensus.trace.NetworkEvent>create(
         networkEventsList, timedEvents.getDroppedEventsCount());
diff --git a/api/src/main/java/io/opencensus/trace/internal/BaseMessageEventUtil.java b/api/src/main/java/io/opencensus/trace/internal/BaseMessageEventUtils.java
index 955c8859..812ec30a 100644
--- a/api/src/main/java/io/opencensus/trace/internal/BaseMessageEventUtil.java
+++ b/api/src/main/java/io/opencensus/trace/internal/BaseMessageEventUtils.java
@@ -26,7 +26,7 @@ import io.opencensus.common.Internal;
  */
 @Internal
 @SuppressWarnings("deprecation")
-public final class BaseMessageEventUtil {
+public final class BaseMessageEventUtils {
   /**
    * Cast or convert a {@link io.opencensus.trace.BaseMessageEvent} to {@link
    * io.opencensus.trace.MessageEvent}.
@@ -78,5 +78,5 @@ public final class BaseMessageEventUtil {
         .build();
   }
 
-  private BaseMessageEventUtil() {}
+  private BaseMessageEventUtils() {}
 }
diff --git a/api/src/test/java/io/opencensus/internal/StringUtilTest.java b/api/src/test/java/io/opencensus/internal/StringUtilsTest.java
index b5c74be0..5e866940 100644
--- a/api/src/test/java/io/opencensus/internal/StringUtilTest.java
+++ b/api/src/test/java/io/opencensus/internal/StringUtilsTest.java
@@ -23,13 +23,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Tests for {@link StringUtil}. */
+/** Tests for {@link StringUtils}. */
 @RunWith(JUnit4.class)
-public final class StringUtilTest {
+public final class StringUtilsTest {
 
   @Test
   public void isPrintableString() {
-    assertTrue(StringUtil.isPrintableString("abcd"));
-    assertFalse(StringUtil.isPrintableString("\2ab\3cd"));
+    assertTrue(StringUtils.isPrintableString("abcd"));
+    assertFalse(StringUtils.isPrintableString("\2ab\3cd"));
   }
 }
diff --git a/api/src/test/java/io/opencensus/trace/internal/BaseMessageEventUtilTest.java b/api/src/test/java/io/opencensus/trace/internal/BaseMessageEventUtilsTest.java
index 2d02d403..4f8c8508 100644
--- a/api/src/test/java/io/opencensus/trace/internal/BaseMessageEventUtilTest.java
+++ b/api/src/test/java/io/opencensus/trace/internal/BaseMessageEventUtilsTest.java
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Unit tests for {@link BaseMessageEventUtil}. */
+/** Unit tests for {@link BaseMessageEventUtils}. */
 @RunWith(JUnit4.class)
-public class BaseMessageEventUtilTest {
+public class BaseMessageEventUtilsTest {
   private static final long SENT_EVENT_ID = 12345L;
   private static final long RECV_EVENT_ID = 67890L;
   private static final long UNCOMPRESSED_SIZE = 100;
@@ -55,17 +55,17 @@ public class BaseMessageEventUtilTest {
 
   @Test
   public void networkEventToMessageEvent() {
-    assertThat(BaseMessageEventUtil.asMessageEvent(SENT_NETWORK_EVENT))
+    assertThat(BaseMessageEventUtils.asMessageEvent(SENT_NETWORK_EVENT))
         .isEqualTo(SENT_MESSAGE_EVENT);
-    assertThat(BaseMessageEventUtil.asMessageEvent(RECV_NETWORK_EVENT))
+    assertThat(BaseMessageEventUtils.asMessageEvent(RECV_NETWORK_EVENT))
         .isEqualTo(RECV_MESSAGE_EVENT);
   }
 
   @Test
   public void messageEventToNetworkEvent() {
-    assertThat(BaseMessageEventUtil.asNetworkEvent(SENT_MESSAGE_EVENT))
+    assertThat(BaseMessageEventUtils.asNetworkEvent(SENT_MESSAGE_EVENT))
         .isEqualTo(SENT_NETWORK_EVENT);
-    assertThat(BaseMessageEventUtil.asNetworkEvent(RECV_MESSAGE_EVENT))
+    assertThat(BaseMessageEventUtils.asNetworkEvent(RECV_MESSAGE_EVENT))
         .isEqualTo(RECV_NETWORK_EVENT);
   }
 }
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index c6658d9d..9de28c1c 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -20,7 +20,7 @@
   <Match>
     <!-- Reason: BaseMessageEvent only has two visible subclasses. -->
     <Bug pattern="BC_UNCONFIRMED_CAST"/>
-    <Class name="io.opencensus.trace.internal.BaseMessageEventUtil" />
+    <Class name="io.opencensus.trace.internal.BaseMessageEventUtils" />
   </Match>
 
   <!-- Suppress some FindBugs warnings related to performance or robustness -->