Feature/INT-1638 - General SDK update (Issuing cards/disputes, Payment Setups, Klarna, and Platforms instrument details)

src/main/java/com/checkout/GsonSerializer.java

@@ -493,7 +493,9 @@ private static JsonDeserializer<ProductResponse> getProductDeserializer() {
                         java.lang.reflect.Field field = Arrays.stream(ProductResponse.class.getDeclaredFields())
                                 .filter(f -> {
                                     SerializedName annotation = f.getAnnotation(SerializedName.class);
-                                    return (annotation != null && annotation.value().equals(jsonKey)) || f.getName().equals(jsonKey);
+                                    return (annotation != null && annotation.value().equals(jsonKey))
+                                            || f.getName().equals(jsonKey)
+                                            || FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES.translateName(f).equals(jsonKey);
                                 })
                                 .findFirst()
                                 .orElse(null);

src/main/java/com/checkout/RequestMetrics.java

@@ -1,20 +1,16 @@
 package com.checkout;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
 public final class RequestMetrics {
 
-    @SerializedName("prev_request_id")
     private String prevRequestId;
 
-    @SerializedName("request_id")
     private String requestId;
 
-    @SerializedName("prev_request_duration")
     private Long prevRequestDuration;
 
     public String toTelemetryHeader() {

src/main/java/com/checkout/accounts/AccountPhone.java

@@ -1,7 +1,6 @@
 package com.checkout.accounts;
 
 import com.checkout.common.CountryCode;
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,7 +12,6 @@
 @AllArgsConstructor
 public final class AccountPhone {
 
-    @SerializedName("country_code")
     private CountryCode countryCode;
 
     private String number;

src/main/java/com/checkout/accounts/AccountsAccountHolder.java

@@ -4,27 +4,21 @@
 import com.checkout.common.AccountHolderType;
 import com.checkout.common.Address;
 import com.checkout.common.CountryCode;
-import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 
 @Data
 public abstract class AccountsAccountHolder {
 
     private AccountHolderType type;
 
-    @SerializedName("tax_id")
     private String taxId;
 
-    @SerializedName("date_of_birth")
     private DateOfBirth dateOfBirth;
 
-    @SerializedName("country_of_birth")
     private CountryCode countryOfBirth;
 
-    @SerializedName("residential_status")
     private String residentialStatus;
 
-    @SerializedName("billing_address")
     private Address billingAddress;
 
     private AccountPhone phone;

src/main/java/com/checkout/accounts/AccountsCorporateAccountHolder.java

@@ -4,7 +4,6 @@
 import com.checkout.common.AccountHolderType;
 import com.checkout.common.Address;
 import com.checkout.common.CountryCode;
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -17,7 +16,6 @@
 @ToString(callSuper = true)
 public final class AccountsCorporateAccountHolder extends AccountsAccountHolder {
 
-    @SerializedName("company_name")
     private String companyName;
 
     @Builder

src/main/java/com/checkout/accounts/AccountsIndividualAccountHolder.java

@@ -4,7 +4,6 @@
 import com.checkout.common.AccountHolderType;
 import com.checkout.common.Address;
 import com.checkout.common.CountryCode;
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -17,10 +16,8 @@
 @EqualsAndHashCode(callSuper = true)
 public final class AccountsIndividualAccountHolder extends AccountsAccountHolder {
 
-    @SerializedName("first_name")
     private String firstName;
 
-    @SerializedName("last_name")
     private String lastName;
 
     @Builder

src/main/java/com/checkout/accounts/AccountsPaymentInstrument.java

@@ -5,7 +5,6 @@
 import com.checkout.common.CountryCode;
 import com.checkout.common.Currency;
 import com.checkout.common.InstrumentType;
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.Data;
 
@@ -17,23 +16,18 @@ public final class AccountsPaymentInstrument {
 
     private String label;
 
-    @SerializedName("account_type")
     private AccountType accountType;
 
-    @SerializedName("account_number")
     private String accountNumber;
 
-    @SerializedName("bank_code")
     private String bankCode;
 
-    @SerializedName("branch_code")
     private String branchCode;
 
     private String iban;
 
     private String bban;
 
-    @SerializedName("swift_bic")
     private String swiftBic;
 
     private Currency currency;
@@ -42,7 +36,6 @@ public final class AccountsPaymentInstrument {
 
     private InstrumentDocument document;
 
-    @SerializedName("account_holder")
     private AccountsAccountHolder accountHolder;
 
     private BankDetails bank;

src/main/java/com/checkout/accounts/Company.java

@@ -1,7 +1,6 @@
 package com.checkout.accounts;
 
 import com.checkout.common.Address;
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,35 +14,26 @@
 @AllArgsConstructor
 public final class Company {
 
-    @SerializedName("legal_name")
     private String legalName;
 
-    @SerializedName("trading_name")
     private String tradingName;
 
-    @SerializedName("business_registration_number")
     private String businessRegistrationNumber;
 
-    @SerializedName("date_of_incorporation")
     private DateOfIncorporation dateOfIncorporation;
 
-    @SerializedName("regulatory_licence_number")
     private String regulatoryLicenceNumber;
 
-    @SerializedName("principal_address")
     private Address principalAddress;
 
-    @SerializedName("registered_address")
     private Address registeredAddress;
 
     private List<Representative> representatives;
 
     private EntityDocument document;
 
-    @SerializedName("financial_details")
     private EntityFinancialDetails financialDetails;
 
-    @SerializedName("business_type")
     private BusinessType businessType;
 
 }

src/main/java/com/checkout/accounts/ContactDetails.java

@@ -1,6 +1,5 @@
 package com.checkout.accounts;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,7 +13,6 @@ public final class ContactDetails {
 
     private AccountPhone phone;
 
-    @SerializedName("email_addresses")
     private EntityEmailAddresses emailAddresses;
 
     private Invitee invitee;

src/main/java/com/checkout/accounts/EntityDocument.java

@@ -1,6 +1,5 @@
 package com.checkout.accounts;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,7 +13,6 @@ public final class EntityDocument {
 
     private String type;
 
-    @SerializedName("file_id")
     private String fileId;
 
 }

src/main/java/com/checkout/accounts/EntityFinancialDetails.java

@@ -1,21 +1,17 @@
 package com.checkout.accounts;
 
 import com.checkout.common.Currency;
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.Data;
 
 @Data
 @Builder
 public final class EntityFinancialDetails {
 
-    @SerializedName("annual_processing_volume")
     private Long annualProcessingVolume;
 
-    @SerializedName("average_transaction_value")
     private Long averageTransactionValue;
 
-    @SerializedName("highest_transaction_value")
     private Long highestTransactionValue;
 
     private EntityFinancialDocuments documents;

src/main/java/com/checkout/accounts/EntityFinancialDocuments.java

@@ -1,16 +1,13 @@
 package com.checkout.accounts;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.Data;
 
 @Data
 @Builder
 public final class EntityFinancialDocuments {
 
-    @SerializedName("bank_statement")
     private EntityDocument bankStatement;
 
-    @SerializedName("financial_statement")
     private EntityDocument financialStatement;
 }

src/main/java/com/checkout/accounts/EntityRequirementListItem.java

@@ -1,7 +1,6 @@
 package com.checkout.accounts;
 
 import com.checkout.common.Resource;
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,7 +38,6 @@ public class EntityRequirementListItem extends Resource {
      * Defaults to {@code entity} if the URN cannot be parsed.
      * [Optional]
      */
-    @SerializedName("resource_type")
     private String resourceType;
 
     /**
@@ -77,15 +75,13 @@ public class EntityRequirementListItem extends Resource {
      * responses) that do not map to a specific field on the entity.
      * [Optional]
      */
-    @SerializedName("field_path")
     private String fieldPath;
 
     /**
      * The schema-registry URN of the field, from the public mapping definition.
      * May be {@code null} if no mapping exists.
      * [Optional]
      */
-    @SerializedName("field_urn")
     private String fieldUrn;
 
     /**

src/main/java/com/checkout/accounts/EntityRequirementUpdateResponse.java

@@ -1,7 +1,6 @@
 package com.checkout.accounts;
 
 import com.checkout.common.Resource;
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +37,5 @@ public final class EntityRequirementUpdateResponse extends Resource {
      * [Optional]
      * Format: date-time (RFC 3339)
      */
-    @SerializedName("submitted_at")
     private Instant submittedAt;
 }

src/main/java/com/checkout/accounts/Identification.java

@@ -1,6 +1,5 @@
 package com.checkout.accounts;
 
-import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,7 +11,6 @@
 @AllArgsConstructor
 public final class Identification {
 
-    @SerializedName("national_id_number")
     private String nationalIdNumber;
 
     private Document document;

src/main/java/com/checkout/accounts/Individual.java

@@ -1,41 +1,31 @@
 package com.checkout.accounts;
 
 import com.checkout.common.Address;
-import com.google.gson.annotations.SerializedName;
 import lombok.Builder;
 import lombok.Data;
 
 @Data
 @Builder
 public final class Individual {
 
-    @SerializedName("first_name")
     private String firstName;
 
-    @SerializedName("middle_name")
     private String middleName;
 
-    @SerializedName("last_name")
     private String lastName;
 
-    @SerializedName("trading_name")
     private String tradingName;
 
-    @SerializedName("national_tax_id")
     private String nationalTaxId;
 
-    @SerializedName("registered_address")
     private Address registeredAddress;
 
-    @SerializedName("date_of_birth")
     private DateOfBirth dateOfBirth;
 
-    @SerializedName("place_of_birth")
     private PlaceOfBirth placeOfBirth;
 
     private Identification identification;
 
-    @SerializedName("financial_details")
     private EntityFinancialDetails financialDetails;
 
 }

src/main/java/com/checkout/accounts/InstrumentAccountType.java

@@ -0,0 +1,15 @@
+package com.checkout.accounts;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * The type of bank account.
+ */
+public enum InstrumentAccountType {
+
+    @SerializedName("savings")
+    SAVINGS,
+
+    @SerializedName("checking")
+    CHECKING
+}