Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/java/core/src/main/java/com/google/protobuf/Descriptors.java

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 853 matching lines @@
     }
 
     /** See {@link FileDescriptor#setProto}. */
     private void setProto(final DescriptorProto proto) {
       this.proto = proto;
 
       for (int i = 0; i < nestedTypes.length; i++) {
         nestedTypes[i].setProto(proto.getNestedType(i));
       }
 
-      for (int i = 0; i < oneofs.length; i++) {
-        oneofs[i].setProto(proto.getOneofDecl(i));
-      }
-
       for (int i = 0; i < enumTypes.length; i++) {
         enumTypes[i].setProto(proto.getEnumType(i));
       }
 
       for (int i = 0; i < fields.length; i++) {
         fields[i].setProto(proto.getField(i));
       }
 
       for (int i = 0; i < extensions.length; i++) {
         extensions[i].setProto(proto.getExtension(i));
@@ skipping 317 matching lines @@
         this.defaultDefault = defaultDefault;
       }
 
       /**
        * The default default value for fields of this type, if it's a primitive
        * type.  This is meant for use inside this file only, hence is private.
        */
       private final Object defaultDefault;
     }
 
-    // This method should match exactly with the ToJsonName() function in C++
-    // descriptor.cc.
-    private static String fieldNameToJsonName(String name) {
+    // TODO(xiaofeng): Implement it consistently across different languages. See b/24751348.
+    private static String fieldNameToLowerCamelCase(String name) {
       StringBuilder result = new StringBuilder(name.length());
       boolean isNextUpperCase = false;
       for (int i = 0; i < name.length(); i++) {
         Character ch = name.charAt(i);
-        if (ch == '_') {
-          isNextUpperCase = true;
-        } else if (isNextUpperCase) {
-          result.append(Character.toUpperCase(ch));
+        if (Character.isLowerCase(ch)) {
+          if (isNextUpperCase) {
+            result.append(Character.toUpperCase(ch));
+          } else {
+            result.append(ch);
+          }
+          isNextUpperCase = false;
+        } else if (Character.isUpperCase(ch)) {
+          if (i == 0) {
+            // Force first letter to lower-case.
+            result.append(Character.toLowerCase(ch));
+          } else {
+            // Capital letters after the first are left as-is.
+            result.append(ch);
+          }
+          isNextUpperCase = false;
+        } else if (Character.isDigit(ch)) {
+          result.append(ch);
           isNextUpperCase = false;
         } else {
-          result.append(ch);
+          isNextUpperCase = true;
         }
       }
       return result.toString();
     }
 
     private FieldDescriptor(final FieldDescriptorProto proto,
                             final FileDescriptor file,
                             final Descriptor parent,
                             final int index,
                             final boolean isExtension)
                      throws DescriptorValidationException {
       this.index = index;
       this.proto = proto;
       fullName = computeFullName(file, parent, proto.getName());
       this.file = file;
       if (proto.hasJsonName()) {
         jsonName = proto.getJsonName();
       } else {
-        jsonName = fieldNameToJsonName(proto.getName());
+        jsonName = fieldNameToLowerCamelCase(proto.getName());
       }
 
       if (proto.hasType()) {
         type = Type.valueOf(proto.getType());
       }
 
       if (getNumber() <= 0) {
         throw new DescriptorValidationException(this,
           "Field numbers must be positive integers.");
       }
@@ skipping 858 matching lines @@
         importPublicDependencies(dependencies[i]);
       }
 
       for (final FileDescriptor dependency : this.dependencies) {
         try {
           addPackage(dependency.getPackage(), dependency);
         } catch (DescriptorValidationException e) {
           // Can't happen, because addPackage() only fails when the name
           // conflicts with a non-package, but we have not yet added any
           // non-packages at this point.
-          throw new AssertionError(e);
+          assert false;
         }
       }
     }
 
     /** Find and put public dependencies of the file into dependencies set.*/
     private void importPublicDependencies(final FileDescriptor file) {
       for (FileDescriptor dependency : file.getPublicDependencies()) {
         if (dependencies.add(dependency)) {
           importPublicDependencies(dependency);
         }
@@ skipping 360 matching lines @@
     public String getName() { return proto.getName(); }
 
     public FileDescriptor getFile() { return file; }
 
     public String getFullName() { return fullName; }
 
     public Descriptor getContainingType() { return containingType; }
 
     public int getFieldCount() { return fieldCount; }
 
-    public OneofOptions getOptions() {
-      return proto.getOptions();
-    }
-
     /** Get a list of this message type's fields. */
     public List<FieldDescriptor> getFields() {
       return Collections.unmodifiableList(Arrays.asList(fields));
     }
 
     public FieldDescriptor getField(int index) {
       return fields[index];
     }
 
-    private void setProto(final OneofDescriptorProto proto) {
-      this.proto = proto;
-    }
-
     private OneofDescriptor(final OneofDescriptorProto proto,
                             final FileDescriptor file,
                             final Descriptor parent,
                             final int index)
                      throws DescriptorValidationException {
       this.proto = proto;
       fullName = computeFullName(file, parent, proto.getName());
       this.file = file;
       this.index = index;
 
       containingType = parent;
       fieldCount = 0;
     }
 
     private final int index;
     private OneofDescriptorProto proto;
     private final String fullName;
     private final FileDescriptor file;
 
     private Descriptor containingType;
     private int fieldCount;
     private FieldDescriptor[] fields;
   }
 }