onlinepayments-sdk-python3 4.22.0__zip → 5.0.0__zip

{onlinepayments-sdk-python3-4.22.0 → onlinepayments_sdk_python3-5.0.0}/onlinepayments/sdk/domain/card_payment_method_specific_output.py

@@ -1,44 +1,41 @@
 # -*- coding: utf-8 -*-
 #
-# This class was auto-generated.
+# This file was automatically generated.
 #
-from onlinepayments.sdk.data_object import DataObject
-from onlinepayments.sdk.domain.acquirer_information import AcquirerInformation
-from onlinepayments.sdk.domain.card_essentials import CardEssentials
-from onlinepayments.sdk.domain.card_fraud_results import CardFraudResults
-from onlinepayments.sdk.domain.currency_conversion import CurrencyConversion
-from onlinepayments.sdk.domain.external_token_linked import ExternalTokenLinked
-from onlinepayments.sdk.domain.network_token_essentials import NetworkTokenEssentials
-from onlinepayments.sdk.domain.payment_product3208_specific_output import PaymentProduct3208SpecificOutput
-from onlinepayments.sdk.domain.payment_product3209_specific_output import PaymentProduct3209SpecificOutput
-from onlinepayments.sdk.domain.three_d_secure_results import ThreeDSecureResults
+from typing import Optional
+
+from .acquirer_information import AcquirerInformation
+from .card_essentials import CardEssentials
+from .card_fraud_results import CardFraudResults
+from .currency_conversion import CurrencyConversion
+from .data_object import DataObject
+from .external_token_linked import ExternalTokenLinked
+from .payment_product3208_specific_output import PaymentProduct3208SpecificOutput
+from .payment_product3209_specific_output import PaymentProduct3209SpecificOutput
+from .three_d_secure_results import ThreeDSecureResults
 
 
 class CardPaymentMethodSpecificOutput(DataObject):
-    """
-    | Object containing the card payment method details
-    """
-
-    __acquirer_information = None
-    __authenticated_amount = None
-    __authorisation_code = None
-    __card = None
-    __currency_conversion = None
-    __external_token_linked = None
-    __fraud_results = None
-    __initial_scheme_transaction_id = None
-    __network_token_data = None
-    __payment_account_reference = None
-    __payment_option = None
-    __payment_product3208_specific_output = None
-    __payment_product3209_specific_output = None
-    __payment_product_id = None
-    __scheme_reference_data = None
-    __three_d_secure_results = None
-    __token = None
+
+    __acquirer_information: Optional[AcquirerInformation] = None
+    __authenticated_amount: Optional[int] = None
+    __authorisation_code: Optional[str] = None
+    __card: Optional[CardEssentials] = None
+    __currency_conversion: Optional[CurrencyConversion] = None
+    __external_token_linked: Optional[ExternalTokenLinked] = None
+    __fraud_results: Optional[CardFraudResults] = None
+    __initial_scheme_transaction_id: Optional[str] = None
+    __payment_account_reference: Optional[str] = None
+    __payment_option: Optional[str] = None
+    __payment_product3208_specific_output: Optional[PaymentProduct3208SpecificOutput] = None
+    __payment_product3209_specific_output: Optional[PaymentProduct3209SpecificOutput] = None
+    __payment_product_id: Optional[int] = None
+    __scheme_reference_data: Optional[str] = None
+    __three_d_secure_results: Optional[ThreeDSecureResults] = None
+    __token: Optional[str] = None
 
     @property
-    def acquirer_information(self) -> AcquirerInformation:
+    def acquirer_information(self) -> Optional[AcquirerInformation]:
         """
         | Information about the acquirer used to process the transaction
 
@@ -47,24 +44,24 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__acquirer_information
 
     @acquirer_information.setter
-    def acquirer_information(self, value: AcquirerInformation):
+    def acquirer_information(self, value: Optional[AcquirerInformation]) -> None:
         self.__acquirer_information = value
 
     @property
-    def authenticated_amount(self) -> int:
+    def authenticated_amount(self) -> Optional[int]:
         """
-        | Allows amount to be authenticated to be different from amount authorized. (Amount in cents and always having 2 decimals)
+        | The amount to be authenticated. This field should be populated if the amount to be authenticated differs from the amount to be authorized (by default they are considered equal). Amount in cents and always having 2 decimals.
 
         Type: int
         """
         return self.__authenticated_amount
 
     @authenticated_amount.setter
-    def authenticated_amount(self, value: int):
+    def authenticated_amount(self, value: Optional[int]) -> None:
         self.__authenticated_amount = value
 
     @property
-    def authorisation_code(self) -> str:
+    def authorisation_code(self) -> Optional[str]:
         """
         | Card Authorization code as returned by the acquirer
 
