Static fixes and test fixes

Author: Vitaliy Boyko

src/com/magento/idea/magento2plugin/actions/generation/dialog/eavattribute/EavAttributeDialog.java

@@ -45,7 +45,12 @@
 import javax.swing.KeyStroke;
 import org.jetbrains.annotations.NotNull;
 
-@SuppressWarnings({"PMD.GodClass", "PMD.TooManyMethods"})
+@SuppressWarnings({
+        "PMD.GodClass",
+        "PMD.TooManyMethods",
+        "PMD.ExcessiveImports",
+        "PMD.AccessorMethodGeneration"
+})
 public abstract class  EavAttributeDialog extends AbstractDialog {
 
     protected String moduleName;
@@ -297,6 +302,10 @@ protected void generateExtraFilesBeforeDataPatchGeneration() {
         generateSourceModelFile();
     }
 
+    @SuppressWarnings({
+            "PMD.EmptyMethodInAbstractClassShouldBeAbstract",
+            "PMD.UncommentedEmptyMethodBody"
+    })
     protected void generateExtraFilesAfterDataPatchGeneration(
             final EavEntityDataInterface eavEntityDataInterface
     ) {}
@@ -319,7 +328,6 @@ protected void addCancelActionForEsc() {
         );
     }
 
-    @SuppressWarnings("PMD.AccessorMethodGeneration")
     protected void setAttributeInputComboBoxAction(
             final JComboBox<ComboBoxItemData> sourceComboBox,
             final JComboBox<ComboBoxItemData> inputComboBox
@@ -333,7 +341,6 @@ protected void setAttributeInputComboBoxAction(
         );
     }
 
-    @SuppressWarnings("PMD.AccessorMethodGeneration")
     protected void setSourceComboBoxAction(final JComboBox<ComboBoxItemData> sourceComboBox) {
         if (sourceComboBox == null) {
             return;
@@ -344,7 +351,6 @@ protected void setSourceComboBoxAction(final JComboBox<ComboBoxItemData> sourceC
         );
     }
 
-    @SuppressWarnings("PMD.AccessorMethodGeneration")
     protected void setSourceModelPanelAction(
             final JPanel attributeCustomSourceModelPanel,
             final JTextField sourceModelDirectoryTexField
@@ -358,7 +364,6 @@ protected void setSourceModelPanelAction(
         );
     }
 
-    @SuppressWarnings("PMD.AccessorMethodGeneration")
     protected void addOptionPanelListener(
             final JComboBox<ComboBoxItemData> attributeSourceComboBox,
             final JComboBox<ComboBoxItemData> attributeInputComboBox,
@@ -407,7 +412,6 @@ protected void setAutocompleteListenerForAttributeCodeField(
                 .addDocumentListener(new AttributeCodeAdapter(attributeCodeTextField));
     }
 
-    @SuppressWarnings("PMD.AccessorMethodGeneration")
     protected void setAutocompleteListenerForDataPathNameField(
             final JTextField mainTextField,
             final JTextField dependentTextField
@@ -421,7 +425,6 @@ protected void setAutocompleteListenerForDataPathNameField(
                 .addDocumentListener(new DataPatchNameAdapter(dependentTextField, getEntityName()));
     }
 
-    @SuppressWarnings("PMD.AccessorMethodGeneration")
     protected void setAutocompleteListenerForSourceModelNameField(
             final JTextField mainTextField,
             final JTextField dependentTextField

src/com/magento/idea/magento2plugin/actions/generation/generator/CustomerEavAttributePatchGenerator.java

@@ -57,8 +57,10 @@ protected void fillAttributes(final Properties attributes) {
                 .append(
                         "EAV_CONFIG_CLASS",
                         DataPatchDependency.EAV_CONFIG.getClassPatch()
-                )
-                .append(
+                ).append(
+                        "ATTRIBUTE_RESOURCE",
+                        DataPatchDependency.ATTRIBUTE_RESOURCE.getClassPatch()
+                ).append(
                         "CUSTOMER_METADATA_INTERFACE",
                         DataPatchDependency.CUSTOMER_METADATA_INTERFACE.getClassPatch()
                 );

src/com/magento/idea/magento2plugin/actions/generation/generator/EavAttributeSetupPatchGenerator.java

@@ -76,9 +76,6 @@ protected void fillAttributes(final Properties attributes) {
                 .append(
                         "MODULE_DATA_SETUP_INTERFACE",
                         DataPatchDependency.MODULE_DATA_SETUP_INTERFACE.getClassPatch()
-                ).append(
-                        "ATTRIBUTE_RESOURCE",
-                        DataPatchDependency.ATTRIBUTE_RESOURCE.getClassPatch()
                 )
                 .append(
                         "EAV_SETUP_FACTORY",

src/com/magento/idea/magento2plugin/actions/generation/generator/util/eav/DefaultAttributeMapper.java

@@ -17,6 +17,8 @@
 import java.util.Map;
 
 public class DefaultAttributeMapper implements AttributeMapperInterface {
+    private final static String PHP_DOUBLE_ARROW_OPERATOR = " => ";
+
     @Override
     public List<String> mapAttributesByEntityData(final EavEntityDataInterface entityData) {
         final List<String> attributesWithValues = new ArrayList<>();
@@ -118,7 +120,7 @@ protected String getMappedOptions(
     }
 
     protected String getParsedOptions(final Map<Integer, String> optionValues) {
-        final String valueNode = "->" + wrapStringValueForTemplate("value") + " => ";
+        final String valueNode = "->" + wrapStringValueForTemplate("value") + PHP_DOUBLE_ARROW_OPERATOR;
         final StringBuilder optionsContent = new StringBuilder();
 
         for (final Integer optionKey : optionValues.keySet()) {
@@ -131,8 +133,8 @@ protected String getParsedOptions(final Map<Integer, String> optionValues) {
             optionsContent
                     .append("->")
                     .append(wrapStringValueForTemplate("option_" + optionKey))
-                    .append(" => ")
-                    .append("[")
+                    .append(PHP_DOUBLE_ARROW_OPERATOR)
+                    .append('[')
                     .append(wrapStringValueForTemplate(optionValue))
                     .append("], ");
         }
@@ -141,7 +143,7 @@ protected String getParsedOptions(final Map<Integer, String> optionValues) {
     }
 
     protected String getParsedOptionSortOrders(final Map<Integer, String> optionSortOrders) {
-        final String orderNode = "->" + wrapStringValueForTemplate("order") + " => ";
+        final String orderNode = "->" + wrapStringValueForTemplate("order") + PHP_DOUBLE_ARROW_OPERATOR;
         final StringBuilder ordersContent = new StringBuilder();
 
         for (final Integer optionKey : optionSortOrders.keySet()) {
@@ -154,9 +156,9 @@ protected String getParsedOptionSortOrders(final Map<Integer, String> optionSort
             ordersContent
                     .append("->")
                     .append(wrapStringValueForTemplate("option_" + optionKey))
-                    .append(" => ")
+                    .append(PHP_DOUBLE_ARROW_OPERATOR)
                     .append(orderValue)
-                    .append(",");
+                    .append(',');
         }
 
         return orderNode + "[" + ordersContent + "->]->";