ibm_watson 0.16.1 → 0.17.0

data/lib/ibm_watson/discovery_v1.rb

@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The IBM Watson™ Discovery Service is a cognitive search and content analytics
-# engine that you can add to applications to identify patterns, trends and actionable
-# insights to drive better decision-making. Securely unify structured and unstructured
-# data with pre-enriched content, and use a simplified query language to eliminate the
-# need for manual filtering of results.
+# IBM Watson™ Discovery is a cognitive search and content analytics engine that
+# you can add to applications to identify patterns, trends and actionable insights to
+# drive better decision-making. Securely unify structured and unstructured data with
+# pre-enriched content, and use a simplified query language to eliminate the need for
+# manual filtering of results.
 
 require "concurrent"
 require "erb"
@@ -49,16 +49,16 @@ module IBMWatson
     #   ready for a later version.
     # @option args url [String] The base url to use when contacting the service (e.g.
     #   "https://gateway.watsonplatform.net/discovery/api").
-    #   The base url may differ between Bluemix regions.
+    #   The base url may differ between IBM Cloud regions.
     # @option args username [String] The username used to authenticate with the service.
     #   Username and password credentials are only required to run your
-    #   application locally or outside of Bluemix. When running on
-    #   Bluemix, the credentials will be automatically loaded from the
+    #   application locally or outside of IBM Cloud. When running on
+    #   IBM Cloud, the credentials will be automatically loaded from the
     #   `VCAP_SERVICES` environment variable.
     # @option args password [String] The password used to authenticate with the service.
     #   Username and password credentials are only required to run your
-    #   application locally or outside of Bluemix. When running on
-    #   Bluemix, the credentials will be automatically loaded from the
+    #   application locally or outside of IBM Cloud. When running on
+    #   IBM Cloud, the credentials will be automatically loaded from the
     #   `VCAP_SERVICES` environment variable.
     # @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
     #   this API key is provided, the SDK will manage the token and handle the
@@ -68,7 +68,9 @@ module IBMWatson
     #   it expires or reactively upon receiving a 401 from the service as any requests
     #   made with an expired token will fail.
     # @option args iam_url [String] An optional URL for the IAM service API. Defaults to
-    #   'https://iam.ng.bluemix.net/identity/token'.
+    #   'https://iam.cloud.ibm.com/identity/token'.
+    # @option args iam_client_id [String] An optional client id for the IAM service API.
+    # @option args iam_client_secret [String] An optional client secret for the IAM service API.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
@@ -79,6 +81,8 @@ module IBMWatson
       defaults[:iam_apikey] = nil
       defaults[:iam_access_token] = nil
       defaults[:iam_url] = nil
+      defaults[:iam_client_id] = nil
+      defaults[:iam_client_secret] = nil
       args = defaults.merge(args)
       args[:vcap_services_name] = "discovery"
       super
@@ -135,26 +139,26 @@ module IBMWatson
     end
 
     ##
-    # @!method delete_environment(environment_id:)
-    # Delete environment.
-    # @param environment_id [String] The ID of the environment.
+    # @!method list_environments(name: nil)
+    # List environments.
+    # List existing environments for the service instance.
+    # @param name [String] Show only the environment with the given name.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_environment(environment_id:)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-
+    def list_environments(name: nil)
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_environment")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_environments")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version
+        "version" => @version,
+        "name" => name
       }
 
-      method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments"
 
       response = request(
-        method: "DELETE",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
@@ -193,61 +197,69 @@ module IBMWatson
     end
 
     ##
-    # @!method list_environments(name: nil)
-    # List environments.
-    # List existing environments for the service instance.
-    # @param name [String] Show only the environment with the given name.
+    # @!method update_environment(environment_id:, name: nil, description: nil, size: nil)
+    # Update an environment.
+    # Updates an environment. The environment's **name** and  **description** parameters
+    #   can be changed. You must specify a **name** for the environment.
+    # @param environment_id [String] The ID of the environment.
+    # @param name [String] Name that identifies the environment.
+    # @param description [String] Description of the environment.
+    # @param size [String] Size that the environment should be increased to. Environment size cannot be
+    #   modified when using a Lite plan. Environment size can only increased and not
+    #   decreased.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_environments(name: nil)
+    def update_environment(environment_id:, name: nil, description: nil, size: nil)
+      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_environments")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_environment")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version,
-        "name" => name
+        "version" => @version
       }
 
-      method_url = "/v1/environments"
+      data = {
+        "name" => name,
+        "description" => description,
+        "size" => size
+      }
+
+      method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "GET",
+        method: "PUT",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method list_fields(environment_id:, collection_ids:)
-    # List fields across collections.
-    # Gets a list of the unique fields (and their types) stored in the indexes of the
-    #   specified collections.
+    # @!method delete_environment(environment_id:)
+    # Delete environment.
     # @param environment_id [String] The ID of the environment.
-    # @param collection_ids [Array[String]] A comma-separated list of collection IDs to be queried against.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_fields(environment_id:, collection_ids:)
+    def delete_environment(environment_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("collection_ids must be provided") if collection_ids.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_fields")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_environment")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version,
-        "collection_ids" => collection_ids.to_a
+        "version" => @version
       }
 
-      method_url = "/v1/environments/%s/fields" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "GET",
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
@@ -257,43 +269,35 @@ module IBMWatson
     end
 
     ##
-    # @!method update_environment(environment_id:, name: nil, description: nil, size: nil)
-    # Update an environment.
-    # Updates an environment. The environment's **name** and  **description** parameters
-    #   can be changed. You must specify a **name** for the environment.
+    # @!method list_fields(environment_id:, collection_ids:)
+    # List fields across collections.
+    # Gets a list of the unique fields (and their types) stored in the indexes of the
+    #   specified collections.
     # @param environment_id [String] The ID of the environment.
-    # @param name [String] Name that identifies the environment.
-    # @param description [String] Description of the environment.
-    # @param size [String] Size that the environment should be increased to. Environment size cannot be
-    #   modified when using a Lite plan. Environment size can only increased and not
-    #   decreased.
+    # @param collection_ids [Array[String]] A comma-separated list of collection IDs to be queried against.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_environment(environment_id:, name: nil, description: nil, size: nil)
+    def list_fields(environment_id:, collection_ids:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
+      raise ArgumentError.new("collection_ids must be provided") if collection_ids.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_environment")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_fields")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version
-      }
-
-      data = {
-        "name" => name,
-        "description" => description,
-        "size" => size
+        "version" => @version,
+        "collection_ids" => collection_ids.to_a
       }
 
-      method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments/%s/fields" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "PUT",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
@@ -364,35 +368,29 @@ module IBMWatson
     end
 
     ##
-    # @!method delete_configuration(environment_id:, configuration_id:)
-    # Delete a configuration.
-    # The deletion is performed unconditionally. A configuration deletion request
-    #   succeeds even if the configuration is referenced by a collection or document
-    #   ingestion. However, documents that have already been submitted for processing
-    #   continue to use the deleted configuration. Documents are always processed with a
-    #   snapshot of the configuration as it existed at the time the document was
-    #   submitted.
+    # @!method list_configurations(environment_id:, name: nil)
+    # List configurations.
+    # Lists existing configurations for the service instance.
     # @param environment_id [String] The ID of the environment.
-    # @param configuration_id [String] The ID of the configuration.
+    # @param name [String] Find configurations with the given name.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_configuration(environment_id:, configuration_id:)
+    def list_configurations(environment_id:, name: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("configuration_id must be provided") if configuration_id.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_configuration")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_configurations")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version
+        "version" => @version,
+        "name" => name
       }
 
-      method_url = "/v1/environments/%s/configurations/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(configuration_id)]
+      method_url = "/v1/environments/%s/configurations" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "DELETE",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
@@ -433,38 +431,6 @@ module IBMWatson
       response
     end
 
