diff --git a/Adyen/services/management.py b/Adyen/services/management/__init__.py similarity index 62% rename from Adyen/services/management.py rename to Adyen/services/management/__init__.py index 4dbe8c32..e5fcbf62 100644 --- a/Adyen/services/management.py +++ b/Adyen/services/management/__init__.py @@ -8,34 +8,34 @@ Generated by: https://openapi-generator.tech """ -from .base import AdyenServiceBase -from .management_dir.api_credentials_company_level_api import APICredentialsCompanyLevelApi -from .management_dir.api_credentials_merchant_level_api import APICredentialsMerchantLevelApi -from .management_dir.api_key_company_level_api import APIKeyCompanyLevelApi -from .management_dir.api_key_merchant_level_api import APIKeyMerchantLevelApi -from .management_dir.account_company_level_api import AccountCompanyLevelApi -from .management_dir.account_merchant_level_api import AccountMerchantLevelApi -from .management_dir.account_store_level_api import AccountStoreLevelApi -from .management_dir.allowed_origins_company_level_api import AllowedOriginsCompanyLevelApi -from .management_dir.allowed_origins_merchant_level_api import AllowedOriginsMerchantLevelApi -from .management_dir.client_key_company_level_api import ClientKeyCompanyLevelApi -from .management_dir.client_key_merchant_level_api import ClientKeyMerchantLevelApi -from .management_dir.my_api_credential_api import MyAPICredentialApi -from .management_dir.payment_methods_merchant_level_api import PaymentMethodsMerchantLevelApi -from .management_dir.payout_settings_merchant_level_api import PayoutSettingsMerchantLevelApi -from .management_dir.terminal_actions_company_level_api import TerminalActionsCompanyLevelApi -from .management_dir.terminal_actions_terminal_level_api import TerminalActionsTerminalLevelApi -from .management_dir.terminal_orders_company_level_api import TerminalOrdersCompanyLevelApi -from .management_dir.terminal_orders_merchant_level_api import TerminalOrdersMerchantLevelApi -from .management_dir.terminal_settings_company_level_api import TerminalSettingsCompanyLevelApi -from .management_dir.terminal_settings_merchant_level_api import TerminalSettingsMerchantLevelApi -from .management_dir.terminal_settings_store_level_api import TerminalSettingsStoreLevelApi -from .management_dir.terminal_settings_terminal_level_api import TerminalSettingsTerminalLevelApi -from .management_dir.terminals_terminal_level_api import TerminalsTerminalLevelApi -from .management_dir.users_company_level_api import UsersCompanyLevelApi -from .management_dir.users_merchant_level_api import UsersMerchantLevelApi -from .management_dir.webhooks_company_level_api import WebhooksCompanyLevelApi -from .management_dir.webhooks_merchant_level_api import WebhooksMerchantLevelApi +from ..base import AdyenServiceBase +from .api_credentials_company_level_api import APICredentialsCompanyLevelApi +from .api_credentials_merchant_level_api import APICredentialsMerchantLevelApi +from .api_key_company_level_api import APIKeyCompanyLevelApi +from .api_key_merchant_level_api import APIKeyMerchantLevelApi +from .account_company_level_api import AccountCompanyLevelApi +from .account_merchant_level_api import AccountMerchantLevelApi +from .account_store_level_api import AccountStoreLevelApi +from .allowed_origins_company_level_api import AllowedOriginsCompanyLevelApi +from .allowed_origins_merchant_level_api import AllowedOriginsMerchantLevelApi +from .client_key_company_level_api import ClientKeyCompanyLevelApi +from .client_key_merchant_level_api import ClientKeyMerchantLevelApi +from .my_api_credential_api import MyAPICredentialApi +from .payment_methods_merchant_level_api import PaymentMethodsMerchantLevelApi +from .payout_settings_merchant_level_api import PayoutSettingsMerchantLevelApi +from .terminal_actions_company_level_api import TerminalActionsCompanyLevelApi +from .terminal_actions_terminal_level_api import TerminalActionsTerminalLevelApi +from .terminal_orders_company_level_api import TerminalOrdersCompanyLevelApi +from .terminal_orders_merchant_level_api import TerminalOrdersMerchantLevelApi +from .terminal_settings_company_level_api import TerminalSettingsCompanyLevelApi +from .terminal_settings_merchant_level_api import TerminalSettingsMerchantLevelApi +from .terminal_settings_store_level_api import TerminalSettingsStoreLevelApi +from .terminal_settings_terminal_level_api import TerminalSettingsTerminalLevelApi +from .terminals_terminal_level_api import TerminalsTerminalLevelApi +from .users_company_level_api import UsersCompanyLevelApi +from .users_merchant_level_api import UsersMerchantLevelApi +from .webhooks_company_level_api import WebhooksCompanyLevelApi +from .webhooks_merchant_level_api import WebhooksMerchantLevelApi class AdyenManagementApi(AdyenServiceBase): diff --git a/Adyen/services/management_dir/account_company_level_api.py b/Adyen/services/management/account_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/account_company_level_api.py rename to Adyen/services/management/account_company_level_api.py diff --git a/Adyen/services/management_dir/account_merchant_level_api.py b/Adyen/services/management/account_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/account_merchant_level_api.py rename to Adyen/services/management/account_merchant_level_api.py diff --git a/Adyen/services/management_dir/account_store_level_api.py b/Adyen/services/management/account_store_level_api.py similarity index 100% rename from Adyen/services/management_dir/account_store_level_api.py rename to Adyen/services/management/account_store_level_api.py diff --git a/Adyen/services/management_dir/allowed_origins_company_level_api.py b/Adyen/services/management/allowed_origins_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/allowed_origins_company_level_api.py rename to Adyen/services/management/allowed_origins_company_level_api.py diff --git a/Adyen/services/management_dir/allowed_origins_merchant_level_api.py b/Adyen/services/management/allowed_origins_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/allowed_origins_merchant_level_api.py rename to Adyen/services/management/allowed_origins_merchant_level_api.py diff --git a/Adyen/services/management_dir/api_credentials_company_level_api.py b/Adyen/services/management/api_credentials_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/api_credentials_company_level_api.py rename to Adyen/services/management/api_credentials_company_level_api.py diff --git a/Adyen/services/management_dir/api_credentials_merchant_level_api.py b/Adyen/services/management/api_credentials_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/api_credentials_merchant_level_api.py rename to Adyen/services/management/api_credentials_merchant_level_api.py diff --git a/Adyen/services/management_dir/api_key_company_level_api.py b/Adyen/services/management/api_key_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/api_key_company_level_api.py rename to Adyen/services/management/api_key_company_level_api.py diff --git a/Adyen/services/management_dir/api_key_merchant_level_api.py b/Adyen/services/management/api_key_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/api_key_merchant_level_api.py rename to Adyen/services/management/api_key_merchant_level_api.py diff --git a/Adyen/services/management_dir/client_key_company_level_api.py b/Adyen/services/management/client_key_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/client_key_company_level_api.py rename to Adyen/services/management/client_key_company_level_api.py diff --git a/Adyen/services/management_dir/client_key_merchant_level_api.py b/Adyen/services/management/client_key_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/client_key_merchant_level_api.py rename to Adyen/services/management/client_key_merchant_level_api.py diff --git a/Adyen/services/management_dir/my_api_credential_api.py b/Adyen/services/management/my_api_credential_api.py similarity index 100% rename from Adyen/services/management_dir/my_api_credential_api.py rename to Adyen/services/management/my_api_credential_api.py diff --git a/Adyen/services/management_dir/payment_methods_merchant_level_api.py b/Adyen/services/management/payment_methods_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/payment_methods_merchant_level_api.py rename to Adyen/services/management/payment_methods_merchant_level_api.py diff --git a/Adyen/services/management_dir/payout_settings_merchant_level_api.py b/Adyen/services/management/payout_settings_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/payout_settings_merchant_level_api.py rename to Adyen/services/management/payout_settings_merchant_level_api.py diff --git a/Adyen/services/management_dir/terminal_actions_company_level_api.py b/Adyen/services/management/terminal_actions_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_actions_company_level_api.py rename to Adyen/services/management/terminal_actions_company_level_api.py diff --git a/Adyen/services/management_dir/terminal_actions_terminal_level_api.py b/Adyen/services/management/terminal_actions_terminal_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_actions_terminal_level_api.py rename to Adyen/services/management/terminal_actions_terminal_level_api.py diff --git a/Adyen/services/management_dir/terminal_orders_company_level_api.py b/Adyen/services/management/terminal_orders_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_orders_company_level_api.py rename to Adyen/services/management/terminal_orders_company_level_api.py diff --git a/Adyen/services/management_dir/terminal_orders_merchant_level_api.py b/Adyen/services/management/terminal_orders_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_orders_merchant_level_api.py rename to Adyen/services/management/terminal_orders_merchant_level_api.py diff --git a/Adyen/services/management_dir/terminal_settings_company_level_api.py b/Adyen/services/management/terminal_settings_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_settings_company_level_api.py rename to Adyen/services/management/terminal_settings_company_level_api.py diff --git a/Adyen/services/management_dir/terminal_settings_merchant_level_api.py b/Adyen/services/management/terminal_settings_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_settings_merchant_level_api.py rename to Adyen/services/management/terminal_settings_merchant_level_api.py diff --git a/Adyen/services/management_dir/terminal_settings_store_level_api.py b/Adyen/services/management/terminal_settings_store_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_settings_store_level_api.py rename to Adyen/services/management/terminal_settings_store_level_api.py diff --git a/Adyen/services/management_dir/terminal_settings_terminal_level_api.py b/Adyen/services/management/terminal_settings_terminal_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminal_settings_terminal_level_api.py rename to Adyen/services/management/terminal_settings_terminal_level_api.py diff --git a/Adyen/services/management_dir/terminals_terminal_level_api.py b/Adyen/services/management/terminals_terminal_level_api.py similarity index 100% rename from Adyen/services/management_dir/terminals_terminal_level_api.py rename to Adyen/services/management/terminals_terminal_level_api.py diff --git a/Adyen/services/management_dir/users_company_level_api.py b/Adyen/services/management/users_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/users_company_level_api.py rename to Adyen/services/management/users_company_level_api.py diff --git a/Adyen/services/management_dir/users_merchant_level_api.py b/Adyen/services/management/users_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/users_merchant_level_api.py rename to Adyen/services/management/users_merchant_level_api.py diff --git a/Adyen/services/management_dir/webhooks_company_level_api.py b/Adyen/services/management/webhooks_company_level_api.py similarity index 100% rename from Adyen/services/management_dir/webhooks_company_level_api.py rename to Adyen/services/management/webhooks_company_level_api.py diff --git a/Adyen/services/management_dir/webhooks_merchant_level_api.py b/Adyen/services/management/webhooks_merchant_level_api.py similarity index 100% rename from Adyen/services/management_dir/webhooks_merchant_level_api.py rename to Adyen/services/management/webhooks_merchant_level_api.py diff --git a/Adyen/services/management_dir/__init__.py b/Adyen/services/management_dir/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Makefile b/Makefile index ca15fe63..fffcff48 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ coverage: generator:=python -openapi-generator-cli:=java -jar openapi-generator-cli-6.0.1.jar +openapi-generator-cli:=java -jar build/openapi-generator-cli.jar services:=balancePlatform binlookup checkout dataProtection legalEntityManagement management payments payouts platformsAccount platformsFund platformsHostedOnboardingPage platformsNotificationConfiguration recurring storedValue terminalManagement transfer binlookup: spec=BinLookupService-v52 @@ -30,7 +30,8 @@ platformsHostedOnboardingPage: spec=HopService-v6 transfer: spec=TransferService-v3 $(services): build/spec - rm -rf Adyen/services/$@_dir + wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar -O build/openapi-generator-cli.jar + rm -rf Adyen/services/$@ $(openapi-generator-cli) generate \ -i build/spec/json/$(spec).json \ -g $(generator) \ @@ -39,14 +40,10 @@ $(services): build/spec --global-property apis,apiTests=false,apiDocs=false,supportingFiles=api-single.py\ --additional-properties serviceName=$@ mkdir -p Adyen/services - cp build/api/api-single.py Adyen/services/$@.py - cp -r build/openapi_client/api Adyen/services/$@_dir - touch Adyen/services/$@_dir/__init__.py - touch Adyen/services/__init__.py + cp -r build/openapi_client/api Adyen/services/$@ + cp build/api/api-single.py Adyen/services/$@/__init__.py rm -rf build build/spec: git clone https://github.com/Adyen/adyen-openapi.git build/spec sed -i 's/"openapi" : "3.[0-9].[0-9]"/"openapi" : "3.0.0"/' build/spec/json/*.json - - diff --git a/templates/api-single.mustache b/templates/api-single.mustache index 7bfd6523..da99157c 100644 --- a/templates/api-single.mustache +++ b/templates/api-single.mustache @@ -1,8 +1,8 @@ {{>partial_header}} -from .base import AdyenServiceBase +from ..base import AdyenServiceBase {{#apiInfo}} {{#apis}} -from .{{serviceName}}_dir.{{classFilename}} import {{classname}} +from .{{classFilename}} import {{classname}} {{/apis}} {{/apiInfo}}