Merge branch 'master' into v0.10

lib/google/apis/generator/annotator.rb

@@ -34,7 +34,8 @@ module Google
       # where algorithmic approaches produce poor APIs.
       class Names
         ActiveSupport::Inflector.inflections do |inflections|
-          u = inflections.uncountable('send_as', 'as')
+          inflections.uncountable('send_as', 'as')
+          inflections.irregular('teamdrive', 'teamdrives')
         end
 
         include Google::Apis::Core::Logging
@@ -288,12 +289,12 @@ module Google
         def check_duplicate_method(m)
           if @all_methods.include?(m.generated_name)
             logger.error do
-              sprintf('Duplicate method %s generated, path %s',
-                m.generated_name, @names.key)
+              sprintf('Duplicate method %s generated, conflicting paths %s and %s',
+                m.generated_name, @names.key, @all_methods[m.generated_name])
             end
             fail 'Duplicate name generated'
           end
-          @all_methods[m.generated_name] = m
+          @all_methods[m.generated_name] = @names.key
         end
       end
     end

lib/google/apis/generator/templates/_class.tmpl

@@ -7,6 +7,9 @@ class <%= cls.generated_class_name %><% if cls.base_ref %> < <%= cls.base_ref.ge
 
   # <%= block_comment(property.description, 2, 1) %>
   # Corresponds to the JSON property `<%= property.name %>`
+<% if property.format == 'byte' -%>
+  # NOTE: Values are automatically base64 encoded/decoded in the client library.
+<% end -%>
   # @return [<%= property.generated_type %>]
   attr_accessor :<%= property.generated_name %>
 <%     if property.type == 'boolean' -%>