Fixed and adjusted tests

Author: Vitaliy Boyko

resources/fileTemplates/internal/Magento Module Ui Grid Collection Data Provider Php.php.ft

@@ -7,33 +7,25 @@
 
 @SuppressWarnings({"PMD.DataClass"})
 public class UiComponentDataProviderData {
-    private final String type;
     private final String name;
     private final String namespace;
     private final String path;
-    private final String collectionFqn;
 
     /**
      * UiComponentGridDataProviderData constructor.
      *
-     * @param type String
      * @param name String
      * @param namespace String
      * @param path String
-     * @param collectionFqn String
      */
     public UiComponentDataProviderData(
-            final String type,
             final String name,
             final String namespace,
-            final String path,
-            final String collectionFqn
+            final String path
     ) {
-        this.type = type;
         this.name = name;
         this.namespace = namespace;
         this.path = path;
-        this.collectionFqn = collectionFqn;
     }
 
     /**
@@ -54,24 +46,6 @@ public String getNamespace() {
         return namespace;
     }
 
-    /**
-     * Get collection FQN.
-     *
-     * @return String
-     */
-    public String getCollectionFqn() {
-        return collectionFqn;
-    }
-
-    /**
-     * Get type of data provider.
-     *
-     * @return String
-     */
-    public String getType() {
-        return type;
-    }
-
     /**
      * Get path.
      *

resources/fileTemplates/internal/Magento Module Ui Grid Collection Data Provider Php.php.html

@@ -437,11 +437,9 @@ private void onOK() {
     private PsiFile generateDataProviderFile() {
         final NamespaceBuilder namespace = getDataProviderNamespace();
         return new UiComponentDataProviderGenerator(new UiComponentDataProviderData(
-            UiComponentDataProviderPhp.CUSTOM_TYPE,
             getDataProviderClassName(),
             namespace.getNamespace(),
-            getDataProviderDirectory(),
-            ""
+            getDataProviderDirectory()
         ), getModuleName(), project).generate(NewUiComponentFormAction.ACTION_NAME, false);
     }
 

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

@@ -254,11 +254,9 @@ public static void open(final Project project, final PsiDirectory directory) {
      */
     public UiComponentDataProviderData getGridDataProviderData() {
         return new UiComponentDataProviderData(
-                getDataProviderType(),
                 getDataProviderClass(),
                 getDataProviderNamespace(),
-                getDataProviderDirectory(),
-                getCollection()
+                getDataProviderDirectory()
         );
     }
 

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

@@ -111,18 +111,6 @@ public PsiFile generate(final String actionName) {
     protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("NAMESPACE", uiComponentGridDataProviderData.getNamespace());
         attributes.setProperty("CLASS_NAME", uiComponentGridDataProviderData.getName());
-        final String dataProviderType = uiComponentGridDataProviderData.getType();
-
-        if (dataProviderType.equals(UiComponentDataProviderPhp.COLLECTION_TYPE)) {
-            attributes.setProperty(
-                    "COLLECTION_CLASS_FQN",
-                    uiComponentGridDataProviderData.getCollectionFqn()
-            );
-            attributes.setProperty(
-                    "COLLECTION_CLASS_NAME",
-                    getNameFromFqn(uiComponentGridDataProviderData.getCollectionFqn())
-            );
-        }
     }
 
     private PhpClass createDataProviderClass(final String actionName) {
@@ -142,8 +130,7 @@ private PhpClass createDataProviderClass(final String actionName) {
 
         dataProviderFile = fileFromTemplateGenerator.generate(
                 UiComponentDataProviderPhp.getInstance(
-                        uiComponentGridDataProviderData.getName(),
-                        uiComponentGridDataProviderData.getType()
+                        uiComponentGridDataProviderData.getName()
                 ),
                 attributes,
                 parentDirectory,

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

@@ -14,35 +14,29 @@
         "PMD.RedundantFieldInitializer"
 })
 public class UiComponentDataProviderPhp implements ModuleFileInterface {
-    public static final String COLLECTION_TEMPLATE =
-            "Magento Module Ui Grid Collection Data Provider Php";
     public static final String CUSTOM_TEMPLATE = "Magento Module Ui Custom Data Provider Php";
     public static final String FILE_EXTENSION = "php";
     public static final String CUSTOM_TYPE = "custom";
     public static final String COLLECTION_TYPE = "collection";
     private static UiComponentDataProviderPhp INSTANCE = null;
     private String className;
-    private String providerType;
     public static final String DEFAULT_DATA_PROVIDER =
             "Magento\\Framework\\View\\Element\\UiComponent\\DataProvider\\DataProvider";
 
     /**
      * Returns a new instance of the class.
      *
      * @param className DataProvider class name
-     * @param providerType DataProvider type
      * @return UiComponentGridDataProviderPhp
      */
     public static UiComponentDataProviderPhp getInstance(
-            final String className,
-            final String providerType
+            final String className
     ) {
         if (null == INSTANCE) {
             INSTANCE = new UiComponentDataProviderPhp();
         }
 
         INSTANCE.setClassName(className);
-        INSTANCE.setProviderType(providerType);
 
         return INSTANCE;
     }
@@ -56,31 +50,14 @@ public void setClassName(final String className) {
         this.className = className;
     }
 
-    /**
-     * Set provided type.
-     *
-     * @param providerType String
-     */
-    public void setProviderType(final String providerType) {
-        this.providerType = providerType;
-    }
-
     @Override
     public String getFileName() {
         return String.format("%s.%s", className, FILE_EXTENSION);
     }
 
     @Override
     public String getTemplate() {
-        if (providerType.equals(COLLECTION_TYPE)) {
-            return COLLECTION_TEMPLATE;
-        }
-
-        if (providerType.equals(CUSTOM_TYPE)) {
-            return CUSTOM_TEMPLATE;
-        }
-
-        return null;
+        return CUSTOM_TEMPLATE;
     }
 
     @Override

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

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <virtualType name="MyVirtualClass" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
+        <arguments>
+            <argument name="resourceModel" xsi:type="string">My/Collection</argument>
+            <argument name="mainTable" xsi:type="string">my_table</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
+        <arguments>
+            <argument xsi:type="array">
+                <item xsi:type="string" name="my_grid_data_source">MyVirtualClass</item>
+            </argument>
+        </arguments>
+    </type>
+</config>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Foo_Bar::menu" sortOrder="10" title="My Title" module="Foo_Bar" parent="Magento_Customer::customer"
+             resource="Foo_Bar::acl" translate="title" action="test"/>
+    </menu>
+</config>

testData/actions/generation/generator/DataProviderDeclarationGenerator/generateDataProviderDeclarationFile/di.xml

@@ -23,6 +23,6 @@ class BackendSaveAction extends Action implements HttpPostActionInterface
      */
     public function execute()
     {
-        // TODO: Implement execute method.
+        return $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_PAGE);
     }
 }