1139: Fixed code after review

Author: anzin

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

@@ -15,6 +15,8 @@
 import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 public class NewSetupDataPatchAction extends CustomGeneratorContextAction {
 
     public static final String ACTION_NAME = "Magento 2 Setup Data Patch";
@@ -34,18 +36,16 @@ public void actionPerformed(final @NotNull AnActionEvent event) {
         if (event.getProject() == null || moduleData == null || getDirectory() == null) {
             return;
         }
-        final String[] templateData = moduleData.getName().split(Package.vendorModuleNameSeparator);
+        final String[] module = moduleData.getName().split(Package.vendorModuleNameSeparator);
 
-        if (templateData.length != 2) { //NOPMD
+        if (module.length != 2) { //NOPMD
             return;
         }
-
-        NewSetupDataPatchDialog.open(
-                event.getProject(),
-                getDirectory(),
-                templateData[0],
-                templateData[1]
+        final PsiDirectory rooDirectory = moduleData.getModuleDir().findSubdirectory(
+                ROOT_DIRECTORY
         );
+
+        NewSetupDataPatchDialog.open(event.getProject(), rooDirectory, module[0], module[1]);
     }
 
     @Override
@@ -57,24 +57,31 @@ protected boolean isVisible(
         if (!moduleData.getType().equals(ComponentType.module)) {
             return false;
         }
-        final String targetDirName = targetDirectory.getName();
 
-        if (!(ROOT_DIRECTORY.equals(targetDirName) || PATCH_DIRECTORY.equals(targetDirName)
-                || DATA_DIRECTORY.equals(targetDirName))
-        ) {
-            return false;
+        if (ROOT_DIRECTORY.equals(targetDirectory.getName())) {
+            return Objects.requireNonNull(targetDirectory.getParentDirectory()).getName().equals(
+                    moduleData.getModuleDir().getName()
+            );
         }
 
-        final PsiDirectory parentDirFirst = targetDirectory.getParentDirectory();
-        PsiDirectory parentDirSecond = null;
-
-        if (parentDirFirst != null) {
-            parentDirSecond = parentDirFirst.getParentDirectory();
+        if (PATCH_DIRECTORY.equals(targetDirectory.getName())) {
+            return ROOT_DIRECTORY.equals(Objects.requireNonNull(
+                    targetDirectory.getParentDirectory()).getName()
+            );
         }
 
+        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()
+                );
+            }
+        }
 
-        return ROOT_DIRECTORY.equals(targetDirName)
-                || parentDirFirst != null && ROOT_DIRECTORY.equals(parentDirFirst.getName())
-                || parentDirSecond != null && ROOT_DIRECTORY.equals(parentDirSecond.getName());
+        return false;
     }
 }

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

@@ -15,12 +15,13 @@
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.PhpClassRule;
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleSetupDataPatchGenerator;
+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 java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.Objects;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -128,11 +129,15 @@ protected void onOK() {
     }
 
     private void generateFile() {
+        final PsiDirectory directory = DirectoryGenerator.getInstance().findOrCreateSubdirectories(
+                baseDir, NewSetupDataPatchAction.PATCH_DIRECTORY + File.separator
+                        + NewSetupDataPatchAction.DATA_DIRECTORY
+        );
         final ModuleSetupDataPatchGenerator generator = new ModuleSetupDataPatchGenerator(
                 new ModuleSetupDataPatchData(
                         modulePackage,
                         moduleName,
-                        createDirectory(baseDir),
+                        directory,
                         getClassName()
                 ),
                 project
@@ -146,16 +151,22 @@ public String getClassName() {
     }
 
     private boolean validateFields() {
-        final PsiDirectory targetDirectory = getDirectory(baseDir);
+        final PsiDirectory patchDirectory = baseDir.findSubdirectory(
+                NewSetupDataPatchAction.PATCH_DIRECTORY
+        );
+        PsiDirectory directory = null;
 
-        if (NewSetupDataPatchAction.DATA_DIRECTORY.equals(targetDirectory.getName())) {
-            final PsiFile[] files = targetDirectory.getFiles();
-            for (final PsiFile file : files) {
+        if (patchDirectory != null) {
+            directory = patchDirectory.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
+        }
+
+        if (directory != null) {
+            for (final PsiFile file : directory.getFiles()) {
                 final String className = ModuleSetupDataPatchFile.resolveClassNameFromInput(
                         getClassName()
                 );
 
-                if (file.getName().equals(className + ".php")) {
+                if (file.getName().equals(className + ModuleSetupDataPatchFile.EXTENSION)) {
                     showErrorMessage(
                             fieldsValidationsList.get(0).getField(),
                             "Class name `" + className + "` already exist."
@@ -165,59 +176,7 @@ private boolean validateFields() {
                 }
             }
         }
-        return validateFormFields();
-    }
-
-    private PsiDirectory getDirectory(final PsiDirectory targetDirectory) {
-        if (NewSetupDataPatchAction.ROOT_DIRECTORY.equals(baseDir.getName())) {
-            final PsiDirectory subDirectoryPatch = baseDir.findSubdirectory(
-                    NewSetupDataPatchAction.PATCH_DIRECTORY
-            );
 
-            if (subDirectoryPatch != null) {
-                return subDirectoryPatch.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
-            }
-        }
-        if (NewSetupDataPatchAction.PATCH_DIRECTORY.equals(baseDir.getName())) {
-            return baseDir.findSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
-        }
-
-        return targetDirectory;
-    }
-
-    private PsiDirectory createDirectory(final PsiDirectory targetDirectory) {
-        if (NewSetupDataPatchAction.ROOT_DIRECTORY.equals(targetDirectory.getName())) {
-            final PsiDirectory subDirectoryPatch = targetDirectory.findSubdirectory(
-                    NewSetupDataPatchAction.PATCH_DIRECTORY
-            );
-
-            if (subDirectoryPatch == null) {
-                return targetDirectory.createSubdirectory(
-                        NewSetupDataPatchAction.PATCH_DIRECTORY
-                ).createSubdirectory(NewSetupDataPatchAction.DATA_DIRECTORY);
-            }
-            final PsiDirectory subDirectoryData = subDirectoryPatch.findSubdirectory(
-                    NewSetupDataPatchAction.DATA_DIRECTORY
-            );
-
-            return Objects.requireNonNullElseGet(
-                    subDirectoryData, () -> subDirectoryPatch.createSubdirectory(
-                            NewSetupDataPatchAction.DATA_DIRECTORY
-                    )
-            );
-        }
-        if (NewSetupDataPatchAction.PATCH_DIRECTORY.equals(targetDirectory.getName())) {
-            final PsiDirectory subDirectoryData = targetDirectory.findSubdirectory(
-                    NewSetupDataPatchAction.DATA_DIRECTORY
-            );
-
-            return Objects.requireNonNullElseGet(
-                    subDirectoryData, () -> targetDirectory.createSubdirectory(
-                            NewSetupDataPatchAction.DATA_DIRECTORY
-                    )
-            );
-        }
-
-        return targetDirectory;
+        return validateFormFields();
     }
 }