Enhanced and refactored bunch of generators and all related files and their testcases

Author: bohdan-harniuk

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

@@ -6,52 +6,36 @@
 package com.magento.idea.magento2plugin.actions.generation.data;
 
 public class DataModelData {
-    private final String namespace;
+
     private final String name;
+    private final String interfaceName;
     private final String moduleName;
-    private final String fqn;
-    private final String interfaceFQN;
     private final String properties;
     private final boolean withInterface;
 
     /**
      * Constructor.
      *
-     * @param namespace String
      * @param name String
+     * @param interfaceName String
      * @param moduleName String
-     * @param fqn String
-     * @param interfaceFQN String
      * @param properties String
      * @param hasInterface boolean
      */
     public DataModelData(
-            final String namespace,
             final String name,
+            final String interfaceName,
             final String moduleName,
-            final String fqn,
-            final String interfaceFQN,
             final String properties,
             final boolean hasInterface
     ) {
-        this.namespace = namespace;
         this.name = name;
+        this.interfaceName = interfaceName;
         this.moduleName = moduleName;
-        this.fqn = fqn;
-        this.interfaceFQN = interfaceFQN;
         this.properties = properties;
         this.withInterface = hasInterface;
     }
 
-    /**
-     * Get Namespace.
-     *
-     * @return String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
     /**
      * Get Name.
      *
@@ -62,30 +46,21 @@ public String getName() {
     }
 
     /**
-     * Get module name.
+     * Get interface name.
      *
      * @return String
      */
-    public String getModuleName() {
-        return moduleName;
+    public String getInterfaceName() {
+        return interfaceName;
     }
 
     /**
-     * Get FQN.
-     *
-     * @return String
-     */
-    public String getFQN() {
-        return fqn;
-    }
-
-    /**
-     * Get Interface FQN.
+     * Get module name.
      *
      * @return String
      */
-    public String getInterfaceFQN() {
-        return interfaceFQN;
+    public String getModuleName() {
+        return moduleName;
     }
 
     /**

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

@@ -5,46 +5,54 @@
 
 package com.magento.idea.magento2plugin.actions.generation.data;
 
+import org.jetbrains.annotations.NotNull;
+
 public class DataModelInterfaceData {
-    private final String namespace;
+
     private final String name;
     private final String moduleName;
-    private final String fqn;
     private final String properties;
 
     /**
-     * Constructor.
+     * Data model interface constructor.
+     *
+     * @param name String
+     * @param moduleName String
+     * @param properties String
      */
     public DataModelInterfaceData(
-            final String namespace,
-            final String name,
-            final String moduleName,
-            final String fqn,
-            final String properties
+            final @NotNull String name,
+            final @NotNull String moduleName,
+            final @NotNull String properties
     ) {
-        this.namespace = namespace;
         this.name = name;
         this.moduleName = moduleName;
-        this.fqn = fqn;
         this.properties = properties;
     }
 
-    public String getNamespace() {
-        return namespace;
-    }
-
+    /**
+     * Get data model interface name.
+     *
+     * @return String
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Get module name.
+     *
+     * @return String
+     */
     public String getModuleName() {
         return moduleName;
     }
 
-    public String getFQN() {
-        return fqn;
-    }
-
+    /**
+     * Get properties.
+     *
+     * @return String
+     */
     public String getProperties() {
         return properties;
     }

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

@@ -8,36 +8,38 @@
 import org.jetbrains.annotations.NotNull;
 
 public class EntityDataMapperData {
+
     private final String moduleName;
     private final String entityName;
-    private final String namespace;
-    private final String classFqn;
-    private final String modelClassFqn;
-    private final String dataModelClassFqn;
+    private final String modelName;
+    private final String dtoName;
+    private final String dtoInterfaceName;
+    private final boolean isDtoWithInterface;
 
     /**
      * Magento entity data mapper data constructor.
      *
      * @param moduleName String
      * @param entityName String
-     * @param namespace String
-     * @param modelClassFqn String
-     * @param dataModelClassFqn String
+     * @param modelName String
+     * @param dtoName String
+     * @param dtoInterfaceName String
+     * @param isDtoWithInterface boolean
      */
     public EntityDataMapperData(
             final @NotNull String moduleName,
             final @NotNull String entityName,
-            final @NotNull String namespace,
-            final @NotNull String classFqn,
-            final @NotNull String modelClassFqn,
-            final @NotNull String dataModelClassFqn
+            final @NotNull String modelName,
+            final @NotNull String dtoName,
+            final @NotNull String dtoInterfaceName,
+            final boolean isDtoWithInterface
     ) {
         this.moduleName = moduleName;
         this.entityName = entityName;
-        this.namespace = namespace;
-        this.classFqn = classFqn;
-        this.modelClassFqn = modelClassFqn;
-        this.dataModelClassFqn = dataModelClassFqn;
+        this.modelName = modelName;
+        this.dtoName = dtoName;
+        this.dtoInterfaceName = dtoInterfaceName;
+        this.isDtoWithInterface = isDtoWithInterface;
     }
 
     /**
@@ -59,38 +61,38 @@ public String getEntityName() {
     }
 
     /**
-     * Get namespace.
+     * Get model name.
      *
      * @return String
      */
-    public String getNamespace() {
-        return namespace;
+    public String getModelName() {
+        return modelName;
     }
 
     /**
-     * Get class fqn.
+     * Get DTO name.
      *
      * @return String
      */
-    public String getClassFqn() {
-        return classFqn;
+    public String getDtoName() {
+        return dtoName;
     }
 
     /**
-     * Get model class fqn.
+     * Get DTO interface name.
      *
      * @return String
      */
-    public String getModelClassFqn() {
-        return modelClassFqn;
+    public String getDtoInterfaceName() {
+        return dtoInterfaceName;
     }
 
     /**
-     * Get data model class fqn.
+     * Check if DTO has interface.
      *
-     * @return String
+     * @return boolean
      */
-    public String getDataModelClassFqn() {
-        return dataModelClassFqn;
+    public boolean isDtoWithInterface() {
+        return isDtoWithInterface;
     }
 }

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

@@ -8,31 +8,30 @@
 import org.jetbrains.annotations.NotNull;
 
 public class GetListQueryModelData {
+
     private final String moduleName;
     private final String entityName;
-    private final String collectionType;
-    private final String collectionTypeFactory;
-    private final String entityDataMapperType;
+    private final String modelName;
+    private final String collectionName;
 
     /**
      * Query Model DTO Constructor.
      *
      * @param moduleName String
      * @param entityName String
-     * @param collectionType String
-     * @param entityDataMapperType String
+     * @param modelName String
+     * @param collectionName String
      */
     public GetListQueryModelData(
             final @NotNull String moduleName,
             final @NotNull String entityName,
-            final @NotNull String collectionType,
-            final @NotNull String entityDataMapperType
+            final @NotNull String modelName,
+            final @NotNull String collectionName
     ) {
         this.moduleName = moduleName;
         this.entityName = entityName;
-        this.collectionType = collectionType;
-        this.collectionTypeFactory = collectionType.concat("Factory");
-        this.entityDataMapperType = entityDataMapperType;
+        this.modelName = modelName;
+        this.collectionName = collectionName;
     }
 
     /**
@@ -54,29 +53,20 @@ public String getEntityName() {
     }
 
     /**
-     * Get entity collection type.
-     *
-     * @return String
-     */
-    public String getCollectionType() {
-        return collectionType;
-    }
-
-    /**
-     * Get entity collection type factory.
+     * Get model name.
      *
      * @return String
      */
-    public String getCollectionTypeFactory() {
-        return collectionTypeFactory;
+    public String getModelName() {
+        return modelName;
     }
 
     /**
-     * Get entity data mapper type.
+     * Get entity collection name.
      *
      * @return String
      */
-    public String getEntityDataMapperType() {
-        return entityDataMapperType;
+    public String getCollectionName() {
+        return collectionName;
     }
 }