#305_refactor code

Author: iamdylanngo

resources/META-INF/plugin.xml

@@ -125,7 +125,7 @@
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.js.MagentoLibJsIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.AclResourceIndex" />
         <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.MenuIndex" />
-        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.UiComponentIndex" />
+        <fileBasedIndex implementation="com.magento.idea.magento2plugin.stubs.indexes.xml.UIComponentIndex" />
 
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginLineMarkerProvider"/>
         <codeInsight.lineMarkerProvider language="PHP" implementationClass="com.magento.idea.magento2plugin.linemarker.php.PluginTargetLineMarkerProvider"/>

src/com/magento/idea/magento2plugin/completion/provider/UiComponentCompletionProvider.java

@@ -13,25 +13,25 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.util.ProcessingContext;
 import com.jetbrains.php.PhpIcons;
-import com.magento.idea.magento2plugin.indexes.UiComponentIndex;
+import com.magento.idea.magento2plugin.indexes.UIComponentIndex;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 
 
 public class UiComponentCompletionProvider extends CompletionProvider<CompletionParameters> {
 
     @Override
-    protected void addCompletions(@NotNull CompletionParameters parameters,
-                                  ProcessingContext context,
-                                  @NotNull CompletionResultSet result) {
-        PsiElement position = parameters.getPosition().getOriginalElement();
+    protected void addCompletions(@NotNull final CompletionParameters parameters,
+                                  final ProcessingContext context,
+                                  @NotNull final CompletionResultSet result) {
+        final PsiElement position = parameters.getPosition().getOriginalElement();
         if (position == null) {
             return;
         }
 
-        List<XmlFile> targets = UiComponentIndex.getUiComponentFiles(position.getProject());
-        if (targets.size() > 0) {
-            for (XmlFile file : targets) {
+        final List<XmlFile> targets = UIComponentIndex.getUiComponentFiles(position.getProject());
+        if (!targets.isEmpty()) {
+            for (final XmlFile file : targets) {
                 result.addElement(LookupElementBuilder
                             .create(file.getVirtualFile().getNameWithoutExtension())
                             .withIcon(PhpIcons.XML_TAG_ICON)

src/com/magento/idea/magento2plugin/indexes/UiComponentIndex.java renamed to src/com/magento/idea/magento2plugin/indexes/UIComponentIndex.java

@@ -19,8 +19,12 @@
 import java.util.List;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("PMD")
+public final class UIComponentIndex {
 
-public class UiComponentIndex {
+    private UIComponentIndex() {
+        throw new AssertionError("Instantiating utility class...");
+    }
 
     /**
      * Available ui component file.
@@ -41,7 +45,10 @@ public static boolean isUiComponentFile(final VirtualFile virtualFile) {
      * @param fileName String
      * @return List
      */
-    public static List<XmlFile> getUiComponentFiles(final Project project, final @Nullable String fileName) {
+    public static List<XmlFile> getUiComponentFiles(
+            final Project project,
+            final @Nullable String fileName
+    ) {
         final List<XmlFile> results = new ArrayList<XmlFile>();//NOPMD
         final Collection<VirtualFile> xmlFiles = FilenameIndex.getAllFilesByExt(project, "xml");
 
@@ -62,11 +69,27 @@ public static List<XmlFile> getUiComponentFiles(final Project project, final @Nu
         return results;
     }
 
+    /**
+     * Get ui component files.
+     *
+     * @param project Project
+     * @return List
+     */
     public static List<XmlFile> getUiComponentFiles(final Project project) {
         return getUiComponentFiles(project, null);
     }
 
-    public static Collection<String> getAllKeys(final ID<String, Void> id, final Project project) {
-        return FileBasedIndex.getInstance().getAllKeys(id, project);
+    /**
+     * Get All Keys.
+     *
+     * @param identifier ID
+     * @param project Project
+     * @return Collection
+     */
+    public static Collection<String> getAllKeys(
+            final ID<String, Void> identifier,
+            final Project project
+    ) {
+        return FileBasedIndex.getInstance().getAllKeys(identifier, project);
     }
 }

src/com/magento/idea/magento2plugin/stubs/indexes/xml/UiComponentIndex.java renamed to src/com/magento/idea/magento2plugin/stubs/indexes/xml/UIComponentIndex.java

@@ -18,7 +18,7 @@
 import org.jetbrains.annotations.NotNull;
 
 
-public class UiComponentIndex extends ScalarIndexExtension<String> {
+public class UIComponentIndex extends ScalarIndexExtension<String> {
 
     public static final ID<String, Void> KEY =
             ID.create("com.magento.idea.magento2plugin.stubs.indexes.ui_component");
@@ -41,7 +41,7 @@ public DataIndexer<String, Void, FileContent> getIndexer() {
             final Map<String, Void> map = new HashMap<>();//NOPMD
 
             final PsiFile psiFile = inputData.getPsiFile();
-            if (!Settings.isEnabled(psiFile.getProject())) {
+            if (!Settings.isEnabled(psiFile.getProject() )) {
                 return map;
             }