chore: restructure token managers into a directory

Author: pyrooka

ibm_cloud_sdk_core/__init__.py

@@ -38,9 +38,9 @@
 
 from .base_service import BaseService
 from .detailed_response import DetailedResponse
-from .iam_token_manager import IAMTokenManager
-from .jwt_token_manager import JWTTokenManager
-from .cp4d_token_manager import CP4DTokenManager
+from .token_managers.iam_token_manager import IAMTokenManager
+from .token_managers.jwt_token_manager import JWTTokenManager
+from .token_managers.cp4d_token_manager import CP4DTokenManager
 from .api_exception import ApiException
 from .utils import datetime_to_string, string_to_datetime, read_external_sources
 from .utils import datetime_to_string_list, string_to_datetime_list

ibm_cloud_sdk_core/authenticators/cp4d_authenticator.py

@@ -19,7 +19,7 @@
 from requests import Request
 
 from .authenticator import Authenticator
-from ..cp4d_token_manager import CP4DTokenManager
+from ..token_managers.cp4d_token_manager import CP4DTokenManager
 from ..utils import has_bad_first_or_last_char
 
 

ibm_cloud_sdk_core/authenticators/iam_authenticator.py

@@ -17,7 +17,7 @@
 from typing import Dict, Optional
 
 from .iam_request_based_authenticator import IAMRequestBasedAuthenticator
-from ..iam_token_manager import IAMTokenManager
+from ..token_managers.iam_token_manager import IAMTokenManager
 from ..utils import has_bad_first_or_last_char
 
 class IAMAuthenticator(IAMRequestBasedAuthenticator):

ibm_cloud_sdk_core/base_service.py

@@ -33,7 +33,7 @@
                     cleanup_values, read_external_sources, strip_extra_slashes)
 from .detailed_response import DetailedResponse
 from .api_exception import ApiException
-from .token_manager import TokenManager
+from .token_managers.token_manager import TokenManager
 
 # Uncomment this to enable http debugging
 # import http.client as http_client

ibm_cloud_sdk_core/token_managers/__init__.py

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+# Copyright 2021 IBM All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

ibm_cloud_sdk_core/cp4d_token_manager.py renamed to ibm_cloud_sdk_core/token_managers/cp4d_token_manager.py

@@ -16,6 +16,7 @@
 
 import json
 from typing import Dict, Optional
+
 from .jwt_token_manager import JWTTokenManager
 
 

ibm_cloud_sdk_core/iam_request_based_token_manager.py renamed to ibm_cloud_sdk_core/token_managers/iam_request_based_token_manager.py

@@ -18,6 +18,7 @@
 
 from .jwt_token_manager import JWTTokenManager
 
+
 class IAMRequestBasedTokenManager(JWTTokenManager):
     """The IamRequestBasedTokenManager class contains code relevant to any token manager that
     interacts with the IAM service to manage a token. It stores information relevant to all

ibm_cloud_sdk_core/iam_token_manager.py renamed to ibm_cloud_sdk_core/token_managers/iam_token_manager.py

@@ -18,6 +18,7 @@
 
 from .iam_request_based_token_manager import IAMRequestBasedTokenManager
 
+
 class IAMTokenManager(IAMRequestBasedTokenManager):
     """The IAMTokenManager takes an api key and performs the necessary interactions with
     the IAM token service to obtain and store a suitable bearer token. Additionally, the IAMTokenManager

ibm_cloud_sdk_core/jwt_token_manager.py renamed to ibm_cloud_sdk_core/token_managers/jwt_token_manager.py

@@ -19,8 +19,8 @@
 
 import jwt
 import requests
-from .api_exception import ApiException
 from .token_manager import TokenManager
+from ..api_exception import ApiException
 
 
 # pylint: disable=too-many-instance-attributes

ibm_cloud_sdk_core/token_manager.py renamed to ibm_cloud_sdk_core/token_managers/token_manager.py

@@ -21,7 +21,7 @@
 import time
 import requests
 
-from .api_exception import ApiException
+from ..api_exception import ApiException
 
 
 # pylint: disable=too-many-instance-attributes

test/test_token_manager.py

@@ -21,7 +21,7 @@
 import pytest
 
 from ibm_cloud_sdk_core import ApiException
-from ibm_cloud_sdk_core.token_manager import TokenManager
+from ibm_cloud_sdk_core.token_managers.token_manager import TokenManager
 
 
 class MockTokenManager(TokenManager):