Merge branch 'master' into conformance-build

Author: haberman

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

@@ -2119,11 +2119,12 @@ private static String computeFullName(
   /**
    * All descriptors implement this to make it easier to implement tools like {@code
    * DescriptorPool}.
-   *
-   * <p>This class is public so that the methods it exposes can be called from outside of this
-   * package. However, it should only be subclassed from nested classes of Descriptors.
    */
   public abstract static class GenericDescriptor {
+
+    // Private constructor to prevent subclasses outside of com.google.protobuf.Descriptors
+    private GenericDescriptor() {}
+
     public abstract Message toProto();
 
     public abstract String getName();
@@ -2593,20 +2594,23 @@ static void validateSymbolName(final GenericDescriptor descriptor)
   }
 
   /** Describes an oneof of a message type. */
-  public static final class OneofDescriptor {
+  public static final class OneofDescriptor extends GenericDescriptor {
     /** Get the index of this descriptor within its parent. */
     public int getIndex() {
       return index;
     }
 
+    @Override
     public String getName() {
       return proto.getName();
     }
 
+    @Override
     public FileDescriptor getFile() {
       return file;
     }
 
+    @Override
     public String getFullName() {
       return fullName;
     }
@@ -2632,6 +2636,11 @@ public FieldDescriptor getField(int index) {
       return fields[index];
     }
 
+    @Override
+    public OneofDescriptorProto toProto() {
+      return proto;
+    }
+
     private void setProto(final OneofDescriptorProto proto) {
       this.proto = proto;
     }

js/binary/decoder_test.js

@@ -255,7 +255,6 @@ describe('binaryDecoderTest', function() {
 
   /**
    * Verifies that misuse of the decoder class triggers assertions.
-   * @suppress {checkTypes|visibility}
    */
   it('testDecodeErrors', function() {
     // Reading a value past the end of the stream should trigger an assertion.

python/google/protobuf/descriptor_pool.py

@@ -164,7 +164,10 @@ def _CheckConflictRegister(self, desc, desc_name, file_name):
           warn_msg = ('Conflict register for file "' + file_name +
                       '": ' + desc_name +
                       ' is already defined in file "' +
-                      old_file + '"')
+                      old_file + '". Please fix the conflict by adding '
+                      'package name on the proto file, or use different '
+                      'name for the duplication. This warning will '
+                      'turn into error soon.')
           if isinstance(desc, descriptor.EnumValueDescriptor):
             warn_msg += ('\nNote: enum values appear as '
                          'siblings of the enum type instead of '

python/google/protobuf/internal/well_known_types.py

@@ -67,6 +67,8 @@
 class Any(object):
   """Class for Any Message type."""
 
+  __slots__ = ()
+
   def Pack(self, msg, type_url_prefix='type.googleapis.com/',
            deterministic=None):
     """Packs the specified message into current Any message."""
@@ -100,6 +102,8 @@ def Is(self, descriptor):
 class Timestamp(object):
   """Class for Timestamp message type."""
 
+  __slots__ = ()
+
   def ToJsonString(self):
     """Converts Timestamp to RFC 3339 date string format.
 
@@ -250,6 +254,8 @@ def FromDatetime(self, dt):
 class Duration(object):
   """Class for Duration message type."""
 
+  __slots__ = ()
+
   def ToJsonString(self):
     """Converts Duration to string format.
 
@@ -407,6 +413,8 @@ def _RoundTowardZero(value, divider):
 class FieldMask(object):
   """Class for FieldMask message type."""
 
+  __slots__ = ()
+
   def ToJsonString(self):
     """Converts FieldMask to string according to proto3 JSON spec."""
     camelcase_paths = []
@@ -563,6 +571,8 @@ class _FieldMaskTree(object):
   In the tree, each leaf node represents a field path.
   """
 
+  __slots__ = ('_root',)
+
   def __init__(self, field_mask=None):
     """Initializes the tree by FieldMask."""
     self._root = {}
@@ -743,7 +753,7 @@ def _GetStructValue(struct_value):
 class Struct(object):
   """Class for Struct message type."""
 
-  __slots__ = []
+  __slots__ = ()
 
   def __getitem__(self, key):
     return _GetStructValue(self.fields[key])
@@ -796,6 +806,8 @@ def update(self, dictionary):  # pylint: disable=invalid-name
 class ListValue(object):
   """Class for ListValue message type."""
 
+  __slots__ = ()
+
   def __len__(self):
     return len(self.values)
 

ruby/ext/google/protobuf_c/map.c

@@ -538,8 +538,8 @@ VALUE Map_dup(VALUE _self) {
   return new_map;
 }
 
-// Used by Google::Protobuf.deep_copy but not exposed directly.
-VALUE Map_deep_copy(VALUE _self) {
+/* :nodoc: */
+static VALUE Map_deep_copy(VALUE _self) {
   Map* self = ruby_to_Map(_self);
   VALUE new_map = Map_new_this_type(_self);
   Map* new_self = ruby_to_Map(new_map);
@@ -851,5 +851,6 @@ void Map_register(VALUE module) {
   rb_define_method(klass, "to_h", Map_to_h, 0);
   rb_define_method(klass, "inspect", Map_inspect, 0);
   rb_define_method(klass, "merge", Map_merge, 1);
+  rb_define_method(klass, "deep_copy", Map_deep_copy, 0);
   rb_include_module(klass, rb_mEnumerable);
 }

ruby/ext/google/protobuf_c/message.c

@@ -511,8 +511,8 @@ VALUE Message_dup(VALUE _self) {
   return new_msg;
 }
 
-// Internal only; used by Google::Protobuf.deep_copy.
-VALUE Message_deep_copy(VALUE _self) {
+/* :nodoc: */
+static VALUE Message_deep_copy(VALUE _self) {
   MessageHeader* self;
   MessageHeader* new_msg_self;
   VALUE new_msg;
@@ -742,6 +742,7 @@ VALUE build_class_from_descriptor(Descriptor* desc) {
   rb_define_method(klass, "to_s", Message_inspect, 0);
   rb_define_method(klass, "[]", Message_index, 1);
   rb_define_method(klass, "[]=", Message_index_set, 2);
+  rb_define_method(klass, "deep_copy", Message_deep_copy, 0);
   rb_define_singleton_method(klass, "decode", Message_decode, 1);
   rb_define_singleton_method(klass, "encode", Message_encode, 1);
   rb_define_singleton_method(klass, "decode_json", Message_decode_json, -1);
@@ -829,21 +830,3 @@ VALUE build_module_from_enumdesc(EnumDescriptor* enumdesc) {
 
   return mod;
 }
-
-/*
- * call-seq:
- *     Google::Protobuf.deep_copy(obj) => copy_of_obj
- *
- * Performs a deep copy of a RepeatedField instance, a Map instance, or a
- * message object, recursively copying its members.
- */
-VALUE Google_Protobuf_deep_copy(VALUE self, VALUE obj) {
-  VALUE klass = CLASS_OF(obj);
-  if (klass == cRepeatedField) {
-    return RepeatedField_deep_copy(obj);
-  } else if (klass == cMap) {
-    return Map_deep_copy(obj);
-  } else {
-    return Message_deep_copy(obj);
-  }
-}

ruby/ext/google/protobuf_c/protobuf.h

@@ -425,7 +425,6 @@ VALUE RepeatedField_replace(VALUE _self, VALUE list);
 VALUE RepeatedField_clear(VALUE _self);
 VALUE RepeatedField_length(VALUE _self);
 VALUE RepeatedField_dup(VALUE _self);
-VALUE RepeatedField_deep_copy(VALUE _self);
 VALUE RepeatedField_to_ary(VALUE _self);
 VALUE RepeatedField_eq(VALUE _self, VALUE _other);
 VALUE RepeatedField_hash(VALUE _self);
@@ -469,7 +468,6 @@ VALUE Map_delete(VALUE _self, VALUE key);
 VALUE Map_clear(VALUE _self);
 VALUE Map_length(VALUE _self);
 VALUE Map_dup(VALUE _self);
-VALUE Map_deep_copy(VALUE _self);
 VALUE Map_eq(VALUE _self, VALUE _other);
 VALUE Map_hash(VALUE _self);
 VALUE Map_to_h(VALUE _self);
@@ -564,7 +562,6 @@ VALUE Message_alloc(VALUE klass);
 VALUE Message_method_missing(int argc, VALUE* argv, VALUE _self);
 VALUE Message_initialize(int argc, VALUE* argv, VALUE _self);
 VALUE Message_dup(VALUE _self);
-VALUE Message_deep_copy(VALUE _self);
 VALUE Message_eq(VALUE _self, VALUE _other);
 VALUE Message_hash(VALUE _self);
 VALUE Message_inspect(VALUE _self);

ruby/ext/google/protobuf_c/repeated_field.c

@@ -355,8 +355,8 @@ VALUE RepeatedField_dup(VALUE _self) {
   return new_rptfield;
 }
 
-// Internal only: used by Google::Protobuf.deep_copy.
-VALUE RepeatedField_deep_copy(VALUE _self) {
+/* :nodoc: */
+static VALUE RepeatedField_deep_copy(VALUE _self) {
   RepeatedField* self = ruby_to_RepeatedField(_self);
   VALUE new_rptfield = RepeatedField_new_this_type(_self);
   RepeatedField* new_rptfield_self = ruby_to_RepeatedField(new_rptfield);
@@ -656,5 +656,6 @@ void RepeatedField_register(VALUE module) {
   rb_define_method(klass, "hash", RepeatedField_hash, 0);
   rb_define_method(klass, "+", RepeatedField_plus, 1);
   rb_define_method(klass, "concat", RepeatedField_concat, 1);
+  rb_define_method(klass, "deep_copy", RepeatedField_deep_copy, 0);
   rb_include_module(klass, rb_mEnumerable);
 }

ruby/lib/google/protobuf.rb

@@ -73,5 +73,13 @@ def self.decode_json(klass, json, options = {})
       klass.decode_json(json, options)
     end
 
+    # call-seq:
+    #     Google::Protobuf.deep_copy(obj) => copy_of_obj
+    #
+    # Performs a deep copy of a RepeatedField instance, a Map instance, or a
+    # message object, recursively copying its members.
+    def self.deep_copy(obj)
+      obj.deep_copy
+    end
   end
 end