-    ##
-    # @!method list_configurations(environment_id:, name: nil)
-    # List configurations.
-    # Lists existing configurations for the service instance.
-    # @param environment_id [String] The ID of the environment.
-    # @param name [String] Find configurations with the given name.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_configurations(environment_id:, name: nil)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_configurations")
-      headers.merge!(sdk_headers)
-
-      params = {
-        "version" => @version,
-        "name" => name
-      }
-
-      method_url = "/v1/environments/%s/configurations" % [ERB::Util.url_encode(environment_id)]
-
-      response = request(
-        method: "GET",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
     ##
     # @!method update_configuration(environment_id:, configuration_id:, name:, description: nil, conversions: nil, enrichments: nil, normalizations: nil, source: nil)
     # Update a configuration.
@@ -525,6 +491,44 @@ module IBMWatson
       )
       response
     end
+
+    ##
+    # @!method delete_configuration(environment_id:, configuration_id:)
+    # Delete a configuration.
+    # The deletion is performed unconditionally. A configuration deletion request
+    #   succeeds even if the configuration is referenced by a collection or document
+    #   ingestion. However, documents that have already been submitted for processing
+    #   continue to use the deleted configuration. Documents are always processed with a
+    #   snapshot of the configuration as it existed at the time the document was
+    #   submitted.
+    # @param environment_id [String] The ID of the environment.
+    # @param configuration_id [String] The ID of the configuration.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def delete_configuration(environment_id:, configuration_id:)
+      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
+
+      raise ArgumentError.new("configuration_id must be provided") if configuration_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_configuration")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      method_url = "/v1/environments/%s/configurations/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(configuration_id)]
+
+      response = request(
+        method: "DELETE",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
     #########################
     # Test your configuration on a document
     #########################
@@ -532,7 +536,10 @@ module IBMWatson
     ##
     # @!method test_configuration_in_environment(environment_id:, configuration: nil, file: nil, filename: nil, file_content_type: nil, metadata: nil, step: nil, configuration_id: nil)
     # Test configuration.
-    # Runs a sample document through the default or your configuration and returns
+    # **Deprecated** This method is no longer supported and is scheduled to be removed
+    #   from service on July 31st 2019.
+    #
+    #    Runs a sample document through the default or your configuration and returns
     #   diagnostic information designed to help you understand how the document was
     #   processed. The document is not added to the index.
     # @param environment_id [String] The ID of the environment.
@@ -549,10 +556,8 @@ module IBMWatson
     #   rejected.
     # @param filename [String] The filename for file.
     # @param file_content_type [String] The content type of file.
-    # @param metadata [String] If you're using the Data Crawler to upload your documents, you can test a document
-    #   against the type of metadata that the Data Crawler might send. The maximum
-    #   supported metadata file size is 1 MB. Metadata parts larger than 1 MB are
-    #   rejected.
+    # @param metadata [String] The maximum supported metadata file size is 1 MB. Metadata parts larger than 1 MB
+    #   are rejected.
     #   Example:  ``` {
     #     \"Creator\": \"Johnny Appleseed\",
     #     \"Subject\": \"Apples\"
@@ -653,29 +658,29 @@ module IBMWatson
     end
 
     ##
-    # @!method delete_collection(environment_id:, collection_id:)
-    # Delete a collection.
+    # @!method list_collections(environment_id:, name: nil)
+    # List collections.
+    # Lists existing collections for the service instance.
     # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
+    # @param name [String] Find collections with the given name.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_collection(environment_id:, collection_id:)
+    def list_collections(environment_id:, name: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_collection")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_collections")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version
+        "version" => @version,
+        "name" => name
       }
 
-      method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "DELETE",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
@@ -717,62 +722,71 @@ module IBMWatson
     end
 
     ##
-    # @!method list_collection_fields(environment_id:, collection_id:)
-    # List collection fields.
-    # Gets a list of the unique fields (and their types) stored in the index.
+    # @!method update_collection(environment_id:, collection_id:, name:, description: nil, configuration_id: nil)
+    # Update a collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
+    # @param name [String] The name of the collection.
+    # @param description [String] A description of the collection.
+    # @param configuration_id [String] The ID of the configuration in which the collection is to be updated.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_collection_fields(environment_id:, collection_id:)
+    def update_collection(environment_id:, collection_id:, name:, description: nil, configuration_id: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_collection_fields")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_collection")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/fields" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      data = {
+        "name" => name,
+        "description" => description,
+        "configuration_id" => configuration_id
+      }
+
+      method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "GET",
+        method: "PUT",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method list_collections(environment_id:, name: nil)
-    # List collections.
-    # Lists existing collections for the service instance.
+    # @!method delete_collection(environment_id:, collection_id:)
+    # Delete a collection.
     # @param environment_id [String] The ID of the environment.
-    # @param name [String] Find collections with the given name.
+    # @param collection_id [String] The ID of the collection.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_collections(environment_id:, name: nil)
+    def delete_collection(environment_id:, collection_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
+      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_collections")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_collection")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version,
-        "name" => name
+        "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "GET",
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
@@ -782,42 +796,33 @@ module IBMWatson
     end
 
     ##
-    # @!method update_collection(environment_id:, collection_id:, name:, description: nil, configuration_id: nil)
-    # Update a collection.
+    # @!method list_collection_fields(environment_id:, collection_id:)
+    # List collection fields.
+    # Gets a list of the unique fields (and their types) stored in the index.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @param name [String] The name of the collection.
-    # @param description [String] A description of the collection.
-    # @param configuration_id [String] The ID of the configuration in which the collection is to be updated.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_collection(environment_id:, collection_id:, name:, description: nil, configuration_id: nil)
+    def list_collection_fields(environment_id:, collection_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_collection")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_collection_fields")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "name" => name,
-        "description" => description,
-        "configuration_id" => configuration_id
-      }
-
-      method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections/%s/fields" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "PUT",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
@@ -826,6 +831,40 @@ module IBMWatson
     # Query modifications
     #########################
 
+    ##
+    # @!method list_expansions(environment_id:, collection_id:)
+    # Get the expansion list.
+    # Returns the current expansion list for the specified collection. If an expansion
+    #   list is not specified, an object with empty expansion arrays is returned.
+    # @param environment_id [String] The ID of the environment.
+    # @param collection_id [String] The ID of the collection.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def list_expansions(environment_id:, collection_id:)
+      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
+
+      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_expansions")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
     ##
     # @!method create_expansions(environment_id:, collection_id:, expansions:)
     # Create or update expansion list.
@@ -885,158 +924,112 @@ module IBMWatson
     end
 
     ##
-    # @!method create_stopword_list(environment_id:, collection_id:, stopword_file:, stopword_filename: nil)
-    # Create stopword list.
-    # Upload a custom stopword list to use with the specified collection.
+    # @!method delete_expansions(environment_id:, collection_id:)
+    # Delete the expansion list.
+    # Remove the expansion information for this collection. The expansion list must be
+    #   deleted to disable query expansion for a collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @param stopword_file [File] The content of the stopword list to ingest.
-    # @param stopword_filename [String] The filename for stopword_file.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_stopword_list(environment_id:, collection_id:, stopword_file:, stopword_filename: nil)
+    # @return [nil]
+    def delete_expansions(environment_id:, collection_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
-      raise ArgumentError.new("stopword_file must be provided") if stopword_file.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_stopword_list")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_expansions")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      form_data = {}
-
-      unless stopword_file.instance_of?(StringIO) || stopword_file.instance_of?(File)
-        stopword_file = stopword_file.respond_to?(:to_json) ? StringIO.new(stopword_file.to_json) : StringIO.new(stopword_file)
-      end
-      stopword_filename = stopword_file.path if stopword_filename.nil? && stopword_file.respond_to?(:path)
-      form_data[:stopword_file] = HTTP::FormData::File.new(stopword_file, content_type: "application/octet-stream", filename: stopword_filename)
-
-      method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
-      response = request(
-        method: "POST",
+      request(
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
-        form: form_data,
-        accept_json: true
+        accept_json: false
       )
-      response
+      nil
     end
 
     ##
-    # @!method create_tokenization_dictionary(environment_id:, collection_id:, tokenization_rules: nil)
-    # Create tokenization dictionary.
-    # Upload a custom tokenization dictionary to use with the specified collection.
+    # @!method get_tokenization_dictionary_status(environment_id:, collection_id:)
+    # Get tokenization dictionary status.
+    # Returns the current status of the tokenization dictionary for the specified
+    #   collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @param tokenization_rules [Array[TokenDictRule]] An array of tokenization rules. Each rule contains, the original `text` string,
-    #   component `tokens`, any alternate character set `readings`, and which
-    #   `part_of_speech` the text is from.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_tokenization_dictionary(environment_id:, collection_id:, tokenization_rules: nil)
+    def get_tokenization_dictionary_status(environment_id:, collection_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_tokenization_dictionary")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_tokenization_dictionary_status")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "tokenization_rules" => tokenization_rules
-      }
-
       method_url = "/v1/environments/%s/collections/%s/word_lists/tokenization_dictionary" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "POST",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method delete_expansions(environment_id:, collection_id:)