@@ -73,11 +70,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__authorisation_code
 
     @authorisation_code.setter
-    def authorisation_code(self, value: str):
+    def authorisation_code(self, value: Optional[str]) -> None:
         self.__authorisation_code = value
 
     @property
-    def card(self) -> CardEssentials:
+    def card(self) -> Optional[CardEssentials]:
         """
         | Object containing card details
 
@@ -86,33 +83,33 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__card
 
     @card.setter
-    def card(self, value: CardEssentials):
+    def card(self, value: Optional[CardEssentials]) -> None:
         self.__card = value
 
     @property
-    def currency_conversion(self) -> CurrencyConversion:
+    def currency_conversion(self) -> Optional[CurrencyConversion]:
         """
         Type: :class:`onlinepayments.sdk.domain.currency_conversion.CurrencyConversion`
         """
         return self.__currency_conversion
 
     @currency_conversion.setter
-    def currency_conversion(self, value: CurrencyConversion):
+    def currency_conversion(self, value: Optional[CurrencyConversion]) -> None:
         self.__currency_conversion = value
 
     @property
-    def external_token_linked(self) -> ExternalTokenLinked:
+    def external_token_linked(self) -> Optional[ExternalTokenLinked]:
         """
         Type: :class:`onlinepayments.sdk.domain.external_token_linked.ExternalTokenLinked`
         """
         return self.__external_token_linked
 
     @external_token_linked.setter
-    def external_token_linked(self, value: ExternalTokenLinked):
+    def external_token_linked(self, value: Optional[ExternalTokenLinked]) -> None:
         self.__external_token_linked = value
 
     @property
-    def fraud_results(self) -> CardFraudResults:
+    def fraud_results(self) -> Optional[CardFraudResults]:
         """
         | Fraud results contained in the CardFraudResults object
 
@@ -121,11 +118,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__fraud_results
 
     @fraud_results.setter
-    def fraud_results(self, value: CardFraudResults):
+    def fraud_results(self, value: Optional[CardFraudResults]) -> None:
         self.__fraud_results = value
 
     @property
-    def initial_scheme_transaction_id(self) -> str:
+    def initial_scheme_transaction_id(self) -> Optional[str]:
         """
         | The unique scheme transactionId of the initial transaction that was performed with SCA. In case this is unknown a scheme transactionId of an earlier transaction part of the same sequence can be used as a fall-back. Strongly advised to be submitted for any MerchantInitiated or recurring transaction (a subsequent one).
 
@@ -134,24 +131,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__initial_scheme_transaction_id
 
     @initial_scheme_transaction_id.setter
-    def initial_scheme_transaction_id(self, value: str):
+    def initial_scheme_transaction_id(self, value: Optional[str]) -> None:
         self.__initial_scheme_transaction_id = value
 
     @property
-    def network_token_data(self) -> NetworkTokenEssentials:
-        """
-        | Object containing network token details
-
-        Type: :class:`onlinepayments.sdk.domain.network_token_essentials.NetworkTokenEssentials`
-        """
-        return self.__network_token_data
-
-    @network_token_data.setter
-    def network_token_data(self, value: NetworkTokenEssentials):
-        self.__network_token_data = value
-
-    @property
-    def payment_account_reference(self) -> str:
+    def payment_account_reference(self) -> Optional[str]:
         """
         | The Payment Account Reference is a unique alphanumeric identifier that links a PAN with all subsequent PANs for the same payment account (e.g., following card replacement) and all EMV payment tokens associated with that account. On its own Payment Account Reference cannot be used to start financial transactions, but it does allow for complying with regulatory requirements, performing risk analysis & supporting loyalty programs. Please note that the Payment Account Reference is a value returned after an authorization & only if provided by the acquirer and/or the issuer.
 
@@ -160,11 +144,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__payment_account_reference
 
     @payment_account_reference.setter
-    def payment_account_reference(self, value: str):
+    def payment_account_reference(self, value: Optional[str]) -> None:
         self.__payment_account_reference = value
 
     @property
