1139: Code refactoring

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/actions/context/php/NewSetupDataPatchAction.java

@@ -13,14 +13,13 @@
 import com.magento.idea.magento2plugin.magento.packages.ComponentType;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
-import java.util.Objects;
 import org.jetbrains.annotations.NotNull;
 
 public class NewSetupDataPatchAction extends CustomGeneratorContextAction {
 
     public static final String ACTION_NAME = "Magento 2 Setup Data Patch";
     public static final String ACTION_DESCRIPTION = "Create a new Magento 2 Setup Data Patch";
-    public static final String ROOT_DIRECTORY = "Setup";
+    public static final String SETUP_DIRECTORY = "Setup";
     public static final String PATCH_DIRECTORY = "Patch";
     public static final String DATA_DIRECTORY = "Data";
 
@@ -40,11 +39,14 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
         if (module.length != 2) { //NOPMD
             return;
         }
-        final PsiDirectory rooDirectory = moduleData.getModuleDir().findSubdirectory(
-                ROOT_DIRECTORY
+        final PsiDirectory rootDirectory = moduleData.getModuleDir().findSubdirectory(
+                SETUP_DIRECTORY
         );
 
-        NewSetupDataPatchDialog.open(event.getProject(), rooDirectory, module[0], module[1]);
+        if (rootDirectory == null) {
+            return;
+        }
+        NewSetupDataPatchDialog.open(event.getProject(), rootDirectory, module[0], module[1]);
     }
 
     @Override
@@ -57,28 +59,30 @@ protected boolean isVisible(
             return false;
         }
 
-        if (ROOT_DIRECTORY.equals(targetDirectory.getName())) {
-            return Objects.requireNonNull(targetDirectory.getParentDirectory()).getName().equals(
-                    moduleData.getModuleDir().getName()
-            );
+        if (SETUP_DIRECTORY.equals(targetDirectory.getName())) {
+            return moduleData.getModuleDir().equals(targetDirectory.getParentDirectory());
         }
 
         if (PATCH_DIRECTORY.equals(targetDirectory.getName())) {
-            return ROOT_DIRECTORY.equals(Objects.requireNonNull(
-                    targetDirectory.getParentDirectory()).getName()
-            );
+            final PsiDirectory setupDirCandidate = targetDirectory.getParentDirectory();
+
+            return setupDirCandidate != null
+                    && SETUP_DIRECTORY.equals(setupDirCandidate.getName())
+                    && moduleData.getModuleDir().equals(setupDirCandidate.getParentDirectory());
         }
 
         if (DATA_DIRECTORY.equals(targetDirectory.getName())) {
-            final PsiDirectory parentDirectory = Objects.requireNonNull(
-                    targetDirectory.getParentDirectory()
-            );
-
-            if (PATCH_DIRECTORY.equals(parentDirectory.getName())) {
-                return ROOT_DIRECTORY.equals(Objects.requireNonNull(
-                        parentDirectory.getParentDirectory()).getName()
-                );
+            final PsiDirectory patchDirCandidate = targetDirectory.getParentDirectory();
+
+            if (patchDirCandidate == null) {
+                return false;
             }
+            final PsiDirectory setupDirCandidate = patchDirCandidate.getParentDirectory();
+
+            return setupDirCandidate != null
+                    && PATCH_DIRECTORY.equals(patchDirCandidate.getName())
+                    && SETUP_DIRECTORY.equals(setupDirCandidate.getName())
+                    && moduleData.getModuleDir().equals(setupDirCandidate.getParentDirectory());
         }
 
         return false;

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewSetupDataPatchDialog.java

@@ -18,6 +18,8 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.magento.files.ModuleSetupDataPatchFile;
 import com.magento.idea.magento2plugin.magento.packages.File;
+import org.jetbrains.annotations.NotNull;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
@@ -57,8 +59,8 @@ public class NewSetupDataPatchDialog extends AbstractDialog {
      * @param directory PsiDirectory
      */
     public NewSetupDataPatchDialog(
-            final Project project,
-            final PsiDirectory directory,
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory,
             final String modulePackage,
             final String moduleName
     ) {
@@ -105,8 +107,8 @@ public void windowClosing(final WindowEvent event) {
      * @param directory PsiDirectory
      */
     public static void open(
-            final Project project,
-            final PsiDirectory directory,
+            final @NotNull Project project,
+            final @NotNull PsiDirectory directory,
             final String modulePackage,
             final String moduleName
     ) {
@@ -130,7 +132,8 @@ protected void onOK() {
 
     private void generateFile() {
         final PsiDirectory directory = DirectoryGenerator.getInstance().findOrCreateSubdirectories(
-                baseDir, NewSetupDataPatchAction.PATCH_DIRECTORY + File.separator
+                baseDir,
+                NewSetupDataPatchAction.PATCH_DIRECTORY + File.separator
                         + NewSetupDataPatchAction.DATA_DIRECTORY
         );
         final ModuleSetupDataPatchGenerator generator = new ModuleSetupDataPatchGenerator(