gapic-generator 0.11.0 → 0.45.1

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.11.0"
+    VERSION = "0.45.1"
   end
 end

data/lib/gapic/generators/base_generator.rb

@@ -16,7 +16,7 @@
 
 require "gapic/file_formatter"
 require "action_controller"
-require "google/protobuf/compiler/plugin.pb"
+require "google/protobuf/compiler/plugin_pb"
 require "tempfile"
 
 module Gapic
@@ -46,8 +46,10 @@ module Gapic
         template_path = File.expand_path template_path
         helpers_path = File.join template_path, "helpers"
 
-        # Configure Dependencies to know how to load helpers
-        ActiveSupport::Dependencies.autoload_paths.prepend helpers_path
+        # For some reason autoload doesn't seem to be working for helpers in Rails 8:
+        #     ActiveSupport::Dependencies.autoload_paths.prepend helpers_path
+        # So instead we eagerly load helpers
+        Dir.glob("#{helpers_path}/*_helper.rb") { |file| require file }
 
         # Configure the controller to know about the templates and helpers
         controller.prepend_view_path template_path
@@ -66,7 +68,7 @@ module Gapic
           template: template, formats: :text, locals: args
         )
         Google::Protobuf::Compiler::CodeGeneratorResponse::File.new(
-          name: filename, content: content
+          name: filename, content: String.new(content)
         )
       end
       alias_method :g, :generate_file

data/lib/gapic/generators/default_generator.rb

@@ -17,6 +17,7 @@
 require "gapic/generators/base_generator"
 require "gapic/generators/default_generator_parameters"
 require "gapic/presenters"
+require "gapic/package_snippets"
 
 module Gapic
   module Generators
@@ -47,57 +48,92 @@ module Gapic
 
         gem = gem_presenter || Gapic::Presenters.gem_presenter(@api)
 
+        if @api.generate_rest_clients? && gem.packages.find(&:generate_rest_clients?).nil?
+          raise "Rest transport specified but no services have HTTP bindings"
+        end
+
         gem.packages.each do |package|
+          package_snippets = PackageSnippets.new snippet_dir: "snippets",
+                                                 proto_package: package.name,
+                                                 gem_name: gem.name
+
           # Package level files
-          files << g("package.erb", "lib/#{package.package_file_path}", package: package)
+          files << g("package", "lib/#{package.package_file_path}", package: package)
+          files << g("package_rest", "lib/#{package.package_rest_file_path}", package: package) if package.generate_rest_clients?
+          files << g("binding_override", "lib/#{package.mixin_binding_overrides_file_path}", package: package) if package.mixin_binding_overrides? && package.generate_rest_clients?
 
           package.services.each do |service|
+            should_generate_grpc = service.generate_grpc_clients?
+            should_generate_rest = service.generate_rest_clients?
+
             # Service level files
