Merge pull request #517 from bohdan-harniuk/refactoring-entity-creator-generators

Refactored entity creator generators, removed unnecessary namespace builders from dto

Author: eduard13

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

@@ -8,41 +8,34 @@
 import org.jetbrains.annotations.NotNull;
 
 public class DeleteEntityByIdCommandData {
+
     private final String moduleName;
     private final String entityName;
-    private final String namespace;
-    private final String classFqn;
-    private final String modelClassFqn;
-    private final String resourceModelClassFqn;
     private final String entityId;
+    private final String modelName;
+    private final String resourceModelName;
 
     /**
      * Delete Command DTO Constructor.
      *
      * @param moduleName String
      * @param entityName String
-     * @param namespace String
-     * @param classFqn String
-     * @param modelClassFqn String
-     * @param resourceModelClassFqn String
      * @param entityId String
+     * @param modelName String
+     * @param resourceModelName String
      */
     public DeleteEntityByIdCommandData(
             final @NotNull String moduleName,
             final @NotNull String entityName,
-            final @NotNull String namespace,
-            final @NotNull String classFqn,
-            final @NotNull String modelClassFqn,
-            final @NotNull String resourceModelClassFqn,
-            final @NotNull String entityId
+            final @NotNull String entityId,
+            final @NotNull String modelName,
+            final @NotNull String resourceModelName
     ) {
         this.moduleName = moduleName;
         this.entityName = entityName;
-        this.namespace = namespace;
-        this.classFqn = classFqn;
-        this.modelClassFqn = modelClassFqn;
-        this.resourceModelClassFqn = resourceModelClassFqn;
         this.entityId = entityId;
+        this.modelName = modelName;
+        this.resourceModelName = resourceModelName;
     }
 
     /**
@@ -64,47 +57,29 @@ public String getEntityName() {
     }
 
     /**
-     * Get namespace.
-     *
-     * @return String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Get class FQN.
-     *
-     * @return String
-     */
-    public String getClassFqn() {
-        return classFqn;
-    }
-
-    /**
-     * Get entity model class FQN.
+     * Get entity Id.
      *
      * @return String
      */
-    public String getModelClassFqn() {
-        return modelClassFqn;
+    public String getEntityId() {
+        return entityId;
     }
 
     /**
-     * Get entity resource model class FQN.
+     * Get model name.
      *
      * @return String
      */
-    public String getResourceModelClassFqn() {
-        return resourceModelClassFqn;
+    public String getModelName() {
+        return modelName;
     }
 
     /**
-     * Get entity Id.
+     * Get resource model name.
      *
      * @return String
      */
-    public String getEntityId() {
-        return entityId;
+    public String getResourceModelName() {
+        return resourceModelName;
     }
 }

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

@@ -11,8 +11,6 @@ public class DeleteEntityControllerFileData {
 
     private final String entityName;
     private final String moduleName;
-    private final String namespace;
-    private final String deleteCommandFqn;
     private final String acl;
     private final String entityId;
 
@@ -21,22 +19,17 @@ public class DeleteEntityControllerFileData {
      *
      * @param entityName String
      * @param moduleName String
-     * @param namespace String
      * @param acl String
      * @param entityId String
      */
     public DeleteEntityControllerFileData(
             final @NotNull String entityName,
             final @NotNull String moduleName,
-            final @NotNull String namespace,
-            final @NotNull String deleteCommandFqn,
             final @NotNull String acl,
             final @NotNull String entityId
     ) {
         this.entityName = entityName;
         this.moduleName = moduleName;
-        this.namespace = namespace;
-        this.deleteCommandFqn = deleteCommandFqn;
         this.acl = acl;
         this.entityId = entityId;
     }
@@ -59,24 +52,6 @@ public String getModuleName() {
         return moduleName;
     }
 
-    /**
-     * Get namespace.
-     *
-     * @return String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Get delete command Fqn.
-     *
-     * @return String
-     */
-    public String getDeleteCommandFqn() {
-        return deleteCommandFqn;
-    }
-
     /**
      * Get acl.
      *

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

@@ -11,8 +11,6 @@ public class EditEntityActionData {
 
     private final String entityName;
     private final String moduleName;
-    private final String classFqn;
-    private final String namespace;
     private final String acl;
     private final String menuIdentifier;
 
@@ -21,23 +19,17 @@ public class EditEntityActionData {
      *
      * @param entityName String
      * @param moduleName String
-     * @param classFqn String
-     * @param namespace String
      * @param acl String
      * @param menuIdentifier String
      */
     public EditEntityActionData(
             final @NotNull String entityName,
             final @NotNull String moduleName,
-            final @NotNull String classFqn,
-            final @NotNull String namespace,
             final @NotNull String acl,
             final @NotNull String menuIdentifier
     ) {
         this.entityName = entityName;
         this.moduleName = moduleName;
-        this.classFqn = classFqn;
-        this.namespace = namespace;
         this.acl = acl;
         this.menuIdentifier = menuIdentifier;
     }
@@ -60,24 +52,6 @@ public String getModuleName() {
         return moduleName;
     }
 
-    /**
-     * Get class FQN.
-     *
-     * @return String
-     */
-    public String getClassFqn() {
-        return classFqn;
-    }
-
-    /**
-     * Get namespace.
-     *
-     * @return String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
     /**
      * Get acl.
      *

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

@@ -12,30 +12,22 @@ public class FormGenericButtonBlockData {
     private final String moduleName;
     private final String entityName;
     private final String entityId;
-    private final String classFqn;
-    private final String namespace;
 
     /**
      * Generic button DTO constructor.
      *
      * @param moduleName String
      * @param entityName String
      * @param entityId String
-     * @param classFqn String
-     * @param namespace String
      */
     public FormGenericButtonBlockData(
             final @NotNull String moduleName,
             final @NotNull String entityName,
-            final @NotNull String entityId,
-            final @NotNull String classFqn,
-            final @NotNull String namespace
+            final @NotNull String entityId
     ) {
         this.moduleName = moduleName;
         this.entityName = entityName;
         this.entityId = entityId;
-        this.classFqn = classFqn;
-        this.namespace = namespace;
     }
 
     /**
@@ -64,22 +56,4 @@ public String getEntityName() {
     public String getEntityId() {
         return entityId;
     }
-
-    /**
-     * Get class FQN.
-     *
-     * @return String
-     */
-    public String getClassFqn() {
-        return classFqn;
-    }
-
-    /**
-     * Get namespace.
-     *
-     * @return String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
 }