DEVX-640: refactoring resolveKey

Author: ShipilA

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/ExpandObjResolverService.java

@@ -3,11 +3,13 @@
 
 import com.commercetools.api.models.IdentifiableObjHolder;
 import com.commercetools.api.models.WithKey;
+import com.commercetools.api.models.common.Reference;
 
-public class ExpandObjResolverService<T extends IdentifiableObjHolder<TResource>, TResource extends WithKey>
-        implements KeyResolverService<T> {
+import java.util.Optional;
 
-    public String resolveKey(T identifiable) {
-        return identifiable.getObj().getKey();
+public class ExpandObjResolverService implements KeyResolverService {
+
+    @Override public <T extends IdentifiableObjHolder<TRes> & Reference, TRes extends WithKey> String resolveKey(T identifiable) {
+        return Optional.ofNullable(identifiable).map(T::getObj).map(TRes::getKey).orElse(null);
     }
 }

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/KeyResolverService.java

@@ -1,6 +1,10 @@
 
 package com.commercetools.sdk;
 
-public interface KeyResolverService<T> {
-    public String resolveKey(T identifiable);
+import com.commercetools.api.models.IdentifiableObjHolder;
+import com.commercetools.api.models.WithKey;
+import com.commercetools.api.models.common.Reference;
+
+public interface KeyResolverService {
+    public <T extends IdentifiableObjHolder<TRes> & Reference, TRes extends WithKey> String resolveKey(T identifiable);
 }

commercetools/commercetools-importapi-utils/src/main/java/com/commercetools/sdk/ProductUtil.java

@@ -35,16 +35,16 @@
 import io.vrap.rmf.base.client.Builder;
 
 public final class ProductUtil {
-    private static KeyResolverService<CategoryReference> catKeyResolverService;
+    private static KeyResolverService keyResolverService;
 
     public ProductUtil() {
-        catKeyResolverService = new ExpandObjResolverService<>();
+        keyResolverService = new ExpandObjResolverService();
     }
 
     public static ProductDraftImport toProductDraftImport(ProductProjection product) {
         var draft = ProductDraftImport.builder()
                 .key(product.getKey())
-                .productType(p -> p.key(product.getProductType().getObj().getKey()))
+                .productType(p -> p.key(keyResolverService.resolveKey(product.getProductType())))
                 .name(l -> getLocalizedStringBuilder(product.getName()))
                 .slug(l -> getLocalizedStringBuilder(product.getSlug()))
                 .description(Optional.ofNullable(product.getDescription())
@@ -85,18 +85,15 @@ private static com.commercetools.importapi.models.common.ProductPriceModeEnum ma
     }
 
     private static StateKeyReference getStateKeyReference(ProductProjection product) {
-        var key = Optional.ofNullable(product.getState()).map(StateReference::getObj).map(State::getKey).orElse(null);
+        var key = keyResolverService.resolveKey(product.getState());
         if (key != null) {
             return StateKeyReference.builder().key(key).build();
         }
         return null;
     }
 
     private static TaxCategoryKeyReference getTaxCategoryKeyReference(ProductProjection product) {
-        var key = Optional.ofNullable(product.getTaxCategory())
-                .map(TaxCategoryReference::getObj)
-                .map(TaxCategory::getKey)
-                .orElse(null);
+        var key = keyResolverService.resolveKey(product.getTaxCategory());
         if (key != null) {
             return TaxCategoryKeyReference.builder().key(key).build();
         }
@@ -170,7 +167,7 @@ private static List<com.commercetools.importapi.models.common.Asset> importAsset
     private static List<CategoryKeyReference> extractCategoryKeyReference(ProductProjection product) {
         return product.getCategories()
                 .stream()
-                .map(c -> CategoryKeyReference.builder().key(catKeyResolverService.resolveKey(c)).build())
+                .map(c -> CategoryKeyReference.builder().key(keyResolverService.resolveKey(c)).build())
                 .collect(Collectors.toList());
     }