Refactoring

Author: konarshankar07

src/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspection.java

@@ -11,13 +11,14 @@
 import com.intellij.lang.jsgraphql.psi.GraphQLValue;
 import com.intellij.lang.jsgraphql.psi.GraphQLVisitor;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.magento.idea.magento2plugin.bundles.InspectionBundle;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import com.magento.idea.magento2plugin.util.magento.graphql.GraphQlUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class SchemaResolverInspection extends LocalInspectionTool {
 
-    public static final String GraphQlResolverProblemDescription = "Class must implements \\Magento\\Framework\\GraphQl\\Query\\ResolverInterface";
+    private final InspectionBundle inspectionBundle = new InspectionBundle();
 
     @NotNull
     @Override
@@ -38,7 +39,9 @@ public void visitValue(@NotNull GraphQLValue element) {
                 }
                 if (!GraphQlUtil.isResolver(resolverClass)) {
                     holder.registerProblem(element,
-                            GraphQlResolverProblemDescription,
+                            inspectionBundle.message(
+                                    "inspection.graphql.resolver.mustImplement"
+                            ),
                             ProblemHighlightType.ERROR);
                 }
             }

testData/inspections/graphqls/SchemaResolverInspection/withValidBatchResolverInterface/schema.graphqls

@@ -0,0 +1,6 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithValidBatchResolverInterface\\Item") @doc(description: "Test")
+}

testData/inspections/graphqls/SchemaResolverInspection/withValidBatchServiceContractResolverInterface/schema.graphqls

@@ -0,0 +1,6 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+type Query {
+    test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithValidBatchServiceContractResolverInterface\\Item") @doc(description: "Test")
+}

testData/project/magento2/app/code/Magento/InspectionTest/Model/GraphQl/WithValidBatchResolverInterface/Item.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InspectionTest\Model\GraphQl\WithValidBatchResolverInterface;
+
+use Magento\Framework\GraphQl\Query\Resolver\BatchResolverInterface;
+
+class Item implements BatchResolverInterface
+{
+}
+?>

testData/project/magento2/app/code/Magento/InspectionTest/Model/GraphQl/WithValidBatchServiceContractResolverInterface/Item.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InspectionTest\Model\GraphQl\WithValidBatchServiceContractResolverInterface;
+
+use Magento\Framework\GraphQl\Query\Resolver\BatchServiceContractResolverInterface;
+
+class Item implements BatchServiceContractResolverInterface
+{
+}
+?>

testData/project/magento2/app/code/Magento/InspectionTest/etc/module.xml

@@ -1,4 +1,10 @@
 <?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_InspectionTest"/>
 </config>

testData/project/magento2/app/code/Magento/InspectionTest/registration.php

@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
     'Magento_InspectionTest',

tests/com/magento/idea/magento2plugin/BaseProjectTestCase.java

@@ -7,6 +7,7 @@
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+import com.magento.idea.magento2plugin.bundles.InspectionBundle;
 import com.magento.idea.magento2plugin.indexes.IndexManager;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.magento.packages.File;
@@ -18,6 +19,7 @@
 abstract public class BaseProjectTestCase extends BasePlatformTestCase {
     private static final String testDataProjectPath = "testData" + File.separator + "project";
     private static final String testDataProjectDirectory = "magento2";
+    protected final InspectionBundle inspectionBundle = new InspectionBundle();
 
     @Override
     protected void setUp() throws Exception {

tests/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspectionTest.java

@@ -1,8 +1,14 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 package com.magento.idea.magento2plugin.inspections.graphqls;
 
 public class SchemaResolverInspectionTest extends InspectionGraphqlsFixtureTestCase {
 
-    private final String errorMessage =  "Class must implements \\Magento\\Framework\\GraphQl\\Query\\ResolverInterface";
+    private final String errorMessage =  inspectionBundle.message(
+            "inspection.graphql.resolver.mustImplement"
+    );
 
     @Override
     public void setUp() throws Exception {
@@ -23,4 +29,16 @@ public void testWithInvalidSchemaResolverInterface() throws Exception {
         myFixture.configureByFile(getFixturePath("schema.graphqls"));
         assertHasHighlighting(errorMessage);
     }
+
+    public void testWithValidBatchResolverInterface() throws Exception {
+        myFixture.configureByFile(getFixturePath("schema.graphqls"));
+
+        assertHasNoHighlighting(errorMessage);
+    }
+
+    public void testWithValidBatchServiceContractResolverInterface() throws Exception {
+        myFixture.configureByFile(getFixturePath("schema.graphqls"));
+
+        assertHasNoHighlighting(errorMessage);
+    }
 }

tests/com/magento/idea/magento2plugin/inspections/php/GraphQlResolverInspectionTest.java

@@ -8,7 +8,6 @@
 
 public class GraphQlResolverInspectionTest extends InspectionPhpFixtureTestCase {
 
-    private final InspectionBundle inspectionBundle = new InspectionBundle();
     private final String errorMessage =  inspectionBundle.message(
         "inspection.graphql.resolver.mustImplement"
     );