2880: static fixes

Author: VitaliyBoyko

.github/workflows/gradle.yml

@@ -111,12 +111,35 @@ jobs:
         run: chmod +x gradlew
       - id: file_changes
         uses: trilom/file-changes-action@v1.2.4
+      - name: Filter Java Files
+        id: filter_java_files
+        run: |
+          # Get modified and added files
+          MODIFIED_FILES=${{ steps.file_changes.outputs.files_modified }}
+          ADDED_FILES=${{ steps.file_changes.outputs.files_added }}
+
+          echo "Modified files: $MODIFIED_FILES"
+          echo "Added files: $ADDED_FILES"
+
+          # Combine and filter for .java files
+          # Make sure we handle empty arrays properly
+          if [ "$MODIFIED_FILES" == "[]" ]; then
+            MODIFIED_FILES="[]"
+          fi
+          if [ "$ADDED_FILES" == "[]" ]; then
+            ADDED_FILES="[]"
+          fi
+
+          # Combine arrays and filter for .java files
+          COMBINED_FILES=$(echo "$MODIFIED_FILES $ADDED_FILES" | jq -s 'add | map(select(endswith(".java")))')
+          echo "JAVA_FILES=$COMBINED_FILES" >> $GITHUB_ENV
+          echo "Filtered Java Files: $COMBINED_FILES"
       - name: Run Code Style Check
         run: ./gradlew checkstyleCI --no-daemon
         env:
-          MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
+          MODIFIED_FILES: ${{ env.JAVA_FILES }}
           ACTIONS_STEP_DEBUG: true
       - name: Run PMD Quality Check
         run: ./gradlew pmdCI --no-daemon
         env:
-          MODIFIED_FILES: ${{ steps.file_changes.outputs.files}}
+          MODIFIED_FILES: ${{ env.JAVA_FILES }}

build.gradle.kts

@@ -208,6 +208,7 @@ tasks.withType(Pmd::class).configureEach {
     // Specify all files that should be checked
     classpath = files()
     setSource("${project.rootDir}")
+    maxHeapSize = "12g"
 }
 
 // Execute PMD on all files

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/AbstractDialog.java