-            files << g("service.erb",                        "lib/#{service.service_file_path}",                 service: service)
-            files << g("service/rest.erb",                   "lib/#{service.rest.service_rest_file_path}",       service: service) if @api.generate_rest_clients? and service.methods_rest_bindings?
-            files << g("service/client.erb",                 "lib/#{service.client_file_path}",                  service: service) unless @api.generate_rest_clients?
-            files << g("service/credentials.erb",            "lib/#{service.credentials_file_path}",             service: service) unless gem.generic_endpoint?
-            files << g("service/paths.erb",                  "lib/#{service.paths_file_path}",                   service: service) if service.paths?
-            files << g("service/operations.erb",             "lib/#{service.operations_file_path}",              service: service) if service.lro? && !@api.generate_rest_clients?
-            files << g("service/nonstandard_lro.erb",        "lib/#{service.nonstandard_lro_file_path}",         service: service) if service.nonstandard_lro_provider? && !service.methods_rest_bindings?
-            files << g("service/nonstandard_lro.erb",        "lib/#{service.rest.nonstandard_lro_file_path}",    service: service) if service.nonstandard_lro_provider? && service.methods_rest_bindings?
-            files << g("service/rest/client.erb",            "lib/#{service.rest.client_file_path}",             service: service) if @api.generate_rest_clients? and service.methods_rest_bindings?
-            files << g("service/rest/service_stub.erb",      "lib/#{service.rest.service_stub_file_path}",       service: service) if @api.generate_rest_clients? and service.methods_rest_bindings?
-            files << g("service/rest/test/client.erb",       "test/#{service.rest.test_client_file_path}",       service: service) if @api.generate_rest_clients? and service.methods_rest_bindings?
-            files << g("service/test/client.erb",            "test/#{service.test_client_file_path}",            service: service) unless @api.generate_rest_clients?
-            files << g("service/test/client_paths.erb",      "test/#{service.test_paths_file_path}",             service: service) if service.paths?
-            files << g("service/test/client_operations.erb", "test/#{service.test_client_operations_file_path}", service: service) if service.lro? && !@api.generate_rest_clients?
+            files << g("service",                        "lib/#{service.service_file_path}",                 service: service)
+            files << g("service/credentials",            "lib/#{service.credentials_file_path}",             service: service) unless gem.generic_endpoint?
+            files << g("service/paths",                  "lib/#{service.paths_file_path}",                   service: service) if service.paths?
+
+            # Rest module file
+            files << g("service/rest",                   "lib/#{service.rest.service_rest_file_path}",       service: service) if should_generate_rest
+
+            # client.rb
+            files << g("service/client",                 "lib/#{service.client_file_path}",                  service: service) if should_generate_grpc
+            files << g("service/rest/client",            "lib/#{service.rest.client_file_path}",             service: service) if should_generate_rest
+
+            # Standard LRO shim
+            files << g("service/operations",             "lib/#{service.operations_file_path}",              service: service) if service.lro? && should_generate_grpc
+            files << g("service/rest/operations",        "lib/#{service.rest.operations_file_path}",         service: service) if service.rest.lro? && should_generate_rest
+
+            # Nonstandard LRO shim
+            files << g("service/nonstandard_lro",        "lib/#{service.nonstandard_lro_file_path}",         service: service) if service.nonstandard_lro_provider? && should_generate_grpc
+            files << g("service/rest/nonstandard_lro",   "lib/#{service.rest.nonstandard_lro_file_path}",    service: service) if service.rest.nonstandard_lro_provider? && should_generate_rest
+            
+            # Rest-only `service.stub` file
+            files << g("service/rest/service_stub",      "lib/#{service.rest.service_stub_file_path}",       service: service) if should_generate_rest
+
+            # Unit tests for `client.rb`
+            files << g("service/test/client",            "test/#{service.test_client_file_path}",            service: service) if should_generate_grpc
+            files << g("service/rest/test/client",       "test/#{service.rest.test_client_file_path}",       service: service) if should_generate_rest
+
+            # Unit tests for `paths.rb`
+            files << g("service/test/client_paths",      "test/#{service.test_paths_file_path}",             service: service) if service.paths? && should_generate_grpc
+
+            # Unit tests for standard LRO shim
+            files << g("service/test/client_operations", "test/#{service.test_client_operations_file_path}", service: service) if service.lro? && should_generate_grpc
 
             if @api.generate_standalone_snippets?
               service.methods.each do |method|
-                snippet = method.snippet
-                files << g("snippets/standalone.erb", "snippets/#{snippet.snippet_file_path}", snippet: snippet)
+                method.all_snippets.each do |snippet|
+                  snippet_file = g("snippets/standalone", "snippets/#{snippet.snippet_file_path}", snippet: snippet)
+                  package_snippets.add(method_presenter: method, snippet_presenter: snippet, snippet_file: snippet_file)
+                end
               end
             end
           end
+
+          files += package_snippets.files if @api.generate_standalone_snippets?
         end
 
         # Gem level files
