ibm_watson 0.13.0 → 0.14.0

data/lib/ibm_watson/text_to_speech_v1.rb

@@ -36,16 +36,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Text to Speech V1 service.
-  class TextToSpeechV1 < WatsonService
+  class TextToSpeechV1 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -102,11 +101,11 @@ module IBMWatson
     #
     #   **See also:** [Specifying a
     #   voice](https://cloud.ibm.com/docs/services/text-to-speech/http.html#voices).
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_voices
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "list_voices")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "list_voices")
 
       method_url = "/v1/voices"
 
@@ -134,13 +133,13 @@ module IBMWatson
     #   returned. You must make the request with service credentials created for the
     #   instance of the service that owns the custom model. Omit the parameter to see
     #   information about the specified voice with no customization.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_voice(voice:, customization_id: nil)
       raise ArgumentError.new("voice must be provided") if voice.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_voice")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_voice")
 
       params = {
         "customization_id" => customization_id
@@ -263,14 +262,14 @@ module IBMWatson
     #   language of the indicated voice. You must make the request with service
     #   credentials created for the instance of the service that owns the custom model.
     #   Omit the parameter to use the specified voice with no customization.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def synthesize(text:, accept: nil, voice: nil, customization_id: nil)
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
         "Accept" => accept
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "synthesize")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "synthesize")
 
       params = {
         "voice" => voice,
@@ -322,13 +321,13 @@ module IBMWatson
     #   must make the request with service credentials created for the instance of the
     #   service that owns the custom model. Omit the parameter to see the translation for
     #   the specified voice with no customization.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_pronunciation(text:, voice: nil, format: nil, customization_id: nil)
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_pronunciation")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_pronunciation")
 
       params = {
         "text" => text,
@@ -369,13 +368,13 @@ module IBMWatson
     #   default language, `en-US`.
     # @param description [String] A description of the new custom voice model. Specifying a description is
     #   recommended.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def create_voice_model(name:, language: nil, description: nil)
       raise ArgumentError.new("name must be provided") if name.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "create_voice_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "create_voice_model")
 
       data = {
         "name" => name,
@@ -412,11 +411,11 @@ module IBMWatson
     # @param language [String] The language for which custom voice models that are owned by the requesting
     #   service credentials are to be returned. Omit the parameter to see all custom voice
     #   models that are owned by the requester.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_voice_models(language: nil)
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "list_voice_models")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "list_voice_models")
 
       params = {
         "language" => language
@@ -481,7 +480,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "update_voice_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "update_voice_model")
 
       data = {
         "name" => name,
@@ -516,13 +515,13 @@ module IBMWatson
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_voice_model(customization_id:)
       raise ArgumentError.new("customization_id must be provided") if customization_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_voice_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_voice_model")
 
       method_url = "/v1/customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
@@ -554,7 +553,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "delete_voice_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "delete_voice_model")
 
       method_url = "/v1/customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
@@ -621,7 +620,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "add_words")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "add_words")
 
       data = {
         "words" => words
@@ -654,13 +653,13 @@ module IBMWatson
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_words(customization_id:)
       raise ArgumentError.new("customization_id must be provided") if customization_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "list_words")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "list_words")
 
       method_url = "/v1/customizations/%s/words" % [ERB::Util.url_encode(customization_id)]
 
@@ -729,7 +728,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "add_word")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "add_word")
 
       data = {
         "translation" => translation,
@@ -763,7 +762,7 @@ module IBMWatson
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
     # @param word [String] The word that is to be queried from the custom voice model.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_word(customization_id:, word:)
       raise ArgumentError.new("customization_id must be provided") if customization_id.nil?
 
@@ -771,7 +770,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_word")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "get_word")
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word)]
 
@@ -807,7 +806,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "delete_word")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "delete_word")
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word)]
 
