Fixing static tests

Author: Sergiy Zhovnir

src/com/magento/idea/magento2plugin/actions/generation/NewControllerAction.java

@@ -25,25 +25,25 @@ public class NewControllerAction extends AnAction {
     /**
      * New controller action constructor.
      */
-    NewControllerAction() {
+    public NewControllerAction() {
         super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
     }
 
     @Override
-    public void actionPerformed(@NotNull AnActionEvent e) {
-        final DataContext dataContext = e.getDataContext();
+    public void actionPerformed(@NotNull AnActionEvent event) {
+        final DataContext dataContext = event.getDataContext();
         final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
 
         if (view == null) {
             return;
         }
 
-        Project project = CommonDataKeys.PROJECT.getData(dataContext);
+        final Project project = CommonDataKeys.PROJECT.getData(dataContext);
         if (project == null) {
             return;
         }
 
-        PsiDirectory directory = view.getOrChooseDirectory();
+        final PsiDirectory directory = view.getOrChooseDirectory();
         if (directory == null) {
             return;
         }

src/com/magento/idea/magento2plugin/actions/generation/data/ControllerFileData.java

@@ -5,6 +5,7 @@
 
 package com.magento.idea.magento2plugin.actions.generation.data;
 
+@SuppressWarnings({"PMD.DataClass"})
 public class ControllerFileData {
     private final String actionDirectory;
     private final String actionClassName;
@@ -28,14 +29,14 @@ public class ControllerFileData {
      * @param namespace String
      */
     public ControllerFileData(
-            String actionDirectory,
-            String controllerClassName,
-            String controllerModule,
-            String controllerArea,
-            String httpMethodName,
-            String acl,
-            Boolean isInheritClass,
-            String namespace
+            final String actionDirectory,
+            final String controllerClassName,
+            final String controllerModule,
+            final String controllerArea,
+            final String httpMethodName,
+            final String acl,
+            final Boolean isInheritClass,
+            final String namespace
     ) {
         this.actionDirectory = actionDirectory;
         this.actionClassName = controllerClassName;

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewControllerDialog.form

@@ -77,7 +77,7 @@
               <text value=""/>
             </properties>
           </component>
-          <component id="d25a" class="javax.swing.JLabel" binding="controllerParentDirectoryLabel">
+          <component id="d25a" class="javax.swing.JLabel">
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
@@ -124,7 +124,7 @@
           <html.disable class="java.lang.Boolean" value="false"/>
         </clientProperties>
       </component>
-      <component id="ad25c" class="javax.swing.JLabel" binding="controllerAreaLabel">
+      <component id="ad25c" class="javax.swing.JLabel">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>

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

@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.magento.files.ControllerFrontendPhp;
 import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.File;
-import com.magento.idea.magento2plugin.magento.packages.HttpRequest;
+import com.magento.idea.magento2plugin.magento.packages.HttpMethod;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
@@ -27,26 +27,27 @@
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 
-@SuppressWarnings({"PMD.TooManyFields", "PMD.OnlyOneReturn"})
+@SuppressWarnings({
+        "PMD.TooManyFields",
+        "PMD.ConstructorCallsOverridableMethod"
+})
 public class NewControllerDialog extends AbstractDialog {
     private final NewControllerValidator validator;
     private final String moduleName;
+    private final Project project;
     private JPanel contentPane;
     private JButton buttonOK;
-    private Project project;
     private JButton buttonCancel;
     private FilteredComboBox controllerAreaSelect;
-    private JLabel controllerAreaLabel;
     private FilteredComboBox httpMethodSelect;
-    private JLabel controllerParentDirectoryLabel;
     private JTextField controllerName;
     private JTextField controllerParentDir;
     private JCheckBox inheritClass;
@@ -61,6 +62,7 @@ public class NewControllerDialog extends AbstractDialog {
      * @param directory PsiDirectory
      */
     public NewControllerDialog(final Project project, final PsiDirectory directory) {
+        super();
         this.project = project;
         this.moduleName = GetModuleNameByDirectory.getInstance(project).execute(directory);
         this.validator = NewControllerValidator.getInstance(this);
@@ -78,15 +80,15 @@ public NewControllerDialog(final Project project, final PsiDirectory directory)
         // call onCancel() when cross is clicked
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent e) {
+            public void windowClosing(final WindowEvent event) {
                 onCancel();
             }
         });
 
         // call onCancel() on ESCAPE
         contentPane.registerKeyboardAction(
                 new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
+                    public void actionPerformed(final ActionEvent event) {
                         onCancel();
                     }
                 },
@@ -169,7 +171,7 @@ public String getActionDirectory() {
      * @param directory PsiDirectory
      */
     public static void open(final Project project, final PsiDirectory directory) {
-        NewControllerDialog dialog = new NewControllerDialog(project, directory);
+        final NewControllerDialog dialog = new NewControllerDialog(project, directory);
         dialog.pack();
         dialog.centerDialog(dialog);
         dialog.setVisible(true);
@@ -245,7 +247,7 @@ protected void onCancel() {
         dispose();
     }
 
-    private ArrayList<String> getAreaList() {
+    private List<String> getAreaList() {
         return new ArrayList<>(
                 Arrays.asList(
                         Areas.frontend.toString(),
@@ -254,8 +256,9 @@ private ArrayList<String> getAreaList() {
         );
     }
 
+    @SuppressWarnings({"PMD.UnusedPrivateMethod"})
     private void createUIComponents() {
         this.controllerAreaSelect = new FilteredComboBox(getAreaList());
-        this.httpMethodSelect = new FilteredComboBox(HttpRequest.getHttpMethodList());
+        this.httpMethodSelect = new FilteredComboBox(HttpMethod.getHttpMethodList());
     }
 }

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/CreateAPluginDialogValidator.java

@@ -15,11 +15,17 @@
 import java.util.List;
 import javax.swing.JOptionPane;
 
-@SuppressWarnings({"PMD.OnlyOneReturn", "PMD.FieldNamingConventions"})
+@SuppressWarnings({
+        "PMD.OnlyOneReturn",
+        "PMD.CyclomaticComplexity",
+        "PMD.NonThreadSafeSingleton",
+        "PMD.NPathComplexity",
+        "PMD.FieldNamingConventions"
+})
 public class CreateAPluginDialogValidator {
     private static final String NOT_EMPTY = "validator.notEmpty";
     private static final String PLUGIN_CLASS_NAME = "Plugin Class Name";
-    private static CreateAPluginDialogValidator INSTANCE = null;
+    private static CreateAPluginDialogValidator INSTANCE;
     private final ValidatorBundle validatorBundle;
     private final CommonBundle commonBundle;
     private CreateAPluginDialog dialog;
@@ -31,7 +37,7 @@ public class CreateAPluginDialogValidator {
      *
      * @return CreateAPluginDialogValidator
      */
-    public static CreateAPluginDialogValidator getInstance(CreateAPluginDialog dialog) {
+    public static CreateAPluginDialogValidator getInstance(final CreateAPluginDialog dialog) {
         if (null == INSTANCE) {
             INSTANCE = new CreateAPluginDialogValidator();
         }
@@ -43,7 +49,7 @@ public static CreateAPluginDialogValidator getInstance(CreateAPluginDialog dialo
     /**
      * Create a plugin dialog validator.
      */
-    private CreateAPluginDialogValidator() {
+    public CreateAPluginDialogValidator() {
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
     }

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/CreateAnObserverDialogValidator.java

@@ -18,11 +18,14 @@
 @SuppressWarnings({
         "PMD.OnlyOneReturn",
         "PMD.FieldNamingConventions",
+        "PMD.CyclomaticComplexity",
+        "PMD.NonThreadSafeSingleton",
         "PMD.DataflowAnomalyAnalysis",
         "PMD.NPathComplexity"
 })
 public class CreateAnObserverDialogValidator {
-    private static CreateAnObserverDialogValidator INSTANCE = null;
+    private static final String OBSERVER_CLASS_NAME = "Observer Class Name";
+    private static CreateAnObserverDialogValidator INSTANCE;
     private final ValidatorBundle validatorBundle;
     private final CommonBundle commonBundle;
     private CreateAnObserverDialog dialog;
@@ -64,7 +67,7 @@ public boolean validate(final Project project) {
         if (!PhpNameUtil.isValidClassName(observerClassName)) {
             final String errorMessage = this.validatorBundle.message(
                     "validator.class.isNotValid",
-                    "Observer Class Name"
+                    OBSERVER_CLASS_NAME
             );
             JOptionPane.showMessageDialog(
                     null,
@@ -79,7 +82,7 @@ public boolean validate(final Project project) {
         if (observerClassName.length() == 0) {
             final String errorMessage = validatorBundle.message(
                     "validator.notEmpty",
-                    "Observer Class Name"
+                    OBSERVER_CLASS_NAME
             );
             JOptionPane.showMessageDialog(
                     null,
@@ -94,7 +97,7 @@ public boolean validate(final Project project) {
         if (!observerClassName.matches(RegExUtil.ALPHANUMERIC)) {
             final String errorMessage = validatorBundle.message(
                     "validator.alphaNumericCharacters",
-                    "Observer Class Name"
+                    OBSERVER_CLASS_NAME
             );
             JOptionPane.showMessageDialog(
                     null,
@@ -111,7 +114,7 @@ public boolean validate(final Project project) {
         ) {
             final String errorMessage = validatorBundle.message(
                     "validator.startWithNumberOrCapitalLetter",
-                    "Observer Class Name"
+                    OBSERVER_CLASS_NAME
             );
             JOptionPane.showMessageDialog(
                     null,

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewBlockValidator.java

@@ -15,11 +15,13 @@
 @SuppressWarnings({
         "PMD.OnlyOneReturn",
         "PMD.FieldNamingConventions",
+        "PMD.NonThreadSafeSingleton",
         "PMD.DataflowAnomalyAnalysis",
         "PMD.NPathComplexity"
 })
 public class NewBlockValidator {
-    private static NewBlockValidator INSTANCE = null;
+    private static final String BLOCK_NAME = "Block Name";
+    private static NewBlockValidator INSTANCE;
     private final ValidatorBundle validatorBundle;
     private final CommonBundle commonBundle;
     private NewBlockDialog dialog;
@@ -42,7 +44,7 @@ public static NewBlockValidator getInstance(final NewBlockDialog dialog) {
     /**
      * New block validator constructor.
      */
-    private NewBlockValidator() {
+    public NewBlockValidator() {
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
     }
@@ -59,7 +61,7 @@ public boolean validate() {
         if (!PhpNameUtil.isValidClassName(moduleName)) {
             final String errorMessage = this.validatorBundle.message(
                     "validator.class.isNotValid",
-                    "Block Name"
+                    BLOCK_NAME
             );
             JOptionPane.showMessageDialog(
                     null,
@@ -74,7 +76,7 @@ public boolean validate() {
         if (moduleName.length() == 0) {
             final String errorMessage = validatorBundle.message(
                     "validator.notEmpty",
-                    "Block Name"
+                    BLOCK_NAME
             );
             JOptionPane.showMessageDialog(
                     null,
@@ -89,7 +91,7 @@ public boolean validate() {
         if (!moduleName.matches(RegExUtil.ALPHANUMERIC)) {
             final String errorMessage = validatorBundle.message(
                     "validator.alphaNumericCharacters",
-                    "Block Name"
+                    BLOCK_NAME
             );
             JOptionPane.showMessageDialog(
                     null,
@@ -106,7 +108,7 @@ public boolean validate() {
         ) {
             final String errorMessage = validatorBundle.message(
                     "validator.startWithNumberOrCapitalLetter",
-                    "Block Name"
+                    BLOCK_NAME
             );
             JOptionPane.showMessageDialog(
                     null,

src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewControllerValidator.java

@@ -16,11 +16,12 @@
         "PMD.OnlyOneReturn",
         "PMD.FieldNamingConventions",
         "PMD.DataflowAnomalyAnalysis",
+        "PMD.NonThreadSafeSingleton",
         "PMD.NPathComplexity"
 })
 public class NewControllerValidator {
     private static final String ACTION_NAME = "Action Name";
-    private static NewControllerValidator INSTANCE = null;
+    private static NewControllerValidator INSTANCE;
     private final ValidatorBundle validatorBundle;
     private final CommonBundle commonBundle;
     private NewControllerDialog dialog;
@@ -32,7 +33,7 @@ public class NewControllerValidator {
      *
      * @return NewControllerValidator
      */
-    public static NewControllerValidator getInstance(NewControllerDialog dialog) {
+    public static NewControllerValidator getInstance(final NewControllerDialog dialog) {
         if (null == INSTANCE) {
             INSTANCE = new NewControllerValidator();
         }
@@ -44,7 +45,7 @@ public static NewControllerValidator getInstance(NewControllerDialog dialog) {
     /**
      * New controller validator constructor.
      */
-    private NewControllerValidator() {
+    public NewControllerValidator() {
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
     }
@@ -120,7 +121,7 @@ public boolean validate() {
             return false;
         }
 
-        String controllerName = dialog.getControllerName();
+        final String controllerName = dialog.getControllerName();
 
         if (!PhpNameUtil.isValidNamespaceName(controllerName)) {
             final String errorMessage = this.validatorBundle.message(