-        files << g("gem/gitignore.erb",             ".gitignore",                   gem: gem)
-        files << g("gem/version.erb",               "lib/#{gem.version_file_path}", gem: gem)
-        files << g("gem/test_helper.erb",           "test/helper.rb",               gem: gem)
-        files << g("gem/gemspec.erb",               "#{gem.name}.gemspec",          gem: gem)
-        files << g("gem/gemfile.erb",               "Gemfile",                      gem: gem)
-        files << g("gem/rakefile.erb",              "Rakefile",                     gem: gem)
-        files << g("gem/readme.erb",                "README.md",                    gem: gem)
-        files << g("gem/changelog.erb",             "CHANGELOG.md",                 gem: gem)
-        files << g("gem/rubocop.erb",               ".rubocop.yml",                 gem: gem)
-        files << g("gem/yardopts.erb",              ".yardopts",                    gem: gem)
-        files << g("gem/license.erb",               "LICENSE.md",                   gem: gem)
-        files << g("gem/entrypoint.erb",            "lib/#{gem.name}.rb",           gem: gem)
-        files << g("gem/gapic_metadata_json.erb",   "gapic_metadata.json",          gem: gem) if @api.generate_metadata
-
-        files << g("snippets/gemfile.erb",          "snippets/Gemfile",             gem: gem) if @api.generate_standalone_snippets?
+        files << g("gem/gitignore",           ".gitignore",                   gem: gem)
+        files << g("gem/version",             "lib/#{gem.version_file_path}", gem: gem)
+        files << g("gem/test_helper",         "test/helper.rb",               gem: gem)
+        files << g("gem/gemspec",             "#{gem.name}.gemspec",          gem: gem)
+        files << g("gem/gemfile",             "Gemfile",                      gem: gem)
+        files << g("gem/rakefile",            "Rakefile",                     gem: gem)
+        files << g("gem/readme",              "README.md",                    gem: gem)
+        files << g("gem/changelog",           "CHANGELOG.md",                 gem: gem)
+        files << g("gem/rubocop",             ".rubocop.yml",                 gem: gem)
+        files << g("gem/toys",                ".toys.rb",                     gem: gem)
+        files << g("gem/yardopts",            ".yardopts",                    gem: gem)
+        files << g("gem/license",             "LICENSE.md",                   gem: gem)
+        files << g("gem/entrypoint",          "lib/#{gem.name}.rb",           gem: gem)
+        files << g("gem/gapic_metadata_json", "gapic_metadata.json",          gem: gem) if @api.generate_metadata
+
+        files << g("snippets/gemfile",        "snippets/Gemfile",             gem: gem) if @api.generate_standalone_snippets?
 
         gem.proto_files.each do |proto_file|
-          files << g("proto_docs/proto_file.erb", "proto_docs/#{proto_file.docs_file_path}", file: proto_file)
+          files << g("proto_docs/proto_file", "proto_docs/#{proto_file.docs_file_path}", file: proto_file)
         end
-        files << g("proto_docs/readme.erb", "proto_docs/README.md", gem: gem)
+        files << g("proto_docs/readme",       "proto_docs/README.md", gem: gem)
 
         format_files files
 

data/lib/gapic/generators/default_generator_parameters.rb

@@ -24,6 +24,8 @@ module Gapic
         ":gem.:free_tier",
         ":gem.:yard_strict",
         ":gem.:generic_endpoint",
+        ":gem.:is_cloud_product",
+        ":gem.:rest_numeric_enums",
         ":generate_metadata",
         ":generate_standalone_snippets",
         ":generate_yardoc_snippets"
@@ -47,7 +49,8 @@ module Gapic
         ":defaults.:service.:default_host",
         "grpc_service_config",
         ":service_yaml",