-    # Delete the expansion list.
-    # Remove the expansion information for this collection. The expansion list must be
-    #   deleted to disable query expansion for a collection.
+    # @!method create_tokenization_dictionary(environment_id:, collection_id:, tokenization_rules: nil)
+    # Create tokenization dictionary.
+    # Upload a custom tokenization dictionary to use with the specified collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @return [nil]
-    def delete_expansions(environment_id:, collection_id:)
+    # @param tokenization_rules [Array[TokenDictRule]] An array of tokenization rules. Each rule contains, the original `text` string,
+    #   component `tokens`, any alternate character set `readings`, and which
+    #   `part_of_speech` the text is from.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def create_tokenization_dictionary(environment_id:, collection_id:, tokenization_rules: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_expansions")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_tokenization_dictionary")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-
-      request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: false
-      )
-      nil
-    end
-
-    ##
-    # @!method delete_stopword_list(environment_id:, collection_id:)
-    # Delete a custom stopword list.
-    # Delete a custom stopword list from the collection. After a custom stopword list is
-    #   deleted, the default list is used for the collection.
-    # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
-    # @return [nil]
-    def delete_stopword_list(environment_id:, collection_id:)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_stopword_list")
-      headers.merge!(sdk_headers)
-
-      params = {
-        "version" => @version
+      data = {
+        "tokenization_rules" => tokenization_rules
       }
 
-      method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections/%s/word_lists/tokenization_dictionary" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
-      request(
-        method: "DELETE",
+      response = request(
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
-        accept_json: false
+        json: data,
+        accept_json: true
       )
-      nil
+      response
     end
 
     ##
@@ -1106,71 +1099,83 @@ module IBMWatson
     end
 
     ##
-    # @!method get_tokenization_dictionary_status(environment_id:, collection_id:)
-    # Get tokenization dictionary status.
-    # Returns the current status of the tokenization dictionary for the specified
-    #   collection.
+    # @!method create_stopword_list(environment_id:, collection_id:, stopword_file:, stopword_filename: nil)
+    # Create stopword list.
+    # Upload a custom stopword list to use with the specified collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
+    # @param stopword_file [File] The content of the stopword list to ingest.
+    # @param stopword_filename [String] The filename for stopword_file.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_tokenization_dictionary_status(environment_id:, collection_id:)
+    def create_stopword_list(environment_id:, collection_id:, stopword_file:, stopword_filename: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
+      raise ArgumentError.new("stopword_file must be provided") if stopword_file.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_tokenization_dictionary_status")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_stopword_list")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/word_lists/tokenization_dictionary" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      form_data = {}
+
+      unless stopword_file.instance_of?(StringIO) || stopword_file.instance_of?(File)
+        stopword_file = stopword_file.respond_to?(:to_json) ? StringIO.new(stopword_file.to_json) : StringIO.new(stopword_file)
+      end
+      stopword_filename = stopword_file.path if stopword_filename.nil? && stopword_file.respond_to?(:path)
+      form_data[:stopword_file] = HTTP::FormData::File.new(stopword_file, content_type: "application/octet-stream", filename: stopword_filename)
+
+      method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "GET",
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
+        form: form_data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method list_expansions(environment_id:, collection_id:)
-    # Get the expansion list.
-    # Returns the current expansion list for the specified collection. If an expansion
-    #   list is not specified, an object with empty expansion arrays is returned.
+    # @!method delete_stopword_list(environment_id:, collection_id:)
+    # Delete a custom stopword list.
+    # Delete a custom stopword list from the collection. After a custom stopword list is
+    #   deleted, the default list is used for the collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_expansions(environment_id:, collection_id:)
+    # @return [nil]
+    def delete_stopword_list(environment_id:, collection_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_expansions")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_stopword_list")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
-      response = request(
-        method: "GET",
+      request(
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
-        accept_json: true
+        accept_json: false
       )
-      response
+      nil
     end
     #########################
     # Documents
@@ -1215,10 +1220,8 @@ module IBMWatson
     #   rejected.
     # @param filename [String] The filename for file.
     # @param file_content_type [String] The content type of file.
-    # @param metadata [String] If you're using the Data Crawler to upload your documents, you can test a document
-    #   against the type of metadata that the Data Crawler might send. The maximum
-    #   supported metadata file size is 1 MB. Metadata parts larger than 1 MB are
-    #   rejected.
+    # @param metadata [String] The maximum supported metadata file size is 1 MB. Metadata parts larger than 1 MB
+    #   are rejected.
     #   Example:  ``` {
     #     \"Creator\": \"Johnny Appleseed\",
     #     \"Subject\": \"Apples\"
@@ -1263,44 +1266,6 @@ module IBMWatson
       response
     end
 
-    ##
-    # @!method delete_document(environment_id:, collection_id:, document_id:)
-    # Delete a document.
-    # If the given document ID is invalid, or if the document is not found, then the a
-    #   success response is returned (HTTP status code `200`) with the status set to
-    #   'deleted'.
-    # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
-    # @param document_id [String] The ID of the document.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_document(environment_id:, collection_id:, document_id:)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-
-      raise ArgumentError.new("document_id must be provided") if document_id.nil?
-
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_document")
-      headers.merge!(sdk_headers)
-
-      params = {
-        "version" => @version
-      }
-
-      method_url = "/v1/environments/%s/collections/%s/documents/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(document_id)]
-
-      response = request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
     ##
     # @!method get_document_status(environment_id:, collection_id:, document_id:)
     # Get document details.
@@ -1357,10 +1322,8 @@ module IBMWatson
     #   rejected.
     # @param filename [String] The filename for file.
     # @param file_content_type [String] The content type of file.
-    # @param metadata [String] If you're using the Data Crawler to upload your documents, you can test a document
-    #   against the type of metadata that the Data Crawler might send. The maximum
-    #   supported metadata file size is 1 MB. Metadata parts larger than 1 MB are
-    #   rejected.
+    # @param metadata [String] The maximum supported metadata file size is 1 MB. Metadata parts larger than 1 MB
+    #   are rejected.
     #   Example:  ``` {
     #     \"Creator\": \"Johnny Appleseed\",
     #     \"Subject\": \"Apples\"
@@ -1406,28 +1369,64 @@ module IBMWatson
       )
       response
     end
+
+    ##
+    # @!method delete_document(environment_id:, collection_id:, document_id:)
+    # Delete a document.
+    # If the given document ID is invalid, or if the document is not found, then the a
+    #   success response is returned (HTTP status code `200`) with the status set to
+    #   'deleted'.
+    # @param environment_id [String] The ID of the environment.
+    # @param collection_id [String] The ID of the collection.
+    # @param document_id [String] The ID of the document.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def delete_document(environment_id:, collection_id:, document_id:)
+      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
+
+      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
+
+      raise ArgumentError.new("document_id must be provided") if document_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_document")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      method_url = "/v1/environments/%s/collections/%s/documents/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(document_id)]
+
+      response = request(
+        method: "DELETE",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
     #########################
     # Queries
     #########################
 
     ##
-    # @!method federated_query(environment_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
-    # Long environment queries.
-    # Complex queries might be too long for a standard method query. By using this
-    #   method, you can construct longer queries. However, these queries may take longer
-    #   to complete than the standard method. For details, see the [Discovery service
+    # @!method query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
+    # Query a collection.
+    # By using this method, you can construct long queries. For details, see the
+    #   [Discovery
     #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-query-concepts#query-concepts).
     # @param environment_id [String] The ID of the environment.
+    # @param collection_id [String] The ID of the collection.
     # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
     #   Filter searches are better for metadata-type searches and for assessing the
     #   concepts in the data set.
     # @param query [String] A query search returns all documents in your data set with full enrichments and
     #   full text, but with the most relevant documents listed first. Use a query search
-    #   when you want to find the most relevant search results. You cannot use
-    #   **natural_language_query** and **query** at the same time.
+    #   when you want to find the most relevant search results.
     # @param natural_language_query [String] A natural language query that returns relevant documents by utilizing training
-    #   data and natural language understanding. You cannot use **natural_language_query**
-    #   and **query** at the same time.
+    #   data and natural language understanding.
     # @param passages [Boolean] A passages query that returns the most relevant passages from the results.
     # @param aggregation [String] An aggregation search that returns an exact answer by combining query search with
     #   filters. Useful for applications to build lists, tables, and time series. For a
@@ -1476,13 +1475,15 @@ module IBMWatson
     #   parameter.
     # @param logging_opt_out [Boolean] If `true`, queries are not stored in the Discovery **Logs** endpoint.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def federated_query(environment_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
+    def query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
+      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
+
       headers = {
         "X-Watson-Logging-Opt-Out" => logging_opt_out
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "federated_query")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query")
       headers.merge!(sdk_headers)
 
       params = {
@@ -1512,7 +1513,7 @@ module IBMWatson
         "bias" => bias
       }
 
-      method_url = "/v1/environments/%s/query" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments/%s/collections/%s/query" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
         method: "POST",
@@ -1526,25 +1527,23 @@ module IBMWatson
     end
 
     ##
-    # @!method federated_query_notices(environment_id:, collection_ids:, filter: nil, query: nil, natural_language_query: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
-    # Query multiple collection system notices.
+    # @!method query_notices(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
+    # Query system notices.
     # Queries for notices (errors or warnings) that might have been generated by the
     #   system. Notices are generated when ingesting documents and performing relevance
-    #   training. See the [Discovery service
+    #   training. See the [Discovery
     #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-query-concepts#query-concepts)
     #   for more details on the query language.
     # @param environment_id [String] The ID of the environment.
-    # @param collection_ids [Array[String]] A comma-separated list of collection IDs to be queried against.
+    # @param collection_id [String] The ID of the collection.
     # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
     #   Filter searches are better for metadata-type searches and for assessing the
     #   concepts in the data set.
     # @param query [String] A query search returns all documents in your data set with full enrichments and
-    #   full text, but with the most relevant documents listed first. Use a query search
-    #   when you want to find the most relevant search results. You cannot use
-    #   **natural_language_query** and **query** at the same time.
+    #   full text, but with the most relevant documents listed first.
     # @param natural_language_query [String] A natural language query that returns relevant documents by utilizing training
-    #   data and natural language understanding. You cannot use **natural_language_query**
-    #   and **query** at the same time.
+    #   data and natural language understanding.
+    # @param passages [Boolean] A passages query that returns the most relevant passages from the results.
     # @param aggregation [String] An aggregation search that returns an exact answer by combining query search with
     #   filters. Useful for applications to build lists, tables, and time series. For a
     #   full list of possible aggregations, see the Query reference.
@@ -1560,6 +1559,11 @@ module IBMWatson
     #   ascending. Ascending is the default sort direction if no prefix is specified.
     # @param highlight [Boolean] When true, a highlight field is returned for each result which contains the fields
     #   which match the query with `<em></em>` tags around the matching query terms.
+    # @param passages_fields [Array[String]] A comma-separated list of fields that passages are drawn from. If this parameter
+    #   not specified, then all top-level fields are included.
+    # @param passages_count [Fixnum] The maximum number of passages to return. The search returns fewer passages if the
+    #   requested total is not found.
+    # @param passages_characters [Fixnum] The approximate number of characters that any one passage will have.
     # @param deduplicate_field [String] When specified, duplicate results based on the field specified are removed from
     #   the returned results. Duplicate comparison is limited to the current query only,
     #   **offset** is not considered. This parameter is currently Beta functionality.
@@ -1575,35 +1579,38 @@ module IBMWatson
     #   identify similar documents. If not specified, the entire document is used for
     #   comparison.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def federated_query_notices(environment_id:, collection_ids:, filter: nil, query: nil, natural_language_query: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
+    def query_notices(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("collection_ids must be provided") if collection_ids.nil?
+      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "federated_query_notices")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_notices")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "collection_ids" => collection_ids.to_a,
         "filter" => filter,
         "query" => query,
         "natural_language_query" => natural_language_query,
+        "passages" => passages,
         "aggregation" => aggregation,
         "count" => count,
         "return" => return_fields.to_a,
         "offset" => offset,
         "sort" => sort.to_a,
         "highlight" => highlight,
+        "passages.fields" => passages_fields.to_a,
+        "passages.count" => passages_count,
+        "passages.characters" => passages_characters,
         "deduplicate.field" => deduplicate_field,
         "similar" => similar,
         "similar.document_ids" => similar_document_ids.to_a,
         "similar.fields" => similar_fields.to_a
       }
 
-      method_url = "/v1/environments/%s/notices" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments/%s/collections/%s/notices" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
         method: "GET",
@@ -1616,24 +1623,20 @@ module IBMWatson
     end
 
     ##
-    # @!method query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
-    # Long collection queries.
-    # Complex queries might be too long for a standard method query. By using this
-    #   method, you can construct longer queries. However, these queries may take longer
-    #   to complete than the standard method. For details, see the [Discovery service
+    # @!method federated_query(environment_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
+    # Query multiple collections.
+    # By using this method, you can construct long queries that search multiple
+    #   collection. For details, see the [Discovery
     #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-query-concepts#query-concepts).
     # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
     # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
     #   Filter searches are better for metadata-type searches and for assessing the
     #   concepts in the data set.
     # @param query [String] A query search returns all documents in your data set with full enrichments and
     #   full text, but with the most relevant documents listed first. Use a query search
-    #   when you want to find the most relevant search results. You cannot use
-    #   **natural_language_query** and **query** at the same time.
+    #   when you want to find the most relevant search results.
     # @param natural_language_query [String] A natural language query that returns relevant documents by utilizing training
-    #   data and natural language understanding. You cannot use **natural_language_query**
-    #   and **query** at the same time.
+    #   data and natural language understanding.
     # @param passages [Boolean] A passages query that returns the most relevant passages from the results.
     # @param aggregation [String] An aggregation search that returns an exact answer by combining query search with
     #   filters. Useful for applications to build lists, tables, and time series. For a
@@ -1682,15 +1685,13 @@ module IBMWatson
     #   parameter.
     # @param logging_opt_out [Boolean] If `true`, queries are not stored in the Discovery **Logs** endpoint.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
+    def federated_query(environment_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, logging_opt_out: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-
       headers = {
         "X-Watson-Logging-Opt-Out" => logging_opt_out
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "federated_query")
       headers.merge!(sdk_headers)
 
       params = {
@@ -1720,60 +1721,7 @@ module IBMWatson
         "bias" => bias
       }
 
-      method_url = "/v1/environments/%s/collections/%s/query" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-
-      response = request(
-        method: "POST",
-        url: method_url,
-        headers: headers,
-        params: params,
-        json: data,
-        accept_json: true
-      )
-      response
-    end
-
-    ##
-    # @!method query_entities(environment_id:, collection_id:, feature: nil, entity: nil, context: nil, count: nil, evidence_count: nil)
-    # Knowledge Graph entity query.
-    # See the [Knowledge Graph
-    #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-kg#kg)
-    #   for more details.
-    # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
-    # @param feature [String] The entity query feature to perform. Supported features are `disambiguate` and
-    #   `similar_entities`.
-    # @param entity [QueryEntitiesEntity] A text string that appears within the entity text field.
-    # @param context [QueryEntitiesContext] Entity text to provide context for the queried entity and rank based on that
-    #   association. For example, if you wanted to query the city of London in England
-    #   your query would look for `London` with the context of `England`.
-    # @param count [Fixnum] The number of results to return. The default is `10`. The maximum is `1000`.
-    # @param evidence_count [Fixnum] The number of evidence items to return for each result. The default is `0`. The
-    #   maximum number of evidence items per query is 10,000.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query_entities(environment_id:, collection_id:, feature: nil, entity: nil, context: nil, count: nil, evidence_count: nil)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_entities")
-      headers.merge!(sdk_headers)
-
-      params = {
-        "version" => @version
-      }
-
-      data = {
-        "feature" => feature,
-        "entity" => entity,
-        "context" => context,
-        "count" => count,
-        "evidence_count" => evidence_count
-      }
-
-      method_url = "/v1/environments/%s/collections/%s/query_entities" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/query" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
         method: "POST",
@@ -1787,26 +1735,22 @@ module IBMWatson
     end
 
     ##
-    # @!method query_notices(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
-    # Query system notices.
+    # @!method federated_query_notices(environment_id:, collection_ids:, filter: nil, query: nil, natural_language_query: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
+    # Query multiple collection system notices.
     # Queries for notices (errors or warnings) that might have been generated by the
     #   system. Notices are generated when ingesting documents and performing relevance
-    #   training. See the [Discovery service
+    #   training. See the [Discovery
     #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-query-concepts#query-concepts)
     #   for more details on the query language.
     # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
+    # @param collection_ids [Array[String]] A comma-separated list of collection IDs to be queried against.
     # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
     #   Filter searches are better for metadata-type searches and for assessing the
     #   concepts in the data set.
     # @param query [String] A query search returns all documents in your data set with full enrichments and
-    #   full text, but with the most relevant documents listed first. Use a query search
-    #   when you want to find the most relevant search results. You cannot use
-    #   **natural_language_query** and **query** at the same time.
+    #   full text, but with the most relevant documents listed first.
     # @param natural_language_query [String] A natural language query that returns relevant documents by utilizing training
-    #   data and natural language understanding. You cannot use **natural_language_query**
-    #   and **query** at the same time.
-    # @param passages [Boolean] A passages query that returns the most relevant passages from the results.
+    #   data and natural language understanding.
     # @param aggregation [String] An aggregation search that returns an exact answer by combining query search with
     #   filters. Useful for applications to build lists, tables, and time series. For a
     #   full list of possible aggregations, see the Query reference.
@@ -1822,11 +1766,6 @@ module IBMWatson
     #   ascending. Ascending is the default sort direction if no prefix is specified.
     # @param highlight [Boolean] When true, a highlight field is returned for each result which contains the fields
     #   which match the query with `<em></em>` tags around the matching query terms.
-    # @param passages_fields [Array[String]] A comma-separated list of fields that passages are drawn from. If this parameter
-    #   not specified, then all top-level fields are included.
-    # @param passages_count [Fixnum] The maximum number of passages to return. The search returns fewer passages if the
-    #   requested total is not found.
-    # @param passages_characters [Fixnum] The approximate number of characters that any one passage will have.
     # @param deduplicate_field [String] When specified, duplicate results based on the field specified are removed from
     #   the returned results. Duplicate comparison is limited to the current query only,
     #   **offset** is not considered. This parameter is currently Beta functionality.
@@ -1842,44 +1781,94 @@ module IBMWatson
     #   identify similar documents. If not specified, the entire document is used for
     #   comparison.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query_notices(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
+    def federated_query_notices(environment_id:, collection_ids:, filter: nil, query: nil, natural_language_query: nil, aggregation: nil, count: nil, return_fields: nil, offset: nil, sort: nil, highlight: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
+      raise ArgumentError.new("collection_ids must be provided") if collection_ids.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_notices")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "federated_query_notices")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
+        "collection_ids" => collection_ids.to_a,
         "filter" => filter,
         "query" => query,
         "natural_language_query" => natural_language_query,
-        "passages" => passages,
         "aggregation" => aggregation,
         "count" => count,
-        "return" => return_fields.to_a,
-        "offset" => offset,
-        "sort" => sort.to_a,
-        "highlight" => highlight,
-        "passages.fields" => passages_fields.to_a,
-        "passages.count" => passages_count,
-        "passages.characters" => passages_characters,
-        "deduplicate.field" => deduplicate_field,
-        "similar" => similar,
-        "similar.document_ids" => similar_document_ids.to_a,
-        "similar.fields" => similar_fields.to_a
+        "return" => return_fields.to_a,
+        "offset" => offset,
+        "sort" => sort.to_a,
+        "highlight" => highlight,
+        "deduplicate.field" => deduplicate_field,
+        "similar" => similar,
+        "similar.document_ids" => similar_document_ids.to_a,
+        "similar.fields" => similar_fields.to_a
+      }
+
+      method_url = "/v1/environments/%s/notices" % [ERB::Util.url_encode(environment_id)]
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
+    ##
+    # @!method query_entities(environment_id:, collection_id:, feature: nil, entity: nil, context: nil, count: nil, evidence_count: nil)
+    # Knowledge Graph entity query.
+    # See the [Knowledge Graph
+    #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-kg#kg)
+    #   for more details.
+    # @param environment_id [String] The ID of the environment.
+    # @param collection_id [String] The ID of the collection.
+    # @param feature [String] The entity query feature to perform. Supported features are `disambiguate` and
+    #   `similar_entities`.
+    # @param entity [QueryEntitiesEntity] A text string that appears within the entity text field.
+    # @param context [QueryEntitiesContext] Entity text to provide context for the queried entity and rank based on that
+    #   association. For example, if you wanted to query the city of London in England
+    #   your query would look for `London` with the context of `England`.
+    # @param count [Fixnum] The number of results to return. The default is `10`. The maximum is `1000`.
+    # @param evidence_count [Fixnum] The number of evidence items to return for each result. The default is `0`. The
+    #   maximum number of evidence items per query is 10,000.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def query_entities(environment_id:, collection_id:, feature: nil, entity: nil, context: nil, count: nil, evidence_count: nil)
+      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
+
+      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
+
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_entities")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version
+      }
+
+      data = {
+        "feature" => feature,
+        "entity" => entity,
+        "context" => context,
+        "count" => count,
+        "evidence_count" => evidence_count
       }
 
-      method_url = "/v1/environments/%s/collections/%s/notices" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections/%s/query_entities" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "GET",
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
@@ -1946,71 +1935,58 @@ module IBMWatson
     #########################
 
     ##
-    # @!method add_training_data(environment_id:, collection_id:, natural_language_query: nil, filter: nil, examples: nil)
-    # Add query to training data.
-    # Adds a query to the training data for this collection. The query can contain a
-    #   filter and natural language query.
+    # @!method list_training_data(environment_id:, collection_id:)
+    # List training data.
+    # Lists the training data for the specified collection.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @param natural_language_query [String] The natural text query for the new training query.
-    # @param filter [String] The filter used on the collection before the **natural_language_query** is
-    #   applied.
-    # @param examples [Array[TrainingExample]] Array of training examples.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def add_training_data(environment_id:, collection_id:, natural_language_query: nil, filter: nil, examples: nil)
+    def list_training_data(environment_id:, collection_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "add_training_data")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_training_data")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "natural_language_query" => natural_language_query,
-        "filter" => filter,
-        "examples" => examples
-      }
-
       method_url = "/v1/environments/%s/collections/%s/training_data" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