@@ -844,7 +843,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "delete_user_data")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "text_to_speech", service_version: "V1", operation_id: "delete_user_data")
 
       params = {
         "customer_id" => customer_id

data/lib/ibm_watson/tone_analyzer_v3.rb

@@ -29,16 +29,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Tone Analyzer V3 service.
-  class ToneAnalyzerV3 < WatsonService
+  class ToneAnalyzerV3 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -146,7 +145,7 @@ module IBMWatson
     #   variants are treated as their parent language; for example, `en-US` is interpreted
     #   as `en`. You can use different languages for **Content-Language** and
     #   **Accept-Language**.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def tone(tone_input:, content_type: nil, sentences: nil, tones: nil, content_language: nil, accept_language: nil)
       raise ArgumentError.new("tone_input must be provided") if tone_input.nil?
 
@@ -155,7 +154,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "tone_analyzer", service_version: "V3", operation_id: "tone")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "tone_analyzer", service_version: "V3", operation_id: "tone")
 
       params = {
         "version" => @version,
@@ -212,7 +211,7 @@ module IBMWatson
     #   variants are treated as their parent language; for example, `en-US` is interpreted
     #   as `en`. You can use different languages for **Content-Language** and
     #   **Accept-Language**.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def tone_chat(utterances:, content_language: nil, accept_language: nil)
       raise ArgumentError.new("utterances must be provided") if utterances.nil?
 
@@ -220,7 +219,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "tone_analyzer", service_version: "V3", operation_id: "tone_chat")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "tone_analyzer", service_version: "V3", operation_id: "tone_chat")
 
       params = {
         "version" => @version

data/lib/ibm_watson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMWatson
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/lib/ibm_watson/visual_recognition_v3.rb

@@ -21,16 +21,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Visual Recognition V3 service.
-  class VisualRecognitionV3 < WatsonService
+  class VisualRecognitionV3 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -116,12 +115,12 @@ module IBMWatson
     #   - `explicit`: Evaluates whether the image might be pornographic.
     # @param images_file_content_type [String] The content type of images_file.
     # @param images_filename [String] The filename for images_file.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def classify(images_file: nil, accept_language: nil, url: nil, threshold: nil, owners: nil, classifier_ids: nil, images_file_content_type: nil, images_filename: nil)
       headers = {
         "Accept-Language" => accept_language
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "classify")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "classify")
 
       params = {
         "version" => @version
@@ -178,7 +177,8 @@ module IBMWatson
     #   Detect faces method does not support general biometric facial recognition.
     #
     #   Supported image formats include .gif, .jpg, .png, and .tif. The maximum image size
-    #   is 10 MB. The minimum recommended pixel density is 32X32 pixels per inch.
+    #   is 10 MB. The minimum recommended pixel density is 32X32 pixels, but the service
+    #   tends to perform better with images that are at least 224 x 224 pixels.
     # @param images_file [File] An image file (gif, .jpg, .png, .tif.) or .zip file with images. Limit the .zip
     #   file to 100 MB. You can include a maximum of 15 images in a request.
     #
@@ -188,19 +188,20 @@ module IBMWatson
     #
     #   You can also include an image with the **url** parameter.
     # @param url [String] The URL of an image to analyze. Must be in .gif, .jpg, .png, or .tif format. The
-    #   minimum recommended pixel density is 32X32 pixels per inch, and the maximum image
+    #   minimum recommended pixel density is 32X32 pixels, but the service tends to
+    #   perform better with images that are at least 224 x 224 pixels. The maximum image
     #   size is 10 MB. Redirects are followed, so you can use a shortened URL.
     #
     #   You can also include images with the **images_file** parameter.
     # @param images_file_content_type [String] The content type of images_file.
     # @param images_filename [String] The filename for images_file.
     # @param accept_language [String] The desired language of parts of the response. See the response for details.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
-    def detect_faces(images_file: nil, url: nil, images_file_content_type: nil, images_filename: nil, accept_language: nil)
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def detect_faces(images_file: nil, url: nil, accept_language: nil, images_file_content_type: nil, images_filename: nil)
       headers = {
         "Accept-Language" => accept_language
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "detect_faces")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "detect_faces")
 
       params = {
         "version" => @version
@@ -264,7 +265,7 @@ module IBMWatson
     #   Encode special characters in the file name in UTF-8.
     # @param positive_examples_filename [Hash] The filename for positive_examples.
     # @param negative_examples_filename [String] The filename for negative_examples.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def create_classifier(name:, positive_examples:, negative_examples: nil, positive_examples_filename: nil, negative_examples_filename: nil)
       raise ArgumentError.new("name must be provided") if name.nil?
 
@@ -275,7 +276,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "create_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "create_classifier")
 
       params = {
         "version" => @version
@@ -321,11 +322,11 @@ module IBMWatson
     # Retrieve a list of classifiers.
     # @param verbose [Boolean] Specify `true` to return details about the classifiers. Omit this parameter to
     #   return a brief list of classifiers.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_classifiers(verbose: nil)
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "list_classifiers")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "list_classifiers")
 
       params = {
         "version" => @version,
@@ -349,13 +350,13 @@ module IBMWatson
     # Retrieve classifier details.
     # Retrieve information about a custom classifier.
     # @param classifier_id [String] The ID of the classifier.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_classifier(classifier_id:)
       raise ArgumentError.new("classifier_id must be provided") if classifier_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "get_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "get_classifier")
 
       params = {
         "version" => @version
@@ -409,7 +410,7 @@ module IBMWatson
     #   Encode special characters in the file name in UTF-8.
     # @param positive_examples_filename [Hash] The filename for positive_examples.
     # @param negative_examples_filename [String] The filename for negative_examples.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def update_classifier(classifier_id:, positive_examples: nil, negative_examples: nil, positive_examples_filename: nil, negative_examples_filename: nil)
       raise ArgumentError.new("classifier_id must be provided") if classifier_id.nil?
 
@@ -419,7 +420,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "update_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "update_classifier")
 
       params = {
         "version" => @version
@@ -468,7 +469,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "delete_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "delete_classifier")
 
       params = {
         "version" => @version
@@ -495,13 +496,13 @@ module IBMWatson
     # Download a Core ML model file (.mlmodel) of a custom classifier that returns
     #   <tt>\"core_ml_enabled\": true</tt> in the classifier details.
     # @param classifier_id [String] The ID of the classifier.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_core_ml_model(classifier_id:)
       raise ArgumentError.new("classifier_id must be provided") if classifier_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "get_core_ml_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "get_core_ml_model")
 
       params = {
         "version" => @version
@@ -539,7 +540,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "delete_user_data")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "delete_user_data")
 
       params = {
         "version" => @version,

data/test/integration/test_iam_assistant_v1.rb

@@ -706,7 +706,7 @@ if !ENV["ASSISTANT_IAM_URL"].nil? && !ENV["ASSISTANT_IAM_APIKEY"].nil?
       begin
         service.iam_apikey(iam_apikey: "bogus_api_key")
         service.list_workspaces
-      rescue WatsonApiException => e
+      rescue IBMCloudSdkCore::ApiException => e
         assert_equal("Provided API key could not be found", e.info["errorMessage"])
         error_received = true
       end

data/test/integration/test_speech_to_text_v1.rb

@@ -55,7 +55,7 @@ if !ENV["SPEECH_TO_TEXT_USERNAME"].nil? && !ENV["SPEECH_TO_TEXT_PASSWORD"].nil?
           model_id: "bogus"
         )
       rescue StandardError => e
-        refute_nil(e.global_transaction_id)
+        refute_nil(e.error)
       end
     end
 

data/test/unit/test_assistant_v1.rb

@@ -101,7 +101,7 @@ class AssistantV1Test < Minitest::Test
         workspace_id: "boguswid",
         text: "I want financial advice today."
       )
-    rescue WatsonApiException => e
+    rescue IBMCloudSdkCore::ApiException => e
       assert_equal(error_code, e.code)
       assert_equal(error_msg, e.error)
       assert(e.to_s.instance_of?(String))
@@ -138,7 +138,7 @@ class AssistantV1Test < Minitest::Test
         workspace_id: "boguswid",
         text: "I want financial advice today."
       )
-    rescue WatsonApiException => e
+    rescue IBMCloudSdkCore::ApiException => e
       assert_equal(error_code, e.code)
       assert_equal(error_msg, e.error)
     end

data/test/unit/test_configure_http_client.rb

@@ -146,7 +146,7 @@ class HTTPConfigTest < Minitest::Test
       username: "username",
       password: "password"
     )