-        ":overrides.:wrapper_gem_name"
+        ":overrides.:wrapper_gem_name",
+        ":snippet_configs_path"
       ].freeze
 
       ARRAY_PARAMETERS = [
@@ -66,7 +69,9 @@ module Gapic
       BOOL_PARAMETERS_ALIASES = {
         "gem-free-tier"        => ":gem.:free_tier",
         "gem-yard-strict"      => ":gem.:yard_strict",
-        "gem-generic-endpoint" => ":gem.:generic_endpoint"
+        "gem-generic-endpoint" => ":gem.:generic_endpoint",
+        "gem-is-cloud-product" => ":gem.:is_cloud_product",
+        "rest-numeric-enums"   => ":gem.:rest_numeric_enums"
       }.freeze
 
       STRING_PARAMETERS_ALIASES = {
@@ -86,7 +91,8 @@ module Gapic
         "gem-factory-method-suffix" => ":gem.:factory_method_suffix",
         "default-service-host"      => ":defaults.:service.:default_host",
         "grpc-service-config"       => "grpc_service_config",
-        "service-yaml"              => ":service_yaml"
+        "service-yaml"              => ":service_yaml",
+        "snippet-configs-path"      => ":snippet_configs_path"
       }.freeze
 
       ARRAY_PARAMETERS_ALIASES = {

data/lib/gapic/grpc_service_config/parser.rb

@@ -62,7 +62,7 @@ module Gapic
         "UNAUTHENTICATED"
       ].freeze
 
-      ERROR_STRING_MAPPING = ERROR_CODE_MAPPING.each_with_index.each_with_object({}) do |(str, num), hash|
+      ERROR_STRING_MAPPING = ERROR_CODE_MAPPING.each_with_index.with_object({}) do |(str, num), hash|
         hash[str] = num
       end.freeze
 
@@ -209,7 +209,7 @@ module Gapic
         timestring_nos = timestring.delete_suffix "s"
         unless valid_float? timestring_nos
           error_text = "Was not able to convert the string `#{timestring}` " \
-                        "to a time interval when parsing a grpc service config"
+                       "to a time interval when parsing a grpc service config"
           raise ParsingError, error_text
         end
         Float(timestring_nos)

data/lib/gapic/model/api_metadata.rb

@@ -0,0 +1,173 @@
+# frozen_string_literal: true
+
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Gapic
+  module Model
+    ##
+    # A collection of metadata about an API.
+    #
+    # This information generally comes from the service yaml rather than from
+    # proto input.
+    #
+    class ApiMetadata
+      ##
+      # @return [String] The full ID of the API, including `".googleapis.com"`.
+      #     For example, `"pubsub.googleapis.com"`.
+      #
+      attr_reader :name
+
+      ##
+      # @return [String] The shortname of the API, omitting `".googleapis.com"`.
+      #     For example, `"pubsub"`.
+      #
+      attr_reader :short_name
+
+      ##
+      # @return [String] A title of the API, including the version.
+      #     For example, `"Cloud Pub/Sub V1"`
+      #
+      attr_reader :title
+
+      ##
+      # @return [String] A short description of the API, suitable for the
+      #     RubyGems summary field.
+      #
+      attr_reader :summary
+
+      ##
+      # @return [String] A longer description of the API, suitable for the
+      #     RubyGems description field.
+      #
+      attr_reader :description
+
+      ##
+      # @return [String] The organization name, determining where the API's
+      #     documentation should be published, among other things. This value
+      #     is `"CLOUD"` for Google Cloud APIs.
+      #
+      attr_reader :organization
+
+      ##
+      # @return [String] The URL for the documentation.
+      #
+      attr_reader :documentation_url
+
+      ##
+      # @return [String] The prefix string for sample doc tags.
+      #
+      attr_reader :doc_tag_prefix
+
+      ##
+      # @return [Hash{String => Array<String>}] A mapping from method name to a list of auto
+      #     populated fields.
+      #
+      attr_reader :auto_populated_fields_by_method_name
+
+      ######## Internal ########
+      # @private
+      SELECTOR = "selector"
+      # @private
+      AUTO_POPULATED_FIELDS = "auto_populated_fields"
+
+      ##
+      # @private
+      # Special cases for short names
+      #
+      SHORT_NAME_MAPPING = {
+        "iam-meta-api" => "iam"
+      }.freeze
+
+      # @private
+      def update! **keywords
+        omit_patterns = [
+          nil,
+          "",
+          "CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED",
+          /\A\s*\(==.+==\)\s*\Z/
+        ]
+        keywords.each do |key, value|
+          instance_variable_set "@#{key}", value unless omit_patterns.any? { |pat| pat === value }
+        end
+        self
+      end
+
+      # @private
+      def standardize_names!
+        return unless name || short_name
+        @name ||= short_name
+        @short_name ||= name
+        @name = "#{name}.googleapis.com" unless name.include? "."
+        @short_name = short_name.split(".").first
+        @short_name = SHORT_NAME_MAPPING.fetch @short_name, @short_name
+        @doc_tag_prefix ||= short_name
+        self
+      end
+
+      # @private
+      def standardize_title! gem_name:
+        return unless title
+        @title = title.sub %r{\s+API$}, ""
+        return if title =~ /\s+V\d+\w*$/
+        vers = gem_name.split("-").last
+        @title = "#{title} #{vers.upcase}" if vers =~ /^v\d+\w*$/
+        self
+      end
+
+      # @private
+      def standardize_descriptions!
+        return unless summary || description
+        @description ||= summary
+        if summary
+          @summary = summary.gsub(/\s+/, " ").strip
+          @summary = "#{summary}." if summary =~ /\w\z/
+          @summary = remove_html_tags summary
+        end
+        @description = "#{description}." if description =~ /\w\z/
+        @description = remove_html_tags description
+        self
+      end
+
+      # @private
+      # Remove html tags and markdown links
+      def remove_html_tags str
+        str
+          .gsub(%r{</?[[:alpha:]]+(?:\s+[[:alpha:]]+\s*=\s*(?:"[^"]+"|'[^']+'|[^\s">]+))*\s*/?>}, "")
+          .gsub(%r{\[([^\]]+)\]\([^)]+\)}, "\\1")
+      end
+
+      ##
+      # @private
+      # Parses a service configuration, mapping method names to their respective
+      #     auto populated field lists.
+      #
+      def standardize_auto_populated_fields! service_config
+        @auto_populated_fields_by_method_name = {}
+        return unless !service_config.nil? && !service_config.apis.nil?
+        @method_settings.each do |setting|
+          selector = setting[SELECTOR]
+          methods = service_config.apis.filter_map do |api|
+            # Removes API prefix and trailing period.
+            selector[api.name.length + 1..].downcase if selector.start_with? api.name
+          end
+          if !methods.nil? && setting.key?(AUTO_POPULATED_FIELDS)
+            @auto_populated_fields_by_method_name[methods.first] = setting[AUTO_POPULATED_FIELDS]
+          end
+        end
+        self
+      end
+    end
+  end
+end