-        method: "POST",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method create_training_example(environment_id:, collection_id:, query_id:, document_id: nil, cross_reference: nil, relevance: nil)
-    # Add example to training data query.
-    # Adds a example to this training data query.
+    # @!method add_training_data(environment_id:, collection_id:, natural_language_query: nil, filter: nil, examples: nil)
+    # Add query to training data.
+    # Adds a query to the training data for this collection. The query can contain a
+    #   filter and natural language query.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @param query_id [String] The ID of the query used for training.
-    # @param document_id [String] The document ID associated with this training example.
-    # @param cross_reference [String] The cross reference associated with this training example.
-    # @param relevance [Fixnum] The relevance of the training example.
+    # @param natural_language_query [String] The natural text query for the new training query.
+    # @param filter [String] The filter used on the collection before the **natural_language_query** is
+    #   applied.
+    # @param examples [Array[TrainingExample]] Array of training examples.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_training_example(environment_id:, collection_id:, query_id:, document_id: nil, cross_reference: nil, relevance: nil)
+    def add_training_data(environment_id:, collection_id:, natural_language_query: nil, filter: nil, examples: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
-      raise ArgumentError.new("query_id must be provided") if query_id.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_training_example")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "add_training_data")
       headers.merge!(sdk_headers)
 
       params = {
@@ -2018,12 +1994,12 @@ module IBMWatson
       }
 
       data = {
-        "document_id" => document_id,
-        "cross_reference" => cross_reference,
-        "relevance" => relevance
+        "natural_language_query" => natural_language_query,
+        "filter" => filter,
+        "examples" => examples
       }
 
-      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
+      method_url = "/v1/environments/%s/collections/%s/training_data" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
 
       response = request(
         method: "POST",
@@ -2070,15 +2046,15 @@ module IBMWatson
     end
 
     ##
-    # @!method delete_training_data(environment_id:, collection_id:, query_id:)
-    # Delete a training data query.
-    # Removes the training data query and all associated examples from the training data
-    #   set.
+    # @!method get_training_data(environment_id:, collection_id:, query_id:)
+    # Get details about a query.
+    # Gets details for a specific training data query, including the query string and
+    #   all examples.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
     # @param query_id [String] The ID of the query used for training.
-    # @return [nil]
-    def delete_training_data(environment_id:, collection_id:, query_id:)
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_training_data(environment_id:, collection_id:, query_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
@@ -2087,7 +2063,7 @@ module IBMWatson
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_training_data")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_training_data")
       headers.merge!(sdk_headers)
 
       params = {
@@ -2096,44 +2072,42 @@ module IBMWatson
 
       method_url = "/v1/environments/%s/collections/%s/training_data/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
 
-      request(
-        method: "DELETE",
+      response = request(
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        accept_json: false
+        accept_json: true
       )
-      nil
+      response
     end
 
     ##
-    # @!method delete_training_example(environment_id:, collection_id:, query_id:, example_id:)
-    # Delete example for training data query.
-    # Deletes the example document with the given ID from the training data query.
+    # @!method delete_training_data(environment_id:, collection_id:, query_id:)
+    # Delete a training data query.
+    # Removes the training data query and all associated examples from the training data
+    #   set.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
     # @param query_id [String] The ID of the query used for training.
-    # @param example_id [String] The ID of the document as it is indexed.
     # @return [nil]
-    def delete_training_example(environment_id:, collection_id:, query_id:, example_id:)
+    def delete_training_data(environment_id:, collection_id:, query_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       raise ArgumentError.new("query_id must be provided") if query_id.nil?
 
-      raise ArgumentError.new("example_id must be provided") if example_id.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_training_example")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_training_data")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
+      method_url = "/v1/environments/%s/collections/%s/training_data/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
 
       request(
         method: "DELETE",
@@ -2146,15 +2120,14 @@ module IBMWatson
     end
 
     ##
-    # @!method get_training_data(environment_id:, collection_id:, query_id:)
-    # Get details about a query.
-    # Gets details for a specific training data query, including the query string and
-    #   all examples.
+    # @!method list_training_examples(environment_id:, collection_id:, query_id:)
+    # List examples for a training data query.
+    # List all examples for this training data query.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
     # @param query_id [String] The ID of the query used for training.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_training_data(environment_id:, collection_id:, query_id:)
+    def list_training_examples(environment_id:, collection_id:, query_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
@@ -2163,14 +2136,14 @@ module IBMWatson
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_training_data")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_training_examples")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/training_data/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
+      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
 
       response = request(
         method: "GET",
@@ -2183,125 +2156,147 @@ module IBMWatson
     end
 
     ##
-    # @!method get_training_example(environment_id:, collection_id:, query_id:, example_id:)
-    # Get details for training data example.
-    # Gets the details for this training example.
+    # @!method create_training_example(environment_id:, collection_id:, query_id:, document_id: nil, cross_reference: nil, relevance: nil)
+    # Add example to training data query.
+    # Adds a example to this training data query.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
     # @param query_id [String] The ID of the query used for training.
-    # @param example_id [String] The ID of the document as it is indexed.
+    # @param document_id [String] The document ID associated with this training example.
+    # @param cross_reference [String] The cross reference associated with this training example.
+    # @param relevance [Fixnum] The relevance of the training example.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_training_example(environment_id:, collection_id:, query_id:, example_id:)
+    def create_training_example(environment_id:, collection_id:, query_id:, document_id: nil, cross_reference: nil, relevance: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       raise ArgumentError.new("query_id must be provided") if query_id.nil?
 
-      raise ArgumentError.new("example_id must be provided") if example_id.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_training_example")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_training_example")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
+      data = {
+        "document_id" => document_id,
+        "cross_reference" => cross_reference,
+        "relevance" => relevance
+      }
+
+      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
 
       response = request(
-        method: "GET",
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method list_training_data(environment_id:, collection_id:)
-    # List training data.
-    # Lists the training data for the specified collection.
+    # @!method delete_training_example(environment_id:, collection_id:, query_id:, example_id:)
+    # Delete example for training data query.
+    # Deletes the example document with the given ID from the training data query.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_training_data(environment_id:, collection_id:)
+    # @param query_id [String] The ID of the query used for training.
+    # @param example_id [String] The ID of the document as it is indexed.
+    # @return [nil]
+    def delete_training_example(environment_id:, collection_id:, query_id:, example_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
+      raise ArgumentError.new("query_id must be provided") if query_id.nil?
+
+      raise ArgumentError.new("example_id must be provided") if example_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_training_data")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_training_example")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/training_data" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
+      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
 
-      response = request(
-        method: "GET",
+      request(
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
-        accept_json: true
+        accept_json: false
       )
-      response
+      nil
     end
 
     ##
-    # @!method list_training_examples(environment_id:, collection_id:, query_id:)
-    # List examples for a training data query.
-    # List all examples for this training data query.
+    # @!method update_training_example(environment_id:, collection_id:, query_id:, example_id:, cross_reference: nil, relevance: nil)
+    # Change label or cross reference for example.
+    # Changes the label or cross reference query for this training data example.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
     # @param query_id [String] The ID of the query used for training.
+    # @param example_id [String] The ID of the document as it is indexed.
+    # @param cross_reference [String] The example to add.
+    # @param relevance [Fixnum] The relevance value for this example.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_training_examples(environment_id:, collection_id:, query_id:)
+    def update_training_example(environment_id:, collection_id:, query_id:, example_id:, cross_reference: nil, relevance: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
 
       raise ArgumentError.new("query_id must be provided") if query_id.nil?
 
+      raise ArgumentError.new("example_id must be provided") if example_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_training_examples")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_training_example")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
+      data = {
+        "cross_reference" => cross_reference,
+        "relevance" => relevance
+      }
+
+      method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
 
       response = request(
-        method: "GET",
+        method: "PUT",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method update_training_example(environment_id:, collection_id:, query_id:, example_id:, cross_reference: nil, relevance: nil)
-    # Change label or cross reference for example.
-    # Changes the label or cross reference query for this training data example.
+    # @!method get_training_example(environment_id:, collection_id:, query_id:, example_id:)
+    # Get details for training data example.
+    # Gets the details for this training example.
     # @param environment_id [String] The ID of the environment.
     # @param collection_id [String] The ID of the collection.
     # @param query_id [String] The ID of the query used for training.
     # @param example_id [String] The ID of the document as it is indexed.
-    # @param cross_reference [String] The example to add.
-    # @param relevance [Fixnum] The relevance value for this example.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_training_example(environment_id:, collection_id:, query_id:, example_id:, cross_reference: nil, relevance: nil)
+    def get_training_example(environment_id:, collection_id:, query_id:, example_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
@@ -2312,26 +2307,20 @@ module IBMWatson
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_training_example")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_training_example")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "cross_reference" => cross_reference,
-        "relevance" => relevance
-      }
-
       method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
 
       response = request(
-        method: "PUT",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
@@ -2422,32 +2411,42 @@ module IBMWatson
     end
 
     ##
-    # @!method get_metrics_event_rate(start_time: nil, end_time: nil, result_type: nil)
-    # Percentage of queries with an associated event.
-    # The percentage of queries using the **natural_language_query** parameter that have
-    #   a corresponding \"click\" event over a specified time window.  This metric
-    #   requires having integrated event tracking in your application using the **Events**
-    #   API.
-    # @param start_time [Time] Metric is computed from data recorded after this timestamp; must be in
-    #   `YYYY-MM-DDThh:mm:ssZ` format.
-    # @param end_time [Time] Metric is computed from data recorded before this timestamp; must be in
-    #   `YYYY-MM-DDThh:mm:ssZ` format.
-    # @param result_type [String] The type of result to consider when calculating the metric.
+    # @!method query_log(filter: nil, query: nil, count: nil, offset: nil, sort: nil)
+    # Search the query and event log.
+    # Searches the query and event log to find query sessions that match the specified
+    #   criteria. Searching the **logs** endpoint uses the standard Discovery query syntax
+    #   for the parameters that are supported.
+    # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
+    #   Filter searches are better for metadata-type searches and for assessing the
+    #   concepts in the data set.
+    # @param query [String] A query search returns all documents in your data set with full enrichments and
+    #   full text, but with the most relevant documents listed first.
+    # @param count [Fixnum] Number of results to return. The maximum for the **count** and **offset** values
+    #   together in any one query is **10000**.
+    # @param offset [Fixnum] The number of query results to skip at the beginning. For example, if the total
+    #   number of results that are returned is 10 and the offset is 8, it returns the last
+    #   two results. The maximum for the **count** and **offset** values together in any
+    #   one query is **10000**.
+    # @param sort [Array[String]] A comma-separated list of fields in the document to sort on. You can optionally
+    #   specify a sort direction by prefixing the field with `-` for descending or `+` for
+    #   ascending. Ascending is the default sort direction if no prefix is specified.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def get_metrics_event_rate(start_time: nil, end_time: nil, result_type: nil)
+    def query_log(filter: nil, query: nil, count: nil, offset: nil, sort: nil)
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_metrics_event_rate")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_log")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version,
-        "start_time" => start_time,
-        "end_time" => end_time,
-        "result_type" => result_type
+        "filter" => filter,
+        "query" => query,
+        "count" => count,
+        "offset" => offset,
+        "sort" => sort.to_a
       }
 
-      method_url = "/v1/metrics/event_rate"
+      method_url = "/v1/logs"
 
       response = request(
         method: "GET",
@@ -2568,6 +2567,44 @@ module IBMWatson
       response
     end
 
+    ##
+    # @!method get_metrics_event_rate(start_time: nil, end_time: nil, result_type: nil)
+    # Percentage of queries with an associated event.
+    # The percentage of queries using the **natural_language_query** parameter that have
+    #   a corresponding \"click\" event over a specified time window.  This metric
+    #   requires having integrated event tracking in your application using the **Events**
+    #   API.
+    # @param start_time [Time] Metric is computed from data recorded after this timestamp; must be in
+    #   `YYYY-MM-DDThh:mm:ssZ` format.
+    # @param end_time [Time] Metric is computed from data recorded before this timestamp; must be in
+    #   `YYYY-MM-DDThh:mm:ssZ` format.
+    # @param result_type [String] The type of result to consider when calculating the metric.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_metrics_event_rate(start_time: nil, end_time: nil, result_type: nil)
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "get_metrics_event_rate")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "start_time" => start_time,
+        "end_time" => end_time,
+        "result_type" => result_type
+      }
+
+      method_url = "/v1/metrics/event_rate"
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
+
     ##
     # @!method get_metrics_query_token_event(count: nil)
     # Most frequent query tokens with an event.
@@ -2600,46 +2637,32 @@ module IBMWatson
       )
       response
     end
+    #########################
+    # Credentials
+    #########################
 
     ##
-    # @!method query_log(filter: nil, query: nil, count: nil, offset: nil, sort: nil)
-    # Search the query and event log.
-    # Searches the query and event log to find query sessions that match the specified
-    #   criteria. Searching the **logs** endpoint uses the standard Discovery query syntax
-    #   for the parameters that are supported.
-    # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
-    #   Filter searches are better for metadata-type searches and for assessing the
-    #   concepts in the data set.
-    # @param query [String] A query search returns all documents in your data set with full enrichments and
-    #   full text, but with the most relevant documents listed first. Use a query search
-    #   when you want to find the most relevant search results. You cannot use
-    #   **natural_language_query** and **query** at the same time.
-    # @param count [Fixnum] Number of results to return. The maximum for the **count** and **offset** values
-    #   together in any one query is **10000**.
-    # @param offset [Fixnum] The number of query results to skip at the beginning. For example, if the total
-    #   number of results that are returned is 10 and the offset is 8, it returns the last
-    #   two results. The maximum for the **count** and **offset** values together in any
-    #   one query is **10000**.
-    # @param sort [Array[String]] A comma-separated list of fields in the document to sort on. You can optionally
-    #   specify a sort direction by prefixing the field with `-` for descending or `+` for
-    #   ascending. Ascending is the default sort direction if no prefix is specified.
+    # @!method list_credentials(environment_id:)
+    # List credentials.
+    # List all the source credentials that have been created for this service instance.
+    #
+    #    **Note:**  All credentials are sent over an encrypted connection and encrypted at
+    #   rest.
+    # @param environment_id [String] The ID of the environment.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query_log(filter: nil, query: nil, count: nil, offset: nil, sort: nil)
+    def list_credentials(environment_id:)
+      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_log")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_credentials")
       headers.merge!(sdk_headers)
 
       params = {
-        "version" => @version,
-        "filter" => filter,
-        "query" => query,
-        "count" => count,
-        "offset" => offset,
-        "sort" => sort.to_a
+        "version" => @version
       }
 
-      method_url = "/v1/logs"
+      method_url = "/v1/environments/%s/credentials" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
         method: "GET",
@@ -2650,12 +2673,9 @@ module IBMWatson
       )
       response
     end
-    #########################
-    # Credentials
-    #########################
 
     ##
-    # @!method create_credentials(environment_id:, source_type: nil, credential_details: nil)
+    # @!method create_credentials(environment_id:, source_type: nil, credential_details: nil, status: nil)
     # Create credentials.
     # Creates a set of credentials to connect to a remote source. Created credentials
     #   are used in a configuration to associate a collection with the remote source.
@@ -2675,8 +2695,12 @@ module IBMWatson
     # @param credential_details [CredentialDetails] Object containing details of the stored credentials.
     #
     #   Obtain credentials for your source from the administrator of the source.
+    # @param status [String] The current status of this set of credentials. `connected` indicates that the
+    #   credentials are available to use with the source configuration of a collection.
+    #   `invalid` refers to the credentials (for example, the password provided has
+    #   expired) and must be corrected before they can be used with a collection.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_credentials(environment_id:, source_type: nil, credential_details: nil)
+    def create_credentials(environment_id:, source_type: nil, credential_details: nil, status: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       headers = {
@@ -2690,7 +2714,8 @@ module IBMWatson
 
       data = {
         "source_type" => source_type,
-        "credential_details" => credential_details
+        "credential_details" => credential_details,
+        "status" => status
       }
 
       method_url = "/v1/environments/%s/credentials" % [ERB::Util.url_encode(environment_id)]
@@ -2706,39 +2731,6 @@ module IBMWatson
       response
     end
 
-    ##
-    # @!method delete_credentials(environment_id:, credential_id:)
-    # Delete credentials.
-    # Deletes a set of stored credentials from your Discovery instance.
-    # @param environment_id [String] The ID of the environment.
-    # @param credential_id [String] The unique identifier for a set of source credentials.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_credentials(environment_id:, credential_id:)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-
-      raise ArgumentError.new("credential_id must be provided") if credential_id.nil?
-
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_credentials")
-      headers.merge!(sdk_headers)
-
-      params = {
-        "version" => @version
-      }
-
-      method_url = "/v1/environments/%s/credentials/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(credential_id)]
-
-      response = request(
-        method: "DELETE",
-        url: method_url,
-        headers: headers,
-        params: params,
-        accept_json: true
-      )
-      response
-    end
-
     ##
     # @!method get_credentials(environment_id:, credential_id:)
     # View Credentials.
@@ -2776,87 +2768,92 @@ module IBMWatson
     end
 
     ##
-    # @!method list_credentials(environment_id:)
-    # List credentials.
-    # List all the source credentials that have been created for this service instance.
+    # @!method update_credentials(environment_id:, credential_id:, source_type: nil, credential_details: nil, status: nil)
+    # Update credentials.
+    # Updates an existing set of source credentials.
     #
-    #    **Note:**  All credentials are sent over an encrypted connection and encrypted at
+    #   **Note:** All credentials are sent over an encrypted connection and encrypted at
     #   rest.
     # @param environment_id [String] The ID of the environment.
+    # @param credential_id [String] The unique identifier for a set of source credentials.
+    # @param source_type [String] The source that this credentials object connects to.
+    #   -  `box` indicates the credentials are used to connect an instance of Enterprise
+    #   Box.
+    #   -  `salesforce` indicates the credentials are used to connect to Salesforce.
+    #   -  `sharepoint` indicates the credentials are used to connect to Microsoft
+    #   SharePoint Online.
+    #   -  `web_crawl` indicates the credentials are used to perform a web crawl.
+    #   =  `cloud_object_storage` indicates the credentials are used to connect to an IBM
+    #   Cloud Object Store.
+    # @param credential_details [CredentialDetails] Object containing details of the stored credentials.
+    #
+    #   Obtain credentials for your source from the administrator of the source.
+    # @param status [String] The current status of this set of credentials. `connected` indicates that the
+    #   credentials are available to use with the source configuration of a collection.
+    #   `invalid` refers to the credentials (for example, the password provided has
+    #   expired) and must be corrected before they can be used with a collection.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_credentials(environment_id:)
+    def update_credentials(environment_id:, credential_id:, source_type: nil, credential_details: nil, status: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
+      raise ArgumentError.new("credential_id must be provided") if credential_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_credentials")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_credentials")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/credentials" % [ERB::Util.url_encode(environment_id)]
+      data = {
+        "source_type" => source_type,
+        "credential_details" => credential_details,
+        "status" => status
+      }
+
+      method_url = "/v1/environments/%s/credentials/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(credential_id)]
 
       response = request(
-        method: "GET",
+        method: "PUT",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method update_credentials(environment_id:, credential_id:, source_type: nil, credential_details: nil)
-    # Update credentials.
-    # Updates an existing set of source credentials.
-    #
-    #   **Note:** All credentials are sent over an encrypted connection and encrypted at
-    #   rest.
+    # @!method delete_credentials(environment_id:, credential_id:)
+    # Delete credentials.
+    # Deletes a set of stored credentials from your Discovery instance.
     # @param environment_id [String] The ID of the environment.
     # @param credential_id [String] The unique identifier for a set of source credentials.
-    # @param source_type [String] The source that this credentials object connects to.
-    #   -  `box` indicates the credentials are used to connect an instance of Enterprise
-    #   Box.
-    #   -  `salesforce` indicates the credentials are used to connect to Salesforce.
-    #   -  `sharepoint` indicates the credentials are used to connect to Microsoft
-    #   SharePoint Online.
-    #   -  `web_crawl` indicates the credentials are used to perform a web crawl.
-    #   =  `cloud_object_storage` indicates the credentials are used to connect to an IBM
-    #   Cloud Object Store.
-    # @param credential_details [CredentialDetails] Object containing details of the stored credentials.
-    #
-    #   Obtain credentials for your source from the administrator of the source.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def update_credentials(environment_id:, credential_id:, source_type: nil, credential_details: nil)
+    def delete_credentials(environment_id:, credential_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       raise ArgumentError.new("credential_id must be provided") if credential_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "update_credentials")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_credentials")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "source_type" => source_type,
-        "credential_details" => credential_details
-      }
-
       method_url = "/v1/environments/%s/credentials/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(credential_id)]
 
       response = request(
-        method: "PUT",
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
@@ -2866,69 +2863,66 @@ module IBMWatson
     #########################
 
     ##
-    # @!method create_gateway(environment_id:, name: nil)
-    # Create Gateway.
-    # Create a gateway configuration to use with a remotely installed gateway.
+    # @!method list_gateways(environment_id:)
+    # List Gateways.
+    # List the currently configured gateways.
     # @param environment_id [String] The ID of the environment.
-    # @param name [String] User-defined name.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_gateway(environment_id:, name: nil)
+    def list_gateways(environment_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_gateway")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_gateways")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      data = {
-        "name" => name
-      }
-
       method_url = "/v1/environments/%s/gateways" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "POST",
+        method: "GET",
         url: method_url,
         headers: headers,
         params: params,
-        json: data,
         accept_json: true
       )
       response
     end
 
     ##
-    # @!method delete_gateway(environment_id:, gateway_id:)
-    # Delete Gateway.
-    # Delete the specified gateway configuration.
+    # @!method create_gateway(environment_id:, name: nil)
+    # Create Gateway.
+    # Create a gateway configuration to use with a remotely installed gateway.
     # @param environment_id [String] The ID of the environment.
-    # @param gateway_id [String] The requested gateway ID.
+    # @param name [String] User-defined name.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def delete_gateway(environment_id:, gateway_id:)
+    def create_gateway(environment_id:, name: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
-      raise ArgumentError.new("gateway_id must be provided") if gateway_id.nil?
-
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_gateway")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "create_gateway")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/gateways/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(gateway_id)]
+      data = {
+        "name" => name
+      }
+
+      method_url = "/v1/environments/%s/gateways" % [ERB::Util.url_encode(environment_id)]
 
       response = request(
-        method: "DELETE",
+        method: "POST",
         url: method_url,
         headers: headers,
         params: params,
+        json: data,
         accept_json: true
       )
       response
@@ -2968,27 +2962,30 @@ module IBMWatson
     end
 
     ##
-    # @!method list_gateways(environment_id:)
-    # List Gateways.
-    # List the currently configured gateways.
+    # @!method delete_gateway(environment_id:, gateway_id:)
+    # Delete Gateway.
+    # Delete the specified gateway configuration.
     # @param environment_id [String] The ID of the environment.
+    # @param gateway_id [String] The requested gateway ID.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_gateways(environment_id:)
+    def delete_gateway(environment_id:, gateway_id:)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
 
+      raise ArgumentError.new("gateway_id must be provided") if gateway_id.nil?
+
       headers = {
       }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_gateways")
+      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "delete_gateway")
       headers.merge!(sdk_headers)
 
       params = {
         "version" => @version
       }
 
-      method_url = "/v1/environments/%s/gateways" % [ERB::Util.url_encode(environment_id)]
+      method_url = "/v1/environments/%s/gateways/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(gateway_id)]
 
       response = request(
-        method: "GET",
+        method: "DELETE",
         url: method_url,
         headers: headers,
         params: params,