Revert "third_party/protobuf: Update to HEAD (5f65ee6ac7)"

third_party/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java

Index: third_party/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
diff --git a/third_party/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java b/third_party/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
index 21d11b2ce759a88355f4fcb55f3db39411c687c9..969615210c4fceeb265107e1ec0bbd9cb3d2f4fb 100644
--- a/third_party/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
+++ b/third_party/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
@@ -32,9 +32,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.Splitter;
 import com.google.common.primitives.Ints;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
@@ -42,9 +39,7 @@ import com.google.protobuf.FieldMask;
 import com.google.protobuf.Internal;
 import com.google.protobuf.Message;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * Utility helper functions to work with {@link com.google.protobuf.FieldMask}.
@@ -53,7 +48,7 @@ public class FieldMaskUtil {
   private static final String FIELD_PATH_SEPARATOR = ",";
   private static final String FIELD_PATH_SEPARATOR_REGEX = ",";
   private static final String FIELD_SEPARATOR_REGEX = "\\.";
-
+  
   private FieldMaskUtil() {}
 
   /**
@@ -83,17 +78,19 @@ public class FieldMaskUtil {
    */
   public static FieldMask fromString(String value) {
     // TODO(xiaofeng): Consider using com.google.common.base.Splitter here instead.
-    return fromStringList(null, Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
+    return fromStringList(
+        null, Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
   }
 
   /**
    * Parses from a string to a FieldMask and validates all field paths.
-   *
+   * 
    * @throws IllegalArgumentException if any of the field path is invalid.
    */
   public static FieldMask fromString(Class<? extends Message> type, String value) {
     // TODO(xiaofeng): Consider using com.google.common.base.Splitter here instead.
-    return fromStringList(type, Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
+    return fromStringList(
+        type, Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
   }
 
   /**
@@ -102,7 +99,8 @@ public class FieldMaskUtil {
    * @throws IllegalArgumentException if any of the field path is not valid.
    */
   // TODO(xiaofeng): Consider renaming fromStrings()
-  public static FieldMask fromStringList(Class<? extends Message> type, Iterable<String> paths) {
+  public static FieldMask fromStringList(
+      Class<? extends Message> type, Iterable<String> paths) {
     FieldMask.Builder builder = FieldMask.newBuilder();
     for (String path : paths) {
       if (path.isEmpty()) {
@@ -110,7 +108,8 @@ public class FieldMaskUtil {
         continue;
       }
       if (type != null && !isValid(type, path)) {
-        throw new IllegalArgumentException(path + " is not a valid path for " + type);
+        throw new IllegalArgumentException(
+            path + " is not a valid path for " + type);
       }
       builder.addPaths(path);
     }
@@ -147,45 +146,15 @@ public class FieldMaskUtil {
   }
 
   /**
-   * 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.
-   */
-  public static String toJsonString(FieldMask fieldMask) {
-    List<String> paths = new ArrayList<String>(fieldMask.getPathsCount());
-    for (String path : fieldMask.getPathsList()) {
-      if (path.isEmpty()) {
-        continue;
-      }
-      paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
-    }
-    return Joiner.on(FIELD_PATH_SEPARATOR).join(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.
-   */
-  public static FieldMask fromJsonString(String value) {
-    Iterable<String> paths = Splitter.on(FIELD_PATH_SEPARATOR).split(value);
-    FieldMask.Builder builder = FieldMask.newBuilder();
-    for (String path : paths) {
-      if (path.isEmpty()) {
-        continue;
-      }
-      builder.addPaths(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, path));
-    }
-    return builder.build();
-  }
-
-  /**
    * Checks whether paths in a given fields mask are valid.
    */
   public static boolean isValid(Class<? extends Message> type, FieldMask fieldMask) {
-    Descriptor descriptor = Internal.getDefaultInstance(type).getDescriptorForType();
-
+    Descriptor descriptor =
+        Internal.getDefaultInstance(type).getDescriptorForType();
+    
     return isValid(descriptor, fieldMask);
   }
-
+  
   /**
    * Checks whether paths in a given fields mask are valid.
    */
@@ -202,8 +171,9 @@ public class FieldMaskUtil {
    * Checks whether a given field path is valid.
    */
   public static boolean isValid(Class<? extends Message> type, String path) {
-    Descriptor descriptor = Internal.getDefaultInstance(type).getDescriptorForType();
-
+    Descriptor descriptor =
+        Internal.getDefaultInstance(type).getDescriptorForType();
+    
     return isValid(descriptor, path);
   }
 
@@ -223,7 +193,8 @@ public class FieldMaskUtil {
       if (field == null) {
         return false;
       }
-      if (!field.isRepeated() && field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
+      if (!field.isRepeated()
+          && field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
         descriptor = field.getMessageType();
       } else {
         descriptor = null;
@@ -231,7 +202,7 @@ public class FieldMaskUtil {
     }
     return true;
   }
-
+  
   /**
    * Converts a FieldMask to its canonical form. In the canonical form of a
    * FieldMask, all field paths are sorted alphabetically and redundant field
@@ -280,7 +251,7 @@ public class FieldMaskUtil {
      * destination message fields) when merging.
      * Default behavior is to merge the source message field into the
      * destination message field.
-     */
+     */ 
     public boolean replaceMessageFields() {
       return replaceMessageFields;
     }
@@ -328,15 +299,16 @@ public class FieldMaskUtil {
    * Merges fields specified by a FieldMask from one message to another with the
    * specified merge options.
    */
-  public static void merge(
-      FieldMask mask, Message source, Message.Builder destination, MergeOptions options) {
+  public static void merge(FieldMask mask, Message source,
+      Message.Builder destination, MergeOptions options) {
     new FieldMaskTree(mask).merge(source, destination, options);
   }
 
   /**
    * Merges fields specified by a FieldMask from one message to another.
    */
-  public static void merge(FieldMask mask, Message source, Message.Builder destination) {
+  public static void merge(FieldMask mask, Message source,
+      Message.Builder destination) {
     merge(mask, source, destination, new MergeOptions());
   }
 }