83: Code review fixes

Vitaliy Boyko · Vitaliy Boyko · commit 4b3e8daf5285 · 2020-09-04T09:39:32.000+03:00
diff --git a/resources/fileTemplates/internal/Magento Module Ui Grid Collection Data Provider Php.php.ft b/resources/fileTemplates/internal/Magento Module Ui Grid Collection Data Provider Php.php.ft
@@ -106,7 +106,7 @@ class ${CLASS_NAME} extends DataProvider
      *
      * @param SearchResultInterface $searchResult
      *
-     * @return array|array[]
+     * @return array
      */
     public function searchResultToOutput(SearchResultInterface $searchResult)
     {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentGridDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewUiComponentGridDialog.java
@@ -175,7 +175,7 @@ private void onOK() {
     }
 
     private void setDefaultValues() {
-        dataProviderParentDirectory.setText("Ui/Listing");
+        dataProviderParentDirectory.setText("Ui/Component/Listing");
     }
 
     private void addActionListeners() {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewUiComponentGridDialogValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/NewUiComponentGridDialogValidator.java
@@ -25,7 +25,7 @@
         "PMD.NPathComplexity"
 })
 public class NewUiComponentGridDialogValidator {
-    private static final String DATA_PROVIDER_NAME = "Data Provider Name";
+    private static final String DATA_PROVIDER_NAME = "Data Provider Class";
     private static final String NOT_EMPTY = "validator.notEmpty";
     private static NewUiComponentGridDialogValidator instance;
     private final ValidatorBundle validatorBundle;
diff --git a/testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateCollectionDataProvider/GridDataProvider.php b/testData/actions/generation/generator/UiComponentGridDataProviderGenerator/generateCollectionDataProvider/GridDataProvider.php
@@ -59,8 +59,7 @@ public function __construct(
         SearchResultInterfaceFactory $searchResultFactory,
         array $meta = [],
         array $data = []
-    )
-    {
+    ) {
         parent::__construct(
             $name,
             $primaryFieldName,
@@ -104,7 +103,7 @@ public function getSearchResult()
      *
      * @param SearchResultInterface $searchResult
      *
-     * @return array|array[]
+     * @return array
      */
     public function searchResultToOutput(SearchResultInterface $searchResult)
     {
diff --git a/testData/actions/generation/generator/UiComponentGridXmlGenerator/generateUiGridForBaseArea/custom_entity_grid.xml b/testData/actions/generation/generator/UiComponentGridXmlGenerator/generateUiGridForBaseArea/custom_entity_grid.xml
@@ -37,4 +37,4 @@
             </settings>
         </column>
     </columns>
-</listing>
+</listing>
diff --git a/testData/actions/generation/generator/UiComponentGridXmlGenerator/generateUiGridWithoutToolbar/custom_entity_grid.xml b/testData/actions/generation/generator/UiComponentGridXmlGenerator/generateUiGridWithoutToolbar/custom_entity_grid.xml
@@ -44,4 +44,4 @@
             </settings>
         </column>
     </columns>
-</listing>
+</listing>
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridDataProviderGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridDataProviderGeneratorTest.java
@@ -11,11 +11,11 @@
 import com.magento.idea.magento2plugin.magento.files.UiComponentGridDataProviderPhp;
 
 public class UiComponentGridDataProviderGeneratorTest extends BaseGeneratorTestCase {
-    private static final String EXPECTED_DIRECTORY = "src/app/code/Foo/Bar/Ui/Listing";
+    private static final String EXPECTED_DIRECTORY = "src/app/code/Foo/Bar/Ui/Component/Listing";
     private static final String MODULE_NAME = "Foo_Bar";
     private static final String PROVIDER_CLASS_NAME = "GridDataProvider";
     private static final String PROVIDER_NAMESPACE = "Foo\\Bar\\Ui\\Listing";
-    private static final String PROVIDER_PATH = "Ui/Listing";
+    private static final String PROVIDER_PATH = "Ui/Component/Listing";
     private static final String COLLECTION_FQN = "Foo\\Bar\\Model\\Resource\\Entity\\Collection";
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class ${CLASS_NAME} extends DataProvider`
`106`	`106`	`*`
`107`	`107`	`* @param SearchResultInterface $searchResult`
`108`	`108`	`*`
`109`		`- * @return array\|array[]`
	`109`	`+ * @return array`
`110`	`110`	`*/`
`111`	`111`	`public function searchResultToOutput(SearchResultInterface $searchResult)`
`112`	`112`	`{`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ private void onOK() {`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`private void setDefaultValues() {`
`178`		`- dataProviderParentDirectory.setText("Ui/Listing");`
	`178`	`+ dataProviderParentDirectory.setText("Ui/Component/Listing");`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`private void addActionListeners() {`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ public function __construct(`
`59`	`59`	`SearchResultInterfaceFactory $searchResultFactory,`
`60`	`60`	`array $meta = [],`
`61`	`61`	`array $data = []`
`62`		`- )`
`63`		`- {`
	`62`	`+ ) {`
`64`	`63`	`parent::__construct(`
`65`	`64`	`$name,`
`66`	`65`	`$primaryFieldName,`
`@@ -104,7 +103,7 @@ public function getSearchResult()`
`104`	`103`	`*`
`105`	`104`	`* @param SearchResultInterface $searchResult`
`106`	`105`	`*`
`107`		`- * @return array\|array[]`
	`106`	`+ * @return array`
`108`	`107`	`*/`
`109`	`108`	`public function searchResultToOutput(SearchResultInterface $searchResult)`
`110`	`109`	`{`