Refactoring

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/inspections/php/fix/PhpImplementResolverClassQuickFix.java

@@ -11,8 +11,8 @@
 import com.intellij.psi.PsiElement;
 import com.jetbrains.php.lang.psi.PhpPsiElementFactory;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.magento.idea.magento2plugin.magento.files.GraphQlResolver;
 import org.jetbrains.annotations.NotNull;
-import com.magento.idea.magento2plugin.util.magento.graphql.GraphQlUtil;
 
 public class PhpImplementResolverClassQuickFix implements LocalQuickFix {
     @NotNull
@@ -23,7 +23,7 @@ public String getFamilyName() {
 
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-        PsiElement correctInterface = PhpPsiElementFactory.createImplementsList(project, GraphQlUtil.RESOLVER_INTERFACE);
+        PsiElement correctInterface = PhpPsiElementFactory.createImplementsList(project, GraphQlResolver.RESOLVER_INTERFACE);
         PhpClass graphQlResolverClass = (PhpClass) descriptor.getPsiElement().getParent();
         graphQlResolverClass.getImplementsList().replace(correctInterface);
     }

src/com/magento/idea/magento2plugin/magento/files/GraphQlResolver.java

@@ -0,0 +1,10 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.magento.files;
+
+public class GraphQlResolver {
+    public static final String RESOLVER_INTERFACE = "\\Magento\\Framework\\GraphQl\\Query\\ResolverInterface";
+    public static final String CLASS_ARGUMENT = "class";
+}

src/com/magento/idea/magento2plugin/util/magento/graphql/GraphQlUtil.java

@@ -7,18 +7,18 @@
 import com.intellij.lang.jsgraphql.psi.GraphQLStringValue;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.magento.idea.magento2plugin.magento.files.GraphQlResolver;
+import com.magento.idea.magento2plugin.magento.packages.Package;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class GraphQlUtil {
 
-    public static final String RESOLVER_INTERFACE = "\\Magento\\Framework\\GraphQl\\Query\\ResolverInterface";
-
     @NotNull
     public static String resolverStringToPhpFQN(String resolverFQN) {
-        resolverFQN = resolverFQN.replace("\\\\", "\\").replace("\"","");
-        if (!resolverFQN.startsWith("\\")) {
-            resolverFQN = "\\".concat(resolverFQN);
+        resolverFQN = resolverFQN.replace("\\\\", Package.FQN_SEPARATOR).replace("\"","");
+        if (!resolverFQN.startsWith(Package.FQN_SEPARATOR)) {
+            resolverFQN = Package.FQN_SEPARATOR.concat(resolverFQN);
         }
         return resolverFQN;
     }
@@ -37,7 +37,7 @@ public static GraphQLStringValue fetchResolverQuotedStringFromArgument(PsiElemen
 
         GraphQLStringValue argumentStringValue = (GraphQLStringValue) argumentChildren[1];
 
-        if (!argumentIdentifier.getText().equals("class")) {
+        if (!argumentIdentifier.getText().equals(GraphQlResolver.CLASS_ARGUMENT)) {
             return null;
         }
 
@@ -47,7 +47,7 @@ public static GraphQLStringValue fetchResolverQuotedStringFromArgument(PsiElemen
     public static boolean isResolver(PhpClass psiElement) {
         PhpClass[] implementedInterfaces = psiElement.getImplementedInterfaces();
         for (PhpClass implementedInterface: implementedInterfaces) {
-            if (!implementedInterface.getFQN().equals(RESOLVER_INTERFACE)) {
+            if (!implementedInterface.getFQN().equals(GraphQlResolver.RESOLVER_INTERFACE)) {
                 continue;
             }
             return false;