MAGETWO-87264: Finalizing - refactoring code for Pr

Author: cpartica

app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php

@@ -6,22 +6,18 @@
 
 namespace Magento\BundleGraphQl\Model;
 
-use Magento\Framework\GraphQl\Config\Data\TypeResolverInterface;
-
 /**
  * {@inheritdoc}
  */
-class BundleProductTypeResolver implements TypeResolverInterface
+class BundleProductTypeResolver
 {
     /**
      * {@inheritdoc}
      */
-    public function resolveType(array $data)
+    public function resolveType($typeId)
     {
-        if (isset($data['type_id']) && $data['type_id'] == 'bundle') {
+        if ($typeId == 'bundle') {
             return 'BundleProduct';
         }
-
-        return null;
     }
 }

app/code/Magento/CatalogGraphQl/Model/CatalogProductTypeResolver.php

@@ -18,12 +18,12 @@ class CatalogProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data)
     {
-        if (isset($data['type_id']) && $data['type_id'] == 'simple') {
-            return 'SimpleProduct';
-        } elseif (isset($data['type_id']) && $data['type_id'] == 'virtual') {
-            return 'VirtualProduct';
+        if (isset($data['type_id'])) {
+            if ($data['type_id'] == 'simple') {
+                return 'SimpleProduct';
+            } elseif ($data['type_id'] == 'virtual') {
+                return 'VirtualProduct';
+            }
         }
-
-        return null;
     }
 }

app/code/Magento/CatalogGraphQl/Model/CustomizableOptionTypeResolver.php

@@ -10,7 +10,7 @@
 use Magento\Framework\GraphQl\Type\Entity\MapperInterface;
 
 /**
- * Class CustomizableOptionTypeResolver
+ * Resolve the CustomizableOptionType for graphql schema
  */
 class CustomizableOptionTypeResolver implements TypeResolverInterface
 {
@@ -35,10 +35,8 @@ public function __construct(MapperInterface $mapper)
     public function resolveType(array $data)
     {
         $map = $this->mapper->getMappedTypes(self::ENTITY_TYPE);
-        if (!isset($map[$data['type']]) || !isset($map[$data['type']])) {
-            return null;
+        if (isset($map[$data['type']])) {
+            return $map[$data['type']];
         }
-
-        return $map[$data['type']];
     }
 }

app/code/Magento/CatalogGraphQl/Model/ProductLinkTypeResolverComposite.php

@@ -43,13 +43,15 @@ public function resolveType(array $data)
             }
             $resolvedType = $productLinksTypeNameResolvers->resolveType($data);
 
-            if (!$resolvedType) {
-                throw new GraphQlInputException(
-                    __('Concrete type for %1 not implemented', ['ProductLinksInterface'])
-                );
+            if ($resolvedType) {
+                return $resolvedType;
             }
         }
 
-        return $resolvedType;
+        if (!$resolvedType) {
+            throw new GraphQlInputException(
+                __('Concrete type for %1 not implemented', ['ProductLinksInterface'])
+            );
+        }
     }
 }

app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php

@@ -29,7 +29,5 @@ public function resolveType(array $data)
                 return 'ProductLinks';
             }
         }
-
-        return null;
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/AstConverter.php

@@ -116,7 +116,7 @@ private function getClausesFromAst(ReferenceType $referenceType, array $argument
     private function getCatalogProductFields()
     {
         $productTypeSchema = $this->config->getTypeStructure('SimpleProduct');
-        if (! $productTypeSchema instanceof Type) {
+        if (!$productTypeSchema instanceof Type) {
             throw new \LogicException(__("SimpleProduct type not defined in schema."));
         }
 

app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php

@@ -21,7 +21,5 @@ public function resolveType(array $data)
         if (isset($data['type_id']) && $data['type_id'] == 'configurable') {
             return 'ConfigurableProduct';
         }
-
-        return null;
     }
 }

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/ConfigurableOptions.php

@@ -11,7 +11,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterInterface;
 
 /**
- * Post formatting plugin to continue formatting data for configurable type products
+ * Post formatting to continue formatting data for configurable type products
  */
 class ConfigurableOptions implements FormatterInterface
 {

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Products/Query/ConfigurableProductPostProcessor.php

@@ -13,7 +13,7 @@
 use Magento\Framework\GraphQl\Query\PostFetchProcessorInterface;
 
 /**
- * Retrieves simple product data for child products, and formats configurable data
+ * Retrieves simple product data for child products and formats configurable data
  */
 class ConfigurableProductPostProcessor implements PostFetchProcessorInterface
 {

app/code/Magento/DownloadableGraphQl/Model/DownloadableProductTypeResolver.php

@@ -21,7 +21,5 @@ public function resolveType(array $data)
         if (isset($data['type_id']) && $data['type_id'] == 'downloadable') {
             return 'DownloadableProduct';
         }
-
-        return null;
     }
 }