Merge remote-tracking branch 'origin/checkout-sdk' into checkout-sdk

# Conflicts:
#	commercetools/commercetools-sdk-java-checkout/src/integrationTest/java/com/commercetools/checkout/defaultconfig/CheckoutIntegrationTests.java

Author: ShipilA

.git-blame-ignore-revs

@@ -7,3 +7,4 @@ d0129c1095216d5c830900c8a6223ef5d4274de1
 bbe9f971763ca1b27687a6a51067a385a0d23b04
 de95c481329aa8b821e6e71ac35c1b8bc67e3e86
 78c44064f4ec15091bde7a2dc590aa2b3a99341d
+03665b75a1e1c3a3cf28df1dec52e91b308e4368

commercetools/commercetools-sdk-java-checkout/src/integrationTest/java/com/commercetools/checkout/defaultconfig/CheckoutIntegrationTests.java

@@ -1,16 +1,15 @@
 
 package com.commercetools.checkout.defaultconfig;
 
+import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.api.defaultconfig.ApiRootBuilder;
-import com.commercetools.api.models.cart.Cart;
 import com.commercetools.api.models.cart.CartDraft;
-import com.commercetools.api.client.ProjectApiRoot;
 import com.commercetools.checkout.models.transaction.TransactionDraft;
-import io.vrap.rmf.base.client.ApiHttpException;
+
 import io.vrap.rmf.base.client.oauth2.ClientCredentials;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 public class CheckoutIntegrationTests {
 
@@ -22,50 +21,49 @@ public class CheckoutIntegrationTests {
         checkoutApiRoot = createCheckoutClient();
     }
     public static ProjectApiRoot createApiClient() {
-        return ApiRootBuilder.ofEnvironmentVariables()
-                .buildProjectRoot();
+        return ApiRootBuilder.ofEnvironmentVariables().buildProjectRoot();
     }
 
     public static com.commercetools.checkout.client.ProjectApiRoot createCheckoutClient() {
         return CheckoutApiRootBuilder.of()
                 .defaultClient(ClientCredentials.of()
-                                .withClientId(System.getenv("CTP_CLIENT_ID"))
-                                .withClientSecret(System.getenv("CTP_CLIENT_SECRET"))
-                                .build(),
-                        ServiceRegion.GCP_EUROPE_WEST1)
+                        .withClientId(System.getenv("CTP_CLIENT_ID"))
+                        .withClientSecret(System.getenv("CTP_CLIENT_SECRET"))
+                        .build(),
+                    ServiceRegion.GCP_EUROPE_WEST1)
                 .build(System.getenv("CTP_PROJECT_KEY"));
     }
 
     // create client, then cart, then transaction
-        @Test
-        public void createAndGetTransactionTest() {
-            var newCart = CartDraft.builder().currency("EUR").build();
+    @Test
+    public void createAndGetTransactionTest() {
+        var newCart = CartDraft.builder().currency("EUR").build();
 
-            var cart = projectApiRoot
-                    .carts()
-                    .post(newCart)
-                    .executeBlocking()
-                    .getBody();
-            Assertions.assertNotNull(cart);
+        var cart = projectApiRoot.carts().post(newCart).executeBlocking().getBody();
+        Assertions.assertNotNull(cart);
 
-            var transactionKey = "transaction-" + CheckoutApiTestUtils.randomKey();
-            var transaction = checkoutApiRoot.with().transactions().post(
-                    TransactionDraft.builder()
-                            .key(transactionKey)
-                            .application(a -> a.key("demo-commercetools-checkout"))
-                            .cart(c -> c.id(cart.getId()))
-                            .plusTransactionItems(t -> t
-                                    .amount(a -> a.centAmount(100).currencyCode("EUR"))
-                                    .paymentIntegration(p -> p.key("ci-payment-integration")))
-                            .build()
+        var transactionKey = "transaction-" + CheckoutApiTestUtils.randomKey();
+        var transaction = checkoutApiRoot.with()
+                .transactions()
+                .post(TransactionDraft.builder()
+                        .key(transactionKey)
+                        .application(a -> a.key("demo-commercetools-checkout"))
+                        .cart(c -> c.id(cart.getId()))
+                        .plusTransactionItems(t -> t.amount(a -> a.centAmount(100).currencyCode("EUR"))
+                                .paymentIntegration(p -> p.key("sample-invoice-payment")))
+                        .build()
 
-            ).executeBlocking().getBody();
+                )
+                .executeBlocking()
+                .getBody();
 
-            // Create transaction
-            Assertions.assertNotNull(transaction);
+        // Create transaction
+        Assertions.assertNotNull(transaction);
 
-            Assertions.assertNotNull(checkoutApiRoot.with().transactions().withId(transaction.getId()).get().executeBlocking().getBody());
-            Assertions.assertEquals(transactionKey, transaction.getKey());
-            Assertions.assertNotNull(checkoutApiRoot.with().transactions().withKey(transaction.getKey()).get().executeBlocking().getBody());
-        }
+        Assertions.assertNotNull(
+            checkoutApiRoot.with().transactions().withId(transaction.getId()).get().executeBlocking().getBody());
+        Assertions.assertEquals(transactionKey, transaction.getKey());
+        Assertions.assertNotNull(
+            checkoutApiRoot.with().transactions().withKey(transaction.getKey()).get().executeBlocking().getBody());
+    }
 }

commercetools/commercetools-sdk-java-checkout/src/main/java/com/commercetools/checkout/defaultconfig/ServiceRegion.java

@@ -9,10 +9,10 @@ public enum ServiceRegion implements ServiceRegionConfig {
         "https://auth.europe-west1.gcp.commercetools.com")),
     GCP_US_CENTRAL1(new RegionHosts("https://checkout.us-central1.gcp.commercetools.com/",
         "https://auth.us-central1.gcp.commercetools.com")),
-//    AWS_US_EAST_2(new RegionHosts("https://checkout.us-east-2.aws.commercetools.com/",
-//        "https://auth.us-east-2.aws.commercetools.com")),
-//    AWS_EU_CENTRAL_1(new RegionHosts("https://checkout.eu-central-1.aws.commercetools.com/",
-//        "https://auth.eu-central-1.aws.commercetools.com")),
+    //    AWS_US_EAST_2(new RegionHosts("https://checkout.us-east-2.aws.commercetools.com/",
+    //        "https://auth.us-east-2.aws.commercetools.com")),
+    //    AWS_EU_CENTRAL_1(new RegionHosts("https://checkout.eu-central-1.aws.commercetools.com/",
+    //        "https://auth.eu-central-1.aws.commercetools.com")),
     GCP_AUSTRALIA_SOUTHEAST1(new RegionHosts("https://checkout.australia-southeast1.gcp.commercetools.com/",
         "https://auth.australia-southeast1.gcp.commercetools.com")),;