Code refactoring after CR

Author: bohdan-harniuk

resources/fileTemplates/code/Magento Entity Data Mapper.php.ft

@@ -9,7 +9,7 @@ use $use;
 #end
 
  /**
- * ${ENTITY_NAME} magento model collection to entity data transfer object array mapper.
+ * Converts a collection of ${ENTITY_NAME} entities to an array of data transfer objects.
  */
 class ${CLASS_NAME}
 {

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

@@ -1019,7 +1019,7 @@ private void generateWhitelistJsonFile(final @NotNull DbSchemaXmlData dbSchemaXm
      */
     private void generateEntityDataMapperFile() {
         final EntityDataMapperFile entityDataMapperFile =
-                EntityDataMapperFile.getInstance(getEntityName());
+                new EntityDataMapperFile(getEntityName());
 
         final String namespace = entityDataMapperFile.getNamespace(getModuleName());
         final String classFqn = entityDataMapperFile.getClassFqn(getModuleName());
@@ -1073,7 +1073,7 @@ private void generateModelGetListQueryFile() {
      */
     private String getEntityDataMapperType() {
         final EntityDataMapperFile entityDataMapperFile =
-                EntityDataMapperFile.getInstance(getEntityName());
+                new EntityDataMapperFile(getEntityName());
 
         return entityDataMapperFile.getClassFqn(getModuleName());
     }

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

@@ -62,8 +62,7 @@ public EntityDataMapperGenerator(
         this.entityDataMapperData = entityDataMapperData;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        entityDataMapperFile = EntityDataMapperFile
-                .getInstance(entityDataMapperData.getEntityName());
+        entityDataMapperFile = new EntityDataMapperFile(entityDataMapperData.getEntityName());
         fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         moduleIndex = ModuleIndex.getInstance(project);

src/com/magento/idea/magento2plugin/magento/files/EntityDataMapperFile.java

@@ -11,35 +11,23 @@
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import org.jetbrains.annotations.NotNull;
 
-public final class EntityDataMapperFile implements ModuleFileInterface {
+public class EntityDataMapperFile implements ModuleFileInterface {
 
     public static final String CLASS_NAME_SUFFIX = "DataMapper";
     public static final String FILE_EXTENSION = "php";
     public static final String TEMPLATE = "Magento Entity Data Mapper";
     private static final String DIRECTORY = "Mapper";
-    private static EntityDataMapperFile instance;
-    private String className;
+    private final String className;
     private String namespaceFqn;
     private String classFqn;
 
-    private EntityDataMapperFile() {}
-
     /**
-     * Get singleton object of entity data mapper file.
+     * Entity data mapper file constructor.
      *
      * @param entityName String
-     *
-     * @return EntityDataMapperFile
      */
-    public static EntityDataMapperFile getInstance(final @NotNull String entityName) {
-        synchronized (EntityDataMapperFile.class) {
-            if (instance == null) {
-                instance = new EntityDataMapperFile();
-                instance.className = entityName.concat(CLASS_NAME_SUFFIX);
-            }
-        }
-
-        return instance;
+    public EntityDataMapperFile(final @NotNull String entityName) {
+        this.className = entityName.concat(CLASS_NAME_SUFFIX);
     }
 
     /**

testData/actions/generation/generator/EntityDataMapperClassGenerator/generateEntityDataMapperFile/UnicornDataMapper.php

@@ -9,7 +9,7 @@
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 
 /**
- * Unicorn magento model collection to entity data transfer object array mapper.
+ * Converts a collection of Unicorn entities to an array of data transfer objects.
  */
 class UnicornDataMapper
 {

tests/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperClassGeneratorTest.java

@@ -36,8 +36,7 @@ public void testGenerateEntityDataMapperFile() {
                         myFixture.getProject(),
                         false
                 );
-        final EntityDataMapperFile entityDataMapperFile =
-                EntityDataMapperFile.getInstance(ENTITY_NAME);
+        final EntityDataMapperFile entityDataMapperFile = new EntityDataMapperFile(ENTITY_NAME);
         final String filePath = this.getFixturePath(entityDataMapperFile.getFileName());
 
         assertGeneratedFileIsCorrect(