Remove protobuf-util usages of guava except annotations.

protobuf-github-bot · copybara-github · commit 5768acddf239 · 2025-08-14T11:34:28.000-07:00
The annotations will be handled in a subsequent change. The change to use java.lang.String.split() instead of Guava's Splitter does introduce behavior changes in the case of handling of degenerate/malformed FieldMask paths (paths like `a///`). The handling of malformed paths shape are already arbitrary and inconsistent between the different methods in this file, and callers should not construct such paths. In a future change we may consider validating and throwing an IllegalArgumentException on such malformed paths more explicitly. #21173 PiperOrigin-RevId: 795126095
diff --git a/java/util/src/main/java/com/google/protobuf/util/Durations.java b/java/util/src/main/java/com/google/protobuf/util/Durations.java
@@ -7,7 +7,6 @@
 
 package com.google.protobuf.util;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.protobuf.util.Timestamps.MICROS_PER_SECOND;
 import static com.google.protobuf.util.Timestamps.MILLIS_PER_SECOND;
 import static com.google.protobuf.util.Timestamps.NANOS_PER_MICROSECOND;
@@ -19,7 +18,6 @@
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import com.google.common.base.Strings;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.CompileTimeConstant;
 import com.google.j2objc.annotations.J2ObjCIncompatible;
