service.rb in google-api-client-0.10.0

- old
+ new

@@ -31,34 +31,26 @@
       #    service = Kgsearch::KgsearchService.new
       #
       # @see https://developers.google.com/knowledge-graph/
       class KgsearchService < Google::Apis::Core::BaseService
         # @return [String]
-        #  API key. Your API key identifies your project and provides you with API access,
-        #  quota, and reports. Required unless you provide an OAuth 2.0 token.
-        attr_accessor :key
-
-        # @return [String]
         #  Available to use for quota purposes for server-side applications. Can be any
         #  arbitrary string assigned to a user, but should not exceed 40 characters.
         attr_accessor :quota_user
 
+        # @return [String]
+        #  API key. Your API key identifies your project and provides you with API access,
+        #  quota, and reports. Required unless you provide an OAuth 2.0 token.
+        attr_accessor :key
+
         def initialize
           super('https://kgsearch.googleapis.com/', '')
         end
         
         # Searches Knowledge Graph for entities that match the constraints.
         # A list of matched entities will be returned in response, which will be in
         # JSON-LD format and compatible with http://schema.org
-        # @param [Boolean] prefix
-        #   Enables prefix match against names and aliases of entities
-        # @param [String] query
-        #   The literal query string for search.
-        # @param [Array<String>, String] types
-        #   Restricts returned entities with these types, e.g. Person
-        #   (as defined in http://schema.org/Person). If multiple types are specified,
-        #   returned entities will contain one or more of these types.
         # @param [Boolean] indent
         #   Enables indenting of json results.
         # @param [Array<String>, String] languages
         #   The list of language codes (defined in ISO 693) to run the query with,
         #   e.g. 'en'.
@@ -66,15 +58,23 @@
         #   The list of entity id to be used for search instead of query string.
         #   To specify multiple ids in the HTTP request, repeat the parameter in the
         #   URL as in ...?ids=A&ids=B
         # @param [Fixnum] limit
         #   Limits the number of entities to be returned.
-        # @param [String] fields
-        #   Selector specifying which fields to include in a partial response.
+        # @param [Boolean] prefix
+        #   Enables prefix match against names and aliases of entities
+        # @param [String] query
+        #   The literal query string for search.
+        # @param [Array<String>, String] types
+        #   Restricts returned entities with these types, e.g. Person
+        #   (as defined in http://schema.org/Person). If multiple types are specified,
+        #   returned entities will contain one or more of these types.
         # @param [String] quota_user
         #   Available to use for quota purposes for server-side applications. Can be any
         #   arbitrary string assigned to a user, but should not exceed 40 characters.
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
         # @param [Google::Apis::RequestOptions] options
         #   Request-specific options
         #
         # @yield [result, err] Result & error if block supplied
         # @yieldparam result [Google::Apis::KgsearchV1::SearchResponse] parsed result object
@@ -83,30 +83,30 @@
         # @return [Google::Apis::KgsearchV1::SearchResponse]
         #
         # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
         # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
         # @raise [Google::Apis::AuthorizationError] Authorization is required
-        def search_entities(prefix: nil, query: nil, types: nil, indent: nil, languages: nil, ids: nil, limit: nil, fields: nil, quota_user: nil, options: nil, &block)
+        def search_entities(indent: nil, languages: nil, ids: nil, limit: nil, prefix: nil, query: nil, types: nil, quota_user: nil, fields: nil, options: nil, &block)
           command =  make_simple_command(:get, 'v1/entities:search', options)
           command.response_representation = Google::Apis::KgsearchV1::SearchResponse::Representation
           command.response_class = Google::Apis::KgsearchV1::SearchResponse
-          command.query['prefix'] = prefix unless prefix.nil?
-          command.query['query'] = query unless query.nil?
-          command.query['types'] = types unless types.nil?
           command.query['indent'] = indent unless indent.nil?
           command.query['languages'] = languages unless languages.nil?
           command.query['ids'] = ids unless ids.nil?
           command.query['limit'] = limit unless limit.nil?
-          command.query['fields'] = fields unless fields.nil?
+          command.query['prefix'] = prefix unless prefix.nil?
+          command.query['query'] = query unless query.nil?
+          command.query['types'] = types unless types.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['fields'] = fields unless fields.nil?
           execute_or_queue_command(command, &block)
         end
 
         protected
 
         def apply_command_defaults(command)
-          command.query['key'] = key unless key.nil?
           command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['key'] = key unless key.nil?
         end
       end
     end
   end
 end