-    def payment_option(self) -> str:
+    def payment_option(self) -> Optional[str]:
         """
         | The specific payment option for the payment. To be used as a complement of the more generic paymentProductId (oney, banquecasino, cofidis), which allows to define a variation of the selected paymentProductId (ex: facilypay3x, banquecasino4x, cofidis3x-sansfrais, ...). List of modalities included in the payment product page.
 
@@ -173,11 +157,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__payment_option
 
     @payment_option.setter
-    def payment_option(self, value: str):
+    def payment_option(self, value: Optional[str]) -> None:
         self.__payment_option = value
 
     @property
-    def payment_product3208_specific_output(self) -> PaymentProduct3208SpecificOutput:
+    def payment_product3208_specific_output(self) -> Optional[PaymentProduct3208SpecificOutput]:
         """
         | OneyDuplo Leroy Merlin specific details
 
@@ -186,11 +170,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__payment_product3208_specific_output
 
     @payment_product3208_specific_output.setter
-    def payment_product3208_specific_output(self, value: PaymentProduct3208SpecificOutput):
+    def payment_product3208_specific_output(self, value: Optional[PaymentProduct3208SpecificOutput]) -> None:
         self.__payment_product3208_specific_output = value
 
     @property
-    def payment_product3209_specific_output(self) -> PaymentProduct3209SpecificOutput:
+    def payment_product3209_specific_output(self) -> Optional[PaymentProduct3209SpecificOutput]:
         """
         | OneyDuplo Alcampo specific details
 
@@ -199,11 +183,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__payment_product3209_specific_output
 
     @payment_product3209_specific_output.setter
-    def payment_product3209_specific_output(self, value: PaymentProduct3209SpecificOutput):
+    def payment_product3209_specific_output(self, value: Optional[PaymentProduct3209SpecificOutput]) -> None:
         self.__payment_product3209_specific_output = value
 
     @property
-    def payment_product_id(self) -> int:
+    def payment_product_id(self) -> Optional[int]:
         """
         | Payment product identifier - Please see Products documentation for a full overview of possible values.
 
@@ -212,11 +196,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__payment_product_id
 
     @payment_product_id.setter
-    def payment_product_id(self, value: int):
+    def payment_product_id(self, value: Optional[int]) -> None:
         self.__payment_product_id = value
 
     @property
-    def scheme_reference_data(self) -> str:
+    def scheme_reference_data(self) -> Optional[str]:
         """
         | This is the unique Scheme Reference Data from the initial transaction that was performed with a Strong Customer Authentication. In case this value is unknown, a Scheme Reference of an earlier transaction that was part of the same sequence can be used as a fall-back. Still, it is strongly advised to submit this value for any Merchant Initiated Transaction or any recurring transaction (hereby defined as "Subsequent").
 
@@ -225,11 +209,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__scheme_reference_data
 
     @scheme_reference_data.setter
-    def scheme_reference_data(self, value: str):
+    def scheme_reference_data(self, value: Optional[str]) -> None:
         self.__scheme_reference_data = value
 
     @property
-    def three_d_secure_results(self) -> ThreeDSecureResults:
+    def three_d_secure_results(self) -> Optional[ThreeDSecureResults]:
         """
         | 3D Secure results object
 
@@ -238,11 +222,11 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__three_d_secure_results
 
     @three_d_secure_results.setter
-    def three_d_secure_results(self, value: ThreeDSecureResults):
+    def three_d_secure_results(self, value: Optional[ThreeDSecureResults]) -> None:
         self.__three_d_secure_results = value
 
     @property
