Merge pull request #1110 from commercetools/cleanup-project-after-sdk-v2-migration

Cleanup project after sdk v2 migration

Author: salander85

build.gradle

@@ -19,7 +19,6 @@ ext{
     caffeineVersion = '3.1.8'
     nexusStagingPluginVersion = '0.22.0'
     commonTextVersion = '1.11.0'
-    commercetoolsJavaSDK2Version = '10.1.0'
 }
 
 apply from: "$rootDir/gradle-scripts/repositories.gradle"
@@ -44,13 +43,14 @@ apply from: "$rootDir/gradle-scripts/mkdocs.gradle"
 apply from: "$rootDir/gradle-scripts/spotless.gradle"
 
 dependencies {
-    implementation "com.commercetools.sdk:commercetools-http-client:${commercetoolsJavaSDK2Version}"
-    implementation "com.commercetools.sdk:commercetools-sdk-java-api:${commercetoolsJavaSDK2Version}"
-
+    implementation "com.commercetools.sdk:commercetools-http-client:${commercetoolsJavaSdkV2Version}"
+    implementation "com.commercetools.sdk:commercetools-sdk-java-api:${commercetoolsJavaSdkV2Version}"
     implementation "com.github.ben-manes.caffeine:caffeine:${caffeineVersion}"
     implementation "org.apache.commons:commons-text:${commonTextVersion}"
-    api "com.commercetools.sdk:commercetools-sdk-compat-v1:${commercetoolsJavaSdkV2Version}"
-    api "com.commercetools.sdk:commercetools-apachehttp-client:${commercetoolsJavaSdkV2Version}"
+    api 'commons-io:commons-io:2.11.0'
+    api 'commons-codec:commons-codec:1.16.0'
+    api 'com.google.code.findbugs:annotations:3.0.1'
+    api 'com.neovisionaries:nv-i18n:1.28'
     testImplementation "org.mockito:mockito-junit-jupiter:${mockitoJunitJupiterVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${jupiterApiVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-params:${jupiterApiVersion}"

src/integration-test/java/com/commercetools/sync/integration/commons/utils/ChannelITUtils.java

@@ -94,7 +94,7 @@ private static Channel createChannelIfNotAlreadyExisting(
   /**
    * Tries to fetch channel of key {@code channelKey} using {@code ctpClient}.
    *
-   * @param ctpClient sphere client used to execute requests
+   * @param ctpClient client used to execute requests
    * @param channelKey key of requested channel
    * @return {@link java.util.Optional} which may contain channel of key {@code channelKey}
    */

src/integration-test/java/com/commercetools/sync/integration/commons/utils/InventoryITUtils.java

@@ -196,7 +196,7 @@ public static CustomFieldsDraft getMockCustomFieldsDraft() {
    * Tries to fetch inventory entry of {@code sku} and {@code supplyChannel} using {@code
    * ctpClient}.
    *
-   * @param ctpClient sphere client used to execute requests
+   * @param ctpClient client used to execute requests
    * @param sku sku of requested inventory entry
    * @param supplyChannel optional reference to supply channel of requested inventory entry
    * @param expand

src/integration-test/java/com/commercetools/sync/integration/commons/utils/ProductTypeITUtils.java

@@ -369,10 +369,9 @@ public static ProductType ensureProductType(
   }
 
   /**
-   * Builds a list of two field definitions; one for a {@link
-   * io.sphere.sdk.products.attributes.LocalizedStringAttributeType} and one for a {@link
-   * io.sphere.sdk.products.attributes.BooleanAttributeType}. The JSON of the created attribute
-   * definition list looks as follows:
+   * Builds a list of two field definitions; one for a {@link AttributeLocalizableTextType} and one
+   * for a {@link AttributeBooleanType}. The JSON of the created attribute definition list looks as
+   * follows:
    *
    * <p>"attributes": [ { "name": "backgroundColor", "label": { "en": "backgroundColor" }, "type": {
    * "name": "LocalizedString" }, "inputHint": "SingleLine" }, { "name": "invisibleInShop", "label":
@@ -420,7 +419,7 @@ private static boolean productTypeExists(
   /**
    * Tries to fetch product type of {@code key} using {@code cptClient}.
    *
-   * @param cptClient sphere client used to execute requests.
+   * @param cptClient client used to execute requests.
    * @param key key of requested product type.
    * @return {@link java.util.Optional} which may contain product type of {@code key}.
    */

src/integration-test/java/com/commercetools/sync/integration/ctpprojectsource/categories/CategorySyncIT.java

@@ -31,10 +31,7 @@
 import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 class CategorySyncIT {
   private CategorySync categorySync;

src/integration-test/java/com/commercetools/sync/integration/ctpprojectsource/products/ProductSyncWithUnexpandedReferencesIT.java

@@ -63,7 +63,6 @@
 import com.commercetools.sync.products.ProductSyncOptionsBuilder;
 import com.commercetools.sync.products.helpers.ProductSyncStatistics;
 import com.commercetools.sync.products.utils.ProductTransformUtils;
-import io.sphere.sdk.products.queries.ProductProjectionQuery;
 import io.vrap.rmf.base.client.ApiHttpResponse;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -79,7 +78,6 @@ class ProductSyncWithUnexpandedReferencesIT {
 
   private static final String RESOURCE_KEY = "foo";
   private static final String TYPE_KEY = "typeKey";
-  private static ProductProjectionQuery productQuery;
 
   private ProductSync productSync;
   private List<String> errorCallBackMessages;
@@ -275,7 +273,6 @@ static void setupSourceProjectData() {
             .build();
 
     CTP_SOURCE_CLIENT.products().create(productDraft).executeBlocking();
-    productQuery = ProductProjectionQuery.ofStaged();
   }
 
   @BeforeEach

src/integration-test/java/com/commercetools/sync/integration/services/impl/CartDiscountServiceImplIT.java

@@ -149,7 +149,7 @@ void fetchMatchingCartDiscountsByKeys_WithAnyExistingKeys_ShouldReturnASetOfCart
 
   @Test
   void fetchMatchingCartDiscountsByKeys_WithBadGateWayExceptionAlways_ShouldFail() {
-    // Mock sphere client to return BadGatewayException on any request.
+    // Mock client to return BadGatewayException on any request.
     final ProjectApiRoot spyClient = spy(CTP_TARGET_CLIENT);
     final ByProjectKeyCartDiscountsRequestBuilder byProjectKeyCartDiscountsRequestBuilder = mock();
     when(spyClient.cartDiscounts()).thenReturn(byProjectKeyCartDiscountsRequestBuilder);

src/integration-test/java/com/commercetools/sync/integration/services/impl/CategoryServiceImplIT.java

@@ -198,7 +198,7 @@ void fetchMatchingCategoriesByKeys_WithAllExistingSetOfKeys_ShouldReturnSetOfCat
 
   @Test
   void fetchMatchingCategoriesByKeys_WithBadGateWayExceptionAlways_ShouldFail() {
-    // Mock sphere client to return BadGatewayException on any request.
+    // Mock client to return BadGatewayException on any request.
 
     final ProjectApiRoot spyClient = spy(CTP_TARGET_CLIENT);
     when(spyClient.categories()).thenReturn(mock(ByProjectKeyCategoriesRequestBuilder.class));
@@ -547,10 +547,10 @@ void updateCategory_WithInvalidChanges_ShouldNotUpdateCategory() {
               final List<DuplicateFieldError> fieldErrors =
                   badRequestException.getErrorResponse().getErrors().stream()
                       .map(
-                          sphereError -> {
-                            assertThat(sphereError.getCode())
+                          error -> {
+                            assertThat(error.getCode())
                                 .isEqualTo(DuplicateFieldError.DUPLICATE_FIELD);
-                            return (DuplicateFieldError) sphereError;
+                            return (DuplicateFieldError) error;
                           })
                       .collect(toList());
               assertThat(fieldErrors).hasSize(1);
@@ -602,7 +602,7 @@ void fetchCategory_WithNullKey_ShouldNotFetchCategory() {
 
   @Test
   void fetchCategory_WithBadGateWayExceptionAlways_ShouldFail() {
-    // Mock sphere client to return BadGatewayException on any request.
+    // Mock client to return BadGatewayException on any request.
     final ProjectApiRoot spyClient = spy(CTP_TARGET_CLIENT);
     when(spyClient.categories()).thenReturn(mock(ByProjectKeyCategoriesRequestBuilder.class));
 

src/integration-test/java/com/commercetools/sync/integration/services/impl/CustomObjectServiceImplIT.java

@@ -213,7 +213,7 @@ void fetchMatchingCustomObjects_WithNonExistingKeysAndContainers_ShouldReturnEmp
 
   @Test
   void fetchMatchingCustomObjectsByCompositeIdentifiers_WithBadGateWayExceptionAlways_ShouldFail() {
-    // Mock sphere client to return BadGatewayException on any request.
+    // Mock client to return BadGatewayException on any request.
     final ProjectApiRoot spyClient = Mockito.spy(TestClientUtils.CTP_TARGET_CLIENT);
     when(spyClient.customObjects()).thenReturn(mock(ByProjectKeyCustomObjectsRequestBuilder.class));
     final ByProjectKeyCustomObjectsGet getMock = mock(ByProjectKeyCustomObjectsGet.class);

src/integration-test/java/com/commercetools/sync/integration/services/impl/ProductTypeServiceImplIT.java

@@ -180,7 +180,7 @@ void fetchMatchingProductTypesByKeys_WithAnyExistingKeys_ShouldReturnASetOfProdu
 
   @Test
   void fetchMatchingProductTypesByKeys_WithBadGateWayExceptionAlways_ShouldFail() {
-    // Mock sphere client to return BadGatewayException on any request.
+    // Mock client to return BadGatewayException on any request.
 
     final ProjectApiRoot spyClient = spy(CTP_TARGET_CLIENT);
     when(spyClient.productTypes()).thenReturn(mock(ByProjectKeyProductTypesRequestBuilder.class));