-    service.configure_http_client(disable_ssl: true)
+    service.configure_http_client(disable_ssl_verification: true)
     refute_nil(service.conn.default_options.ssl_context)
   end
 end

data/test/unit/test_personality_insights_v3.rb

@@ -14,7 +14,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
       .with(
         body: personality_text,
@@ -66,7 +66,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -103,7 +103,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "text/csv"
     }
-    expected_response = DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&csv_headers=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -141,7 +141,7 @@ class PersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
       .with(
         body: personality_text,

data/test/unit/test_tone_analyzer_v3.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative("./../../lib/ibm_watson/watson_api_exception.rb")
 require("json")
 require_relative("./../test_helper.rb")
 require("webmock/minitest")
@@ -14,7 +13,7 @@ class ToneAnalyzerV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, headers: headers, body: tone_response)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, headers: headers, body: tone_response)
     tone_text = File.read(Dir.getwd + "/resources/personality.txt")
     stub_request(:post, "https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone?version=2017-09-21")
       .with(
@@ -46,7 +45,7 @@ class ToneAnalyzerV3Test < Minitest::Test
       "Content-Type" => "application/json"
     }
     tone_text = File.read(Dir.getwd + "/resources/personality.txt")
-    expected_response = DetailedResponse.new(status: 200, headers: headers, body: tone_response)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, headers: headers, body: tone_response)
     stub_request(:post, "https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone?sentences=false&version=2017-09-21")
       .with(
         body: tone_text,
@@ -76,7 +75,7 @@ class ToneAnalyzerV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(body: tone_response, status: 200, headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(body: tone_response, status: 200, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone_chat?version=2017-09-21")
       .with(
         body: "{\"utterances\":[{\"text\":\"I am very happy\",\"user\":\"glenn\"}]}",
@@ -136,7 +135,7 @@ class ToneAnalyzerV3Test < Minitest::Test
     )
     begin
       service.tone(tone_input: text, content_type: "application/json")
-    rescue WatsonApiException => e
+    rescue IBMCloudSdkCore::ApiException => e
       assert_equal(error_code, e.code)
       assert_equal(error_message, e.error)
       assert_equal("C00012", e.info["sub_code"])

data/test/unit/test_vcap_using_personality_insights.rb

@@ -16,7 +16,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
       .with(
         body: personality_text,
@@ -49,7 +49,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "applicaiton/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -84,7 +84,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "text/csv"
     }
-    expected_response = DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&csv_headers=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -120,7 +120,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = IBMCloudSdkCore::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
       .with(
         body: personality_text,