-    def token(self) -> str:
+    def token(self) -> Optional[str]:
         """
         | ID of the token. This property is populated when the payment was done with a token or when the payment was tokenized.
 
@@ -251,10 +235,10 @@ class CardPaymentMethodSpecificOutput(DataObject):
         return self.__token
 
     @token.setter
-    def token(self, value: str):
+    def token(self, value: Optional[str]) -> None:
         self.__token = value
 
-    def to_dictionary(self):
+    def to_dictionary(self) -> dict:
         dictionary = super(CardPaymentMethodSpecificOutput, self).to_dictionary()
         if self.acquirer_information is not None:
             dictionary['acquirerInformation'] = self.acquirer_information.to_dictionary()
@@ -272,8 +256,6 @@ class CardPaymentMethodSpecificOutput(DataObject):
             dictionary['fraudResults'] = self.fraud_results.to_dictionary()
         if self.initial_scheme_transaction_id is not None:
             dictionary['initialSchemeTransactionId'] = self.initial_scheme_transaction_id
-        if self.network_token_data is not None:
-            dictionary['networkTokenData'] = self.network_token_data.to_dictionary()
         if self.payment_account_reference is not None:
             dictionary['paymentAccountReference'] = self.payment_account_reference
         if self.payment_option is not None:
@@ -292,7 +274,7 @@ class CardPaymentMethodSpecificOutput(DataObject):
             dictionary['token'] = self.token
         return dictionary
 
-    def from_dictionary(self, dictionary):
+    def from_dictionary(self, dictionary: dict) -> 'CardPaymentMethodSpecificOutput':
         super(CardPaymentMethodSpecificOutput, self).from_dictionary(dictionary)
         if 'acquirerInformation' in dictionary:
             if not isinstance(dictionary['acquirerInformation'], dict):
@@ -325,11 +307,6 @@ class CardPaymentMethodSpecificOutput(DataObject):
             self.fraud_results = value.from_dictionary(dictionary['fraudResults'])
         if 'initialSchemeTransactionId' in dictionary:
             self.initial_scheme_transaction_id = dictionary['initialSchemeTransactionId']
-        if 'networkTokenData' in dictionary:
-            if not isinstance(dictionary['networkTokenData'], dict):
-                raise TypeError('value \'{}\' is not a dictionary'.format(dictionary['networkTokenData']))
-            value = NetworkTokenEssentials()
-            self.network_token_data = value.from_dictionary(dictionary['networkTokenData'])
         if 'paymentAccountReference' in dictionary:
             self.payment_account_reference = dictionary['paymentAccountReference']
         if 'paymentOption' in dictionary:

{onlinepayments-sdk-python3-4.22.0 → onlinepayments_sdk_python3-5.0.0}/onlinepayments/sdk/domain/card_payout_method_specific_input.py

@@ -1,23 +1,22 @@
 # -*- coding: utf-8 -*-
 #
-# This class was auto-generated.
+# This file was automatically generated.
 #
-from onlinepayments.sdk.data_object import DataObject
-from onlinepayments.sdk.domain.card import Card
+from typing import Optional
+
+from .card import Card
+from .data_object import DataObject
 
 
 class CardPayoutMethodSpecificInput(DataObject):
-    """
-    | Object containing the payout details for a card
-    """
 
-    __card = None
-    __payment_product_id = None
-    __payout_reason = None
-    __token = None
+    __card: Optional[Card] = None
+    __payment_product_id: Optional[int] = None
+    __payout_reason: Optional[str] = None
+    __token: Optional[str] = None
 
     @property
-    def card(self) -> Card:
+    def card(self) -> Optional[Card]:
         """
         | Object containing card details
 
@@ -26,11 +25,11 @@ class CardPayoutMethodSpecificInput(DataObject):
         return self.__card
 
     @card.setter
-    def card(self, value: Card):
+    def card(self, value: Optional[Card]) -> None:
         self.__card = value
 
     @property
-    def payment_product_id(self) -> int:
+    def payment_product_id(self) -> Optional[int]:
         """
         | Payment product identifier - Please see Products documentation for a full overview of possible values.
 
@@ -39,27 +38,28 @@ class CardPayoutMethodSpecificInput(DataObject):
         return self.__payment_product_id
 
     @payment_product_id.setter
-    def payment_product_id(self, value: int):
+    def payment_product_id(self, value: Optional[int]) -> None:
         self.__payment_product_id = value
 
     @property
-    def payout_reason(self) -> str:
+    def payout_reason(self) -> Optional[str]:
         """
         | Allows you to additionally specify the reason for initiating the payout for authorization purposes. If this field is not specified, authorisation of the payment will be made according to your merchant profile. Possible values are:
-        |   * Gambling
-        |   * Refund
-        |   * Loyalty
+        
+        * Gambling
+        * Refund
+        * Loyalty
 
         Type: str
         """
         return self.__payout_reason
 
     @payout_reason.setter
-    def payout_reason(self, value: str):
+    def payout_reason(self, value: Optional[str]) -> None:
         self.__payout_reason = value
 
     @property
-    def token(self) -> str:
+    def token(self) -> Optional[str]:
         """
         | ID of the token
 
@@ -68,10 +68,10 @@ class CardPayoutMethodSpecificInput(DataObject):
         return self.__token
 
     @token.setter
-    def token(self, value: str):
+    def token(self, value: Optional[str]) -> None:
         self.__token = value
 
-    def to_dictionary(self):
+    def to_dictionary(self) -> dict:
         dictionary = super(CardPayoutMethodSpecificInput, self).to_dictionary()
         if self.card is not None:
             dictionary['card'] = self.card.to_dictionary()
