Feature/int 1600 - New Java modules

src/main/java/com/checkout/ApacheHttpClientTransport.java

@@ -1,6 +1,7 @@
 package com.checkout;
 
 import com.checkout.accounts.AccountsFileRequest;
+import com.checkout.accounts.Headers;
 import com.checkout.common.AbstractFileRequest;
 import com.checkout.common.CheckoutUtils;
 import com.checkout.common.FileRequest;
@@ -33,6 +34,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +44,7 @@
 import java.util.stream.Collectors;
 import java.util.function.Supplier;
 
+import com.google.gson.annotations.SerializedName;
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.ratelimiter.RateLimiter;
 import io.github.resilience4j.retry.Retry;
@@ -99,7 +102,6 @@
                                               final String idempotencyKey,
                                               final Map<String, String> queryParams) {
 
-        final Object requestBodyOrEntity = prepareRequestContent(requestObject);
         return CompletableFuture.supplyAsync(() -> {
             final HttpUriRequest request;
             switch (clientOperation) {
@@ -135,7 +137,7 @@
             if (idempotencyKey != null) {
                 request.setHeader(CKO_IDEMPOTENCY_KEY, idempotencyKey);
             }
-            return performCall(authorization, requestBodyOrEntity, request, clientOperation);
+            return performCall(authorization, requestObject, request, clientOperation);
         }, executor);
     }
 
@@ -155,7 +157,6 @@
                                final Object requestObject,
                                final String idempotencyKey,
                                final Map<String, String> queryParams) {
-        final Object requestBodyOrEntity = prepareRequestContent(requestObject);
         final HttpUriRequest request;
         switch (clientOperation) {
             case GET:
@@ -191,7 +192,7 @@
             request.setHeader(CKO_IDEMPOTENCY_KEY, idempotencyKey);
         }
 
-        final Supplier<Response> callSupplier = () -> performCall(authorization, requestBodyOrEntity, request, clientOperation);
+        final Supplier<Response> callSupplier = () -> performCall(authorization, requestObject, request, clientOperation);
         return executeWithResilience4j(callSupplier);
     }
 
@@ -235,29 +236,6 @@
         return decoratedSupplier.get();
     }
 