@@ -74,9 +74,18 @@ public AbstractDialog() {
      * so this method is kept for compatibility.
      *
      * @param dialog AbstractDialog
+     * @deprecated This method is no longer needed as DialogWrapper handles centering automatically.
+     *             It is kept for backward compatibility with existing code.
      */
+    @Deprecated
+    @SuppressWarnings({
+            "PMD.UncommentedEmptyMethod",
+            "PMD.EmptyMethodInAbstractClassShouldBeAbstract"
+    })
     protected void centerDialog(final AbstractDialog dialog) {
         // DialogWrapper handles centering automatically
+        // This method is intentionally left with minimal implementation
+        // as it's deprecated and only kept for backward compatibility
     }
 
     /**
@@ -87,9 +96,7 @@ protected void centerDialog(final AbstractDialog dialog) {
      */
     @Nullable
     @Override
-    protected JComponent createCenterPanel() {
-        return null; // Subclasses must override this method
-    }
+    protected abstract JComponent createCenterPanel();
 
     /**
      * Default on cancel action.
@@ -157,8 +164,8 @@ public void doCancelAction() {
             "PMD.CognitiveComplexity"
     })
     protected boolean validateFormFields() {
-        boolean dialogHasErrors;
-        isValidationErrorShown = dialogHasErrors = false;
+        boolean dialogHasErrors = false;
+        isValidationErrorShown = false;
         clearValidationHighlighting();
 
         for (final FieldValidationData fieldValidationData : getFieldsToValidate()) {

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/InjectAViewModelDialog.java

@@ -25,7 +25,6 @@
 import com.magento.idea.magento2plugin.magento.packages.XsiTypes;
 import com.magento.idea.magento2plugin.util.FirstLetterToLowercaseUtil;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java

@@ -19,27 +19,19 @@
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.Nullable;
 
 public class NewBlockDialog extends AbstractDialog {
 
     private final PsiDirectory baseDir;
     private final String moduleName;
     private JPanel contentPanel;
-    private JButton buttonOK;
-    private JButton buttonCancel;
     private final Project project;
     private JTextPane warning;//NOPMD
     private JRadioButton adminhtmlRadioButton;//NOPMD

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronGroupDialog.java

@@ -16,35 +16,29 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.ModuleCronGroupXmlGenerator;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-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.JSpinner;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import javax.swing.SpinnerNumberModel;
 import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings({
         "PMD.TooManyFields",
         "PMD.TooManyMethods",
-        "PMD.ExcessiveImports,"
+        "PMD.ExcessiveImports",
+        "PMD.ImmutableField"
 })
 public class NewCronGroupDialog extends AbstractDialog {
 
     private final String moduleName;
     private final Project project;
     private JPanel contentPanel;
-    private JButton buttonOK;
-    private JButton buttonCancel;
     private static final String NAME = "name";
 
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, NAME})

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewCronjobDialog.java

@@ -26,12 +26,8 @@
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import com.magento.idea.magento2plugin.util.CamelCaseToSnakeCase;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -40,7 +36,6 @@
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -63,8 +58,8 @@ public class NewCronjobDialog extends AbstractDialog {
     private final CamelCaseToSnakeCase camelCaseToSnakeCase;
 
     private JPanel contentPane;
-    private JButton buttonOK;
-    private JButton buttonCancel;
+    private JButton buttonOK;//NOPMD
+    private JButton buttonCancel;//NOPMD
     private JRadioButton fixedScheduleRadioButton;
     private JRadioButton configurableScheduleRadioButton;
     private JRadioButton everyMinuteRadioButton;
@@ -265,16 +260,15 @@ private String suggestCronjobName(final String cronjobClassname) {
         }
 
         if (cronjobClassname == null || cronjobClassname.isEmpty()) {
-            return moduleName.toLowerCase(new java.util.Locale("en","EN"));
+            return moduleName.toLowerCase(java.util.Locale.ENGLISH);
         }
 
         final String cronjobClassnameToSnakeCase = this.camelCaseToSnakeCase.convert(
                 cronjobClassname
         );
 
-        return moduleName.toLowerCase(new java.util.Locale("en","EN"))
-                + "_"
-                + cronjobClassnameToSnakeCase;
+        final String moduleNameLower = moduleName.toLowerCase(java.util.Locale.ENGLISH);
+        return moduleNameLower + "_" + cronjobClassnameToSnakeCase;
     }
 
     /**

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewCustomerEavAttributeDialog.java

@@ -55,11 +55,11 @@
 public class NewCustomerEavAttributeDialog extends AbstractDialog {
 
     private static final String ENTITY_NAME = "Customer";
-    private String moduleName;
-    private Project project;
-    private String actionName;
+    private final String moduleName;
+    private final Project project;
+    private final String actionName;
     private TableGroupWrapper entityPropertiesTableGroupWrapper;
-    private SourceModelData sourceModelData;
+    private final SourceModelData sourceModelData;
 
     private JPanel contentPanel;
     private JButton buttonOK;
@@ -179,9 +179,9 @@ protected void fillAttributeTypeComboBox() {
         }
 
         for (final AttributeType typeValue : AttributeType.values()) {
-            typeComboBox.addItem(
-                    new ComboBoxItemData(typeValue.getType(), typeValue.getType())
-            );
+            final String type = typeValue.getType();
+            final ComboBoxItemData item = new ComboBoxItemData(type, type);
+            typeComboBox.addItem(item);
         }
     }
 
@@ -194,9 +194,9 @@ protected void fillAttributeInputComboBox() {
         }
 
         for (final AttributeInput inputValue : AttributeInput.values()) {
-            inputComboBox.addItem(
-                    new ComboBoxItemData(inputValue.getInput(), inputValue.getInput())
-            );
+            final String input = inputValue.getInput();
+            final ComboBoxItemData item = new ComboBoxItemData(input, input);
+            inputComboBox.addItem(item);
         }
     }
 
@@ -532,6 +532,9 @@ protected void generateExtraFilesBeforeDataPatchGeneration() {
 
     /**
      * Generate extra files after data patch generation.
+     * This method is intentionally left empty as no extra files need to be generated
+     * after the data patch for customer EAV attributes. Subclasses may override this
+     * method to provide specific implementation if needed.
      *
      * @param eavEntityDataInterface EavEntityDataInterface
      */

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewDataModelDialog.java

@@ -31,10 +31,6 @@
 import com.magento.idea.magento2plugin.ui.table.TableButton;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.JButton;
@@ -45,15 +41,15 @@
 import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings({
         "PMD.ExcessiveImports",
-        "PMD.ConstructorCallsOverridableMethod"
+        "PMD.ConstructorCallsOverridableMethod",
+        "PMD.ImmutableField"
 })
 public class NewDataModelDialog extends AbstractDialog {
 
@@ -148,10 +144,9 @@ protected void onWriteActionOK() {
 
     @Override
     protected boolean validateFormFields() {
-        boolean valid = false;
+        boolean valid = super.validateFormFields();
 
-        if (super.validateFormFields()) {
-            valid = true;
+        if (valid) {
             final String errorTitle = commonBundle.message("common.error");
             final int column = 0;
 

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewDbSchemaDialog.java

@@ -25,9 +25,6 @@
 import com.magento.idea.magento2plugin.magento.packages.database.TableResources;
 import com.magento.idea.magento2plugin.ui.table.TableGroupWrapper;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -41,7 +38,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
-import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,10 +50,6 @@ public class NewDbSchemaDialog extends AbstractDialog {
     private final String moduleName;
     private JPanel contentPanel;
 
-    // Buttons
-    private JButton buttonOK;
-    private JButton buttonCancel;
-
     // Fields
     @FieldValidation(rule = RuleRegistry.NOT_EMPTY, message = {NotEmptyRule.MESSAGE, TABLE_NAME})
     @FieldValidation(rule = RuleRegistry.LOWERCASE, message = {Lowercase.MESSAGE, TABLE_NAME})