@@ -146,7 +144,10 @@ public static boolean isPositive(Duration duration) {
   @J2ktIncompatible
   @J2ObjCIncompatible
   public static Duration checkNotNegative(Duration duration) {
-    checkArgument(!isNegative(duration), "duration (%s) must not be negative", toString(duration));
+    if (isNegative(duration)) {
+      throw new IllegalArgumentException(
+          "duration (" + toString(duration) + ") must not be negative");
+    }
     return duration;
   }
 
@@ -161,7 +162,9 @@ public static Duration checkNotNegative(Duration duration) {
   @J2ktIncompatible
   @J2ObjCIncompatible
   public static Duration checkPositive(Duration duration) {
-    checkArgument(isPositive(duration), "duration (%s) must be positive", toString(duration));
+    if (!isPositive(duration)) {
+      throw new IllegalArgumentException("duration (" + toString(duration) + ") must be positive");
+    }
     return duration;
   }
 
@@ -172,12 +175,14 @@ public static Duration checkValid(Duration duration) {
     int nanos = duration.getNanos();
     if (!isValid(seconds, nanos)) {
       throw new IllegalArgumentException(
-          Strings.lenientFormat(
-              "Duration is not valid. See proto definition for valid values. "
-                  + "Seconds (%s) must be in range [-315,576,000,000, +315,576,000,000]. "
-                  + "Nanos (%s) must be in range [-999,999,999, +999,999,999]. "
-                  + "Nanos must have the same sign as seconds",
-              seconds, nanos));
+          "Duration is not valid. See proto definition for valid values. "
+              + "Seconds ("
+              + seconds
+              + ") must be in range [-315,576,000,000, +315,576,000,000]. "
+              + "Nanos ("
+              + nanos
+              + ") must be in range [-999,999,999, +999,999,999]. "
+              + "Nanos must have the same sign as seconds");
     }
     return duration;
   }
diff --git a/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java b/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
@@ -7,14 +7,14 @@
 
 package com.google.protobuf.util;
 
-import com.google.common.base.Splitter;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.FieldMask;
 import com.google.protobuf.GeneratedMessage;
 import com.google.protobuf.Message;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.SortedMap;
@@ -125,8 +125,12 @@ FieldMaskTree mergeFromFieldMask(FieldMask mask) {
    * </ul>
    */
   @CanIgnoreReturnValue
+  @SuppressWarnings("StringSplitter")
   FieldMaskTree removeFieldPath(String path) {
-    List<String> parts = Splitter.onPattern(FIELD_PATH_SEPARATOR_REGEX).splitToList(path);
+    if (path.isEmpty()) {
+      return this;
+    }
+    List<String> parts = Arrays.asList(path.split(FIELD_PATH_SEPARATOR_REGEX));
     if (parts.isEmpty()) {
       return this;
     }
@@ -191,6 +195,7 @@ private static void getFieldPaths(Node node, String path, List<String> paths) {
   }
 
   /** Adds the intersection of this tree with the given {@code path} to {@code output}. */
+  @SuppressWarnings("StringSplitter")
   void intersectFieldPath(String path, FieldMaskTree output) {
     if (root.children.isEmpty()) {
       return;
diff --git a/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java b/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
@@ -7,13 +7,6 @@
 
 package com.google.protobuf.util;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.base.Splitter;
-import com.google.common.primitives.Ints;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
@@ -23,6 +16,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 /** Utility helper functions to work with {@link com.google.protobuf.FieldMask}. */
@@ -35,7 +30,6 @@ private FieldMaskUtil() {}
 
   /** Converts a FieldMask to a string. */
   public static String toString(FieldMask fieldMask) {
-    // TODO: Consider using com.google.common.base.Joiner here instead.
     StringBuilder result = new StringBuilder();
     boolean first = true;
     for (String value : fieldMask.getPathsList()) {
@@ -55,7 +49,6 @@ public static String toString(FieldMask fieldMask) {
 
   /** Parses from a string to a FieldMask. */
   public static FieldMask fromString(String value) {
-    // TODO: Consider using com.google.common.base.Splitter here instead.
     return fromStringList(Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
   }
 
@@ -65,7 +58,6 @@ public static FieldMask fromString(String value) {
    * @throws IllegalArgumentException if any of the field path is invalid.
    */
   public static FieldMask fromString(Class<? extends Message> type, String value) {
-    // TODO: Consider using com.google.common.base.Splitter here instead.
     return fromStringList(type, Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
   }
 
@@ -92,7 +84,7 @@ public static FieldMask fromStringList(Descriptor descriptor, Iterable<String> p
    * paths.
    */
   public static FieldMask fromStringList(Iterable<String> paths) {
-    return fromStringList(Optional.<Descriptor>absent(), paths);
+    return fromStringList(Optional.<Descriptor>empty(), paths);
   }
 
   private static FieldMask fromStringList(Optional<Descriptor> descriptor, Iterable<String> paths) {
@@ -117,7 +109,7 @@ private static FieldMask fromStringList(Optional<Descriptor> descriptor, Iterabl
    * @throws IllegalArgumentException if any of the fields are invalid for the message.
    */
   public static FieldMask fromFieldNumbers(Class<? extends Message> type, int... fieldNumbers) {
-    return fromFieldNumbers(type, Ints.asList(fieldNumbers));
+    return fromFieldNumbers(type, Arrays.stream(fieldNumbers).boxed().collect(Collectors.toList()));
   }
 
   /**
@@ -128,16 +120,50 @@ public static FieldMask fromFieldNumbers(Class<? extends Message> type, int... f
   public static FieldMask fromFieldNumbers(
       Class<? extends Message> type, Iterable<Integer> fieldNumbers) {
     Descriptor descriptor = Internal.getDefaultInstance(type).getDescriptorForType();
-
     FieldMask.Builder builder = FieldMask.newBuilder();
     for (Integer fieldNumber : fieldNumbers) {
       FieldDescriptor field = descriptor.findFieldByNumber(fieldNumber);
-      checkArgument(field != null, "%s is not a valid field number for %s.", fieldNumber, type);
+      if (field == null) {
+        throw new IllegalArgumentException(
+            String.format(
+                "%s is not a valid field number for %s.", fieldNumber, descriptor.getFullName()));
+      }
       builder.addPaths(field.getName());
     }
     return builder.build();
   }
 
+  /** Converts a lower_underscore to lowerCamelCase style. */
+  private static String lowerUnderscoreToLowerCamel(String str) {
+    StringBuilder sb = new StringBuilder();
+    boolean capitalizeNext = false;
+    for (int i = 0; i < str.length(); i++) {
+      char c = str.charAt(i);
+      if (c == '_') {
+        capitalizeNext = true;
+      } else if (capitalizeNext) {
+        sb.append(Character.toUpperCase(c));
+        capitalizeNext = false;
+      } else {
+        sb.append(Character.toLowerCase(c));
+      }
+    }
+    return sb.toString();
+  }
+
+  /** Converts a lowerCamelCase string to lower_underscore style. */
+  private static String lowerCamelToLowerUnderscore(String str) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < str.length(); i++) {
+      char c = str.charAt(i);
+      if (c >= 'A' && c <= 'Z') {
+        sb.append('_');
+      }
+      sb.append(Character.toLowerCase(c));
+    }
+    return sb.toString();
+  }
+
   /**
    * Converts a field mask to a Proto3 JSON string, that is converting from snake case to camel case
    * and joining all paths into one string with commas.
@@ -148,23 +174,24 @@ public static String toJsonString(FieldMask fieldMask) {
       if (path.isEmpty()) {
         continue;
       }
-      paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
+      paths.add(lowerUnderscoreToLowerCamel(path));
     }
-    return Joiner.on(FIELD_PATH_SEPARATOR).join(paths);
+    return String.join(FIELD_PATH_SEPARATOR, paths);
   }
 
   /**
    * Converts a field mask from a Proto3 JSON string, that is splitting the paths along commas and
    * converting from camel case to snake case.
    */
+  @SuppressWarnings("StringSplitter")
   public static FieldMask fromJsonString(String value) {
-    Iterable<String> paths = Splitter.on(FIELD_PATH_SEPARATOR).split(value);
+    String[] paths = value.split(FIELD_PATH_SEPARATOR);
     FieldMask.Builder builder = FieldMask.newBuilder();
     for (String path : paths) {
       if (path.isEmpty()) {
         continue;
       }
-      builder.addPaths(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, path));
+      builder.addPaths(lowerCamelToLowerUnderscore(path));
     }
     return builder.build();
   }
diff --git a/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java b/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
@@ -7,9 +7,6 @@
 
 package com.google.protobuf.util;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.BaseEncoding;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -54,6 +51,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.ParseException;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -83,7 +81,7 @@ public static Printer printer() {
         com.google.protobuf.TypeRegistry.getEmptyTypeRegistry(),
         TypeRegistry.getEmptyTypeRegistry(),
         ShouldPrintDefaults.ONLY_IF_PRESENT,
-        /* includingDefaultValueFields */ ImmutableSet.of(),
+        /* includingDefaultValueFields */ Collections.emptySet(),
         /* preservingProtoFieldNames */ false,
         /* omittingInsignificantWhitespace */ false,
         /* printingEnumsAsInts */ false,
@@ -196,7 +194,7 @@ public Printer includingDefaultValueFields() {
           registry,
           oldRegistry,
           ShouldPrintDefaults.ALWAYS_PRINT_EXCEPT_MESSAGES_AND_ONEOFS,
-          ImmutableSet.of(),
+          Collections.emptySet(),
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
@@ -213,9 +211,10 @@ public Printer includingDefaultValueFields() {
      * here.
      */
     public Printer includingDefaultValueFields(Set<FieldDescriptor> fieldsToAlwaysOutput) {
-      Preconditions.checkArgument(
-          null != fieldsToAlwaysOutput && !fieldsToAlwaysOutput.isEmpty(),
-          "Non-empty Set must be supplied for includingDefaultValueFields.");
+      if (fieldsToAlwaysOutput == null || fieldsToAlwaysOutput.isEmpty()) {
+        throw new IllegalArgumentException(
+            "Non-empty Set must be supplied for includingDefaultValueFields.");
+      }
       if (shouldPrintDefaults != ShouldPrintDefaults.ONLY_IF_PRESENT) {
         throw new IllegalStateException(
             "JsonFormat includingDefaultValueFields has already been set.");
@@ -224,7 +223,7 @@ public Printer includingDefaultValueFields(Set<FieldDescriptor> fieldsToAlwaysOu
           registry,
           oldRegistry,
           ShouldPrintDefaults.ALWAYS_PRINT_SPECIFIED_FIELDS,
-          ImmutableSet.copyOf(fieldsToAlwaysOutput),
+          Collections.unmodifiableSet(new HashSet<>(fieldsToAlwaysOutput)),
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
@@ -245,7 +244,7 @@ public Printer alwaysPrintFieldsWithNoPresence() {
           registry,
           oldRegistry,
           ShouldPrintDefaults.ALWAYS_PRINT_WITHOUT_PRESENCE_FIELDS,
-          ImmutableSet.of(),
+          Collections.emptySet(),
           preservingProtoFieldNames,
           omittingInsignificantWhitespace,
           printingEnumsAsInts,
@@ -1251,7 +1250,7 @@ private void printSingleFieldValue(
 
         case BYTES:
           generator.print("\"");
-          generator.print(BaseEncoding.base64().encode(((ByteString) value).toByteArray()));
+          generator.print(Base64.getEncoder().encodeToString(((ByteString) value).toByteArray()));
           generator.print("\"");
           break;
 
@@ -1906,9 +1905,9 @@ private String parseString(JsonElement json) {
 
     private ByteString parseBytes(JsonElement json) {
       try {
-        return ByteString.copyFrom(BaseEncoding.base64().decode(json.getAsString()));
+        return ByteString.copyFrom(Base64.getDecoder().decode(json.getAsString()));
       } catch (IllegalArgumentException e) {
-        return ByteString.copyFrom(BaseEncoding.base64Url().decode(json.getAsString()));
+        return ByteString.copyFrom(Base64.getUrlDecoder().decode(json.getAsString()));
       }
     }
 
@@ -1964,7 +1963,7 @@ private Object parseFieldValue(FieldDescriptor field, JsonElement json, Message.
           // If the field type is primitive, but the json type is JsonObject rather than
           // JsonElement, throw a type mismatch error.
           throw new InvalidProtocolBufferException(
-              String.format("Invalid value: %s for expected type: %s", json, field.getType()));
+              "Invalid value: " + json + " for expected type: " + field.getType());
         }
       }
       switch (field.getType()) {
diff --git a/java/util/src/main/java/com/google/protobuf/util/Timestamps.java b/java/util/src/main/java/com/google/protobuf/util/Timestamps.java
@@ -13,7 +13,6 @@
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
-import com.google.common.base.Strings;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.CompileTimeConstant;
 import com.google.j2objc.annotations.J2ObjCIncompatible;
@@ -170,11 +169,13 @@ public static Timestamp checkValid(Timestamp timestamp) {
     int nanos = timestamp.getNanos();
     if (!isValid(seconds, nanos)) {
       throw new IllegalArgumentException(
-          Strings.lenientFormat(
-              "Timestamp is not valid. See proto definition for valid values. "
-                  + "Seconds (%s) must be in range [-62,135,596,800, +253,402,300,799]. "
-                  + "Nanos (%s) must be in range [0, +999,999,999].",
-              seconds, nanos));
+          "Timestamp is not valid. See proto definition for valid values. "
+              + "Seconds ("
+              + seconds
+              + ") must be in range [-62,135,596,800, +253,402,300,799]. "
+              + "Nanos ("
+              + nanos
+              + ") must be in range [0, +999,999,999].");
     }
     return timestamp;
   }
@@ -504,10 +505,10 @@ static Timestamp normalizedTimestamp(long seconds, int nanos) {
     // when normalized.
     if (!isValidSeconds(seconds)) {
       throw new IllegalArgumentException(
-          Strings.lenientFormat(
-              "Timestamp is not valid. Input seconds is too large. "
-                  + "Seconds (%s) must be in range [-62,135,596,800, +253,402,300,799]. ",
-              seconds));
+          "Timestamp is not valid. Input seconds is too large. "
+              + "Seconds ("
+              + seconds
+              + ") must be in range [-62,135,596,800, +253,402,300,799]. ");
     }
     if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
       seconds = addExact(seconds, nanos / NANOS_PER_SECOND);