-    /**
-     * Prepares the request content based on the type of request object.
-     * If the request object is a UrlEncodedFormEntity, it returns it directly.
-     * Otherwise, it serializes the object to JSON.
-     */
-    private Object prepareRequestContent(final Object requestObject) {
-        Object request = null;
-
-        if (requestObject != null) {
-            if (requestObject instanceof UrlEncodedFormEntity) {
-                // Return the form entity directly for form-encoded requests
-                request = requestObject;
-            }
-            else
-            {
-                // Default behavior: serialize to JSON
-                request = serializer.toJson(requestObject);
-            }
-        }   
-
-        return request;
-    }
-
     private HttpEntity getMultipartFileEntity(final AbstractFileRequest abstractFileRequest) {
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create().setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
         if (abstractFileRequest instanceof FileRequest) {
@@ -277,31 +255,43 @@
     }
 
     private Response performCall(final SdkAuthorization authorization,
-                                 final Object requestBodyOrEntity,
+                                 final Object requestBody,
                                  final HttpUriRequest request,
                                  final ClientOperation clientOperation) {
         log.info("{}: {}", clientOperation, request.getURI());
         request.setHeader(USER_AGENT, PROJECT_NAME + "/" + getVersionFromManifest());
         request.setHeader(ACCEPT, getAcceptHeader(clientOperation));
         request.setHeader(AUTHORIZATION, authorization.getAuthorizationHeader());
 
+        // Check and add headers from the request object if needed
+        addHeadersFromRequestBody(requestBody, request);
+
         String currentRequestId = UUID.randomUUID().toString();
 
         addTelemetryHeader(request, currentRequestId);
 
         long startTime = System.currentTimeMillis();
 
         log.info("Request: " + Arrays.toString(sanitiseHeaders(request.getAllHeaders())));
-        if (requestBodyOrEntity != null && request instanceof HttpEntityEnclosingRequest) {
-            if (requestBodyOrEntity instanceof UrlEncodedFormEntity) {
-                // Handle form-encoded content
+        if (requestBody != null && request instanceof HttpEntityEnclosingRequest) {
+            HttpEntity httpEntity = null;
+
+            if (requestBody instanceof HttpEntity) {
+                httpEntity = (HttpEntity) requestBody;
+            } else if (requestBody instanceof MultipartEntityBuilder) {
+                httpEntity = ((MultipartEntityBuilder) requestBody).build();
+            } else if (requestBody instanceof UrlEncodedFormEntity) {
+                // Ensure proper Content-Type header for form-encoded content
                 request.setHeader(CONTENT_TYPE, ContentType.APPLICATION_FORM_URLENCODED.getMimeType());
-                ((HttpEntityEnclosingRequestBase) request).setEntity((UrlEncodedFormEntity) requestBodyOrEntity);
-            } else if (requestBodyOrEntity instanceof String) {
-                // Handle JSON content
-                ((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity((String) requestBodyOrEntity, ContentType.APPLICATION_JSON));
+                httpEntity = (UrlEncodedFormEntity) requestBody;
+            } else {
+                String json = serializer.toJson(requestBody);
+                httpEntity = new StringEntity(json, ContentType.APPLICATION_JSON);
             }
+
+            ((HttpEntityEnclosingRequestBase) request).setEntity(httpEntity);
         }
+
         try (final CloseableHttpResponse response = httpClient.execute(request)) {
             long elapsed = System.currentTimeMillis() - startTime;
             log.info("Response: " + response.getStatusLine().getStatusCode() + " " + Arrays.toString(response.getAllHeaders()));
@@ -327,6 +317,23 @@
         }
     }
 
+    private void addHeadersFromRequestBody(final Object requestBody, final HttpUriRequest request) {
+        if (requestBody instanceof Headers) {
+            Headers headers = (Headers) requestBody;
+            for (Field field : Headers.class.getDeclaredFields()) {
+                field.setAccessible(true);
+                try {
+                    Object value = field.get(headers);
+                    if (value != null && !value.toString().isEmpty()) {
+                        SerializedName serializedName = field.getAnnotation(SerializedName.class);
+                        String headerName = serializedName != null ? serializedName.value() : field.getName();
+                        request.setHeader(headerName, value.toString());
+                    }
+                } catch (IllegalAccessException ignored) {}
+            }
+        }
+    }
+
     private void addTelemetryHeader(HttpUriRequest request, String currentRequestId) {
         if (configuration.isTelemetryEnabled()) {
             String telemetryHeader = generateTelemetryHeader(currentRequestId);

src/main/java/com/checkout/CheckoutApi.java

@@ -9,6 +9,7 @@
 import com.checkout.forward.ForwardClient;
 import com.checkout.handlepaymentsandpayouts.flow.FlowClient;
 import com.checkout.handlepaymentsandpayouts.setups.PaymentSetupsClient;
+import com.checkout.handlepaymentsandpayouts.applepay.ApplePayClient;
 import com.checkout.identities.faceauthentications.FaceAuthenticationClient;
 import com.checkout.identities.applicants.ApplicantClient;
 import com.checkout.identities.identityverification.IdentityVerificationClient;
@@ -17,13 +18,16 @@
 import com.checkout.instruments.InstrumentsClient;
 import com.checkout.issuing.IssuingClient;
 import com.checkout.metadata.MetadataClient;
+import com.checkout.networktokens.NetworkTokensClient;
+import com.checkout.paymentmethods.PaymentMethodsClient;
 import com.checkout.payments.PaymentsClient;
 import com.checkout.payments.contexts.PaymentContextsClient;
 import com.checkout.payments.hosted.HostedPaymentsClient;
 import com.checkout.payments.links.PaymentLinksClient;
 import com.checkout.reports.ReportsClient;
 import com.checkout.risk.RiskClient;
 import com.checkout.sessions.SessionsClient;
+import com.checkout.standaloneaccountupdater.StandaloneAccountUpdaterClient;
 import com.checkout.tokens.TokensClient;
 import com.checkout.transfers.TransfersClient;
 import com.checkout.workflows.WorkflowsClient;
@@ -52,6 +56,8 @@ public interface CheckoutApi extends CheckoutApmApi {
 
     PaymentLinksClient paymentLinksClient();
 
+    PaymentMethodsClient paymentMethodsClient();
+
     HostedPaymentsClient hostedPaymentsClient();
 
     BalancesClient balancesClient();
@@ -72,6 +78,8 @@ public interface CheckoutApi extends CheckoutApmApi {
 
     PaymentSetupsClient paymentSetupsClient();
 
+    ApplePayClient applePayClient();
+
     ForwardClient forwardClient();
 
     FaceAuthenticationClient faceAuthenticationClient();
@@ -84,4 +92,8 @@ public interface CheckoutApi extends CheckoutApmApi {
 
     AmlScreeningClient amlScreeningClient();
 
+    NetworkTokensClient networkTokensClient();
+
+    StandaloneAccountUpdaterClient standaloneAccountUpdaterClient();
+
 }

src/main/java/com/checkout/CheckoutApiImpl.java

@@ -18,6 +18,8 @@
 import com.checkout.handlepaymentsandpayouts.flow.FlowClientImpl;
 import com.checkout.handlepaymentsandpayouts.setups.PaymentSetupsClient;
 import com.checkout.handlepaymentsandpayouts.setups.PaymentSetupsClientImpl;
+import com.checkout.handlepaymentsandpayouts.applepay.ApplePayClient;
+import com.checkout.handlepaymentsandpayouts.applepay.ApplePayClientImpl;
 import com.checkout.identities.faceauthentications.FaceAuthenticationClient;
 import com.checkout.identities.faceauthentications.FaceAuthenticationClientImpl;
 import com.checkout.identities.applicants.ApplicantClient;
@@ -34,6 +36,10 @@
 import com.checkout.issuing.IssuingClientImpl;
 import com.checkout.metadata.MetadataClient;
 import com.checkout.metadata.MetadataClientImpl;
+import com.checkout.networktokens.NetworkTokensClient;
+import com.checkout.networktokens.NetworkTokensClientImpl;
+import com.checkout.paymentmethods.PaymentMethodsClient;
+import com.checkout.paymentmethods.PaymentMethodsClientImpl;
 import com.checkout.payments.PaymentsClient;
 import com.checkout.payments.PaymentsClientImpl;
 import com.checkout.payments.contexts.PaymentContextsClient;
@@ -48,6 +54,8 @@
 import com.checkout.risk.RiskClientImpl;
 import com.checkout.sessions.SessionsClient;
 import com.checkout.sessions.SessionsClientImpl;
+import com.checkout.standaloneaccountupdater.StandaloneAccountUpdaterClient;
+import com.checkout.standaloneaccountupdater.StandaloneAccountUpdaterClientImpl;
 import com.checkout.tokens.TokensClient;
 import com.checkout.tokens.TokensClientImpl;
 import com.checkout.transfers.TransfersClient;
@@ -70,6 +78,7 @@ public class CheckoutApiImpl extends AbstractCheckoutApmApi implements CheckoutA
     private final SessionsClient sessionsClient;
     private final ForexClient forexClient;
     private final PaymentLinksClient paymentLinksClient;
+    private final PaymentMethodsClient paymentMethodsClient;
     private final HostedPaymentsClient hostedPaymentsClient;
     private final TransfersClient transfersClient;
     private final BalancesClient balancesClient;
@@ -80,12 +89,15 @@ public class CheckoutApiImpl extends AbstractCheckoutApmApi implements CheckoutA
     private final PaymentContextsClient paymentContextsClient;
     private final FlowClient flowClient;
     private final PaymentSetupsClient paymentSetupsClient;
+    private final ApplePayClient applePayClient;
     private final ForwardClient forwardClient;
     private final FaceAuthenticationClient faceAuthenticationClient;
     private final ApplicantClient applicantClient;
     private final IdentityVerificationClient identityVerificationClient;
     private final IdDocumentVerificationClient idDocumentVerificationClient;
     private final AmlScreeningClient amlScreeningClient;
+    private final NetworkTokensClient networkTokensClient;
+    private final StandaloneAccountUpdaterClient standaloneAccountUpdaterClient;
 
     public CheckoutApiImpl(final CheckoutConfiguration configuration) {
         super(configuration);
@@ -99,6 +111,7 @@ public CheckoutApiImpl(final CheckoutConfiguration configuration) {
         this.sessionsClient = new SessionsClientImpl(this.apiClient, configuration);
         this.forexClient = new ForexClientImpl(this.apiClient, configuration);
         this.paymentLinksClient = new PaymentLinksClientImpl(this.apiClient, configuration);
+        this.paymentMethodsClient = new PaymentMethodsClientImpl(this.apiClient, configuration);
         this.hostedPaymentsClient = new HostedPaymentsClientImpl(this.apiClient, configuration);
         this.transfersClient = new TransfersClientImpl(getTransfersClient(configuration), configuration);
         this.balancesClient = new BalancesClientImpl(getBalancesClient(configuration), configuration);
@@ -112,12 +125,15 @@ public CheckoutApiImpl(final CheckoutConfiguration configuration) {
         this.paymentContextsClient = new PaymentContextsClientImpl(this.apiClient, configuration);
         this.flowClient = new FlowClientImpl(this.apiClient, configuration);
         this.paymentSetupsClient = new PaymentSetupsClientImpl(this.apiClient, configuration);
+        this.applePayClient = new ApplePayClientImpl(this.apiClient, configuration);
         this.forwardClient = new ForwardClientImpl(this.apiClient, configuration);
         this.faceAuthenticationClient = new FaceAuthenticationClientImpl(this.apiClient, configuration);
         this.applicantClient = new ApplicantClientImpl(this.apiClient, configuration);
         this.identityVerificationClient = new IdentityVerificationClientImpl(this.apiClient, configuration);
         this.idDocumentVerificationClient = new IdDocumentVerificationClientImpl(this.apiClient, configuration);
         this.amlScreeningClient = new AmlScreeningClientImpl(this.apiClient, configuration);
+        this.networkTokensClient = new NetworkTokensClientImpl(this.apiClient, configuration);
+        this.standaloneAccountUpdaterClient = new StandaloneAccountUpdaterClientImpl(this.apiClient, configuration);
     }
 
     @Override
@@ -175,6 +191,11 @@ public PaymentLinksClient paymentLinksClient() {
         return paymentLinksClient;
     }
 
+    @Override
+    public PaymentMethodsClient paymentMethodsClient() {
+        return paymentMethodsClient;
+    }
+
     @Override
     public HostedPaymentsClient hostedPaymentsClient() {
         return hostedPaymentsClient;
@@ -215,6 +236,9 @@ public MetadataClient metadataClient() {
     @Override
     public PaymentSetupsClient paymentSetupsClient() { return paymentSetupsClient; }
 
+    @Override
+    public ApplePayClient applePayClient() { return applePayClient; }
+
     @Override
     public ForwardClient forwardClient() { return forwardClient; }
 
@@ -233,6 +257,12 @@ public MetadataClient metadataClient() {
     @Override
     public AmlScreeningClient amlScreeningClient() { return amlScreeningClient; }
 
+    @Override
+    public NetworkTokensClient networkTokensClient() { return networkTokensClient; }
+
+    @Override
+    public StandaloneAccountUpdaterClient standaloneAccountUpdaterClient() { return standaloneAccountUpdaterClient; }
+
     private ApiClient getFilesClient(final CheckoutConfiguration configuration) {
         return new ApiClientImpl(configuration, new FilesApiUriStrategy(configuration));
     }

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

@@ -24,7 +24,6 @@
 import com.checkout.payments.sender.Sender;
 import com.checkout.payments.sender.SenderType;
 import com.checkout.handlepaymentsandpayouts.flow.entities.PaymentSessionStatus;
-import com.checkout.handlepaymentsandpayouts.flow.responses.PaymentSubmissionResponse;
 import com.checkout.webhooks.previous.WebhookResponse;
 import com.checkout.workflows.actions.WorkflowActionType;
 import com.checkout.workflows.conditions.WorkflowConditionType;

src/main/java/com/checkout/HttpMetadata.java

@@ -18,4 +18,8 @@ public String getRequestId() {
         return CheckoutUtils.getRequestId(responseHeaders);
     }
 
+    public String getEtag() {
+        return CheckoutUtils.getEtag(responseHeaders);
+    }
+
 }

src/main/java/com/checkout/OAuthScope.java

@@ -42,6 +42,7 @@ public enum OAuthScope {
     MIDDLEWARE_MERCHANTS_SECRET("middleware:merchants-secret"),
     PAYMENT_CONTEXTS("gateway:payment-contexts"),
     PAYMENT_SESSIONS("payment-sessions"),
+    PAYMENTS_SEARCH("payments:search"),
     PAYOUTS_BANK_DETAILS("payouts:bank-details"),
     REPORTS("reports"),
     REPORTS_VIEW("reports:view"),
@@ -55,7 +56,9 @@ public enum OAuthScope {
     VAULT_CARD_METADATA("vault:card-metadata"),
     VAULT_INSTRUMENTS("vault:instruments"),
     VAULT_TOKENIZATION("vault:tokenization"),
-    FORWARD("forward");
+    VAULT_NETWORK_TOKENS("vault:network-tokens"),
+    FORWARD("forward"),
+    FORWARD_SECRETS("forward:secrets");
 
     private final String scope;