Code refactoring after CR

bohdan-harniuk · bohdan-harniuk · commit 4202bbf079b2 · 2021-06-09T12:04:48.000+03:00
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/DeleteEntityControllerFileData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/DeleteEntityControllerFileData.java
@@ -13,7 +13,7 @@ public class DeleteEntityControllerFileData {
     private final String moduleName;
     private final String acl;
     private final String entityId;
-    private final boolean deleteCommandHasInterface;
+    private final boolean hasDeleteCommandInterface;
 
     /**
      * Controller Delete file constructor.
@@ -22,19 +22,20 @@ public class DeleteEntityControllerFileData {
      * @param moduleName String
      * @param acl String
      * @param entityId String
+     * @param hasDeleteCommandInterface boolean
      */
     public DeleteEntityControllerFileData(
             final @NotNull String entityName,
             final @NotNull String moduleName,
             final @NotNull String acl,
             final @NotNull String entityId,
-            final boolean isDeleteCommandHasInterface
+            final boolean hasDeleteCommandInterface
     ) {
         this.entityName = entityName;
         this.moduleName = moduleName;
         this.acl = acl;
         this.entityId = entityId;
-        this.deleteCommandHasInterface = isDeleteCommandHasInterface;
+        this.hasDeleteCommandInterface = hasDeleteCommandInterface;
     }
 
     /**
@@ -78,7 +79,7 @@ public String getEntityId() {
      *
      * @return boolean
      */
-    public boolean isDeleteCommandHasInterface() {
-        return deleteCommandHasInterface;
+    public boolean isHasDeleteCommandInterface() {
+        return hasDeleteCommandInterface;
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/EntityDataMapperData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/EntityDataMapperData.java
@@ -15,7 +15,7 @@ public class EntityDataMapperData {
     private final String modelName;
     private final String dtoName;
     private final String dtoInterfaceName;
-    private final boolean dtoWithInterface;
+    private final boolean hasDtoInterface;
 
     /**
      * Magento entity data mapper data constructor.
@@ -25,22 +25,22 @@ public class EntityDataMapperData {
      * @param modelName String
      * @param dtoName String
      * @param dtoInterfaceName String
-     * @param isDtoWithInterface boolean
+     * @param hasDtoInterface boolean
      */
     public EntityDataMapperData(
             final @NotNull String moduleName,
             final @NotNull String entityName,
             final @NotNull String modelName,
             final @NotNull String dtoName,
             final @NotNull String dtoInterfaceName,
-            final boolean isDtoWithInterface
+            final boolean hasDtoInterface
     ) {
         this.moduleName = moduleName;
         this.entityName = entityName;
         this.modelName = modelName;
         this.dtoName = dtoName;
         this.dtoInterfaceName = dtoInterfaceName;
-        this.dtoWithInterface = isDtoWithInterface;
+        this.hasDtoInterface = hasDtoInterface;
     }
 
     /**
@@ -93,7 +93,7 @@ public String getDtoInterfaceName() {
      *
      * @return boolean
      */
-    public boolean isDtoWithInterface() {
-        return dtoWithInterface;
+    public boolean isHasDtoInterface() {
+        return hasDtoInterface;
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/SaveEntityControllerFileData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/SaveEntityControllerFileData.java
@@ -15,8 +15,8 @@ public class SaveEntityControllerFileData {
     private final String entityId;
     private final String dtoName;
     private final String dtoInterfaceName;
-    private final boolean dtoWithInterface;
-    private final boolean saveCommandHasInterface;
+    private final boolean hasDtoInterface;
+    private final boolean hasSaveCommandInterface;
 
     /**
      * Controller save file constructor.
@@ -27,8 +27,8 @@ public class SaveEntityControllerFileData {
      * @param entityId String
      * @param dtoName String
      * @param dtoInterfaceName String
-     * @param isDtoWithInterface boolean
-     * @param isSaveCommandHasInterface boolean
+     * @param hasDtoInterface boolean
+     * @param hasSaveCommandInterface boolean
      */
     public SaveEntityControllerFileData(
             final @NotNull String entityName,
@@ -37,17 +37,17 @@ public SaveEntityControllerFileData(
             final @NotNull String entityId,
             final @NotNull String dtoName,
             final @NotNull String dtoInterfaceName,
-            final boolean isDtoWithInterface,
-            final boolean isSaveCommandHasInterface
+            final boolean hasDtoInterface,
+            final boolean hasSaveCommandInterface
     ) {
         this.entityName = entityName;
         this.moduleName = moduleName;
         this.acl = acl;
         this.entityId = entityId;
         this.dtoName = dtoName;
         this.dtoInterfaceName = dtoInterfaceName;
-        this.dtoWithInterface = isDtoWithInterface;
-        this.saveCommandHasInterface = isSaveCommandHasInterface;
+        this.hasDtoInterface = hasDtoInterface;
+        this.hasSaveCommandInterface = hasSaveCommandInterface;
     }
 
     /**
@@ -109,16 +109,16 @@ public String getDtoInterfaceName() {
      *
      * @return boolean
      */
-    public boolean isDtoWithInterface() {
-        return dtoWithInterface;
+    public boolean isHasDtoInterface() {
+        return hasDtoInterface;
     }
 
     /**
      * Check if save command has interface.
      *
      * @return boolean
      */
-    public boolean isSaveCommandHasInterface() {
-        return saveCommandHasInterface;
+    public boolean isHasSaveCommandInterface() {
+        return hasSaveCommandInterface;
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentDataProviderData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/UiComponentDataProviderData.java
@@ -11,7 +11,7 @@ public class UiComponentDataProviderData {
     private final String path;
     private final String entityName;
     private final String entityIdFieldName;
-    private final boolean queryHasInterface;
+    private final boolean hasQueryInterface;
 
     /**
      * UiComponentGridDataProviderData constructor.
@@ -33,20 +33,20 @@ public UiComponentDataProviderData(
      * @param path String
      * @param entityName String
      * @param entityIdFieldName String
-     * @param isQueryHasInterface boolean
+     * @param hasQueryInterface boolean
      */
     public UiComponentDataProviderData(
             final String name,
             final String path,
             final String entityName,
             final String entityIdFieldName,
-            final boolean isQueryHasInterface
+            final boolean hasQueryInterface
     ) {
         this.name = name;
         this.path = path;
         this.entityName = entityName;
         this.entityIdFieldName = entityIdFieldName;
-        this.queryHasInterface = isQueryHasInterface;
+        this.hasQueryInterface = hasQueryInterface;
     }
 
     /**
@@ -90,7 +90,7 @@ public String getEntityIdFieldName() {
      *
      * @return boolean
      */
-    public boolean isQueryHasInterface() {
-        return queryHasInterface;
+    public boolean isHasQueryInterface() {
+        return hasQueryInterface;
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java
@@ -72,7 +72,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                         new DeleteEntityByIdCommandFile(
                                 data.getModuleName(),
                                 data.getEntityName(),
-                                data.isDeleteCommandHasInterface()
+                                data.isHasDeleteCommandInterface()
                         ).getClassFqn()
                 )
                 .append("CONTEXT", BackendModuleType.CONTEXT.getType())
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java
@@ -62,12 +62,12 @@ protected AbstractPhpFile initFile() {
     @Override
     protected void fillAttributes(final @NotNull Properties attributes) {
         final ModelFile modelFile = new ModelFile(data.getModuleName(), data.getModelName());
-        final DataModelFile dtoFile = new DataModelFile(data.getDtoName(), data.getModuleName());
+        final DataModelFile dtoFile = new DataModelFile(data.getModuleName(), data.getDtoName());
         final DataModelInterfaceFile dtoInterfaceFile =
                 new DataModelInterfaceFile(data.getModuleName(), data.getDtoInterfaceName());
         String dtoType;
 
-        if (data.isDtoWithInterface()) {
+        if (data.isHasDtoInterface()) {
             dtoType = dtoInterfaceFile.getClassFqn();
         } else {
             dtoType = dtoFile.getClassFqn();
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java
@@ -65,7 +65,7 @@ protected AbstractPhpFile initFile() {
     protected void fillAttributes(final @NotNull Properties attributes) {
         String dtoType;
 
-        if (data.isDtoWithInterface()) {
+        if (data.isHasDtoInterface()) {
             final DataModelInterfaceFile dataModelInterfaceFile =
                     new DataModelInterfaceFile(data.getModuleName(), data.getDtoInterfaceName());
             dtoType = dataModelInterfaceFile.getClassFqn();
@@ -90,7 +90,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                         new SaveEntityCommandFile(
                                 data.getModuleName(),
                                 data.getEntityName(),
-                                data.isSaveCommandHasInterface()
+                                data.isHasSaveCommandInterface()
                         ).getClassFqn()
                 )
                 .append("DATA_OBJECT", FrameworkLibraryType.DATA_OBJECT.getType())
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java
@@ -81,7 +81,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                             new GetListQueryFile(
                                     moduleName,
                                     data.getEntityName(),
-                                    data.isQueryHasInterface()
+                                    data.isHasQueryInterface()
                             ).getClassFqn()
                     )
                     .append("REPORTING_TYPE", FrameworkLibraryType.REPORTING.getType())
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/pool/provider/NewEntityGeneratorsProviderUtil.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/pool/provider/NewEntityGeneratorsProviderUtil.java
@@ -138,13 +138,11 @@ public static void initializeGenerators(
                 )
                 .addNext(
                         EntityDataMapperGeneratorHandler.class,
-                        new EntityDataMapperDtoConverter(context, dialogData),
-                        dialogData::hasAdminUiComponents
+                        new EntityDataMapperDtoConverter(context, dialogData)
                 )
                 .addNext(
                         GetListQueryGeneratorHandler.class,
-                        new GetListQueryDtoConverter(context, dialogData),
-                        dialogData::hasAdminUiComponents
+                        new GetListQueryDtoConverter(context, dialogData)
                 )
                 .addNext(
                         DataProviderGeneratorHandler.class,
@@ -173,13 +171,11 @@ public static void initializeGenerators(
                 )
                 .addNext(
                         SaveCommandGeneratorHandler.class,
-                        new SaveEntityCommandDtoConverter(context, dialogData),
-                        dialogData::hasAdminUiComponents
+                        new SaveEntityCommandDtoConverter(context, dialogData)
                 )
                 .addNext(
                         DeleteByIdCommandGeneratorHandler.class,
-                        new DeleteEntityByIdCommandDtoConverter(context, dialogData),
-                        dialogData::hasAdminUiComponents
+                        new DeleteEntityByIdCommandDtoConverter(context, dialogData)
                 )
                 .addNext(
                         FormSaveControllerGeneratorHandler.class,

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {`
`72`	`72`	`new DeleteEntityByIdCommandFile(`
`73`	`73`	`data.getModuleName(),`
`74`	`74`	`data.getEntityName(),`
`75`		`- data.isDeleteCommandHasInterface()`
	`75`	`+ data.isHasDeleteCommandInterface()`
`76`	`76`	`).getClassFqn()`
`77`	`77`	`)`
`78`	`78`	`.append("CONTEXT", BackendModuleType.CONTEXT.getType())`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {`
`81`	`81`	`new GetListQueryFile(`
`82`	`82`	`moduleName,`
`83`	`83`	`data.getEntityName(),`
`84`		`- data.isQueryHasInterface()`
	`84`	`+ data.isHasQueryInterface()`
`85`	`85`	`).getClassFqn()`
`86`	`86`	`)`
`87`	`87`	`.append("REPORTING_TYPE", FrameworkLibraryType.REPORTING.getType())`
Original file line number	Diff line number	Diff line change
`@@ -138,13 +138,11 @@ public static void initializeGenerators(`
`138`	`138`	`)`
`139`	`139`	`.addNext(`
`140`	`140`	`EntityDataMapperGeneratorHandler.class,`
`141`		`- new EntityDataMapperDtoConverter(context, dialogData),`
`142`		`- dialogData::hasAdminUiComponents`
	`141`	`+ new EntityDataMapperDtoConverter(context, dialogData)`
`143`	`142`	`)`
`144`	`143`	`.addNext(`
`145`	`144`	`GetListQueryGeneratorHandler.class,`
`146`		`- new GetListQueryDtoConverter(context, dialogData),`
`147`		`- dialogData::hasAdminUiComponents`
	`145`	`+ new GetListQueryDtoConverter(context, dialogData)`
`148`	`146`	`)`
`149`	`147`	`.addNext(`
`150`	`148`	`DataProviderGeneratorHandler.class,`
`@@ -173,13 +171,11 @@ public static void initializeGenerators(`
`173`	`171`	`)`
`174`	`172`	`.addNext(`
`175`	`173`	`SaveCommandGeneratorHandler.class,`
`176`		`- new SaveEntityCommandDtoConverter(context, dialogData),`
`177`		`- dialogData::hasAdminUiComponents`
	`174`	`+ new SaveEntityCommandDtoConverter(context, dialogData)`
`178`	`175`	`)`
`179`	`176`	`.addNext(`
`180`	`177`	`DeleteByIdCommandGeneratorHandler.class,`
`181`		`- new DeleteEntityByIdCommandDtoConverter(context, dialogData),`
`182`		`- dialogData::hasAdminUiComponents`
	`178`	`+ new DeleteEntityByIdCommandDtoConverter(context, dialogData)`
`183`	`179`	`)`
`184`	`180`	`.addNext(`
`185`	`181`	`FormSaveControllerGeneratorHandler.class,`