@@ -83,7 +83,7 @@ class CardPayoutMethodSpecificInput(DataObject):
             dictionary['token'] = self.token
         return dictionary
 
-    def from_dictionary(self, dictionary):
+    def from_dictionary(self, dictionary: dict) -> 'CardPayoutMethodSpecificInput':
         super(CardPayoutMethodSpecificInput, self).from_dictionary(dictionary)
         if 'card' in dictionary:
             if not isinstance(dictionary['card'], dict):

{onlinepayments-sdk-python3-4.22.0 → onlinepayments_sdk_python3-5.0.0}/onlinepayments/sdk/domain/card_recurrence_details.py

@@ -1,22 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# This class was auto-generated.
+# This file was automatically generated.
 #
-from onlinepayments.sdk.data_object import DataObject
+from typing import Optional
+
+from .data_object import DataObject
 
 
 class CardRecurrenceDetails(DataObject):
-    """
-    | Object containing data related to recurring
-    """
 
-    __recurring_payment_sequence_indicator = None
+    __recurring_payment_sequence_indicator: Optional[str] = None
 
     @property
-    def recurring_payment_sequence_indicator(self) -> str:
+    def recurring_payment_sequence_indicator(self) -> Optional[str]:
         """
-        | * first = This transaction is the first of a series of recurring transactions
-        | * recurring = This transaction is a subsequent transaction in a series of recurring transactions
+        * first = This transaction is the first of a series of recurring transactions
+        * recurring = This transaction is a subsequent transaction in a series of recurring transactions
         
         | Note: For any first of a recurring the system will automatically create a token as you will need to use a token for any subsequent recurring transactions. In case a token already exists this is indicated in the response with a value of False for the isNewToken property in the response.
 
@@ -25,16 +24,16 @@ class CardRecurrenceDetails(DataObject):
         return self.__recurring_payment_sequence_indicator
 
     @recurring_payment_sequence_indicator.setter
-    def recurring_payment_sequence_indicator(self, value: str):
+    def recurring_payment_sequence_indicator(self, value: Optional[str]) -> None:
         self.__recurring_payment_sequence_indicator = value
 
-    def to_dictionary(self):
+    def to_dictionary(self) -> dict:
         dictionary = super(CardRecurrenceDetails, self).to_dictionary()
         if self.recurring_payment_sequence_indicator is not None:
             dictionary['recurringPaymentSequenceIndicator'] = self.recurring_payment_sequence_indicator
         return dictionary
 
-    def from_dictionary(self, dictionary):
+    def from_dictionary(self, dictionary: dict) -> 'CardRecurrenceDetails':
         super(CardRecurrenceDetails, self).from_dictionary(dictionary)
         if 'recurringPaymentSequenceIndicator' in dictionary:
             self.recurring_payment_sequence_indicator = dictionary['recurringPaymentSequenceIndicator']

{onlinepayments-sdk-python3-4.22.0 → onlinepayments_sdk_python3-5.0.0}/onlinepayments/sdk/domain/card_source.py

@@ -1,23 +1,22 @@
 # -*- coding: utf-8 -*-
 #
-# This class was auto-generated.
+# This file was automatically generated.
 #
-from onlinepayments.sdk.data_object import DataObject
-from onlinepayments.sdk.domain.surcharge_calculation_card import SurchargeCalculationCard
+from typing import Optional
+
+from .data_object import DataObject
+from .surcharge_calculation_card import SurchargeCalculationCard
 
 
 class CardSource(DataObject):
-    """
-    | Contains elements from which card number can be obtained.
-    """
 
-    __card = None
-    __encrypted_customer_input = None
-    __hosted_tokenization_id = None
-    __token = None
+    __card: Optional[SurchargeCalculationCard] = None
+    __encrypted_customer_input: Optional[str] = None
+    __hosted_tokenization_id: Optional[str] = None
+    __token: Optional[str] = None
 
     @property
-    def card(self) -> SurchargeCalculationCard:
+    def card(self) -> Optional[SurchargeCalculationCard]:
         """
         | An object containing card number and payment product id, which is used to determine surcharge product type
 
@@ -26,11 +25,11 @@ class CardSource(DataObject):
         return self.__card
 
     @card.setter
-    def card(self, value: SurchargeCalculationCard):
+    def card(self, value: Optional[SurchargeCalculationCard]) -> None:
         self.__card = value
 
     @property