data/lib/gapic/model/method/http_annotation.rb

@@ -23,99 +23,197 @@ module Gapic
       # The information used in the generation process that
       # can be gathered from the `google.api.http` annotation.
       # `google.api.http` is used in two distinct ways:
-      #   - the rest libs use it as part of the transcoding to set up the REST call
-      #   - both rest and grpc libs use it as a source of implicit routing headers
+      #   - REST libs use it as part of the transcoding to set up the REST call
+      #   - gRPC libs use it as a source of implicit routing headers
       #
       class HttpAnnotation
         ##
-        # @param proto_method [Gapic::Schema::Method]
+        # The Http bindings found in the annotation
+        # this includes main binding in the annotation itself,
+        # as well as those in the `additional_bindings`.
         #
-        def initialize proto_method
-          @proto_method = proto_method
+        # @return [Array<HttpBinding>]
+        attr_reader :bindings
+
+        ##
+        # @param proto_http [::Google::Api::HttpRule]
+        #   The base http annotation
+        #
+        def initialize proto_http
+          @bindings = parse_bindings proto_http
         end
 
         ##
-        # Whether a http verb is present for this method
+        # Whether any implicit routing parameters are present.
         #
         # @return [Boolean]
-        def verb?
-          !verb.nil?
+        def routing_params?
+          routing_params.any?
         end
 
         ##
-        # The http verb for this method
+        # The implicit routing parameter names.
         #
-        # @return [Symbol, Nil]
-        def verb
-          return nil if @proto_method.http.nil?
-
-          method = {
-            get:    @proto_method.http.get,
-            post:   @proto_method.http.post,
-            put:    @proto_method.http.put,
-            patch:  @proto_method.http.patch,
-            delete: @proto_method.http.delete
-          }.find { |_, value| !value.empty? }
-
-          method[0] unless method.nil?
+        # @return [Array<String>]
+        def routing_params
+          routing_params_with_patterns.map { |param, _| param }
         end
 
         ##
-        # Whether a method path is present and non-empty
+        # The implicit routing parameter names and their corresponding paterns,
+        # including the `*` pattern implied for the named segments
+        # without an explicitly specified pattern.
         #
-        # @return [Boolean]
-        def path?
-          !path.empty?
+        # @return [Array<Array<String>>]
+        def routing_params_with_patterns
+          bindings.first&.routing_params_with_patterns || []
         end
 
         ##
-        # A method path or an empty string if not present
+        # @param proto_method [::Gapic::Schema::Method]
+        #   The proto method this annotation model applies to
+        # @param service_config [::Google::Api::Service]
+        #   The service config that might contain an override for the http annotation.
+        #   This is used for mixins: when generating Operations sublients, and when
+        #   setting up overrides for other mixin clients in the host services's classes.
+        #   For non-mixin service generation
+        #   it is assumed that the service config is merged into protos before generation.
         #