-    def encrypted_customer_input(self) -> str:
+    def encrypted_customer_input(self) -> Optional[str]:
         """
         | Data that was encrypted client side containing all customer entered data elements like card data.
 
@@ -39,11 +38,11 @@ class CardSource(DataObject):
         return self.__encrypted_customer_input
 
     @encrypted_customer_input.setter
-    def encrypted_customer_input(self, value: str):
+    def encrypted_customer_input(self, value: Optional[str]) -> None:
         self.__encrypted_customer_input = value
 
     @property
-    def hosted_tokenization_id(self) -> str:
+    def hosted_tokenization_id(self) -> Optional[str]:
         """
         | An Id of a hosted tokenization session
 
@@ -52,11 +51,11 @@ class CardSource(DataObject):
         return self.__hosted_tokenization_id
 
     @hosted_tokenization_id.setter
-    def hosted_tokenization_id(self, value: str):
+    def hosted_tokenization_id(self, value: Optional[str]) -> None:
         self.__hosted_tokenization_id = value
 
     @property
-    def token(self) -> str:
+    def token(self) -> Optional[str]:
         """
         | An identifier that represents card details that have been previously stored
 
@@ -65,10 +64,10 @@ class CardSource(DataObject):
         return self.__token
 
     @token.setter
-    def token(self, value: str):
+    def token(self, value: Optional[str]) -> None:
         self.__token = value
 
-    def to_dictionary(self):
+    def to_dictionary(self) -> dict:
         dictionary = super(CardSource, self).to_dictionary()
         if self.card is not None:
             dictionary['card'] = self.card.to_dictionary()
@@ -80,7 +79,7 @@ class CardSource(DataObject):
             dictionary['token'] = self.token
         return dictionary
 
-    def from_dictionary(self, dictionary):
+    def from_dictionary(self, dictionary: dict) -> 'CardSource':
         super(CardSource, self).from_dictionary(dictionary)
         if 'card' in dictionary:
             if not isinstance(dictionary['card'], dict):

{onlinepayments-sdk-python3-4.22.0 → onlinepayments_sdk_python3-5.0.0}/onlinepayments/sdk/domain/card_without_cvv.py

@@ -1,17 +1,20 @@
 # -*- coding: utf-8 -*-
 #
-# This class was auto-generated.
+# This file was automatically generated.
 #
-from onlinepayments.sdk.data_object import DataObject
+from typing import Optional
+
+from .data_object import DataObject
 
 
 class CardWithoutCvv(DataObject):
-    __card_number = None
-    __cardholder_name = None
-    __expiry_date = None
+
+    __card_number: Optional[str] = None
+    __cardholder_name: Optional[str] = None
+    __expiry_date: Optional[str] = None
 
     @property
-    def card_number(self) -> str:
+    def card_number(self) -> Optional[str]:
         """
         | The obfuscated card number
 
@@ -20,11 +23,11 @@ class CardWithoutCvv(DataObject):
         return self.__card_number
 
     @card_number.setter
-    def card_number(self, value: str):
+    def card_number(self, value: Optional[str]) -> None:
         self.__card_number = value
 
     @property
-    def cardholder_name(self) -> str:
+    def cardholder_name(self) -> Optional[str]:
         """
         | The card holder's name on the card.
 
@@ -33,24 +36,23 @@ class CardWithoutCvv(DataObject):
         return self.__cardholder_name
 
     @cardholder_name.setter
-    def cardholder_name(self, value: str):
+    def cardholder_name(self, value: Optional[str]) -> None:
         self.__cardholder_name = value
 
     @property
-    def expiry_date(self) -> str:
+    def expiry_date(self) -> Optional[str]:
         """
-        | Expiry date of the card
-        | Format: MMYY
+        | Expiry date of the card Format: MMYY
 
         Type: str
         """
         return self.__expiry_date
 
     @expiry_date.setter
-    def expiry_date(self, value: str):
+    def expiry_date(self, value: Optional[str]) -> None:
         self.__expiry_date = value
 
-    def to_dictionary(self):
+    def to_dictionary(self) -> dict:
         dictionary = super(CardWithoutCvv, self).to_dictionary()
         if self.card_number is not None:
             dictionary['cardNumber'] = self.card_number
@@ -60,7 +62,7 @@ class CardWithoutCvv(DataObject):
             dictionary['expiryDate'] = self.expiry_date
         return dictionary
 
-    def from_dictionary(self, dictionary):
+    def from_dictionary(self, dictionary: dict) -> 'CardWithoutCvv':
         super(CardWithoutCvv, self).from_dictionary(dictionary)
         if 'cardNumber' in dictionary:
             self.card_number = dictionary['cardNumber']