-        # @return [String]
-        def path
-          return "" if @proto_method.http.nil?
+        def self.create_with_override proto_method, service_config = nil
+          proto_http = proto_method.http
 
-          verb_path = [
-            @proto_method.http.get, @proto_method.http.post, @proto_method.http.put,
-            @proto_method.http.patch, @proto_method.http.delete
-          ].find { |x| !x.empty? }
+          http_override = service_config&.http&.rules&.find { |http_rule| http_rule.selector == proto_method.full_name }
 
-          verb_path || @proto_method.http.custom&.path || ""
+          http = http_override || proto_http
+          HttpAnnotation.new http
         end
 
         ##
-        # Whether any routing params are present
+        # A single Http binding.
         #
-        # @return [Boolean]
-        def routing_params?
-          routing_params.any?
+        class HttpBinding
+          ##
+          # @param binding [::Google::Api::HttpRule]
+          #   The baseline instance of the Http annotation
+          def initialize binding
+            @binding = binding
+          end
+
+          ##
+          # Whether a http verb is present for this method
+          #
+          # @return [Boolean]
+          def verb?
+            !verb.nil?
+          end
+
+          ##
+          # The http verb for this method
+          #
+          # @return [Symbol, nil]
+          def verb
+            verb_path[0] if verb_path
+          end
+
+          ##
+          # Whether a method path is present and non-empty
+          #
+          # @return [Boolean]
+          def path?
+            !path.empty?
+          end
+
+          ##
+          # A method path or an empty string if not present
+          #
+          # @return [String]
+          def path
+            return "" unless verb_path
+            verb_path[1]
+          end
+
+          ##
+          # Whether any routing params are present
+          #
+          # @return [Boolean]
+          def routing_params?
+            routing_params.any?
+          end
+
+          ##
+          # The segment key names and their corresponding paterns,
+          # including the `*` pattern implied for the named segments
+          # without pattern explicitly specified.
+          #
+          # @return [Array<Array<String>>]
+          def routing_params_with_patterns
+            @routing_params_with_patterns ||= begin
+              Gapic::UriTemplate.parse_arguments(path).map do |name, pattern|
+                [name, pattern.empty? ? "*" : pattern]
+              end
+            end
+          end
+
+          ##
+          # The segment key names.
+          #
+          # @return [Array<String>]
+          def routing_params
+            routing_params_with_patterns.map { |param, _| param }
+          end
+
+          ##
+          # Whether method has body specified in proto
+          #
+          # @return [Boolean]
+          def body?
+            !body.empty?
+          end
+
+          ##
+          # The body specified for the given method in proto
+          # or an empty string if not specified
+          #
+          # @return [String]
+          def body
+            @binding&.body || ""
+          end
+
+          private
+
+          ##
+          # The combination of verb and path found in the http annotation
+          # (or Nil if the annotation is Nil).
+          #
+          # @return [Array<Symbol, String>, Nil]
+          def verb_path
+            return nil if @binding.nil?
+
+            {
+              get:    @binding.get,
+              post:   @binding.post,
+              put:    @binding.put,
+              patch:  @binding.patch,
+              delete: @binding.delete
+            }.find { |_, value| !value.empty? }
+          end
         end
 
-        ##
-        # The segment key names.
-        #
-        # @return [Array<String>]
-        def routing_params
-          Gapic::UriTemplate.parse_arguments path
-        end
+        private
 
         ##
-        # Whether method has body specified in proto
+        # Parses http bindings from the `google.api.http` annotation, preserving order.
         #
-        # @return [Boolean]
-        def body?
-          return false if @proto_method.http.nil?
-
-          !@proto_method.http.body.empty?
-        end
-
-        ##
-        # The body specified for the given method in proto
-        # or an empty string if not specified
+        # @param http [::Google::Api::HttpRule]
+        #   The root instance of the HttpRule to parse.
         #
-        # @return [String]
-        def body
-          @proto_method.http&.body || ""
+        # @return Array<HttpBinding>
+        #  The parsed bindings.
+        def parse_bindings http
+          return [] if http.nil?
+
+          raw_binds = [http] + http.additional_bindings.to_a
+          raw_binds.map { |raw_bind| HttpBinding.new raw_bind }
         end
       end
     end