From 7669e578904d6d0ebf5eb1a0033f00aa5b09b254 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@magento.com>
Date: Fri, 15 Sep 2017 16:38:47 -0500
Subject: [PATCH 01/19] MQE-326: allow data persistence to custom stores.

---
 .../DataGenerator/Api/ApiExecutor.php         | 12 +++-
 .../DataGenerator/Api/EntityApiHandler.php    | 25 ++++++--
 .../DataGenerator/Objects/JsonDefinition.php  | 45 ++++++++------
 .../DataGenerator/etc/dataOperation.xsd       |  1 +
 .../Test/etc/testSchema.xsd                   |  2 +
 .../Util/TestGenerator.php                    | 59 ++++++++++---------
 6 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
index ee0f6eb81..68dfc4666 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
@@ -57,16 +57,25 @@ class ApiExecutor
      */
     private static $entitySequences = [];
 
+    /**
+     * Store code in web api rest url.
+     *
+     * @var string
+     */
+    private $storeCode;
+
     /**
      * ApiSubObject constructor.
      * @param string $operation
      * @param EntityDataObject $entityObject
      * @param array $dependentEntities
+     * @param string $storeCode
      */
-    public function __construct($operation, $entityObject, $dependentEntities = null)
+    public function __construct($operation, $entityObject, $dependentEntities = null, $storeCode = 'default')
     {
         $this->operation = $operation;
         $this->entityObject = $entityObject;
+        $this->storeCode = $storeCode;
         if ($dependentEntities != null) {
             foreach ($dependentEntities as $entity) {
                 $this->dependentEntities[$entity->getName()] = $entity;
@@ -86,6 +95,7 @@ public function __construct($operation, $entityObject, $dependentEntities = null
      */
     public function executeRequest()
     {
+        $this->jsonDefinition->setStoreCode($this->storeCode);
         $apiClientUrl = $this->jsonDefinition->getApiUrl();
 
         $matchedParams = [];
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php
index 8116dbd87..898fce8f8 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php
@@ -34,6 +34,13 @@ class EntityApiHandler
      */
     private $dependentObjects = [];
 
+    /**
+     * Store code in web api rest url.
+     *
+     * @var string
+     */
+    private $storeCode;
+
     /**
      * ApiPersistenceHandler constructor.
      * @param EntityDataObject $entityObject
@@ -43,15 +50,21 @@ public function __construct($entityObject, $dependentObjects = null)
     {
         $this->entityObject = clone $entityObject;
         $this->dependentObjects = $dependentObjects;
+        $this->storeCode = 'default';
     }
 
     /**
      * Function which executes a create request based on specific operation metadata
+     *
+     * @param string $storeCode
      * @return void
      */
-    public function createEntity()
+    public function createEntity($storeCode = null)
     {
-        $apiExecutor = new ApiExecutor('create', $this->entityObject, $this->dependentObjects);
+        if (!$storeCode) {
+            $storeCode = $this->storeCode;
+        }
+        $apiExecutor = new ApiExecutor('create', $this->entityObject, $this->dependentObjects, $storeCode);
         $result = $apiExecutor->executeRequest();
 
         $this->createdObject = new EntityDataObject(
@@ -66,11 +79,15 @@ public function createEntity()
     /**
      * Function which executes a delete request based on specific operation metadata
      *
+     * @param string $storeCode
      * @return string | false
      */
-    public function deleteEntity()
+    public function deleteEntity($storeCode = null)
     {
-        $apiExecutor = new ApiExecutor('delete', $this->createdObject);
+        if (!$storeCode) {
+            $storeCode = $this->storeCode;
+        }
+        $apiExecutor = new ApiExecutor('delete', $this->createdObject, null, $storeCode);
         $result = $apiExecutor->executeRequest();
 
         return $result;
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php
index f19a2e51e..a50b108bf 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php
@@ -40,18 +40,18 @@ class JsonDefinition
     private $apiMethod;
 
     /**
-     * Base URL for the request
+     * Api request url.
      *
      * @var string
      */
-    private $baseUrl;
+    private $apiUrl;
 
     /**
      * Resource specific URI for the request
      *
      * @var string
      */
-    private $apiUrl;
+    private $apiUri;
 
     /**
      * Authorization path for retrieving a token
@@ -81,38 +81,49 @@ class JsonDefinition
      */
     private $jsonMetadata = [];
 
+    /**
+     * Store code in api url.
+     *
+     * @var string
+     */
+    private $apiStoreCode;
+
     /**
      * JsonDefinition constructor.
      * @param string $name
      * @param string $operation
      * @param string $dataType
      * @param string $apiMethod
-     * @param string $apiUrl
+     * @param string $apiUri
      * @param string $auth
      * @param array $headers
      * @param array $params
      * @param array $jsonMetadata
+     * @param string $apiStoreCode
      */
     public function __construct(
         $name,
         $operation,
         $dataType,
         $apiMethod,
-        $apiUrl,
+        $apiUri,
         $auth,
         $headers,
         $params,
-        $jsonMetadata
+        $jsonMetadata,
+        $apiStoreCode = 'default'
     ) {
         $this->name = $name;
         $this->operation = $operation;
         $this->dataType = $dataType;
         $this->apiMethod = $apiMethod;
-        $this->baseUrl = $apiUrl;
+        $this->apiUri = $apiUri;
         $this->auth = $auth;
         $this->headers = $headers;
         $this->params = $params;
         $this->jsonMetadata = $jsonMetadata;
+        $this->apiStoreCode = $apiStoreCode;
+        $this->apiUrl = null;
     }
 
     /**
@@ -152,7 +163,7 @@ public function getApiMethod()
      */
     public function getApiUrl()
     {
-        $this->cleanApiUrl();
+        $this->apiUrl = '/rest/' . $this->apiStoreCode . '/' . trim($this->apiUri, '/');
 
         if (array_key_exists('path', $this->params)) {
             $this->addPathParam();
@@ -172,7 +183,7 @@ public function getApiUrl()
      */
     public function getAuth()
     {
-        return $this->auth;
+        return '/rest/' . $this->apiStoreCode . '/' . trim($this->auth, '/');
     }
 
     /**
@@ -196,17 +207,14 @@ public function getJsonMetadata()
     }
 
     /**
-     * Function to validate api format and add "/" char where necessary
+     * Set store code.
      *
+     * @param $newStoreCode
      * @return void
      */
-    private function cleanApiUrl()
+    public function setStoreCode($newStoreCode)
     {
-        if (substr($this->baseUrl, -1) == "/") {
-            $this->apiUrl = rtrim($this->baseUrl, "/");
-        } else {
-            $this->apiUrl = $this->baseUrl;
-        }
+        $this->apiStoreCode = $newStoreCode;
     }
 
     /**
@@ -228,15 +236,14 @@ private function addPathParam()
      */
     private function addQueryParams()
     {
-
         foreach ($this->params['query'] as $paramName => $paramValue) {
-            if (!stringContains("?", $this->apiUrl)) {
+            if (strpos($this->apiUrl, '?') == false) {
                 $this->apiUrl = $this->apiUrl . "?";
             } else {
                 $this->apiUrl = $this->apiUrl . "&";
             }
 
-            $this->apiUrl = $paramName . "=" . $paramValue;
+            $this->apiUrl = $this->apiUrl . $paramName . "=" . $paramValue;
         }
     }
 }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
index 52e144f22..e74923dbc 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
@@ -18,6 +18,7 @@
                         <xs:attribute type="xs:string" name="url"/>
                         <xs:attribute type="xs:string" name="auth"/>
                         <xs:attribute type="xs:string" name="method"/>
+                        <xs:attribute type="xs:string" name="storeCode" default="default"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
index 945f2e133..51c8c783f 100644
--- a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
+++ b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
@@ -361,6 +361,7 @@
         <xs:attribute type="xs:boolean" name="remove" default="false"/>
         <xs:attribute type="xs:string" name="before"/>
         <xs:attribute type="xs:string" name="after"/>
+        <xs:attribute type="xs:string" name="storeCode"/>
     </xs:complexType>
     <xs:complexType name="requiredEntityType">
         <xs:simpleContent>
@@ -380,6 +381,7 @@
                 <xs:attribute type="xs:boolean" name="remove" default="false"/>
                 <xs:attribute type="xs:string" name="before"/>
                 <xs:attribute type="xs:string" name="after"/>
+                <xs:attribute type="xs:string" name="storeCode"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 6799e4bb5..41267f01e 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -430,6 +430,29 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                             }
                         }
                     }
+
+                    if ($hookObject) {
+                        $createEntityFunctionCall = sprintf("\t\t\$this->%s->createEntity(", $key);
+                        $entityApiHandlerFunctionCall = sprintf(
+                            "\t\t\$this->%s = new EntityApiHandler($%s",
+                            $key,
+                            $entity
+                        );
+                    } else {
+                        $createEntityFunctionCall = sprintf("\t\t\$%s->createEntity(", $key);
+                        $entityApiHandlerFunctionCall = sprintf(
+                            "\t\t$%s = new EntityApiHandler($%s",
+                            $key,
+                            $entity
+                        );
+                    }
+
+                    if (isset($customActionAttributes['storeCode'])) {
+                        $createEntityFunctionCall .= sprintf("\"%s\");\n", $customActionAttributes['storeCode']);
+                    } else {
+                        $createEntityFunctionCall .= ");\n";
+                    }
+
                     //If required-entities are defined, reassign dataObject to not overwrite the static definition.
                     //Also, EntityApiHandler needs to be defined with customData array.
                     if (!empty($requiredEntities)) {
@@ -445,37 +468,15 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                             $entity
                         );
 
-                        if ($hookObject) {
-                            $testSteps .= sprintf(
-                                "\t\t\$this->%s = new EntityApiHandler($%s, [%s]);\n",
-                                $key,
-                                $entity,
-                                implode(', ', $requiredEntityObjects)
-                            );
-                            $testSteps .= sprintf("\t\t\$this->%s->createEntity();\n", $key);
-                        } else {
-                            $testSteps .= sprintf(
-                                "\t\t$%s = new EntityApiHandler($%s, [%s]);\n",
-                                $key,
-                                $entity,
-                                implode(', ', $requiredEntityObjects)
-                            );
-                            $testSteps .= sprintf("\t\t$%s->createEntity();\n", $key);
-                        }
+                        $entityApiHandlerFunctionCall .= sprintf(
+                            ", [%s]);\n",
+                            implode(', ', $requiredEntityObjects)
+                        );
                     } else {
-                        if ($hookObject) {
-                            $testSteps .= sprintf(
-                                "\t\t\$this->%s = new EntityApiHandler($%s);\n",
-                                $key,
-                                $entity
-                            );
-                            $testSteps .= sprintf("\t\t\$this->%s->createEntity();\n", $key);
-                        } else {
-                            $testSteps .= sprintf("\t\t$%s = new EntityApiHandler($%s);\n", $key, $entity);
-                            $testSteps .= sprintf("\t\t$%s->createEntity();\n", $key);
-                        }
+                        $entityApiHandlerFunctionCall .= ");\n";
                     }
-
+                    $testSteps .= $entityApiHandlerFunctionCall;
+                    $testSteps .= $createEntityFunctionCall;
                     break;
                 case "deleteData":
                     $key = $customActionAttributes['createDataKey'];

From 596f419950b7915903e46e3c1f6502865f0fa9b5 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@magento.com>
Date: Thu, 21 Sep 2017 09:46:13 -0500
Subject: [PATCH 02/19] MQE-369: Implement non web api data persistence.

---
 etc/di.xml                                    |  18 --
 .../Handlers/DataDefinitionObjectHandler.php  | 225 ++++++++++++++
 .../Handlers/JsonDefinitionObjectHandler.php  | 213 -------------
 ...{JsonDefinition.php => DataDefinition.php} | 106 +++++--
 .../{JsonElement.php => DataElement.php}      |  22 +-
 .../Persist/Curl/AbstractExecutor.php         |  45 +++
 .../Persist/Curl/AdminExecutor.php            | 182 +++++++++++
 .../Persist/Curl/WebapiExecutor.php           | 140 +++++++++
 .../CurlHandler.php}                          | 212 +++++++------
 .../DataPersistHandler.php}                   |  49 +--
 .../Util/DataObjectExtractor.php              | 129 ++++++++
 .../Util/JsonObjectExtractor.php              | 129 --------
 .../DataGenerator/etc/dataOperation.xsd       |  20 +-
 .../DataGenerator/etc/sample.xml              |  25 --
 .../Util/ApiClientUtil.php                    | 117 -------
 .../Util/Protocol/CurlInterface.php           |  57 ++++
 .../Util/Protocol/CurlTransport.php           | 292 ++++++++++++++++++
 .../Util/TestGenerator.php                    |  20 +-
 18 files changed, 1329 insertions(+), 672 deletions(-)
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
 rename src/Magento/FunctionalTestingFramework/DataGenerator/Objects/{JsonDefinition.php => DataDefinition.php} (64%)
 rename src/Magento/FunctionalTestingFramework/DataGenerator/Objects/{JsonElement.php => DataElement.php} (76%)
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AbstractExecutor.php
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
 rename src/Magento/FunctionalTestingFramework/DataGenerator/{Api/ApiExecutor.php => Persist/CurlHandler.php} (52%)
 rename src/Magento/FunctionalTestingFramework/DataGenerator/{Api/EntityApiHandler.php => Persist/DataPersistHandler.php} (67%)
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/etc/sample.xml
 delete mode 100644 src/Magento/FunctionalTestingFramework/Util/ApiClientUtil.php
 create mode 100644 src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
 create mode 100644 src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php

diff --git a/etc/di.xml b/etc/di.xml
index 081b324fc..ae49b5afc 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -49,24 +49,6 @@
         </arguments>
     </type>
     <type name="Magento\FunctionalTestingFramework\Util\ModuleResolver\SequenceSorter" />
-    <type name="Magento\FunctionalTestingFramework\Generate\GeneratePage">
-        <arguments>
-            <argument name="configData" xsi:type="object">Magento\FunctionalTestingFramework\Page\Config\Data</argument>
-        </arguments>
-    </type>
-    <type name="Magento\FunctionalTestingFramework\Generate\GenerateBlock">
-        <arguments>
-            <argument name="configData" xsi:type="object">Magento\FunctionalTestingFramework\Block\Config\Data</argument>
-        </arguments>
-    </type>
-    <type name="Magento\FunctionalTestingFramework\Generate\Pool">
-        <arguments>
-            <argument name="pool" xsi:type="array">
-                <item name="page" xsi:type="object">Magento\FunctionalTestingFramework\Generate\GeneratePage</item>
-                <item name="block" xsi:type="object">Magento\FunctionalTestingFramework\Generate\GenerateBlock</item>
-            </argument>
-        </arguments>
-    </type>
     <!--
     Array item can be of any type just like an argument, including array type itself, which creates circular dependency.
     Proxy is used to resolve the circular dependency, so that array items undergo the same interpretation as arguments.
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
new file mode 100644
index 000000000..e43c46832
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\FunctionalTestingFramework\DataGenerator\Handlers;
+
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataDefinition;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataElement;
+use Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationMetadataParser;
+use Magento\FunctionalTestingFramework\DataGenerator\Util\DataObjectExtractor;
+use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
+use Magento\FunctionalTestingFramework\ObjectManagerFactory;
+
+class DataDefinitionObjectHandler implements ObjectHandlerInterface
+{
+    const ENTITY_OPERATION_ROOT_TAG = 'operation';
+    const ENTITY_OPERATION_TYPE = 'type';
+    const ENTITY_OPERATION_DATA_TYPE = 'dataType';
+    const ENTITY_OPERATION_URL = 'url';
+    const ENTITY_OPERATION_METHOD = 'method';
+    const ENTITY_OPERATION_AUTH = 'auth';
+    const ENTITY_OPERATION_STORE_CODE = 'storeCode';
+    const ENTITY_OPERATION_SUCCESS_REGEX = 'successRegex';
+    const ENTITY_OPERATION_RETURN_REGEX = 'returnRegex';
+    const ENTITY_OPERATION_HEADER = 'header';
+    const ENTITY_OPERATION_HEADER_PARAM = 'param';
+    const ENTITY_OPERATION_HEADER_VALUE = 'value';
+    const ENTITY_OPERATION_URL_PARAM = 'param';
+    const ENTITY_OPERATION_URL_PARAM_TYPE = 'type';
+    const ENTITY_OPERATION_URL_PARAM_KEY = 'key';
+    const ENTITY_OPERATION_URL_PARAM_VALUE = 'value';
+    const ENTITY_OPERATION_ENTRY = 'entry';
+    const ENTITY_OPERATION_ENTRY_KEY = 'key';
+    const ENTITY_OPERATION_ENTRY_VALUE = 'value';
+    const ENTITY_OPERATION_ARRAY = 'array';
+    const ENTITY_OPERATION_ARRAY_KEY = 'key';
+    const ENTITY_OPERATION_ARRAY_VALUE = 'value';
+    const ENTITY_OPERATION_OBJECT = 'object';
+    const ENTITY_OPERATION_OBJECT_KEY = 'key';
+    const ENTITY_OPERATION_OBJECT_VALUE = 'value';
+    const ENTITY_OPERATION_DATA_OBJECT = 'metaDataObject';
+
+    /**
+     * Singleton Instance of class
+     *
+     * @var DataDefinitionObjectHandler
+     */
+    private static $DATA_DEFINITION_OBJECT_HANDLER;
+
+    /**
+     * Array containing all Data Definition Objects
+     *
+     * @var array
+     */
+    private $dataDefinitions = [];
+
+    /**
+     * Object used to extract dataObjects from array into DataElements
+     *
+     * @var DataObjectExtractor
+     */
+    private $dataDefExtractor;
+
+    /**
+     * Singleton method to return DataDefinitionProcessor.
+     *
+     * @return DataDefinitionObjectHandler
+     */
+    public static function getInstance()
+    {
+        if (!self::$DATA_DEFINITION_OBJECT_HANDLER) {
+            self::$DATA_DEFINITION_OBJECT_HANDLER = new DataDefinitionObjectHandler();
+            self::$DATA_DEFINITION_OBJECT_HANDLER->initDataDefinitions();
+        }
+
+        return self::$DATA_DEFINITION_OBJECT_HANDLER;
+    }
+
+    /**
+     * Returns a DataDefinition object based on name
+     *
+     * @param string $dataDefinitionName
+     * @return DataDefinition
+     */
+    public function getObject($dataDefinitionName)
+    {
+        return $this->dataDefinitions[$dataDefinitionName];
+    }
+
+    /**
+     * Returns all data Definition objects
+     *
+     * @return array
+     */
+    public function getAllObjects()
+    {
+        return $this->dataDefinitions;
+    }
+
+    /**
+     * DataDefintionArrayProcessor constructor.
+     */
+    private function __construct()
+    {
+        $this->dataDefExtractor = new DataObjectExtractor();
+    }
+
+    /**
+     * This method takes an operation such as create and a data type such as 'customer' and returns the corresponding
+     * data definition defined in metadata.xml
+     *
+     * @param string $operation
+     * @param string $dataType
+     * @return DataDefinition
+     */
+    public function getDataDefinition($operation, $dataType)
+    {
+        return $this->getObject($operation . $dataType);
+    }
+
+    /**
+     * This method reads all dataDefinitions from metadata xml into memory.
+     * @return void
+     */
+    private function initDataDefinitions()
+    {
+        $objectManager = ObjectManagerFactory::getObjectManager();
+        $metadataParser = $objectManager->create(OperationMetadataParser::class);
+        foreach ($metadataParser->readOperationMetadata()[DataDefinitionObjectHandler::ENTITY_OPERATION_ROOT_TAG] as
+                 $dataDefName => $dataDefArray) {
+            $operation = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_TYPE];
+            $dataType = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_TYPE];
+            $url = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_URL] ?? null;
+            $method = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_METHOD] ?? null;
+            $auth = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_AUTH] ?? null;
+            $storeCode = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_STORE_CODE] ?? null;
+            $successRegex = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_SUCCESS_REGEX] ?? null;
+            $returnRegex = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_RETURN_REGEX] ?? null;
+            $headers = [];
+            $params = [];
+            $metaData = [];
+
+            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER, $dataDefArray)) {
+                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER] as $headerEntry) {
+                    if (isset($headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE])
+                        && $headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE] !== 'none') {
+                        $headers[] = $headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_PARAM] . ': ' .
+                            $headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE];
+                    }
+                }
+            }
+
+            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM, $dataDefArray)) {
+                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM] as $paramEntry) {
+                    $params[$paramEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_TYPE]]
+                    [$paramEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_KEY]] =
+                        $paramEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_VALUE];
+                }
+            }
+
+            // extract relevant dataObjects as DataElements
+            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT, $dataDefArray)) {
+                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT] as $dataObjectArray) {
+                    $metaData[] = $this->dataDefExtractor->extractDataObject($dataObjectArray);
+                }
+            }
+
+            //handle loose entries
+
+            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY, $dataDefArray)) {
+                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY] as $dataEntryType) {
+                    $metaData[] = new DataElement(
+                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
+                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
+                        DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
+                    );
+                }
+            }
+
+            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY, $dataDefArray)) {
+                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY] as $dataEntryType) {
+                    $subMetaData = [];
+                    $value = null;
+                    $type = null;
+
+                    if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT, $dataEntryType)) {
+                        $nestedDataElement = $this->dataDefExtractor->extractDataObject(
+                            $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT][0]
+                        );
+                        $subMetaData[$nestedDataElement->getKey()] = $nestedDataElement;
+                        $value = $nestedDataElement->getValue();
+                        $type = $nestedDataElement->getKey();
+                    } else {
+                        $value = $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
+                        [DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
+                        $type = [DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
+                    }
+
+                    $metaData[] = new DataElement(
+                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
+                        $value,
+                        $type,
+                        $subMetaData
+                    );
+                }
+            }
+
+            $this->dataDefinitions[$operation . $dataType] = new DataDefinition(
+                $dataDefName,
+                $operation,
+                $dataType,
+                $method,
+                $url,
+                $auth,
+                $headers,
+                $params,
+                $metaData,
+                $successRegex,
+                $returnRegex,
+                $storeCode
+            );
+        }
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
deleted file mode 100644
index 165962409..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\FunctionalTestingFramework\DataGenerator\Handlers;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonDefinition;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonElement;
-use Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationMetadataParser;
-use Magento\FunctionalTestingFramework\DataGenerator\Util\JsonObjectExtractor;
-use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
-use Magento\FunctionalTestingFramework\ObjectManagerFactory;
-
-class JsonDefinitionObjectHandler implements ObjectHandlerInterface
-{
-    const ENTITY_OPERATION_ROOT_TAG = 'operation';
-    const ENTITY_OPERATION_TYPE = 'type';
-    const ENTITY_OPERATION_DATA_TYPE = 'dataType';
-    const ENTITY_OPERATION_URL = 'url';
-    const ENTITY_OPERATION_METHOD = 'method';
-    const ENTITY_OPERATION_AUTH = 'auth';
-    const ENTITY_OPERATION_HEADER = 'header';
-    const ENTITY_OPERATION_HEADER_PARAM = 'param';
-    const ENTITY_OPERATION_HEADER_VALUE = 'value';
-    const ENTITY_OPERATION_URL_PARAM = 'param';
-    const ENTITY_OPERATION_URL_PARAM_TYPE = 'type';
-    const ENTITY_OPERATION_URL_PARAM_KEY = 'key';
-    const ENTITY_OPERATION_URL_PARAM_VALUE = 'value';
-    const ENTITY_OPERATION_ENTRY = 'entry';
-    const ENTITY_OPERATION_ENTRY_KEY = 'key';
-    const ENTITY_OPERATION_ENTRY_VALUE = 'value';
-    const ENTITY_OPERATION_ARRAY = 'array';
-    const ENTITY_OPERATION_ARRAY_KEY = 'key';
-    const ENTITY_OPERATION_ARRAY_VALUE = 'value';
-    const ENTITY_OPERATION_OBJECT = 'object';
-    const ENTITY_OPERATION_OBJECT_KEY = 'key';
-    const ENTITY_OPERATION_OBJECT_VALUE = 'value';
-    const ENTITY_OPERATION_JSON_OBJECT = 'jsonObject';
-
-    /**
-     * Singleton Instance of class
-     *
-     * @var JsonDefinitionObjectHandler
-     */
-    private static $JSON_DEFINITION_OBJECT_HANDLER;
-
-    /**
-     * Array containing all Json Definition Objects
-     *
-     * @var array
-     */
-    private $jsonDefinitions = [];
-
-    /**
-     * Object used to extract jsonObjects from array into JsonElements
-     *
-     * @var JsonObjectExtractor
-     */
-    private $jsonDefExtractor;
-
-    /**
-     * Singleton method to return JsonDefinitionProcessor.
-     *
-     * @return JsonDefinitionObjectHandler
-     */
-    public static function getInstance()
-    {
-        if (!self::$JSON_DEFINITION_OBJECT_HANDLER) {
-            self::$JSON_DEFINITION_OBJECT_HANDLER = new JsonDefinitionObjectHandler();
-            self::$JSON_DEFINITION_OBJECT_HANDLER->initJsonDefinitions();
-        }
-
-        return self::$JSON_DEFINITION_OBJECT_HANDLER;
-    }
-
-    /**
-     * Returns a JsonDefinition object based on name
-     *
-     * @param string $jsonDefinitionName
-     * @return JsonDefinition
-     */
-    public function getObject($jsonDefinitionName)
-    {
-        return $this->jsonDefinitions[$jsonDefinitionName];
-    }
-
-    /**
-     * Returns all Json Definition objects
-     *
-     * @return array
-     */
-    public function getAllObjects()
-    {
-        return $this->jsonDefinitions;
-    }
-
-    /**
-     * JsonDefintionArrayProcessor constructor.
-     */
-    private function __construct()
-    {
-        $this->jsonDefExtractor = new JsonObjectExtractor();
-    }
-
-    /**
-     * This method takes an operation such as create and a data type such as 'customer' and returns the corresponding
-     * json definition defined in metadata.xml
-     *
-     * @param string $operation
-     * @param string $dataType
-     * @return JsonDefinition
-     */
-    public function getJsonDefinition($operation, $dataType)
-    {
-        return $this->getObject($operation . $dataType);
-    }
-
-    /**
-     * This method reads all jsonDefinitions from metadata xml into memory.
-     * @return void
-     */
-    private function initJsonDefinitions()
-    {
-        $objectManager = ObjectManagerFactory::getObjectManager();
-        $metadataParser = $objectManager->create(OperationMetadataParser::class);
-        foreach ($metadataParser->readOperationMetadata()[JsonDefinitionObjectHandler::ENTITY_OPERATION_ROOT_TAG] as
-                 $jsonDefName => $jsonDefArray) {
-            $operation = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_TYPE];
-            $dataType = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_DATA_TYPE];
-            $url = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL] ?? null;
-            $method = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_METHOD] ?? null;
-            $auth = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_AUTH] ?? null;
-            $headers = [];
-            $params = [];
-            $jsonMetadata = [];
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER] as $headerEntry) {
-                    $headers[] = $headerEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER_PARAM] . ': ' .
-                        $headerEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE];
-                }
-            }
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM] as $paramEntry) {
-                    $params[$paramEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_TYPE]]
-                    [$paramEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_KEY]] =
-                        $paramEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_VALUE];
-                }
-            }
-
-            // extract relevant jsonObjects as JsonElements
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_JSON_OBJECT, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_JSON_OBJECT] as $jsonObjectArray) {
-                    $jsonMetadata[] = $this->jsonDefExtractor->extractJsonObject($jsonObjectArray);
-                }
-            }
-
-            //handle loose entries
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY] as $jsonEntryType) {
-                    $jsonMetadata[] = new JsonElement(
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                        JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
-                    );
-                }
-            }
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY] as $jsonEntryType) {
-                    $jsonSubMetadata = [];
-                    $value = null;
-                    $type = null;
-
-                    if (array_key_exists('jsonObject', $jsonEntryType)) {
-                        $jsonNestedElement = $this->jsonDefExtractor->extractJsonObject(
-                            $jsonEntryType['jsonObject'][0]
-                        );
-                        $jsonSubMetadata[$jsonNestedElement->getKey()] = $jsonNestedElement;
-                        $value = $jsonNestedElement->getValue();
-                        $type = $jsonNestedElement->getKey();
-                    } else {
-                        $value = $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
-                        [JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                        $type = [JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                    }
-
-                    $jsonMetadata[] = new JsonElement(
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
-                        $value,
-                        $type,
-                        $jsonSubMetadata
-                    );
-                }
-            }
-
-            $this->jsonDefinitions[$operation . $dataType] = new JsonDefinition(
-                $jsonDefName,
-                $operation,
-                $dataType,
-                $method,
-                $url,
-                $auth,
-                $headers,
-                $params,
-                $jsonMetadata
-            );
-        }
-    }
-}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataDefinition.php
similarity index 64%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataDefinition.php
index a50b108bf..b09cfcc1f 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonDefinition.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataDefinition.php
@@ -7,26 +7,26 @@
 namespace Magento\FunctionalTestingFramework\DataGenerator\Objects;
 
 /**
- * Class JsonDefinition
+ * Class DataDefinition
  */
-class JsonDefinition
+class DataDefinition
 {
     /**
-     * Json Definitions Name
+     * Data Definitions Name
      *
      * @var string
      */
     private $name;
 
     /**
-     * Operation which the json defintion describes
+     * Operation which the data defintion describes
      *
      * @var string
      */
     private $operation;
 
     /**
-     * Data type for which the json defintiion is used
+     * Data type for which the data defintiion is used
      *
      * @var string
      */
@@ -75,21 +75,35 @@ class JsonDefinition
     private $params = [];
 
     /**
-     * The metadata describing the json fields and values themselves
+     * The metadata describing the data fields and values themselves
      *
      * @var array
      */
-    private $jsonMetadata = [];
+    private $metaData = [];
 
     /**
      * Store code in api url.
      *
      * @var string
      */
-    private $apiStoreCode;
+    private $storeCode;
 
     /**
-     * JsonDefinition constructor.
+     * Regex to check for request success.
+     *
+     * @var string
+     */
+    private $successRegex;
+
+    /**
+     * Regex to grab return value from response.
+     *
+     * @var string
+     */
+    private $returnRegex;
+
+    /**
+     * DataDefinition constructor.
      * @param string $name
      * @param string $operation
      * @param string $dataType
@@ -98,8 +112,10 @@ class JsonDefinition
      * @param string $auth
      * @param array $headers
      * @param array $params
-     * @param array $jsonMetadata
-     * @param string $apiStoreCode
+     * @param array $metaData
+     * @param string $successRegex
+     * @param string $returnRegex
+     * @param string $storeCode
      */
     public function __construct(
         $name,
@@ -110,8 +126,10 @@ public function __construct(
         $auth,
         $headers,
         $params,
-        $jsonMetadata,
-        $apiStoreCode = 'default'
+        $metaData,
+        $successRegex = null,
+        $returnRegex = null,
+        $storeCode = 'default'
     ) {
         $this->name = $name;
         $this->operation = $operation;
@@ -121,13 +139,15 @@ public function __construct(
         $this->auth = $auth;
         $this->headers = $headers;
         $this->params = $params;
-        $this->jsonMetadata = $jsonMetadata;
-        $this->apiStoreCode = $apiStoreCode;
+        $this->metaData = $metaData;
+        $this->storeCode = $storeCode;
+        $this->successRegex = $successRegex;
+        $this->returnRegex = $returnRegex;
         $this->apiUrl = null;
     }
 
     /**
-     * Getter for json data type
+     * Getter for data's data type
      *
      * @return string
      */
@@ -137,7 +157,7 @@ public function getDataType()
     }
 
     /**
-     * Getter for json operation
+     * Getter for data operation
      *
      * @return string
      */
@@ -157,13 +177,22 @@ public function getApiMethod()
     }
 
     /**
-     * Getter for api url
+     * Getter for api url for a store.
      *
+     * @param string $storeCode
      * @return string
      */
-    public function getApiUrl()
+    public function getApiUrl($storeCode)
     {
-        $this->apiUrl = '/rest/' . $this->apiStoreCode . '/' . trim($this->apiUri, '/');
+        if (isset($storeCode)) {
+            $this->storeCode = $storeCode;
+        }
+
+        if (strpos($this->auth, 'Formkey') === false) {
+            $this->apiUrl = '/rest/' . $this->storeCode . '/' . trim($this->apiUri, '/');
+        } else {
+            $this->apiUrl = trim($this->apiUri, '/') . '/';
+        }
 
         if (array_key_exists('path', $this->params)) {
             $this->addPathParam();
@@ -183,7 +212,7 @@ public function getApiUrl()
      */
     public function getAuth()
     {
-        return '/rest/' . $this->apiStoreCode . '/' . trim($this->auth, '/');
+        return $this->auth;
     }
 
     /**
@@ -197,24 +226,43 @@ public function getHeaders()
     }
 
     /**
-     * Getter for json metadata
+     * Getter for data metadata
      *
      * @return array
      */
-    public function getJsonMetadata()
+    public function getMetaData()
     {
-        return $this->jsonMetadata;
+        return $this->metaData;
     }
 
     /**
-     * Set store code.
+     * Getter for store code.
      *
-     * @param $newStoreCode
-     * @return void
+     * @return string
+     */
+    public function getStoreCode()
+    {
+        return $this->storeCode;
+    }
+
+    /**
+     * Getter for success regex.
+     *
+     * @return string
+     */
+    public function getSuccessRegex()
+    {
+        return $this->successRegex;
+    }
+
+    /**
+     * Getter for return regex.
+     *
+     * @return string
      */
-    public function setStoreCode($newStoreCode)
+    public function getReturnRegex()
     {
-        $this->apiStoreCode = $newStoreCode;
+        return $this->returnRegex;
     }
 
     /**
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonElement.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
similarity index 76%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonElement.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
index 03f0192cc..c49e92411 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/JsonElement.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
@@ -6,45 +6,45 @@
 
 namespace Magento\FunctionalTestingFramework\DataGenerator\Objects;
 
-class JsonElement
+class DataElement
 {
     /**
-     * Json parameter name
+     * Data parameter name
      *
      * @var string
      */
     private $key;
 
     /**
-     * Json parameter metadata value (e.g. string, bool)
+     * Data parameter metadata value (e.g. string, bool)
      *
      * @var string
      */
     private $value;
 
     /**
-     * Json type such as array or entry
+     * Data type such as array or entry
      *
      * @var string
      */
     private $type;
 
     /**
-     * Nested Json Objects defined within the same operation.xml file
+     * Nested data Objects defined within the same operation.xml file
      *
      * @var array
      */
     private $nestedElements = [];
 
     /**
-     * Nested Metadata which must be included for a jsonElement of type jsonObject
+     * Nested Metadata which must be included for a dataElement of type dataObject
      *
      * @var array|null
      */
     private $nestedMetadata = [];
 
     /**
-     * JsonElement constructor.
+     * DataElement constructor.
      * @param string $key
      * @param string $value
      * @param string $type
@@ -61,7 +61,7 @@ public function __construct($key, $value, $type, $nestedElements = [], $nestedMe
     }
 
     /**
-     * Getter for json parameter name
+     * Getter for data parameter name
      *
      * @return string
      */
@@ -91,12 +91,12 @@ public function getType()
     }
 
     /**
-     * Returns the nested json element based on the type of entity passed
+     * Returns the nested data element based on the type of entity passed
      *
      * @param string $type
      * @return array
      */
-    public function getNestedJsonElement($type)
+    public function getNestedDataElement($type)
     {
         if (array_key_exists($type, $this->nestedElements)) {
             return $this->nestedElements[$type];
@@ -106,7 +106,7 @@ public function getNestedJsonElement($type)
     }
 
     /**
-     * Returns relevant nested json metadata for a json element which is a json object
+     * Returns relevant nested data metadata for a data element which is a data object
      *
      * @return array|null
      */
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AbstractExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AbstractExecutor.php
new file mode 100644
index 000000000..6adf87892
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AbstractExecutor.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl;
+
+use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
+
+/**
+ * Abstract Curl executor.
+ */
+abstract class AbstractExecutor implements CurlInterface
+{
+    /**
+     * Base url.
+     *
+     * @var string
+     */
+    protected static $baseUrl = null;
+
+    /**
+     * Resolve base url.
+     *
+     * @return void
+     */
+    protected static function resolveBaseUrl()
+    {
+
+        if ((getenv('MAGENTO_RESTAPI_SERVER_HOST') !== false)
+            && (getenv('MAGENTO_RESTAPI_SERVER_HOST') !== '') ) {
+            self::$baseUrl = getenv('MAGENTO_RESTAPI_SERVER_HOST');
+        } else {
+            self::$baseUrl = getenv('MAGENTO_BASE_URL');
+        }
+
+        if ((getenv('MAGENTO_RESTAPI_SERVER_PORT') !== false)
+            && (getenv('MAGENTO_RESTAPI_SERVER_PORT') !== '')) {
+            self::$baseUrl .= ':' . getenv('MAGENTO_RESTAPI_SERVER_PORT');
+        }
+
+        self::$baseUrl = rtrim(self::$baseUrl, '/') . '/';
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
new file mode 100644
index 000000000..7a56c06ec
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl;
+
+use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
+use Magento\FunctionalTestingFramework\Util\Protocol\CurlTransport;
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
+
+/**
+ * Curl executor for requests to Admin.
+ */
+class AdminExecutor extends AbstractExecutor implements CurlInterface
+{
+    /**
+     * Curl transport protocol.
+     *
+     * @var CurlTransport
+     */
+    private $transport;
+
+    /**
+     * Form key.
+     *
+     * @var string
+     */
+    private $formKey = null;
+
+    /**
+     * Response data.
+     *
+     * @var string
+     */
+    private $response;
+
+    /**
+     * Backend url.
+     *
+     * @var string
+     */
+    private static $adminUrl;
+
+    /**
+     * Constructor.
+     *
+     * @constructor
+     */
+    public function __construct()
+    {
+        if (!isset(parent::$baseUrl)) {
+            parent::resolveBaseUrl();
+        }
+        self::$adminUrl = parent::$baseUrl . getenv('MAGENTO_BACKEND_NAME') . '/';
+        $this->transport = new CurlTransport();
+        $this->authorize();
+    }
+
+    /**
+     * Authorize customer on backend.
+     *
+     * @return void
+     * @throws TestFrameworkException
+     */
+    public function authorize()
+    {
+        // Perform GET to backend url so form_key is set
+        $this->transport->write(self::$adminUrl, [], CurlInterface::GET);
+        $this->read();
+
+        // Authenticate admin user
+        $authUrl = self::$adminUrl . 'admin/auth/login/';
+        $data = [
+            'login[username]' => getenv('MAGENTO_ADMIN_USERNAME'),
+            'login[password]' => getenv('MAGENTO_ADMIN_PASSWORD'),
+            'form_key' => $this->formKey,
+        ];
+        $this->transport->write($authUrl, $data, CurlInterface::POST);
+        $response = $this->read();
+        if (strpos($response, 'login-form')) {
+            throw new TestFrameworkException('Admin user authentication failed!');
+        }
+    }
+
+    /**
+     * Init Form Key from response.
+     *
+     * @return void
+     */
+    private function setFormKey()
+    {
+        preg_match('!var FORM_KEY = \'(\w+)\';!', $this->response, $matches);
+        if (!empty($matches[1])) {
+            $this->formKey = $matches[1];
+        }
+    }
+
+    /**
+     * Send request to the remote server.
+     *
+     * @param string $url
+     * @param array $params
+     * @param string $method
+     * @param mixed $headers
+     * @return void
+     * @throws TestFrameworkException
+     */
+    public function write($url, $params = [], $method = CurlInterface::POST, $headers = [])
+    {
+        $apiUrl = self::$adminUrl . $url;
+        if ($this->formKey) {
+            $params['form_key'] = $this->formKey;
+        } else {
+            throw new TestFrameworkException(
+                sprintf('Form key is absent! Url: "%s" Response: "%s"', $url, $this->response)
+            );
+        }
+
+        $this->transport->write($apiUrl, str_replace('null', '', http_build_query($params)), $method, $headers);
+    }
+
+    /**
+     * Read response from server.
+     *
+     * @param string $successRegex
+     * @param string $returnRegex
+     * @return string|array
+     * @throws TestFrameworkException
+     */
+    public function read($successRegex = null, $returnRegex = null)
+    {
+        $this->response = $this->transport->read();
+        $this->setFormKey();
+
+        if (isset($successRegex)) {
+            preg_match(
+                '/' . preg_quote($successRegex, '/') . '/',
+                $this->response,
+                $successMatches
+            );
+            if (empty($successMatches)) {
+                throw new TestFrameworkException("Entity creation was not successful! Response: $this->response");
+            }
+        }
+
+        if (isset($returnRegex)) {
+            preg_match(
+                '/' . preg_quote($returnRegex, '/') . '/',
+                $this->response,
+                $returnMatches
+            );
+            if (!empty($returnMatches)) {
+                return $returnMatches;
+            }
+        }
+        return $this->response;
+    }
+
+    /**
+     * Add additional option to cURL.
+     *
+     * @param int $option the CURLOPT_* constants
+     * @param mixed $value
+     * @return void
+     */
+    public function addOption($option, $value)
+    {
+        $this->transport->addOption($option, $value);
+    }
+
+    /**
+     * Close the connection to the server.
+     *
+     * @return void
+     */
+    public function close()
+    {
+        $this->transport->close();
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
new file mode 100644
index 000000000..f5414598b
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl;
+
+use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
+use Magento\FunctionalTestingFramework\Util\Protocol\CurlTransport;
+
+/**
+ * Curl executor for Magento Web Api requests.
+ */
+class WebapiExecutor extends AbstractExecutor implements CurlInterface
+{
+    /**
+     * Curl transport protocol.
+     *
+     * @var CurlTransport
+     */
+    private $transport;
+
+    /**
+     * Api headers.
+     *
+     * @var array
+     */
+    private $headers = [
+        'Accept: application/json',
+        'Content-Type: application/json',
+    ];
+
+    /**
+     * Response data.
+     *
+     * @var string
+     */
+    private $response;
+
+    /**
+     *  Admin authentication url.
+     */
+    const ADMIN_AUTH_URL = '/V1/integration/admin/token';
+
+    /**
+     * Store code in api request.
+     *
+     * @var string
+     */
+    private $storeCode;
+
+    /**
+     * @construct
+     * @param string $storeCode
+     */
+    public function __construct($storeCode = 'default')
+    {
+        if (!isset(parent::$baseUrl)) {
+            parent::resolveBaseUrl();
+        }
+        $this->storeCode = $storeCode;
+        $this->transport = new CurlTransport();
+        $this->authorize();
+    }
+
+    /**
+     * Returns the authorization token needed for some requests via REST call.
+     *
+     * @return void
+     */
+    private function authorize()
+    {
+        $authUrl = parent::$baseUrl . 'rest/' . $this->storeCode . self::ADMIN_AUTH_URL;
+        $authCreds = [
+            'username' => getenv('MAGENTO_ADMIN_USERNAME'),
+            'password' => getenv('MAGENTO_ADMIN_PASSWORD')
+        ];
+
+        $this->transport->write($authUrl, json_encode($authCreds), CurlInterface::POST, $this->headers);
+        $this->headers = array_merge(
+            ['Authorization: Bearer ' . str_replace('"', "", $this->read())],
+            $this->headers
+        );
+    }
+
+    /**
+     * Send request to the remote server.
+     *
+     * @param string $url
+     * @param array $params
+     * @param string $method
+     * @param array $headers
+     * @return void
+     */
+    public function write($url, $params = [], $method = CurlInterface::POST, $headers = [])
+    {
+        $this->transport->write(
+            parent::$baseUrl . ltrim($url, '/'),
+            json_encode($params, JSON_PRETTY_PRINT),
+            $method,
+            array_unique(array_merge($headers, $this->headers))
+        );
+    }
+
+    /**
+     * Read response from server.
+     *
+     * @param string $successRegex
+     * @param string $returnRegex
+     * @return string
+     */
+    public function read($successRegex = null, $returnRegex = null)
+    {
+        $this->response = $this->transport->read();
+        return $this->response;
+    }
+
+    /**
+     * Add additional option to cURL.
+     *
+     * @param  int $option the CURLOPT_* constants
+     * @param  mixed $value
+     * @return void
+     */
+    public function addOption($option, $value)
+    {
+        $this->transport->addOption($option, $value);
+    }
+
+    /**
+     * Close the connection to the server.
+     *
+     * @return void
+     */
+    public function close()
+    {
+        $this->transport->close();
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
similarity index 52%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
index 68dfc4666..1dc55619a 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -3,20 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\FunctionalTestingFramework\DataGenerator\Api;
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist;
 
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\AdminExecutor;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\WebapiExecutor;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\JsonDefinitionObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataDefinitionObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonDefinition;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonElement;
-use Magento\FunctionalTestingFramework\DataGenerator\Util\JsonObjectExtractor;
-use Magento\FunctionalTestingFramework\Util\ApiClientUtil;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataDefinition;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataElement;
+use Magento\FunctionalTestingFramework\DataGenerator\Util\DataObjectExtractor;
+use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
 
 /**
- * Class ApiExecutor
+ * Class CurlHandler
  */
-class ApiExecutor
+class CurlHandler
 {
     const PRIMITIVE_TYPES = ['string', 'boolean', 'integer', 'double', 'array'];
 
@@ -35,14 +37,14 @@ class ApiExecutor
     private $entityObject;
 
     /**
-     * The json definitions used to map the operation.
+     * The data definitions used to map the operation.
      *
-     * @var JsonDefinition $jsonDefinition
+     * @var DataDefinition $dataDefinition
      */
-    private $jsonDefinition;
+    private $dataDefinition;
 
     /**
-     * The array of dependentEntities this class can be given. When finding linked entities, APIExecutor
+     * The array of dependentEntities this class can be given. When finding linked entities, CurlHandler
      * uses this repository before looking for static data.
      *
      * @var array
@@ -64,6 +66,39 @@ class ApiExecutor
      */
     private $storeCode;
 
+    /**
+     * Operation to Curl method mapping.
+     *
+     * @var array
+     */
+    private static $curlMethodMapping = [
+            'create' => CurlInterface::POST,
+            'delete' => CurlInterface::DELETE,
+            'update' => CurlInterface::PUT,
+            'get' => CurlInterface::GET,
+        ];
+
+    /**
+     * Persisted entity.
+     *
+     * @var EntityDataObject
+     */
+    private $persistedEntity;
+
+    /**
+     * Persisted dependent entities.
+     *
+     * @var array
+     */
+    private $persistedDependentEntities = [];
+
+    /**
+     * If it's a REST request.
+     *
+     * @var bool
+     */
+    private $isRestRequest;
+
     /**
      * ApiSubObject constructor.
      * @param string $operation
@@ -76,13 +111,14 @@ public function __construct($operation, $entityObject, $dependentEntities = null
         $this->operation = $operation;
         $this->entityObject = $entityObject;
         $this->storeCode = $storeCode;
+        $this->isRestRequest = true;
         if ($dependentEntities != null) {
             foreach ($dependentEntities as $entity) {
                 $this->dependentEntities[$entity->getName()] = $entity;
             }
         }
 
-        $this->jsonDefinition = JsonDefinitionObjectHandler::getInstance()->getJsonDefinition(
+        $this->dataDefinition = DataDefinitionObjectHandler::getInstance()->getDataDefinition(
             $this->operation,
             $this->entityObject->getType()
         );
@@ -95,11 +131,10 @@ public function __construct($operation, $entityObject, $dependentEntities = null
      */
     public function executeRequest()
     {
-        $this->jsonDefinition->setStoreCode($this->storeCode);
-        $apiClientUrl = $this->jsonDefinition->getApiUrl();
+        $apiUrl = $this->dataDefinition->getApiUrl($this->storeCode);
 
         $matchedParams = [];
-        preg_match_all("/[{](.+?)[}]/", $apiClientUrl, $matchedParams);
+        preg_match_all("/[{](.+?)[}]/", $apiUrl, $matchedParams);
 
         if (!empty($matchedParams)) {
             foreach ($matchedParams[0] as $paramKey => $paramValue) {
@@ -107,134 +142,133 @@ public function executeRequest()
                     $matchedParams[1][$paramKey],
                     EntityDataObject::CEST_UNIQUE_VALUE
                 );
-                $apiClientUrl = str_replace($paramValue, $param, $apiClientUrl);
+                $apiUrl = str_replace($paramValue, $param, $apiUrl);
             }
         }
 
-        $authorization = $this->jsonDefinition->getAuth();
-        $headers = $this->jsonDefinition->getHeaders();
-
-        if ($authorization) {
-            $headers[] = $this->getAuthorizationHeader($authorization);
+        $executor = null;
+        $successRegex = null;
+        $returnRegex = null;
+        $headers = $this->dataDefinition->getHeaders();
+        $params = $this->convertDataArray($this->entityObject, $this->dataDefinition->getMetaData());
+
+        $authorization = $this->dataDefinition->getAuth();
+        switch ($authorization) {
+            case 'adminOauth':
+                $executor = new WebapiExecutor($this->storeCode);
+                $executor->write($apiUrl, $params, self::$curlMethodMapping[$this->operation], $headers);
+                break;
+            case 'adminFormkey':
+                $this->isRestRequest = false;
+                $executor = new AdminExecutor();
+                $executor->write($apiUrl, $params, self::$curlMethodMapping[$this->operation], $headers);
+                $successRegex = $this->dataDefinition->getSuccessRegex();
+                $returnRegex = $this->dataDefinition->getReturnRegex();
+                break;
+            case 'customFromkey':
+                $this->isRestRequest = false;
+                // TODO: add frontend request executor.
+                break;
         }
-
-        $jsonBody = $this->getEncodedJsonString();
-
-        $apiClientUtil = new ApiClientUtil(
-            $apiClientUrl,
-            $headers,
-            $this->jsonDefinition->getApiMethod(),
-            empty($jsonBody) ? null : $jsonBody
-        );
-
-        return $apiClientUtil->submit();
+        $response = $executor->read($successRegex, $returnRegex);
+        $executor->close();
+        return $response;
     }
 
     /**
-     * Returns the authorization token needed for some requests via REST call.
+     * If the request is a Rest.
      *
-     * @param string $authUrl
-     * @return string
+     * @return bool
      */
-    private function getAuthorizationHeader($authUrl)
+    public function isRestRequest()
     {
-        $headers = ['Content-Type: application/json'];
-        $authCreds = [
-            'username' => getenv('MAGENTO_ADMIN_USERNAME'),
-            'password' => getenv('MAGENTO_ADMIN_PASSWORD')
-        ];
-
-        $apiClientUtil = new ApiClientUtil($authUrl, $headers, 'POST', json_encode($authCreds));
-        $token = $apiClientUtil->submit();
-        $authHeader = 'Authorization: Bearer ' . str_replace('"', "", $token);
-
-        return $authHeader;
+        return $this->isRestRequest;
     }
 
     /**
-     * This function returns an array which is structurally equal to the json which is needed by the web api for
-     * entity creation. The function retrieves an array describing the json metadata and traverses any dependencies
-     * recursively forming an array which represents the json structure for the api of the desired type.
+     * This function returns an array which is structurally equal to the data which is needed by the magento web api,
+     * magento backend / frontend requests for entity creation. The function retrieves an array describing the entity's
+     * metadata and traverses any dependencies recursively forming an array which represents the data structure for the
+     * request of the desired entity type.
      *
      * @param EntityDataObject $entityObject
-     * @param array $jsonArrayMetadata
+     * @param array $dataArrayMetadata
      * @return array
      */
-    private function convertJsonArray($entityObject, $jsonArrayMetadata)
+    public function convertDataArray($entityObject, $dataArrayMetadata)
     {
-        $jsonArray = [];
+        $dataArray = [];
         self::incrementSequence($entityObject->getName());
 
-        foreach ($jsonArrayMetadata as $jsonElement) {
-            if ($jsonElement->getType() == JsonObjectExtractor::JSON_OBJECT_OBJ_NAME) {
-                $jsonArray[$jsonElement->getValue()] =
-                    $this->convertJsonArray($entityObject, $jsonElement->getNestedMetadata());
+        foreach ($dataArrayMetadata as $dataElement) {
+            if ($dataElement->getType() == DataObjectExtractor::MATA_DATA_OBJECT_NAME) {
+                $dataArray[$dataElement->getValue()] =
+                    $this->convertDataArray($entityObject, $dataElement->getNestedMetadata());
             }
 
-            $jsonElementType = $jsonElement->getValue();
+            $dataElementType = $dataElement->getValue();
 
-            if (in_array($jsonElementType, ApiExecutor::PRIMITIVE_TYPES)) {
+            if (in_array($dataElementType, CurlHandler::PRIMITIVE_TYPES)) {
                 $elementData = $entityObject->getDataByName(
-                    $jsonElement->getKey(),
+                    $dataElement->getKey(),
                     EntityDataObject::CEST_UNIQUE_VALUE
                 );
 
-                if (array_key_exists($jsonElement->getKey(), $entityObject->getUniquenessData())) {
-                    $uniqueData = $entityObject->getUniquenessDataByName($jsonElement->getKey());
+                if (array_key_exists($dataElement->getKey(), $entityObject->getUniquenessData())) {
+                    $uniqueData = $entityObject->getUniquenessDataByName($dataElement->getKey());
                     if ($uniqueData === 'suffix') {
                         $elementData .= (string)self::getSequence($entityObject->getName());
                     } else {
-                        $elementData = (string)self::getSequence($entityObject->getName())
-                            . $elementData;
+                        $elementData = (string)self::getSequence($entityObject->getName()) . $elementData;
                     }
                 }
 
-                $jsonArray[$jsonElement->getKey()] = $this->castValue($jsonElementType, $elementData);
+                $dataArray[$dataElement->getKey()] = $this->castValue($dataElementType, $elementData);
             } else {
-                $entityNamesOfType = $entityObject->getLinkedEntitiesOfType($jsonElementType);
+                $entityNamesOfType = $entityObject->getLinkedEntitiesOfType($dataElementType);
 
                 foreach ($entityNamesOfType as $entityName) {
-                    $jsonDataSubArray = $this->resolveNonPrimitiveElement($entityName, $jsonElement);
+                    $dataSubArray = $this->resolveNonPrimitiveElement($entityName, $dataElement);
 
-                    if ($jsonElement->getType() == 'array') {
-                        $jsonArray[$jsonElement->getKey()][] = $jsonDataSubArray;
+                    if ($dataElement->getType() == 'array') {
+                        $dataArray[$dataElement->getKey()][] = $dataSubArray;
                     } else {
-                        $jsonArray[$jsonElement->getKey()] = $jsonDataSubArray;
+                        $dataArray[$dataElement->getKey()] = $dataSubArray;
                     }
                 }
             }
         }
 
-        return $jsonArray;
+        return $dataArray;
     }
 
     /**
-     * Resolves JsonObjects and pre-defined metadata (in other operation.xml file) referenced by the json metadata
+     * Resolves dataObjects and pre-defined metadata (in other operation.xml file) referenced by the metadata.
      *
      * @param string $entityName
-     * @param JsonElement $jsonElement
+     * @param DataElement $dataElement
      * @return array
      */
-    private function resolveNonPrimitiveElement($entityName, $jsonElement)
+    private function resolveNonPrimitiveElement($entityName, $dataElement)
     {
         $linkedEntityObj = $this->resolveLinkedEntityObject($entityName);
 
-        if (!empty($jsonElement->getNestedJsonElement($jsonElement->getValue()))
-            && $jsonElement->getType() == 'array') {
-            $jsonSubArray = $this->convertJsonArray(
+        if (!empty($dataElement->getNestedDataElement($dataElement->getValue()))
+            && $dataElement->getType() == 'array') {
+            $dataSubArray = $this->convertDataArray(
                 $linkedEntityObj,
-                [$jsonElement->getNestedJsonElement($jsonElement->getValue())]
+                [$dataElement->getNestedDataElement($dataElement->getValue())]
             );
 
-            return $jsonSubArray[$jsonElement->getValue()];
+            return $dataSubArray[$dataElement->getValue()];
         }
 
-        $jsonMetadata = JsonDefinitionObjectHandler::getInstance()->getJsonDefinition(
+        $metaData = DataDefinitionObjectHandler::getInstance()->getDataDefinition(
             $this->operation,
             $linkedEntityObj->getType()
-        )->getJsonMetadata();
+        )->getMetaData();
 
-        return $this->convertJsonArray($linkedEntityObj, $jsonMetadata);
+        return $this->convertDataArray($linkedEntityObj, $metaData);
     }
 
     /**
@@ -253,18 +287,6 @@ private function resolveLinkedEntityObject($entityName)
         return DataObjectHandler::getInstance()->getObject($entityName);
     }
 
-    /**
-     * This function retrieves an array representative of json body for a request and returns it encoded as a string.
-     *
-     * @return string
-     */
-    public function getEncodedJsonString()
-    {
-        $jsonMetadataArray = $this->convertJsonArray($this->entityObject, $this->jsonDefinition->getJsonMetadata());
-
-        return json_encode($jsonMetadataArray, JSON_PRETTY_PRINT);
-    }
-
     /**
      * Increment an entity's sequence number by 1.
      *
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
similarity index 67%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
index 898fce8f8..dee646134 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/EntityApiHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\FunctionalTestingFramework\DataGenerator\Api;
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist;
 
-use Magento\FunctionalTestingFramework\Config\Data;
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
-use Magento\FunctionalTestingFramework\Test\Handlers\CestObjectHandler;
-use Magento\FunctionalTestingFramework\Util\TestGenerator;
 
-class EntityApiHandler
+/**
+ * Class DataPersistHandler
+ */
+class DataPersistHandler
 {
     /**
      * Entity object data to use for create, delete, or update.
@@ -29,7 +28,7 @@ class EntityApiHandler
     private $createdObject;
 
     /**
-     * Array of dependent entities, handed to ApiExecutor when entity is created.
+     * Array of dependent entities, handed to CurlHandler when entity is created.
      * @var array|null
      */
     private $dependentObjects = [];
@@ -61,19 +60,29 @@ public function __construct($entityObject, $dependentObjects = null)
      */
     public function createEntity($storeCode = null)
     {
-        if (!$storeCode) {
-            $storeCode = $this->storeCode;
+        if (isset($storeCode)) {
+            $this->storeCode = $storeCode;
         }
-        $apiExecutor = new ApiExecutor('create', $this->entityObject, $this->dependentObjects, $storeCode);
-        $result = $apiExecutor->executeRequest();
+        $curlHandler = new CurlHandler('create', $this->entityObject, $this->dependentObjects, $this->storeCode);
+        $result = $curlHandler->executeRequest();
 
-        $this->createdObject = new EntityDataObject(
-            $this->entityObject->getName(),
-            $this->entityObject->getType(),
-            json_decode($result, true),
-            null,
-            null // No uniqueness data is needed to be further processed.
-        );
+        if ($curlHandler->isRestRequest()) {
+            $this->createdObject = new EntityDataObject(
+                $this->entityObject->getName(),
+                $this->entityObject->getType(),
+                json_decode($result, true),
+                null,
+                null // No uniqueness data is needed to be further processed.
+            );
+        } else {
+            $this->createdObject = new EntityDataObject(
+                $this->entityObject->getName(),
+                $this->entityObject->getType(),
+                null,
+                null,
+                null
+            );
+        }
     }
 
     /**
@@ -87,8 +96,8 @@ public function deleteEntity($storeCode = null)
         if (!$storeCode) {
             $storeCode = $this->storeCode;
         }
-        $apiExecutor = new ApiExecutor('delete', $this->createdObject, null, $storeCode);
-        $result = $apiExecutor->executeRequest();
+        $curlHandler = new CurlHandler('delete', $this->createdObject, null, $storeCode);
+        $result = $curlHandler->executeRequest();
 
         return $result;
     }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
new file mode 100644
index 000000000..002e53645
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Util;
+
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataDefinitionObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataElement;
+
+class DataObjectExtractor
+{
+    const DATA_OBJECT_KEY = 'key';
+    const DATA_OBJECT_DATA_TYPE = 'dataType';
+    const DATA_OBJECT_ARRAY = 'array';
+    const DATA_OBJECT_ENTRY = 'entry';
+    const MATA_DATA_OBJECT_NAME = 'metaDataObject';
+    const DATA_OBJECT_ARRAY_VALUE = 'value';
+
+    /**
+     * DataObjectExtractor constructor.
+     */
+    public function __construct()
+    {
+        // public constructor
+    }
+
+    /**
+     * Takes an array representative of a dataObject and converts the array into a DataElement
+     *
+     * @param array $dataObjectArray
+     * @return DataElement
+     * @throws \Exception
+     */
+    public function extractDataObject($dataObjectArray)
+    {
+        // extract key
+        $dataDefKey = $dataObjectArray[DataObjectExtractor::DATA_OBJECT_KEY];
+
+        // extract dataType
+        $dataType = $dataObjectArray[DataObjectExtractor::DATA_OBJECT_DATA_TYPE];
+
+        $metaData = [];
+        $nestedDataElements = [];
+
+        // extract nested entries
+        if (array_key_exists(DataObjectExtractor::DATA_OBJECT_ENTRY, $dataObjectArray)) {
+            $this->extractDataEntries($metaData, $dataObjectArray[DataObjectExtractor::DATA_OBJECT_ENTRY]);
+        }
+
+        // extract nested arrays
+        if (array_key_exists(DataObjectExtractor::DATA_OBJECT_ARRAY, $dataObjectArray)) {
+            $this->extractDataArrays($metaData, $dataObjectArray[DataObjectExtractor::DATA_OBJECT_ARRAY]);
+        }
+
+        // extract nested
+        if (array_key_exists(DataObjectExtractor::MATA_DATA_OBJECT_NAME, $dataObjectArray)) {
+            foreach ($dataObjectArray[DataObjectExtractor::MATA_DATA_OBJECT_NAME] as $dataObject) {
+                $nestedDataElement = $this->extractDataObject($dataObject);
+                $nestedDataElements[$nestedDataElement->getKey()] = $nestedDataElement;
+            }
+        }
+
+        // a dataObject specified in xml must contain corresponding metadata for the object
+        if (empty($metaData)) {
+            throw new \Exception("must specify dataObject metadata if declaration is used");
+        }
+
+        return new DataElement(
+            $dataDefKey,
+            $dataType,
+            DataObjectExtractor::MATA_DATA_OBJECT_NAME,
+            $nestedDataElements,
+            $metaData
+        );
+    }
+
+    /**
+     * Creates and Adds relevant DataElements from data entries defined within dataObject array
+     *
+     * @param array &$metaData
+     * @param array $dataEntryArray
+     * @return void
+     */
+    private function extractDataEntries(&$metaData, $dataEntryArray)
+    {
+        foreach ($dataEntryArray as $dataEntryType) {
+            $metaData[] = new DataElement(
+                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
+                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
+                DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
+            );
+        }
+    }
+
+    /**
+     * Creates and Adds relevant DataElements from data arrays defined within dataObject array
+     *
+     * @param array &$dataArrayData
+     * @param array $dataArrayArray
+     * @return void
+     */
+    private function extractDataArrays(&$dataArrayData, $dataArrayArray)
+    {
+        foreach ($dataArrayArray as $dataEntryType) {
+            $dataElementValue =
+                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
+                [DataObjectExtractor::DATA_OBJECT_ARRAY_VALUE] ?? null;
+
+            $nestedDataElements = [];
+            if (array_key_exists(DataObjectExtractor::MATA_DATA_OBJECT_NAME, $dataEntryType)) {
+                //add the key to reference this object later
+                $dataObjectKeyedArray = $dataEntryType[DataObjectExtractor::MATA_DATA_OBJECT_NAME][0];
+                $dataObjectKeyedArray[DataObjectExtractor::DATA_OBJECT_KEY] =
+                    $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY];
+                $dataElement = $this->extractDataObject($dataObjectKeyedArray);
+                $dataElementValue = $dataElement->getValue();
+                $nestedDataElements[$dataElement->getValue()] = $dataElement;
+            }
+            $dataArrayData[] = new DataElement(
+                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
+                $dataElementValue,
+                DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY,
+                $nestedDataElements
+            );
+        }
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
deleted file mode 100644
index 6f30192b9..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\FunctionalTestingFramework\DataGenerator\Util;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\JsonDefinitionObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonElement;
-
-class JsonObjectExtractor
-{
-    const JSON_OBJECT_KEY = 'key';
-    const JSON_OBJECT_DATA_TYPE = 'dataType';
-    const JSON_OBJECT_ARRAY = 'array';
-    const JSON_OBJECT_ENTRY = 'entry';
-    const JSON_OBJECT_OBJ_NAME = 'jsonObject';
-    const JSON_OBJECT_ARRAY_VALUE = 'value';
-
-    /**
-     * JsonObjectExtractor constructor.
-     */
-    public function __construct()
-    {
-        // public constructor
-    }
-
-    /**
-     * Takes an array representative of a jsonObject and converts the array into a JsonElement
-     *
-     * @param array $jsonObjectArray
-     * @return JsonElement
-     * @throws \Exception
-     */
-    public function extractJsonObject($jsonObjectArray)
-    {
-        // extract key
-        $jsonDefKey = $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_KEY];
-
-        // extract dataType
-        $dataType = $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_DATA_TYPE];
-
-        $jsonMetadata = [];
-        $nestedJsonElements = [];
-
-        // extract nested entries
-        if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_ENTRY, $jsonObjectArray)) {
-            $this->extractJsonEntries($jsonMetadata, $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_ENTRY]);
-        }
-
-        // extract nested arrays
-        if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_ARRAY, $jsonObjectArray)) {
-            $this->extractJsonArrays($jsonMetadata, $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_ARRAY]);
-        }
-
-        // extract nested
-        if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_OBJ_NAME, $jsonObjectArray)) {
-            foreach ($jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_OBJ_NAME] as $jsonObject) {
-                $nestedJsonElement = $this->extractJsonObject($jsonObject);
-                $nestedJsonElements[$nestedJsonElement->getKey()] = $nestedJsonElement;
-            }
-        }
-
-        // a jsonObject specified in xml must contain corresponding metadata for the object
-        if (empty($jsonMetadata)) {
-            throw new \Exception("must specificy jsonObject metadata if declaration is used");
-        }
-
-        return new JsonElement(
-            $jsonDefKey,
-            $dataType,
-            JsonObjectExtractor::JSON_OBJECT_OBJ_NAME,
-            $nestedJsonElements,
-            $jsonMetadata
-        );
-    }
-
-    /**
-     * Creates and Adds relevant JsonElements from json entries defined within jsonObject array
-     *
-     * @param array &$jsonMetadata
-     * @param array $jsonEntryArray
-     * @return void
-     */
-    private function extractJsonEntries(&$jsonMetadata, $jsonEntryArray)
-    {
-        foreach ($jsonEntryArray as $jsonEntryType) {
-            $jsonMetadata[] = new JsonElement(
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
-            );
-        }
-    }
-
-    /**
-     * Creates and Adds relevant JsonElements from json arrays defined within jsonObject array
-     *
-     * @param array &$jsonArrayData
-     * @param array $jsonArrayArray
-     * @return void
-     */
-    private function extractJsonArrays(&$jsonArrayData, $jsonArrayArray)
-    {
-        foreach ($jsonArrayArray as $jsonEntryType) {
-            $jsonElementValue =
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
-                [JsonObjectExtractor::JSON_OBJECT_ARRAY_VALUE] ?? null;
-
-            $nestedJsonElements = [];
-            if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_OBJ_NAME, $jsonEntryType)) {
-                //add the key to reference this object later
-                $jsonObjectKeyedArray = $jsonEntryType[JsonObjectExtractor::JSON_OBJECT_OBJ_NAME][0];
-                $jsonObjectKeyedArray[JsonObjectExtractor::JSON_OBJECT_KEY] =
-                    $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY];
-                $jsonElement = $this->extractJsonObject($jsonObjectKeyedArray);
-                $jsonElementValue = $jsonElement->getValue();
-                $nestedJsonElements[$jsonElement->getValue()] = $jsonElement;
-            }
-            $jsonArrayData[] = new JsonElement(
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
-                $jsonElementValue,
-                JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY,
-                $nestedJsonElements
-            );
-        }
-    }
-}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
index e74923dbc..4b7f08268 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
@@ -6,7 +6,7 @@
                 <xs:element name="operation" maxOccurs="unbounded" minOccurs="0">
                     <xs:complexType>
                         <xs:choice minOccurs="0" maxOccurs="unbounded">
-                            <xs:element name="jsonObject" type="jsonObject" maxOccurs="unbounded" minOccurs="0"/>
+                            <xs:element name="metaDataObject" type="metaDataObject" maxOccurs="unbounded" minOccurs="0"/>
                             <xs:element name="entry" type="entry" maxOccurs="unbounded" minOccurs="0"/>
                             <xs:element name="array" type="array" maxOccurs="unbounded" minOccurs="0"/>
                             <xs:element name="header" type="header" maxOccurs="unbounded" minOccurs="0"/>
@@ -16,19 +16,21 @@
                         <xs:attribute type="xs:string" name="dataType" use="required"/>
                         <xs:attribute type="operationEnum" name="type" use="required"/>
                         <xs:attribute type="xs:string" name="url"/>
-                        <xs:attribute type="xs:string" name="auth"/>
+                        <xs:attribute type="authEnum" name="auth"/>
                         <xs:attribute type="xs:string" name="method"/>
                         <xs:attribute type="xs:string" name="storeCode" default="default"/>
+                        <xs:attribute type="xs:string" name="successRegex"/>
+                        <xs:attribute type="xs:string" name="returnRegex"/>
                     </xs:complexType>
                 </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:complexType name="jsonObject">
+    <xs:complexType name="metaDataObject">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
             <xs:element name="entry" type="entry" maxOccurs="unbounded" minOccurs="0"/>
             <xs:element name="array" type="array" maxOccurs="unbounded" minOccurs="0"/>
-            <xs:element name="jsonObject" type="jsonObject" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="metaDataObject" type="metaDataObject" maxOccurs="unbounded" minOccurs="0"/>
         </xs:choice>
         <xs:attribute type="xs:string" name="key"/>
         <xs:attribute type="xs:string" name="dataType" use="required"/>
@@ -43,7 +45,7 @@
     </xs:complexType>
     <xs:complexType name="array">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="jsonObject" type="jsonObject" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="metaDataObject" type="metaDataObject" maxOccurs="unbounded" minOccurs="0"/>
             <xs:element name="value" type="xs:string" maxOccurs="1" minOccurs="0"/>
         </xs:choice>
         <xs:attribute type="xs:string" name="key" use="required"/>
@@ -71,4 +73,12 @@
             <xs:enumeration value="update" />
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="authEnum" final="restriction" >
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="adminOauth" />
+            <xs:enumeration value="customerOauth" />
+            <xs:enumeration value="adminFormkey" />
+            <xs:enumeration value="customerFormkey" />
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>
\ No newline at end of file
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/sample.xml b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/sample.xml
deleted file mode 100644
index 722e5e6e7..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/sample.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="DataProfileSchema.xsd">
-    <entity name="CustomerEntityOne" type="Website">
-        <dataConfig>simpleConfiguration</dataConfig>
-        <dataConfig>regressionConfiguration</dataConfig>
-        <dataObject name="Personal">
-            <data key="firstName">asdf</data>
-            <data key="LastName"/>
-            <data key="Address"/>
-            <data key="DateOfBirth"/>
-            <assert>AssertNumberOne</assert>
-            <assert>AssertNumberTwo</assert>
-        </dataObject>
-        <dataObject name="Billing">
-            <data key="FirstName">FirstNameData</data>
-            <data key="LastName"/>
-            <data key="Address"/>
-            <assert>AssertNumberOne</assert>
-            <assert>AssertNumberTwo</assert>
-            <assert>AssertNumberThree</assert>
-        </dataObject>
-    </entity>
-</config>
\ No newline at end of file
diff --git a/src/Magento/FunctionalTestingFramework/Util/ApiClientUtil.php b/src/Magento/FunctionalTestingFramework/Util/ApiClientUtil.php
deleted file mode 100644
index 0db7075b8..000000000
--- a/src/Magento/FunctionalTestingFramework/Util/ApiClientUtil.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\FunctionalTestingFramework\Util;
-
-class ApiClientUtil
-{
-    /**
-     * Curl resource for request execution
-     *
-     * @var resource $curl
-     */
-    private $curl;
-
-    /**
-     * Api Path for the request
-     *
-     * @var string $apiPath
-     */
-    private $apiPath;
-
-    /**
-     * Headers to be included in the request
-     *
-     * @var array $headers
-     */
-    private $headers;
-
-    /**
-     * An HTTP Request Type (e.g. CREATE, GET, POST, DELETE)
-     *
-     * @var string $apiOperation
-     */
-    private $apiOperation;
-
-    /**
-     * The json body to be submitted in the request
-     *
-     * @var string $jsonBody
-     */
-    private $jsonBody;
-
-    /**
-     * A list of successful HTTP responses that will not trigger an exception
-     *
-     * @var int[] SUCCESSFUL_HTTP_CODES
-     */
-    const SUCCESSFUL_HTTP_CODES = [200, 201, 202, 203, 204, 205];
-
-    /**
-     * ApiClientUtil constructor.
-     * @param string $apiPath
-     * @param array $headers
-     * @param string $apiOperation
-     * @param string $jsonBody
-     */
-    public function __construct($apiPath, $headers, $apiOperation, $jsonBody)
-    {
-        $this->apiPath = $apiPath;
-        $this->headers = $headers;
-        $this->apiOperation = $apiOperation;
-        $this->jsonBody = $jsonBody;
-
-        $this->curl = curl_init();
-    }
-
-    /**
-     * Submits the request based on object properties
-     *
-     * @param bool $verbose
-     * @return string|bool
-     * @throws \Exception
-     */
-    public function submit($verbose = false)
-    {
-        $url = null;
-
-        if ($this->jsonBody) {
-            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $this->jsonBody);
-        }
-
-        curl_setopt($this->curl, CURLOPT_VERBOSE, $verbose);
-
-        if ((getenv('MAGENTO_RESTAPI_SERVER_HOST') !== false)
-            && (getenv('MAGENTO_RESTAPI_SERVER_HOST') !== '') ) {
-            $url = getenv('MAGENTO_RESTAPI_SERVER_HOST');
-        } else {
-            $url = getenv('MAGENTO_BASE_URL');
-        }
-
-        if ((getenv('MAGENTO_RESTAPI_SERVER_PORT') !== false)
-            && (getenv('MAGENTO_RESTAPI_SERVER_PORT') !== '')) {
-            $url .= ':' . getenv('MAGENTO_RESTAPI_SERVER_PORT');
-        }
-
-        curl_setopt_array($this->curl, [
-            CURLOPT_RETURNTRANSFER => 1,
-            CURLOPT_HTTPHEADER => $this->headers,
-            CURLOPT_CUSTOMREQUEST => $this->apiOperation,
-            CURLOPT_URL => $url . $this->apiPath
-        ]);
-
-        $response = curl_exec($this->curl);
-        $http_code = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
-
-        if ($response === false || !in_array($http_code, ApiClientUtil::SUCCESSFUL_HTTP_CODES)) {
-            throw new \Exception('API returned response code: ' . $http_code . '    Response:' . $response);
-        }
-
-        curl_close($this->curl);
-
-        return $response;
-    }
-}
diff --git a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
new file mode 100644
index 000000000..990f341d6
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2017 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\Util\Protocol;
+
+/**
+ * Curl protocol interface.
+ */
+interface CurlInterface
+{
+    /**
+     * HTTP request methods.
+     */
+    const GET = 'GET';
+    const PUT = 'PUT';
+    const POST = 'POST';
+    const DELETE = 'DELETE';
+
+    /**
+     * Add additional option to cURL.
+     *
+     * @param int $option
+     * @param mixed $value
+     * @return $this
+     */
+    public function addOption($option, $value);
+
+    /**
+     * Send request to the remote server.
+     *
+     * @param string $url
+     * @param mixed $params
+     * @param string $method
+     * @param mixed $headers
+     * @return void
+     */
+    public function write($url, $params = [], $method = CurlInterface::POST, $headers = []);
+
+    /**
+     * Read response from server.
+     *
+     * @param string $successRegex
+     * @param string $returnRegex
+     * @return string|array
+     */
+    public function read($successRegex = null, $returnRegex = null);
+
+    /**
+     * Close the connection to the server.
+     *
+     * @return void
+     */
+    public function close();
+}
diff --git a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
new file mode 100644
index 000000000..8d826a331
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * Copyright © 2017 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\Util\Protocol;
+
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
+
+/**
+ * HTTP Curl Adapter.
+ */
+class CurlTransport implements CurlInterface
+{
+    /**
+     * Parameters array.
+     *
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * Curl handle.
+     *
+     * @var resource
+     */
+    protected $resource;
+
+    /**
+     * Allow parameters.
+     *
+     * @var array
+     */
+    protected $allowedParams = [
+        'timeout' => CURLOPT_TIMEOUT,
+        'maxredirects' => CURLOPT_MAXREDIRS,
+        'proxy' => CURLOPT_PROXY,
+        'ssl_cert' => CURLOPT_SSLCERT,
+        'userpwd' => CURLOPT_USERPWD,
+    ];
+
+    /**
+     * Array of CURL options.
+     *
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * A list of successful HTTP responses that will not trigger an exception.
+     *
+     * @var int[] SUCCESSFUL_HTTP_CODES
+     */
+    const SUCCESSFUL_HTTP_CODES = [200, 201, 202, 203, 204, 205];
+
+    /**
+     * Apply current configuration array to curl resource.
+     *
+     * @return $this
+     */
+    protected function applyConfig()
+    {
+        // apply additional options to cURL
+        foreach ($this->options as $option => $value) {
+            curl_setopt($this->getResource(), $option, $value);
+        }
+
+        if (empty($this->config)) {
+            return $this;
+        }
+        foreach (array_keys($this->config) as $param) {
+            if (array_key_exists($param, $this->allowedParams)) {
+                curl_setopt($this->getResource(), $this->allowedParams[$param], $this->config[$param]);
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * Set array of additional cURL options.
+     *
+     * @param array $options
+     * @return $this
+     */
+    public function setOptions(array $options = [])
+    {
+        $this->options = $options;
+        return $this;
+    }
+
+    /**
+     * Add additional option to cURL.
+     *
+     * @param int $option
+     * @param mixed $value
+     * @return $this
+     */
+    public function addOption($option, $value)
+    {
+        $this->options[$option] = $value;
+        return $this;
+    }
+
+    /**
+     * Set the configuration array for the adapter.
+     *
+     * @param array $config
+     * @return $this
+     */
+    public function setConfig(array $config = [])
+    {
+        $this->config = $config;
+        return $this;
+    }
+
+    /**
+     * Send request to the remote server.
+     *
+     * @param string $url
+     * @param mixed $params
+     * @param string $method
+     * @param mixed $headers
+     * @return void
+     * @throws TestFrameworkException
+     */
+    public function write($url, $params = [], $method = CurlInterface::POST, $headers = [])
+    {
+        $this->applyConfig();
+        $options = [
+            CURLOPT_URL => $url,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_COOKIEFILE => '',
+            CURLOPT_HTTPHEADER => $headers,
+            CURLOPT_SSL_VERIFYPEER => false,
+        ];
+        switch ($method) {
+            case CurlInterface::POST:
+                $options[CURLOPT_POST] = true;
+                $options[CURLOPT_POSTFIELDS] = $params;
+                break;
+            case CurlInterface::PUT:
+                $options[CURLOPT_CUSTOMREQUEST] = self::PUT;
+                $options[CURLOPT_POSTFIELDS] = $params;
+                break;
+            case CurlInterface::DELETE:
+                $options[CURLOPT_CUSTOMREQUEST] = self::DELETE;
+                break;
+            case CurlInterface::GET:
+                $options[CURLOPT_HTTPGET] = true;
+                break;
+            default:
+                throw new TestFrameworkException("Undefined curl method: $method");
+        }
+
+        curl_setopt_array($this->getResource(), $options);
+    }
+
+    /**
+     * Read response from server.
+     *
+     * @param string $successRegex
+     * @param string $returnRegex
+     * @return string
+     * @throws TestFrameworkException
+     */
+    public function read($successRegex = null, $returnRegex = null)
+    {
+        $response = curl_exec($this->getResource());
+
+        if ($response === false) {
+            throw new TestFrameworkException(curl_error($this->getResource()));
+        }
+        $http_code = $this->getInfo(CURLINFO_HTTP_CODE);
+        if (!in_array($http_code, self::SUCCESSFUL_HTTP_CODES)) {
+            throw new TestFrameworkException('Error HTTP response code: ' . $http_code . '    Response:' . $response);
+        }
+
+        return $response;
+    }
+
+    /**
+     * Close the connection to the server.
+     *
+     * @return void
+     */
+    public function close()
+    {
+        curl_close($this->getResource());
+        $this->resource = null;
+    }
+
+    /**
+     * Returns a cURL handle on success.
+     *
+     * @return resource
+     */
+    protected function getResource()
+    {
+        if ($this->resource === null) {
+            $this->resource = curl_init();
+        }
+        return $this->resource;
+    }
+
+    /**
+     * Get last error number.
+     *
+     * @return int
+     */
+    public function getErrno()
+    {
+        return curl_errno($this->getResource());
+    }
+
+    /**
+     * Get string with last error for the current session.
+     *
+     * @return string
+     */
+    public function getError()
+    {
+        return curl_error($this->getResource());
+    }
+
+    /**
+     * Get information regarding a specific transfer.
+     *
+     * @param int $opt CURLINFO option
+     * @return mixed
+     */
+    public function getInfo($opt = 0)
+    {
+        return curl_getinfo($this->getResource(), $opt);
+    }
+
+    /**
+     * Provide curl_multi_* requests support.
+     *
+     * @param array $urls
+     * @param array $options
+     * @return array
+     */
+    public function multiRequest(array $urls, array $options = [])
+    {
+        $handles = [];
+        $result = [];
+
+        $multiHandle = curl_multi_init();
+
+        foreach ($urls as $key => $url) {
+            $handles[$key] = curl_init();
+            curl_setopt($handles[$key], CURLOPT_URL, $url);
+            curl_setopt($handles[$key], CURLOPT_HEADER, 0);
+            curl_setopt($handles[$key], CURLOPT_RETURNTRANSFER, 1);
+            if (!empty($options)) {
+                curl_setopt_array($handles[$key], $options);
+            }
+            curl_multi_add_handle($multiHandle, $handles[$key]);
+        }
+        $process = null;
+        do {
+            curl_multi_exec($multiHandle, $process);
+            usleep(100);
+        } while ($process > 0);
+
+        foreach ($handles as $key => $handle) {
+            $result[$key] = curl_multi_getcontent($handle);
+            curl_multi_remove_handle($multiHandle, $handle);
+        }
+        curl_multi_close($multiHandle);
+        return $result;
+    }
+
+    /**
+     * Extract the response code from a response string.
+     *
+     * @param string $responseStr
+     * @return int
+     */
+    public static function extractCode($responseStr)
+    {
+        preg_match("|^HTTP/[\d\.x]+ (\d+)|", $responseStr, $m);
+
+        if (isset($m[1])) {
+            return (int)$m[1];
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 41267f01e..5d7692631 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -155,7 +155,7 @@ private function generateUseStatementsPhp()
         $useStatementsPhp = "use Magento\FunctionalTestingFramework\AcceptanceTester;\n";
 
         $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;\n";
-        $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Api\EntityApiHandler;\n";
+        $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistHandler;\n";
         $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;\n";
 
         $allureStatements = [
@@ -433,15 +433,15 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
 
                     if ($hookObject) {
                         $createEntityFunctionCall = sprintf("\t\t\$this->%s->createEntity(", $key);
-                        $entityApiHandlerFunctionCall = sprintf(
-                            "\t\t\$this->%s = new EntityApiHandler($%s",
+                        $dataPersistHandlerFunctionCall = sprintf(
+                            "\t\t\$this->%s = new DataPersistHandler($%s",
                             $key,
                             $entity
                         );
                     } else {
                         $createEntityFunctionCall = sprintf("\t\t\$%s->createEntity(", $key);
-                        $entityApiHandlerFunctionCall = sprintf(
-                            "\t\t$%s = new EntityApiHandler($%s",
+                        $dataPersistHandlerFunctionCall = sprintf(
+                            "\t\t$%s = new DataPersistHandler($%s",
                             $key,
                             $entity
                         );
@@ -454,7 +454,7 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                     }
 
                     //If required-entities are defined, reassign dataObject to not overwrite the static definition.
-                    //Also, EntityApiHandler needs to be defined with customData array.
+                    //Also, DataPersistHandler needs to be defined with customData array.
                     if (!empty($requiredEntities)) {
                         $testSteps .= sprintf(
                             "\t\t$%s = new EntityDataObject($%s->getName(), $%s->getType(), $%s->getData()
@@ -468,14 +468,14 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                             $entity
                         );
 
-                        $entityApiHandlerFunctionCall .= sprintf(
+                        $dataPersistHandlerFunctionCall .= sprintf(
                             ", [%s]);\n",
                             implode(', ', $requiredEntityObjects)
                         );
                     } else {
-                        $entityApiHandlerFunctionCall .= ");\n";
+                        $dataPersistHandlerFunctionCall .= ");\n";
                     }
-                    $testSteps .= $entityApiHandlerFunctionCall;
+                    $testSteps .= $dataPersistHandlerFunctionCall;
                     $testSteps .= $createEntityFunctionCall;
                     break;
                 case "deleteData":
@@ -804,7 +804,7 @@ private function generateHooksPhp($hookObjects)
             foreach ($hookObject->getActions() as $step) {
                 if ($step->getType() == "createData") {
                     $hooks .= "\t/**\n";
-                    $hooks .= sprintf("\t  * @var EntityApiHandler $%s;\n", $step->getMergeKey());
+                    $hooks .= sprintf("\t  * @var DataPersistHandler $%s;\n", $step->getMergeKey());
                     $hooks .= "\t */\n";
                     $hooks .= sprintf("\tprotected $%s;\n\n", $step->getMergeKey());
                     $createData = true;

From 36bc43cd2151589be50fe305a11393bddc4ae6d1 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Thu, 21 Sep 2017 13:04:39 -0500
Subject: [PATCH 03/19] MQE-376

Added selector1 and selector2 to array.
---
 .../FunctionalTestingFramework/Test/Objects/ActionObject.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
index cb58c361b..3cf9a3138 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -20,7 +20,7 @@
 class ActionObject
 {
     const DATA_ENABLED_ATTRIBUTES = ["userInput", "parameterArray"];
-    const SELECTOR_ENABLED_ATTRIBUTES = ['selector', 'dependentSelector'];
+    const SELECTOR_ENABLED_ATTRIBUTES = ['selector', 'dependentSelector', "selector1", "selector2"];
     const MERGE_ACTION_ORDER_AFTER = 'after';
     const ACTION_ATTRIBUTE_URL = 'url';
     const ACTION_ATTRIBUTE_SELECTOR = 'selector';

From 3ef29c8c3fa1d78dcdb76a4b3fd36eede849f9e6 Mon Sep 17 00:00:00 2001
From: KevinBKozan <kkozan@magento.com>
Date: Tue, 12 Sep 2017 15:39:12 -0500
Subject: [PATCH 04/19] MQE-359

Removed addslashes, added replace of " to \" since &quot; is read in a " via the xml parser.

(cherry picked from commit c7c7bc9)
---
 src/Magento/FunctionalTestingFramework/Util/TestGenerator.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 5d7692631..8bffdb2d0 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -996,7 +996,8 @@ private function wrapWithSingleQuotes($input)
         if (empty($input)) {
             return '';
         }
-        $input = addslashes($input);
+        //Only replace &quot; with \" so that it doesn't break outer string.
+        $input = str_replace('"', '\"', $input);
         return sprintf('"%s"', $input);
     }
 

From 05190b1d85a1c3d39904ac978f612104b8286ec6 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Wed, 13 Sep 2017 14:22:59 -0500
Subject: [PATCH 05/19] MQE-359

Removed addslashes, added replace of " to \" since &quot; is read in a " via the xml parser.
Rename wrapWithSingleQuotes to wrapWithDoubleQuotes, and fixed PHP Doc for the function.

(cherry picked from commit 1f81574)
---
 .../Util/TestGenerator.php                    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 8bffdb2d0..1f3196087 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -336,15 +336,15 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
             if (isset($customActionAttributes['selectorArray'])) {
                 $selector = $customActionAttributes['selectorArray'];
             } elseif (isset($customActionAttributes['selector'])) {
-                $selector = $this->wrapWithSingleQuotes($customActionAttributes['selector']);
+                $selector = $this->wrapWithDoubleQuotes($customActionAttributes['selector']);
             }
 
             if (isset($customActionAttributes['selector1'])) {
-                $selector1 = $this->wrapWithSingleQuotes($customActionAttributes['selector1']);
+                $selector1 = $this->wrapWithDoubleQuotes($customActionAttributes['selector1']);
             }
 
             if (isset($customActionAttributes['selector2'])) {
-                $selector2 = $this->wrapWithSingleQuotes($customActionAttributes['selector2']);
+                $selector2 = $this->wrapWithDoubleQuotes($customActionAttributes['selector2']);
             }
 
             if (isset($customActionAttributes['x'])) {
@@ -364,15 +364,15 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
             }
 
             if (isset($customActionAttributes['locale'])) {
-                $locale = $this->wrapWithSingleQuotes($customActionAttributes['locale']);
+                $locale = $this->wrapWithDoubleQuotes($customActionAttributes['locale']);
             }
 
             if (isset($customActionAttributes['username'])) {
-                $username = $this->wrapWithSingleQuotes($customActionAttributes['username']);
+                $username = $this->wrapWithDoubleQuotes($customActionAttributes['username']);
             }
 
             if (isset($customActionAttributes['password'])) {
-                $password = $this->wrapWithSingleQuotes($customActionAttributes['password']);
+                $password = $this->wrapWithDoubleQuotes($customActionAttributes['password']);
             }
 
             if (isset($customActionAttributes['width'])) {
@@ -384,15 +384,15 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
             }
 
             if (isset($customActionAttributes['value'])) {
-                $value = $this->wrapWithSingleQuotes($customActionAttributes['value']);
+                $value = $this->wrapWithDoubleQuotes($customActionAttributes['value']);
             }
 
             if (isset($customActionAttributes['button'])) {
-                $button = $this->wrapWithSingleQuotes($customActionAttributes['button']);
+                $button = $this->wrapWithDoubleQuotes($customActionAttributes['button']);
             }
 
             if (isset($customActionAttributes['parameter'])) {
-                $parameter = $this->wrapWithSingleQuotes($customActionAttributes['parameter']);
+                $parameter = $this->wrapWithDoubleQuotes($customActionAttributes['parameter']);
             }
 
             switch ($actionName) {
@@ -584,7 +584,7 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                     $testSteps .= $this->wrapFunctionCall($actor, $actionName, $function);
                     break;
                 case "executeJS":
-                    $testSteps .= $this->wrapFunctionCall($actor, $actionName, $this->wrapWithSingleQuotes($function));
+                    $testSteps .= $this->wrapFunctionCall($actor, $actionName, $this->wrapWithDoubleQuotes($function));
                     break;
                 case "performOn":
                 case "waitForElementChange":
@@ -594,7 +594,7 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                     $testSteps .= $this->wrapFunctionCall(
                         $actor,
                         $actionName,
-                        $this->wrapWithSingleQuotes($function),
+                        $this->wrapWithDoubleQuotes($function),
                         $time
                     );
                     break;
@@ -972,26 +972,26 @@ private function addUniquenessFunctionCall($input)
                 $parts[$i] = $this->stripWrappedQuotes($parts[$i]);
             }
             if (!empty($parts[0])) {
-                $output = $this->wrapWithSingleQuotes($parts[0]);
+                $output = $this->wrapWithDoubleQuotes($parts[0]);
             }
             $output .= $output === '' ? $matches[0] : '.' . $matches[0];
             if (!empty($parts[1])) {
-                $output .= '.' . $this->wrapWithSingleQuotes($parts[1]);
+                $output .= '.' . $this->wrapWithDoubleQuotes($parts[1]);
             }
         } else {
-            $output = $this->wrapWithSingleQuotes($input);
+            $output = $this->wrapWithDoubleQuotes($input);
         }
 
         return $output;
     }
 
     /**
-     * Wrap input string with single quotes.
+     * Wrap input string with double quotes, and replaces " with \" to prevent broken PHP when generated.
      *
      * @param string $input
      * @return string
      */
-    private function wrapWithSingleQuotes($input)
+    private function wrapWithDoubleQuotes($input)
     {
         if (empty($input)) {
             return '';

From 423534c65309420654ab06914aa2d61711c57360 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@magento.com>
Date: Fri, 22 Sep 2017 10:14:15 -0500
Subject: [PATCH 06/19] MQE-369: Implement non web api data persistence.

---
 .../DataGenerator/Persist/CurlHandler.php     | 63 +++++++++++--------
 .../Persist/DataPersistHandler.php            | 42 ++++++-------
 2 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
index 1dc55619a..d0c2c77dc 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -51,6 +51,13 @@ class CurlHandler
      */
     private $dependentEntities = [];
 
+    /**
+     * Persisted data array.
+     *
+     * @var array
+     */
+    private $persistedDataArray;
+
     /**
      * The array of entity name and number of objects being created,
      * we don't need to track objects in update and delete operations.
@@ -79,25 +86,11 @@ class CurlHandler
         ];
 
     /**
-     * Persisted entity.
-     *
-     * @var EntityDataObject
-     */
-    private $persistedEntity;
-
-    /**
-     * Persisted dependent entities.
-     *
-     * @var array
-     */
-    private $persistedDependentEntities = [];
-
-    /**
-     * If it's a REST request.
+     * If it's a web api request.
      *
      * @var bool
      */
-    private $isRestRequest;
+    private $isWebApiRequest;
 
     /**
      * ApiSubObject constructor.
@@ -111,7 +104,7 @@ public function __construct($operation, $entityObject, $dependentEntities = null
         $this->operation = $operation;
         $this->entityObject = $entityObject;
         $this->storeCode = $storeCode;
-        $this->isRestRequest = true;
+        $this->isWebApiRequest = true;
         if ($dependentEntities != null) {
             foreach ($dependentEntities as $entity) {
                 $this->dependentEntities[$entity->getName()] = $entity;
@@ -150,23 +143,33 @@ public function executeRequest()
         $successRegex = null;
         $returnRegex = null;
         $headers = $this->dataDefinition->getHeaders();
-        $params = $this->convertDataArray($this->entityObject, $this->dataDefinition->getMetaData());
+        $this->persistedDataArray = $this->convertDataArray($this->entityObject, $this->dataDefinition->getMetaData());
 
         $authorization = $this->dataDefinition->getAuth();
         switch ($authorization) {
             case 'adminOauth':
                 $executor = new WebapiExecutor($this->storeCode);
-                $executor->write($apiUrl, $params, self::$curlMethodMapping[$this->operation], $headers);
+                $executor->write(
+                    $apiUrl,
+                    $this->persistedDataArray,
+                    self::$curlMethodMapping[$this->operation],
+                    $headers
+                );
                 break;
             case 'adminFormkey':
-                $this->isRestRequest = false;
+                $this->isWebApiRequest = false;
                 $executor = new AdminExecutor();
-                $executor->write($apiUrl, $params, self::$curlMethodMapping[$this->operation], $headers);
+                $executor->write(
+                    $apiUrl,
+                    $this->persistedDataArray,
+                    self::$curlMethodMapping[$this->operation],
+                    $headers
+                );
                 $successRegex = $this->dataDefinition->getSuccessRegex();
                 $returnRegex = $this->dataDefinition->getReturnRegex();
                 break;
             case 'customFromkey':
-                $this->isRestRequest = false;
+                $this->isWebApiRequest = false;
                 // TODO: add frontend request executor.
                 break;
         }
@@ -176,13 +179,23 @@ public function executeRequest()
     }
 
     /**
-     * If the request is a Rest.
+     * If it's a web api request.
      *
      * @return bool
      */
-    public function isRestRequest()
+    public function isWebApiRequest()
+    {
+        return $this->isWebApiRequest;
+    }
+
+    /**
+     * Get persisted data array.
+     *
+     * @return array
+     */
+    public function getPersistedDataArray()
     {
-        return $this->isRestRequest;
+        return $this->persistedDataArray;
     }
 
     /**
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
index dee646134..1b4b5ced2 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
@@ -41,7 +41,8 @@ class DataPersistHandler
     private $storeCode;
 
     /**
-     * ApiPersistenceHandler constructor.
+     * DataPersistHandler constructor.
+     *
      * @param EntityDataObject $entityObject
      * @param array $dependentObjects
      */
@@ -66,23 +67,20 @@ public function createEntity($storeCode = null)
         $curlHandler = new CurlHandler('create', $this->entityObject, $this->dependentObjects, $this->storeCode);
         $result = $curlHandler->executeRequest();
 
-        if ($curlHandler->isRestRequest()) {
-            $this->createdObject = new EntityDataObject(
-                $this->entityObject->getName(),
-                $this->entityObject->getType(),
-                json_decode($result, true),
-                null,
-                null // No uniqueness data is needed to be further processed.
-            );
+        $persistedDataArray = $curlHandler->getPersistedDataArray();
+        if ($curlHandler->isWebApiRequest()) {
+            $persistedDataArray = array_merge($persistedDataArray, json_decode($result, true));
         } else {
-            $this->createdObject = new EntityDataObject(
-                $this->entityObject->getName(),
-                $this->entityObject->getType(),
-                null,
-                null,
-                null
-            );
+            $persistedDataArray = array_merge($persistedDataArray, ['return' => $result]);
         }
+
+        $this->createdObject = new EntityDataObject(
+            $this->entityObject->getName(),
+            $this->entityObject->getType(),
+            $persistedDataArray,
+            null,
+            null
+        );
     }
 
     /**
@@ -93,10 +91,10 @@ public function createEntity($storeCode = null)
      */
     public function deleteEntity($storeCode = null)
     {
-        if (!$storeCode) {
-            $storeCode = $this->storeCode;
+        if (isset($storeCode)) {
+            $this->storeCode = $storeCode;
         }
-        $curlHandler = new CurlHandler('delete', $this->createdObject, null, $storeCode);
+        $curlHandler = new CurlHandler('delete', $this->createdObject, null, $this->storeCode);
         $result = $curlHandler->executeRequest();
 
         return $result;
@@ -118,11 +116,7 @@ public function getCreatedObject()
      */
     public function getCreatedDataByName($dataName)
     {
-        $data = $this->createdObject->getDataByName($dataName, EntityDataObject::NO_UNIQUE_PROCESS);
-        if (empty($data)) {
-            $data = $this->entityObject->getDataByName($dataName, EntityDataObject::CEST_UNIQUE_VALUE);
-        }
-        return $data;
+        return $this->createdObject->getDataByName($dataName, EntityDataObject::NO_UNIQUE_PROCESS);
     }
 
     // TODO add update function

From 93e5768262800f0e6a0e979a889223fd48a8260a Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@magento.com>
Date: Tue, 26 Sep 2017 13:32:38 -0500
Subject: [PATCH 07/19] Resolve merge conflicts: Merge remote-tracking branch
 'origin/sprint-develop' into MQE-326-multi-stores

    # Conflicts:
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
    #       src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
---
 .../DataGenerator/Api/ApiExecutor.php         | 368 ------------------
 .../Handlers/DataDefinitionObjectHandler.php  |   5 +-
 .../Handlers/JsonDefinitionObjectHandler.php  | 216 ----------
 .../DataGenerator/Persist/CurlHandler.php     |  67 +++-
 .../Util/DataObjectExtractor.php              |   7 +-
 .../Util/JsonObjectExtractor.php              | 132 -------
 6 files changed, 67 insertions(+), 728 deletions(-)
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php

diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
deleted file mode 100644
index 2cad2bf16..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\FunctionalTestingFramework\DataGenerator\Api;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\JsonDefinitionObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonDefinition;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonElement;
-use Magento\FunctionalTestingFramework\DataGenerator\Util\JsonObjectExtractor;
-use Magento\FunctionalTestingFramework\Util\ApiClientUtil;
-use Magento\Setup\Exception;
-
-/**
- * Class ApiExecutor
- */
-class ApiExecutor
-{
-    const PRIMITIVE_TYPES = ['string', 'boolean', 'integer', 'double', 'array'];
-    const EXCEPTION_REQUIRED_DATA = "%s of key \" %s\" in \"%s\" is required by metadata, but was not provided.";
-
-    /**
-     * Describes the operation for the executor ('create','update','delete')
-     *
-     * @var string
-     */
-    private $operation;
-
-    /**
-     * The entity object data being created, updated, or deleted.
-     *
-     * @var EntityDataObject $entityObject
-     */
-    private $entityObject;
-
-    /**
-     * The json definitions used to map the operation.
-     *
-     * @var JsonDefinition $jsonDefinition
-     */
-    private $jsonDefinition;
-
-    /**
-     * The array of dependentEntities this class can be given. When finding linked entities, APIExecutor
-     * uses this repository before looking for static data.
-     *
-     * @var array
-     */
-    private $dependentEntities = [];
-
-    /**
-     * The array of entity name and number of objects being created,
-     * we don't need to track objects in update and delete operations.
-     *
-     * @var array
-     */
-    private static $entitySequences = [];
-
-    /**
-     * ApiSubObject constructor.
-     * @param string $operation
-     * @param EntityDataObject $entityObject
-     * @param array $dependentEntities
-     */
-    public function __construct($operation, $entityObject, $dependentEntities = null)
-    {
-        $this->operation = $operation;
-        $this->entityObject = $entityObject;
-        if ($dependentEntities != null) {
-            foreach ($dependentEntities as $entity) {
-                $this->dependentEntities[$entity->getName()] = $entity;
-            }
-        }
-
-        $this->jsonDefinition = JsonDefinitionObjectHandler::getInstance()->getJsonDefinition(
-            $this->operation,
-            $this->entityObject->getType()
-        );
-    }
-
-    /**
-     * Executes an api request based on parameters given by constructor.
-     *
-     * @return string | null
-     */
-    public function executeRequest()
-    {
-        $apiClientUrl = $this->jsonDefinition->getApiUrl();
-
-        $matchedParams = [];
-        preg_match_all("/[{](.+?)[}]/", $apiClientUrl, $matchedParams);
-
-        if (!empty($matchedParams)) {
-            foreach ($matchedParams[0] as $paramKey => $paramValue) {
-                $param = $this->entityObject->getDataByName(
-                    $matchedParams[1][$paramKey],
-                    EntityDataObject::CEST_UNIQUE_VALUE
-                );
-                $apiClientUrl = str_replace($paramValue, $param, $apiClientUrl);
-            }
-        }
-
-        $authorization = $this->jsonDefinition->getAuth();
-        $headers = $this->jsonDefinition->getHeaders();
-
-        if ($authorization) {
-            $headers[] = $this->getAuthorizationHeader($authorization);
-        }
-
-        $jsonBody = $this->getEncodedJsonString();
-
-        $apiClientUtil = new ApiClientUtil(
-            $apiClientUrl,
-            $headers,
-            $this->jsonDefinition->getApiMethod(),
-            empty($jsonBody) ? null : $jsonBody
-        );
-
-        return $apiClientUtil->submit();
-    }
-
-    /**
-     * Returns the authorization token needed for some requests via REST call.
-     *
-     * @param string $authUrl
-     * @return string
-     */
-    private function getAuthorizationHeader($authUrl)
-    {
-        $headers = ['Content-Type: application/json'];
-        $authCreds = [
-            'username' => getenv('MAGENTO_ADMIN_USERNAME'),
-            'password' => getenv('MAGENTO_ADMIN_PASSWORD')
-        ];
-
-        $apiClientUtil = new ApiClientUtil($authUrl, $headers, 'POST', json_encode($authCreds));
-        $token = $apiClientUtil->submit();
-        $authHeader = 'Authorization: Bearer ' . str_replace('"', "", $token);
-
-        return $authHeader;
-    }
-
-    /**
-     * This function returns an array which is structurally equal to the json which is needed by the web api for
-     * entity creation. The function retrieves an array describing the json metadata and traverses any dependencies
-     * recursively forming an array which represents the json structure for the api of the desired type.
-     *
-     * @param EntityDataObject $entityObject
-     * @param array $jsonArrayMetadata
-     * @return array
-     * @throws \Exception
-     */
-    private function convertJsonArray($entityObject, $jsonArrayMetadata)
-    {
-        $jsonArray = [];
-        self::incrementSequence($entityObject->getName());
-
-        foreach ($jsonArrayMetadata as $jsonElement) {
-            if ($jsonElement->getType() == JsonObjectExtractor::JSON_OBJECT_OBJ_NAME) {
-                $entityObj = $this->resolveJsonObjectAndEntityData($entityObject, $jsonElement->getValue());
-                $jsonArray[$jsonElement->getValue()] =
-                    $this->convertJsonArray($entityObj, $jsonElement->getNestedMetadata());
-                continue;
-            }
-
-            $jsonElementType = $jsonElement->getValue();
-
-            if (in_array($jsonElementType, ApiExecutor::PRIMITIVE_TYPES)) {
-                $elementData = $entityObject->getDataByName(
-                    $jsonElement->getKey(),
-                    EntityDataObject::CEST_UNIQUE_VALUE
-                );
-
-                // If data was defined at all, attempt to put it into JSON body
-                // If data was not defined, and element is required, throw exception
-                // If no data is defined, don't input defaults per primitive into JSON for the data
-                if ($elementData != null) {
-                    if (array_key_exists($jsonElement->getKey(), $entityObject->getUniquenessData())) {
-                        $uniqueData = $entityObject->getUniquenessDataByName($jsonElement->getKey());
-                        if ($uniqueData === 'suffix') {
-                            $elementData .= (string)self::getSequence($entityObject->getName());
-                        } else {
-                            $elementData = (string)self::getSequence($entityObject->getName()) . $elementData;
-                        }
-                    }
-                    $jsonArray[$jsonElement->getKey()] = $this->castValue($jsonElementType, $elementData);
-
-                } elseif ($jsonElement->getRequired()) {
-                    throw new \Exception(sprintf(
-                        ApiExecutor::EXCEPTION_REQUIRED_DATA,
-                        $jsonElement->getType(),
-                        $jsonElement->getKey(),
-                        $this->entityObject->getName()
-                    ));
-                }
-            } else {
-                $entityNamesOfType = $entityObject->getLinkedEntitiesOfType($jsonElementType);
-
-                // If an element is required by metadata, but was not provided in the entity, throw an exception
-                if ($jsonElement->getRequired() && $entityNamesOfType == null) {
-                    throw new \Exception(sprintf(
-                        ApiExecutor::EXCEPTION_REQUIRED_DATA,
-                        $jsonElement->getType(),
-                        $jsonElement->getKey(),
-                        $this->entityObject->getName()
-                    ));
-                }
-                foreach ($entityNamesOfType as $entityName) {
-                    $jsonDataSubArray = $this->resolveNonPrimitiveElement($entityName, $jsonElement);
-
-                    if ($jsonElement->getType() == 'array') {
-                        $jsonArray[$jsonElement->getKey()][] = $jsonDataSubArray;
-                    } else {
-                        $jsonArray[$jsonElement->getKey()] = $jsonDataSubArray;
-                    }
-                }
-            }
-        }
-
-        return $jsonArray;
-    }
-
-    /**
-     * This function does a comparison of the entity object being matched to the json element. If there is a mismatch in
-     * type we attempt to use a nested entity, if the entities are properly matched, we simply return the object.
-     *
-     * @param EntityDataObject $entityObject
-     * @param string $jsonElementValue
-     * @return EntityDataObject|null
-     */
-    private function resolveJsonObjectAndEntityData($entityObject, $jsonElementValue)
-    {
-        if ($jsonElementValue != $entityObject->getType()) {
-            // if we have a mismatch attempt to retrieve linked data and return just the first linkage
-            $linkName = $entityObject->getLinkedEntitiesOfType($jsonElementValue)[0];
-            return DataObjectHandler::getInstance()->getObject($linkName);
-        }
-
-        return $entityObject;
-    }
-
-    /**
-     * Resolves JsonObjects and pre-defined metadata (in other operation.xml file) referenced by the json metadata
-     *
-     * @param string $entityName
-     * @param JsonElement $jsonElement
-     * @return array
-     */
-    private function resolveNonPrimitiveElement($entityName, $jsonElement)
-    {
-        $linkedEntityObj = $this->resolveLinkedEntityObject($entityName);
-
-        // in array case
-        if (!empty($jsonElement->getNestedJsonElement($jsonElement->getValue()))
-            && $jsonElement->getType() == 'array'
-        ) {
-            $jsonSubArray = $this->convertJsonArray(
-                $linkedEntityObj,
-                [$jsonElement->getNestedJsonElement($jsonElement->getValue())]
-            );
-
-            return $jsonSubArray[$jsonElement->getValue()];
-        }
-
-        $jsonMetadata = JsonDefinitionObjectHandler::getInstance()->getJsonDefinition(
-            $this->operation,
-            $linkedEntityObj->getType()
-        )->getJsonMetadata();
-
-        return $this->convertJsonArray($linkedEntityObj, $jsonMetadata);
-    }
-
-    /**
-     * Method to wrap entity resolution, checks locally defined dependent entities first
-     *
-     * @param string $entityName
-     * @return EntityDataObject
-     */
-    private function resolveLinkedEntityObject($entityName)
-    {
-        // check our dependent entity list to see if we have this defined
-        if (array_key_exists($entityName, $this->dependentEntities)) {
-            return $this->dependentEntities[$entityName];
-        }
-
-        return DataObjectHandler::getInstance()->getObject($entityName);
-    }
-
-    /**
-     * This function retrieves an array representative of json body for a request and returns it encoded as a string.
-     *
-     * @return string
-     */
-    public function getEncodedJsonString()
-    {
-        $jsonMetadataArray = $this->convertJsonArray($this->entityObject, $this->jsonDefinition->getJsonMetadata());
-
-        return json_encode($jsonMetadataArray, JSON_PRETTY_PRINT);
-    }
-
-    /**
-     * Increment an entity's sequence number by 1.
-     *
-     * @param string $entityName
-     * @return void
-     */
-    private static function incrementSequence($entityName)
-    {
-        if (array_key_exists($entityName, self::$entitySequences)) {
-            self::$entitySequences[$entityName]++;
-        } else {
-            self::$entitySequences[$entityName] = 1;
-        }
-    }
-
-    /**
-     * Get the current sequence number for an entity.
-     *
-     * @param string $entityName
-     * @return int
-     */
-    private static function getSequence($entityName)
-    {
-        if (array_key_exists($entityName, self::$entitySequences)) {
-            return self::$entitySequences[$entityName];
-        }
-        return 0;
-    }
-
-    // @codingStandardsIgnoreStart
-
-    /**
-     * This function takes a string value and its corresponding type and returns the string cast
-     * into its the type passed.
-     *
-     * @param string $type
-     * @param string $value
-     * @return mixed
-     */
-    private function castValue($type, $value)
-    {
-        $newVal = $value;
-
-        switch ($type) {
-            case 'string':
-                break;
-            case 'integer':
-                $newVal = (integer)$value;
-                break;
-            case 'boolean':
-                if (strtolower($newVal) === 'false') {
-                    return false;
-                }
-                $newVal = (boolean)$value;
-                break;
-            case 'double':
-                $newVal = (double)$value;
-                break;
-        }
-
-        return $newVal;
-    }
-    // @codingStandardsIgnoreEnd
-}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
index e43c46832..af207bc4b 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
@@ -40,6 +40,7 @@ class DataDefinitionObjectHandler implements ObjectHandlerInterface
     const ENTITY_OPERATION_OBJECT_KEY = 'key';
     const ENTITY_OPERATION_OBJECT_VALUE = 'value';
     const ENTITY_OPERATION_DATA_OBJECT = 'metaDataObject';
+    const ENTITY_OPERATION_REQUIRED = 'required';
 
     /**
      * Singleton Instance of class
@@ -173,7 +174,8 @@ private function initDataDefinitions()
                     $metaData[] = new DataElement(
                         $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
                         $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                        DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
+                        DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
+                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
                     );
                 }
             }
@@ -201,6 +203,7 @@ private function initDataDefinitions()
                         $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
                         $value,
                         $type,
+                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
                         $subMetaData
                     );
                 }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
deleted file mode 100644
index 9243ff46e..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\FunctionalTestingFramework\DataGenerator\Handlers;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonDefinition;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonElement;
-use Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationMetadataParser;
-use Magento\FunctionalTestingFramework\DataGenerator\Util\JsonObjectExtractor;
-use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
-use Magento\FunctionalTestingFramework\ObjectManagerFactory;
-
-class JsonDefinitionObjectHandler implements ObjectHandlerInterface
-{
-    const ENTITY_OPERATION_ROOT_TAG = 'operation';
-    const ENTITY_OPERATION_TYPE = 'type';
-    const ENTITY_OPERATION_DATA_TYPE = 'dataType';
-    const ENTITY_OPERATION_URL = 'url';
-    const ENTITY_OPERATION_METHOD = 'method';
-    const ENTITY_OPERATION_AUTH = 'auth';
-    const ENTITY_OPERATION_HEADER = 'header';
-    const ENTITY_OPERATION_HEADER_PARAM = 'param';
-    const ENTITY_OPERATION_HEADER_VALUE = 'value';
-    const ENTITY_OPERATION_URL_PARAM = 'param';
-    const ENTITY_OPERATION_URL_PARAM_TYPE = 'type';
-    const ENTITY_OPERATION_URL_PARAM_KEY = 'key';
-    const ENTITY_OPERATION_URL_PARAM_VALUE = 'value';
-    const ENTITY_OPERATION_ENTRY = 'entry';
-    const ENTITY_OPERATION_ENTRY_KEY = 'key';
-    const ENTITY_OPERATION_ENTRY_VALUE = 'value';
-    const ENTITY_OPERATION_ARRAY = 'array';
-    const ENTITY_OPERATION_ARRAY_KEY = 'key';
-    const ENTITY_OPERATION_ARRAY_VALUE = 'value';
-    const ENTITY_OPERATION_OBJECT = 'object';
-    const ENTITY_OPERATION_OBJECT_KEY = 'key';
-    const ENTITY_OPERATION_OBJECT_VALUE = 'value';
-    const ENTITY_OPERATION_JSON_OBJECT = 'jsonObject';
-    const ENTITY_OPERATION_REQUIRED = 'required';
-
-    /**
-     * Singleton Instance of class
-     *
-     * @var JsonDefinitionObjectHandler
-     */
-    private static $JSON_DEFINITION_OBJECT_HANDLER;
-
-    /**
-     * Array containing all Json Definition Objects
-     *
-     * @var array
-     */
-    private $jsonDefinitions = [];
-
-    /**
-     * Object used to extract jsonObjects from array into JsonElements
-     *
-     * @var JsonObjectExtractor
-     */
-    private $jsonDefExtractor;
-
-    /**
-     * Singleton method to return JsonDefinitionProcessor.
-     *
-     * @return JsonDefinitionObjectHandler
-     */
-    public static function getInstance()
-    {
-        if (!self::$JSON_DEFINITION_OBJECT_HANDLER) {
-            self::$JSON_DEFINITION_OBJECT_HANDLER = new JsonDefinitionObjectHandler();
-            self::$JSON_DEFINITION_OBJECT_HANDLER->initJsonDefinitions();
-        }
-
-        return self::$JSON_DEFINITION_OBJECT_HANDLER;
-    }
-
-    /**
-     * Returns a JsonDefinition object based on name
-     *
-     * @param string $jsonDefinitionName
-     * @return JsonDefinition
-     */
-    public function getObject($jsonDefinitionName)
-    {
-        return $this->jsonDefinitions[$jsonDefinitionName];
-    }
-
-    /**
-     * Returns all Json Definition objects
-     *
-     * @return array
-     */
-    public function getAllObjects()
-    {
-        return $this->jsonDefinitions;
-    }
-
-    /**
-     * JsonDefintionArrayProcessor constructor.
-     */
-    private function __construct()
-    {
-        $this->jsonDefExtractor = new JsonObjectExtractor();
-    }
-
-    /**
-     * This method takes an operation such as create and a data type such as 'customer' and returns the corresponding
-     * json definition defined in metadata.xml
-     *
-     * @param string $operation
-     * @param string $dataType
-     * @return JsonDefinition
-     */
-    public function getJsonDefinition($operation, $dataType)
-    {
-        return $this->getObject($operation . $dataType);
-    }
-
-    /**
-     * This method reads all jsonDefinitions from metadata xml into memory.
-     * @return void
-     */
-    private function initJsonDefinitions()
-    {
-        $objectManager = ObjectManagerFactory::getObjectManager();
-        $metadataParser = $objectManager->create(OperationMetadataParser::class);
-        foreach ($metadataParser->readOperationMetadata()[JsonDefinitionObjectHandler::ENTITY_OPERATION_ROOT_TAG] as
-                 $jsonDefName => $jsonDefArray) {
-            $operation = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_TYPE];
-            $dataType = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_DATA_TYPE];
-            $url = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL] ?? null;
-            $method = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_METHOD] ?? null;
-            $auth = $jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_AUTH] ?? null;
-            $headers = [];
-            $params = [];
-            $jsonMetadata = [];
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER] as $headerEntry) {
-                    $headers[] = $headerEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER_PARAM] . ': ' .
-                        $headerEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE];
-                }
-            }
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM] as $paramEntry) {
-                    $params[$paramEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_TYPE]]
-                    [$paramEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_KEY]] =
-                        $paramEntry[JsonDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_VALUE];
-                }
-            }
-
-            // extract relevant jsonObjects as JsonElements
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_JSON_OBJECT, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_JSON_OBJECT] as $jsonObjectArray) {
-                    $jsonMetadata[] = $this->jsonDefExtractor->extractJsonObject($jsonObjectArray);
-                }
-            }
-
-            //handle loose entries
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY] as $jsonEntryType) {
-                    $jsonMetadata[] = new JsonElement(
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                        JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
-                    );
-                }
-            }
-
-            if (array_key_exists(JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY, $jsonDefArray)) {
-                foreach ($jsonDefArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY] as $jsonEntryType) {
-                    $jsonSubMetadata = [];
-                    $value = null;
-                    $type = null;
-
-                    if (array_key_exists('jsonObject', $jsonEntryType)) {
-                        $jsonNestedElement = $this->jsonDefExtractor->extractJsonObject(
-                            $jsonEntryType['jsonObject'][0]
-                        );
-                        $jsonSubMetadata[$jsonNestedElement->getKey()] = $jsonNestedElement;
-                        $value = $jsonNestedElement->getValue();
-                        $type = $jsonNestedElement->getKey();
-                    } else {
-                        $value = $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
-                        [JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                        $type = [JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                    }
-
-                    $jsonMetadata[] = new JsonElement(
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
-                        $value,
-                        $type,
-                        $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
-                        $jsonSubMetadata
-                    );
-                }
-            }
-
-            $this->jsonDefinitions[$operation . $dataType] = new JsonDefinition(
-                $jsonDefName,
-                $operation,
-                $dataType,
-                $method,
-                $url,
-                $auth,
-                $headers,
-                $params,
-                $jsonMetadata
-            );
-        }
-    }
-}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
index d0c2c77dc..2a0166774 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -21,6 +21,7 @@
 class CurlHandler
 {
     const PRIMITIVE_TYPES = ['string', 'boolean', 'integer', 'double', 'array'];
+    const EXCEPTION_REQUIRED_DATA = "%s of key \" %s\" in \"%s\" is required by metadata, but was not provided.";
 
     /**
      * Describes the operation for the executor ('create','update','delete')
@@ -207,6 +208,7 @@ public function getPersistedDataArray()
      * @param EntityDataObject $entityObject
      * @param array $dataArrayMetadata
      * @return array
+     * @throws \Exception
      */
     public function convertDataArray($entityObject, $dataArrayMetadata)
     {
@@ -215,8 +217,10 @@ public function convertDataArray($entityObject, $dataArrayMetadata)
 
         foreach ($dataArrayMetadata as $dataElement) {
             if ($dataElement->getType() == DataObjectExtractor::MATA_DATA_OBJECT_NAME) {
+                $entityObj = $this->resolveDataObjectAndEntityData($entityObject, $dataElement->getValue());
                 $dataArray[$dataElement->getValue()] =
                     $this->convertDataArray($entityObject, $dataElement->getNestedMetadata());
+                continue;
             }
 
             $dataElementType = $dataElement->getValue();
@@ -227,19 +231,40 @@ public function convertDataArray($entityObject, $dataArrayMetadata)
                     EntityDataObject::CEST_UNIQUE_VALUE
                 );
 
-                if (array_key_exists($dataElement->getKey(), $entityObject->getUniquenessData())) {
-                    $uniqueData = $entityObject->getUniquenessDataByName($dataElement->getKey());
-                    if ($uniqueData === 'suffix') {
-                        $elementData .= (string)self::getSequence($entityObject->getName());
-                    } else {
-                        $elementData = (string)self::getSequence($entityObject->getName()) . $elementData;
+                // If data was defined at all, attempt to put it into JSON body
+                // If data was not defined, and element is required, throw exception
+                // If no data is defined, don't input defaults per primitive into JSON for the data
+                if ($elementData != null) {
+                    if (array_key_exists($dataElement->getKey(), $entityObject->getUniquenessData())) {
+                        $uniqueData = $entityObject->getUniquenessDataByName($dataElement->getKey());
+                        if ($uniqueData === 'suffix') {
+                            $elementData .= (string)self::getSequence($entityObject->getName());
+                        } else {
+                            $elementData = (string)self::getSequence($entityObject->getName()) . $elementData;
+                        }
                     }
-                }
 
-                $dataArray[$dataElement->getKey()] = $this->castValue($dataElementType, $elementData);
+                    $dataArray[$dataElement->getKey()] = $this->castValue($dataElementType, $elementData);
+                } elseif ($dataElement->getRequired()) {
+                    throw new \Exception(sprintf(
+                        CurlHandler::EXCEPTION_REQUIRED_DATA,
+                        $dataElement->getType(),
+                        $dataElement->getKey(),
+                        $this->entityObject->getName()
+                    ));
+                }
             } else {
                 $entityNamesOfType = $entityObject->getLinkedEntitiesOfType($dataElementType);
 
+                // If an element is required by metadata, but was not provided in the entity, throw an exception
+                if ($dataElement->getRequired() && $entityNamesOfType == null) {
+                    throw new \Exception(sprintf(
+                        CurlHandler::EXCEPTION_REQUIRED_DATA,
+                        $dataElement->getType(),
+                        $dataElement->getKey(),
+                        $this->entityObject->getName()
+                    ));
+                }
                 foreach ($entityNamesOfType as $entityName) {
                     $dataSubArray = $this->resolveNonPrimitiveElement($entityName, $dataElement);
 
@@ -255,6 +280,25 @@ public function convertDataArray($entityObject, $dataArrayMetadata)
         return $dataArray;
     }
 
+    /**
+     * This function does a comparison of the entity object being matched to the data element. If there is a mismatch in
+     * type we attempt to use a nested entity, if the entities are properly matched, we simply return the object.
+     *
+     * @param EntityDataObject $entityObject
+     * @param string $dataElementValue
+     * @return EntityDataObject|null
+     */
+    private function resolveDataObjectAndEntityData($entityObject, $dataElementValue)
+    {
+        if ($dataElementValue != $entityObject->getType()) {
+            // if we have a mismatch attempt to retrieve linked data and return just the first linkage
+            $linkName = $entityObject->getLinkedEntitiesOfType($dataElementValue)[0];
+            return DataObjectHandler::getInstance()->getObject($linkName);
+        }
+
+        return $entityObject;
+    }
+
     /**
      * Resolves dataObjects and pre-defined metadata (in other operation.xml file) referenced by the metadata.
      *
@@ -266,8 +310,10 @@ private function resolveNonPrimitiveElement($entityName, $dataElement)
     {
         $linkedEntityObj = $this->resolveLinkedEntityObject($entityName);
 
+        // in array case
         if (!empty($dataElement->getNestedDataElement($dataElement->getValue()))
-            && $dataElement->getType() == 'array') {
+            && $dataElement->getType() == 'array'
+        ) {
             $dataSubArray = $this->convertDataArray(
                 $linkedEntityObj,
                 [$dataElement->getNestedDataElement($dataElement->getValue())]
@@ -349,6 +395,9 @@ private function castValue($type, $value)
                 $newVal = (integer)$value;
                 break;
             case 'boolean':
+                if (strtolower($newVal) === 'false') {
+                    return false;
+                }
                 $newVal = (boolean)$value;
                 break;
             case 'double':
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
index 002e53645..52aa04da9 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
@@ -58,7 +58,7 @@ public function extractDataObject($dataObjectArray)
         if (array_key_exists(DataObjectExtractor::MATA_DATA_OBJECT_NAME, $dataObjectArray)) {
             foreach ($dataObjectArray[DataObjectExtractor::MATA_DATA_OBJECT_NAME] as $dataObject) {
                 $nestedDataElement = $this->extractDataObject($dataObject);
-                $nestedDataElements[$nestedDataElement->getKey()] = $nestedDataElement;
+                $metaData[] = $nestedDataElement;
             }
         }
 
@@ -71,6 +71,7 @@ public function extractDataObject($dataObjectArray)
             $dataDefKey,
             $dataType,
             DataObjectExtractor::MATA_DATA_OBJECT_NAME,
+            $dataObjectArray[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
             $nestedDataElements,
             $metaData
         );
@@ -89,7 +90,8 @@ private function extractDataEntries(&$metaData, $dataEntryArray)
             $metaData[] = new DataElement(
                 $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
                 $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY
+                DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
+                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
             );
         }
     }
@@ -122,6 +124,7 @@ private function extractDataArrays(&$dataArrayData, $dataArrayArray)
                 $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
                 $dataElementValue,
                 DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY,
+                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
                 $nestedDataElements
             );
         }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
deleted file mode 100644
index f5c80065a..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\FunctionalTestingFramework\DataGenerator\Util;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\JsonDefinitionObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\JsonElement;
-
-class JsonObjectExtractor
-{
-    const JSON_OBJECT_KEY = 'key';
-    const JSON_OBJECT_DATA_TYPE = 'dataType';
-    const JSON_OBJECT_ARRAY = 'array';
-    const JSON_OBJECT_ENTRY = 'entry';
-    const JSON_OBJECT_OBJ_NAME = 'jsonObject';
-    const JSON_OBJECT_ARRAY_VALUE = 'value';
-
-    /**
-     * JsonObjectExtractor constructor.
-     */
-    public function __construct()
-    {
-        // public constructor
-    }
-
-    /**
-     * Takes an array representative of a jsonObject and converts the array into a JsonElement
-     *
-     * @param array $jsonObjectArray
-     * @return JsonElement
-     * @throws \Exception
-     */
-    public function extractJsonObject($jsonObjectArray)
-    {
-        // extract key
-        $jsonDefKey = $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_KEY];
-
-        // extract dataType
-        $dataType = $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_DATA_TYPE];
-
-        $jsonMetadata = [];
-        $nestedJsonElements = [];
-
-        // extract nested entries
-        if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_ENTRY, $jsonObjectArray)) {
-            $this->extractJsonEntries($jsonMetadata, $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_ENTRY]);
-        }
-
-        // extract nested arrays
-        if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_ARRAY, $jsonObjectArray)) {
-            $this->extractJsonArrays($jsonMetadata, $jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_ARRAY]);
-        }
-
-        // extract nested
-        if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_OBJ_NAME, $jsonObjectArray)) {
-            foreach ($jsonObjectArray[JsonObjectExtractor::JSON_OBJECT_OBJ_NAME] as $jsonObject) {
-                $nestedJsonElement = $this->extractJsonObject($jsonObject);
-                $jsonMetadata[] = $nestedJsonElement;
-            }
-        }
-
-        // a jsonObject specified in xml must contain corresponding metadata for the object
-        if (empty($jsonMetadata)) {
-            throw new \Exception("must specificy jsonObject metadata if declaration is used");
-        }
-
-        return new JsonElement(
-            $jsonDefKey,
-            $dataType,
-            JsonObjectExtractor::JSON_OBJECT_OBJ_NAME,
-            $jsonObjectArray[JsonDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
-            $nestedJsonElements,
-            $jsonMetadata
-        );
-    }
-
-    /**
-     * Creates and Adds relevant JsonElements from json entries defined within jsonObject array
-     *
-     * @param array &$jsonMetadata
-     * @param array $jsonEntryArray
-     * @return void
-     */
-    private function extractJsonEntries(&$jsonMetadata, $jsonEntryArray)
-    {
-        foreach ($jsonEntryArray as $jsonEntryType) {
-            $jsonMetadata[] = new JsonElement(
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                JsonDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
-            );
-        }
-    }
-
-    /**
-     * Creates and Adds relevant JsonElements from json arrays defined within jsonObject array
-     *
-     * @param array &$jsonArrayData
-     * @param array $jsonArrayArray
-     * @return void
-     */
-    private function extractJsonArrays(&$jsonArrayData, $jsonArrayArray)
-    {
-        foreach ($jsonArrayArray as $jsonEntryType) {
-            $jsonElementValue =
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
-                [JsonObjectExtractor::JSON_OBJECT_ARRAY_VALUE] ?? null;
-
-            $nestedJsonElements = [];
-            if (array_key_exists(JsonObjectExtractor::JSON_OBJECT_OBJ_NAME, $jsonEntryType)) {
-                //add the key to reference this object later
-                $jsonObjectKeyedArray = $jsonEntryType[JsonObjectExtractor::JSON_OBJECT_OBJ_NAME][0];
-                $jsonObjectKeyedArray[JsonObjectExtractor::JSON_OBJECT_KEY] =
-                    $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY];
-                $jsonElement = $this->extractJsonObject($jsonObjectKeyedArray);
-                $jsonElementValue = $jsonElement->getValue();
-                $nestedJsonElements[$jsonElement->getValue()] = $jsonElement;
-            }
-            $jsonArrayData[] = new JsonElement(
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
-                $jsonElementValue,
-                JsonDefinitionObjectHandler::ENTITY_OPERATION_ARRAY,
-                $jsonEntryType[JsonDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
-                $nestedJsonElements
-            );
-        }
-    }
-}

From 5ee90706015c94874835be7711c229aa59443057 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Tue, 26 Sep 2017 15:16:50 -0500
Subject: [PATCH 08/19] MQE-353

* MQE-353

CAP changes, along with exception bugfix found in last spring demo.

* MQE-353 CR

Changed ternary to be included in parent if.
---
 .../Test/Objects/ActionObject.php             | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
index 3cf9a3138..796224fa1 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -25,8 +25,7 @@ class ActionObject
     const ACTION_ATTRIBUTE_URL = 'url';
     const ACTION_ATTRIBUTE_SELECTOR = 'selector';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w.\[\]]+}}/';
-    const ACTION_ATTRIBUTE_VARIABLE_REGEX_NESTED = '/{{[\w.\[\]()\',${} ]+}}/';
+    const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/{{[\w.\[\]()\',$ ]+}}/';
 
     /**
      * The unique identifier for the action
@@ -298,15 +297,7 @@ private function stripAndReturnParameters($reference)
      */
     private function findAndReplaceReferences($objectHandler, $inputString)
     {
-        //Determine if there are Parethesis and parameters. If not, use strict regex. If so, use nested regex.
-        preg_match_all(ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER, $inputString, $variableMatches);
-        if (empty($variableMatches[0])) {
-            $regex = ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN;
-        } else {
-            $regex = ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_NESTED;
-        }
-        preg_match_all($regex, $inputString, $matches);
-
+        preg_match_all(ActionObject::ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN, $inputString, $matches);
         if (empty($matches[0])) {
             return $inputString;
         }
@@ -383,24 +374,38 @@ private function matchParameterReferences($reference, $parameters)
     {
         preg_match_all('/{{[\w.]+}}/', $reference, $varMatches);
         if (count($varMatches[0]) > count($parameters)) {
+            if (is_array($parameters)) {
+                $parametersGiven = implode(",", $parameters);
+            } elseif ($parameters == null) {
+                $parametersGiven = "NONE";
+            } else {
+                $parametersGiven = $parameters;
+            }
             throw new TestReferenceException(
                 "Parameter Resolution Failed: Not enough parameters given for reference " .
-                $reference . ". Parameters Given: " . implode(",", $parameters)
+                $reference . ". Parameters Given: " . $parametersGiven
             );
         } elseif (count($varMatches[0]) < count($parameters)) {
             throw new TestReferenceException(
                 "Parameter Resolution Failed: Too many parameters given for reference " .
-                $reference . ". Parameters Given: " . implode(",", $parameters)
+                $reference . ". Parameters Given: " . implode(", ", $parameters)
             );
         }
 
         //Attempt to Resolve {{data}} references to actual output.
+        //If regex matched it means that it's either a 'StringLiteral' or $key.data$/$$key.data$$ reference.
+        //Else assume it's a normal {{data.key}} reference and recurse through findAndReplace
         $resolvedParameters = [];
         foreach ($parameters as $parameter) {
-            $resolvedParameters[] = $this->findAndReplaceReferences(
-                DataObjectHandler::getInstance(),
-                $parameter
-            );
+            preg_match_all("/[$'][\w.$]+[$']/", $parameter, $match);
+            if (!empty($match[0])) {
+                $resolvedParameters[] = ltrim(rtrim($parameter, "'"), "'");
+            } else {
+                $resolvedParameters[] = $this->findAndReplaceReferences(
+                    DataObjectHandler::getInstance(),
+                    '{{' . $parameter . '}}'
+                );
+            }
         }
 
         $resolveIndex = 0;

From 4c3acb4c9114246e3a33310e16c34ae9492122d7 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Wed, 27 Sep 2017 13:10:13 -0500
Subject: [PATCH 09/19] MQE 292 (#8)

* MQE-292

Renamed locator to selector where applicable (schema, objects, and handlers).
Also removed locatorVariables element from schema, as it was deprecated by parameterized url/selector implementation.

* MQE-292

Codesniffer fixes.
---
 .../Page/Handlers/SectionObjectHandler.php         |  6 +++---
 .../Page/Objects/ElementObject.php                 | 14 +++++++-------
 .../Page/etc/SectionObject.xsd                     | 11 ++---------
 .../Test/Objects/ActionObject.php                  |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php b/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php
index e4da7f787..65edaeab2 100644
--- a/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php
@@ -20,7 +20,7 @@ class SectionObjectHandler implements ObjectHandlerInterface
     const TYPE = 'section';
     const SUB_TYPE = 'element';
     const ELEMENT_TYPE_ATTR = 'type';
-    const ELEMENT_LOCATOR_ATTR = 'locator';
+    const ELEMENT_SELECTOR_ATTR = 'selector';
     const ELEMENT_TIMEOUT_ATTR = 'timeout';
     const ELEMENT_PARAMETERIZED = 'parameterized';
 
@@ -102,14 +102,14 @@ private function initSectionObjects()
             $elements = [];
             foreach ($sectionData[SectionObjectHandler::SUB_TYPE] as $elementName => $elementData) {
                 $elementType = $elementData[SectionObjectHandler::ELEMENT_TYPE_ATTR];
-                $elementLocator = $elementData[SectionObjectHandler::ELEMENT_LOCATOR_ATTR];
+                $elementSelector = $elementData[SectionObjectHandler::ELEMENT_SELECTOR_ATTR];
                 $elementTimeout = $elementData[SectionObjectHandler::ELEMENT_TIMEOUT_ATTR] ?? null;
                 $elementParameterized = $elementData[SectionObjectHandler::ELEMENT_PARAMETERIZED] ?? false;
 
                 $elements[$elementName] = new ElementObject(
                     $elementName,
                     $elementType,
-                    $elementLocator,
+                    $elementSelector,
                     $elementTimeout,
                     $elementParameterized
                 );
diff --git a/src/Magento/FunctionalTestingFramework/Page/Objects/ElementObject.php b/src/Magento/FunctionalTestingFramework/Page/Objects/ElementObject.php
index 4d867ad08..b55911b61 100644
--- a/src/Magento/FunctionalTestingFramework/Page/Objects/ElementObject.php
+++ b/src/Magento/FunctionalTestingFramework/Page/Objects/ElementObject.php
@@ -31,7 +31,7 @@ class ElementObject
      *
      * @var string
      */
-    private $locator;
+    private $selector;
 
     /**
      * Section element timeout
@@ -51,15 +51,15 @@ class ElementObject
      * ElementObject constructor.
      * @param string $name
      * @param string $type
-     * @param string $locator
+     * @param string $selector
      * @param string $timeout
      * @param bool $parameterized
      */
-    public function __construct($name, $type, $locator, $timeout, $parameterized)
+    public function __construct($name, $type, $selector, $timeout, $parameterized)
     {
         $this->name = $name;
         $this->type = $type;
-        $this->locator = $locator;
+        $this->selector = $selector;
         $this->timeout = $timeout;
         $this->parameterized = $parameterized;
     }
@@ -85,13 +85,13 @@ public function getType()
     }
 
     /**
-     * Getter for the locator of an element
+     * Getter for the selector of an element
      *
      * @return string
      */
-    public function getLocator()
+    public function getSelector()
     {
-        return $this->locator;
+        return $this->selector;
     }
 
     /**
diff --git a/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd b/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd
index d69706881..e0c421dcb 100644
--- a/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd
+++ b/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd
@@ -58,17 +58,10 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:attribute>
-            <xs:attribute type="notEmptyType" name="locator" use="required">
+            <xs:attribute type="notEmptyType" name="selector" use="required">
                 <xs:annotation>
                     <xs:documentation>
-                        Locator of the element. Use %s for placeholders for variables.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:attribute>
-            <xs:attribute type="notEmptyType" name="locatorVariables" use="optional">
-                <xs:annotation>
-                    <xs:documentation>
-                        Optional variable names separated by "," which are used to substitute %s in locator attribute.
+                        Selector of the element.
                     </xs:documentation>
                 </xs:annotation>
             </xs:attribute>
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
index 796224fa1..767012694 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -323,7 +323,7 @@ private function findAndReplaceReferences($objectHandler, $inputString)
                         throw new TestReferenceException("Could not resolve entity reference " . $inputString);
                     }
                     $parameterized = $obj->getElement($objField)->isParameterized();
-                    $replacement = $obj->getElement($objField)->getLocator();
+                    $replacement = $obj->getElement($objField)->getSelector();
                     $this->timeout = $obj->getElement($objField)->getTimeout();
                     break;
                 case (get_class($obj) == EntityDataObject::class):

From ee3508c8719b15db260219cd97a84eeb5bdb8833 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@magento.com>
Date: Tue, 26 Sep 2017 17:36:50 -0500
Subject: [PATCH 10/19] MQE-369:[Data Input] Non Web Api Data Persistence.

---
 etc/di.xml                                    |   4 +-
 .../Handlers/DataDefinitionObjectHandler.php  | 228 -----------
 .../OperationDefinitionObjectHandler.php      | 233 +++++++++++
 ...tion.php => OperationDefinitionObject.php} |  91 ++---
 .../{DataElement.php => OperationElement.php} |   6 +-
 .../Parsers/DataProfileSchemaParser.php       |   7 +
 ...rser.php => OperationDefinitionParser.php} |  11 +-
 .../Persist/Curl/AdminExecutor.php            |  12 +-
 .../Persist/Curl/WebapiExecutor.php           |  13 +-
 .../DataGenerator/Persist/CurlHandler.php     | 375 ++++--------------
 ...Handler.php => DataPersistenceHandler.php} |  95 +++--
 .../Persist/OperationDataArrayResolver.php    | 277 +++++++++++++
 .../Util/DataObjectExtractor.php              | 132 ------
 .../Util/OperationElementExtractor.php        | 139 +++++++
 .../DataGenerator/etc/dataOperation.xsd       |  19 +-
 .../Util/Protocol/CurlInterface.php           |   6 +-
 .../Util/Protocol/CurlTransport.php           |   8 +-
 .../Util/TestGenerator.php                    |  20 +-
 18 files changed, 904 insertions(+), 772 deletions(-)
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
 rename src/Magento/FunctionalTestingFramework/DataGenerator/Objects/{DataDefinition.php => OperationDefinitionObject.php} (76%)
 rename src/Magento/FunctionalTestingFramework/DataGenerator/Objects/{DataElement.php => OperationElement.php} (96%)
 rename src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/{OperationMetadataParser.php => OperationDefinitionParser.php} (80%)
 rename src/Magento/FunctionalTestingFramework/DataGenerator/Persist/{DataPersistHandler.php => DataPersistenceHandler.php} (57%)
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
 delete mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
 create mode 100644 src/Magento/FunctionalTestingFramework/DataGenerator/Util/OperationElementExtractor.php

diff --git a/etc/di.xml b/etc/di.xml
index ae49b5afc..087f49b57 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -158,7 +158,7 @@
 
     <!-- Configuration for Data Operation Metadata.xml -->
 
-    <type name="Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationMetadataParser">
+    <type name="Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationDefinitionParser">
         <arguments>
             <argument name="metadata" xsi:type="object">Magento\FunctionalTestingFramework\DataProfile\Config\Metadata</argument>
         </arguments>
@@ -180,7 +180,7 @@
             <argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Metadata</argument>
             <argument name="idAttributes" xsi:type="array">
                 <item name="/config/operation" xsi:type="string">name</item>
-                <item name="/config/operation/entry" xsi:type="string">key</item>
+                <item name="/config/operation/field" xsi:type="string">key</item>
                 <item name="/config/operation/array" xsi:type="string">key</item>
                 <item name="/config/operation/object" xsi:type="string">key</item>
             </argument>
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
deleted file mode 100644
index af207bc4b..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataDefinitionObjectHandler.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\FunctionalTestingFramework\DataGenerator\Handlers;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataDefinition;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataElement;
-use Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationMetadataParser;
-use Magento\FunctionalTestingFramework\DataGenerator\Util\DataObjectExtractor;
-use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
-use Magento\FunctionalTestingFramework\ObjectManagerFactory;
-
-class DataDefinitionObjectHandler implements ObjectHandlerInterface
-{
-    const ENTITY_OPERATION_ROOT_TAG = 'operation';
-    const ENTITY_OPERATION_TYPE = 'type';
-    const ENTITY_OPERATION_DATA_TYPE = 'dataType';
-    const ENTITY_OPERATION_URL = 'url';
-    const ENTITY_OPERATION_METHOD = 'method';
-    const ENTITY_OPERATION_AUTH = 'auth';
-    const ENTITY_OPERATION_STORE_CODE = 'storeCode';
-    const ENTITY_OPERATION_SUCCESS_REGEX = 'successRegex';
-    const ENTITY_OPERATION_RETURN_REGEX = 'returnRegex';
-    const ENTITY_OPERATION_HEADER = 'header';
-    const ENTITY_OPERATION_HEADER_PARAM = 'param';
-    const ENTITY_OPERATION_HEADER_VALUE = 'value';
-    const ENTITY_OPERATION_URL_PARAM = 'param';
-    const ENTITY_OPERATION_URL_PARAM_TYPE = 'type';
-    const ENTITY_OPERATION_URL_PARAM_KEY = 'key';
-    const ENTITY_OPERATION_URL_PARAM_VALUE = 'value';
-    const ENTITY_OPERATION_ENTRY = 'entry';
-    const ENTITY_OPERATION_ENTRY_KEY = 'key';
-    const ENTITY_OPERATION_ENTRY_VALUE = 'value';
-    const ENTITY_OPERATION_ARRAY = 'array';
-    const ENTITY_OPERATION_ARRAY_KEY = 'key';
-    const ENTITY_OPERATION_ARRAY_VALUE = 'value';
-    const ENTITY_OPERATION_OBJECT = 'object';
-    const ENTITY_OPERATION_OBJECT_KEY = 'key';
-    const ENTITY_OPERATION_OBJECT_VALUE = 'value';
-    const ENTITY_OPERATION_DATA_OBJECT = 'metaDataObject';
-    const ENTITY_OPERATION_REQUIRED = 'required';
-
-    /**
-     * Singleton Instance of class
-     *
-     * @var DataDefinitionObjectHandler
-     */
-    private static $DATA_DEFINITION_OBJECT_HANDLER;
-
-    /**
-     * Array containing all Data Definition Objects
-     *
-     * @var array
-     */
-    private $dataDefinitions = [];
-
-    /**
-     * Object used to extract dataObjects from array into DataElements
-     *
-     * @var DataObjectExtractor
-     */
-    private $dataDefExtractor;
-
-    /**
-     * Singleton method to return DataDefinitionProcessor.
-     *
-     * @return DataDefinitionObjectHandler
-     */
-    public static function getInstance()
-    {
-        if (!self::$DATA_DEFINITION_OBJECT_HANDLER) {
-            self::$DATA_DEFINITION_OBJECT_HANDLER = new DataDefinitionObjectHandler();
-            self::$DATA_DEFINITION_OBJECT_HANDLER->initDataDefinitions();
-        }
-
-        return self::$DATA_DEFINITION_OBJECT_HANDLER;
-    }
-
-    /**
-     * Returns a DataDefinition object based on name
-     *
-     * @param string $dataDefinitionName
-     * @return DataDefinition
-     */
-    public function getObject($dataDefinitionName)
-    {
-        return $this->dataDefinitions[$dataDefinitionName];
-    }
-
-    /**
-     * Returns all data Definition objects
-     *
-     * @return array
-     */
-    public function getAllObjects()
-    {
-        return $this->dataDefinitions;
-    }
-
-    /**
-     * DataDefintionArrayProcessor constructor.
-     */
-    private function __construct()
-    {
-        $this->dataDefExtractor = new DataObjectExtractor();
-    }
-
-    /**
-     * This method takes an operation such as create and a data type such as 'customer' and returns the corresponding
-     * data definition defined in metadata.xml
-     *
-     * @param string $operation
-     * @param string $dataType
-     * @return DataDefinition
-     */
-    public function getDataDefinition($operation, $dataType)
-    {
-        return $this->getObject($operation . $dataType);
-    }
-
-    /**
-     * This method reads all dataDefinitions from metadata xml into memory.
-     * @return void
-     */
-    private function initDataDefinitions()
-    {
-        $objectManager = ObjectManagerFactory::getObjectManager();
-        $metadataParser = $objectManager->create(OperationMetadataParser::class);
-        foreach ($metadataParser->readOperationMetadata()[DataDefinitionObjectHandler::ENTITY_OPERATION_ROOT_TAG] as
-                 $dataDefName => $dataDefArray) {
-            $operation = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_TYPE];
-            $dataType = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_TYPE];
-            $url = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_URL] ?? null;
-            $method = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_METHOD] ?? null;
-            $auth = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_AUTH] ?? null;
-            $storeCode = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_STORE_CODE] ?? null;
-            $successRegex = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_SUCCESS_REGEX] ?? null;
-            $returnRegex = $dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_RETURN_REGEX] ?? null;
-            $headers = [];
-            $params = [];
-            $metaData = [];
-
-            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER, $dataDefArray)) {
-                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER] as $headerEntry) {
-                    if (isset($headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE])
-                        && $headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE] !== 'none') {
-                        $headers[] = $headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_PARAM] . ': ' .
-                            $headerEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE];
-                    }
-                }
-            }
-
-            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM, $dataDefArray)) {
-                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM] as $paramEntry) {
-                    $params[$paramEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_TYPE]]
-                    [$paramEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_KEY]] =
-                        $paramEntry[DataDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_VALUE];
-                }
-            }
-
-            // extract relevant dataObjects as DataElements
-            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT, $dataDefArray)) {
-                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT] as $dataObjectArray) {
-                    $metaData[] = $this->dataDefExtractor->extractDataObject($dataObjectArray);
-                }
-            }
-
-            //handle loose entries
-
-            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY, $dataDefArray)) {
-                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY] as $dataEntryType) {
-                    $metaData[] = new DataElement(
-                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
-                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                        DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
-                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
-                    );
-                }
-            }
-
-            if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY, $dataDefArray)) {
-                foreach ($dataDefArray[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY] as $dataEntryType) {
-                    $subMetaData = [];
-                    $value = null;
-                    $type = null;
-
-                    if (array_key_exists(DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT, $dataEntryType)) {
-                        $nestedDataElement = $this->dataDefExtractor->extractDataObject(
-                            $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_DATA_OBJECT][0]
-                        );
-                        $subMetaData[$nestedDataElement->getKey()] = $nestedDataElement;
-                        $value = $nestedDataElement->getValue();
-                        $type = $nestedDataElement->getKey();
-                    } else {
-                        $value = $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
-                        [DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                        $type = [DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                    }
-
-                    $metaData[] = new DataElement(
-                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
-                        $value,
-                        $type,
-                        $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
-                        $subMetaData
-                    );
-                }
-            }
-
-            $this->dataDefinitions[$operation . $dataType] = new DataDefinition(
-                $dataDefName,
-                $operation,
-                $dataType,
-                $method,
-                $url,
-                $auth,
-                $headers,
-                $params,
-                $metaData,
-                $successRegex,
-                $returnRegex,
-                $storeCode
-            );
-        }
-    }
-}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
new file mode 100644
index 000000000..4d28caab0
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\FunctionalTestingFramework\DataGenerator\Handlers;
+
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationDefinitionObject;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationElement;
+use Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationDefinitionParser;
+use Magento\FunctionalTestingFramework\DataGenerator\Util\OperationElementExtractor;
+use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
+use Magento\FunctionalTestingFramework\ObjectManagerFactory;
+
+class OperationDefinitionObjectHandler implements ObjectHandlerInterface
+{
+    const ENTITY_OPERATION_ROOT_TAG = 'operation';
+    const ENTITY_OPERATION_TYPE = 'type';
+    const ENTITY_OPERATION_DATA_TYPE = 'dataType';
+    const ENTITY_OPERATION_URL = 'url';
+    const ENTITY_OPERATION_METHOD = 'method';
+    const ENTITY_OPERATION_AUTH = 'auth';
+    const ENTITY_OPERATION_STORE_CODE = 'storeCode';
+    const ENTITY_OPERATION_SUCCESS_REGEX = 'successRegex';
+    const ENTITY_OPERATION_RETURN_REGEX = 'returnRegex';
+    const ENTITY_OPERATION_HEADER = 'header';
+    const ENTITY_OPERATION_CONTENT_TYPE = 'contentType';
+    const ENTITY_OPERATION_HEADER_PARAM = 'param';
+    const ENTITY_OPERATION_HEADER_VALUE = 'value';
+    const ENTITY_OPERATION_URL_PARAM = 'param';
+    const ENTITY_OPERATION_URL_PARAM_TYPE = 'type';
+    const ENTITY_OPERATION_URL_PARAM_KEY = 'key';
+    const ENTITY_OPERATION_URL_PARAM_VALUE = 'value';
+    const ENTITY_OPERATION_ENTRY = 'field';
+    const ENTITY_OPERATION_ENTRY_KEY = 'key';
+    const ENTITY_OPERATION_ENTRY_VALUE = 'value';
+    const ENTITY_OPERATION_ARRAY = 'array';
+    const ENTITY_OPERATION_ARRAY_KEY = 'key';
+    const ENTITY_OPERATION_ARRAY_VALUE = 'value';
+    const ENTITY_OPERATION_OBJECT = 'object';
+    const ENTITY_OPERATION_OBJECT_KEY = 'key';
+    const ENTITY_OPERATION_OBJECT_VALUE = 'value';
+    const ENTITY_OPERATION_REQUIRED = 'required';
+
+    /**
+     * Singleton Instance of class
+     *
+     * @var OperationDefinitionObjectHandler
+     */
+    private static $DATA_DEFINITION_OBJECT_HANDLER;
+
+    /**
+     * Array containing all Data Definition Objects
+     *
+     * @var array
+     */
+    private $operationDefinitions = [];
+
+    /**
+     * Object used to extract dataObjects from array into DataElements
+     *
+     * @var OperationElementExtractor
+     */
+    private $dataDefExtractor;
+
+    /**
+     * Singleton method to return DataDefinitionProcessor.
+     *
+     * @return OperationDefinitionObjectHandler
+     */
+    public static function getInstance()
+    {
+        if (!self::$DATA_DEFINITION_OBJECT_HANDLER) {
+            self::$DATA_DEFINITION_OBJECT_HANDLER = new OperationDefinitionObjectHandler();
+            self::$DATA_DEFINITION_OBJECT_HANDLER->initDataDefinitions();
+        }
+
+        return self::$DATA_DEFINITION_OBJECT_HANDLER;
+    }
+
+    /**
+     * Returns a OperationDefinitionObject object based on name
+     *
+     * @param string $operationDefinitionName
+     * @return OperationDefinitionObject
+     */
+    public function getObject($operationDefinitionName)
+    {
+        return $this->operationDefinitions[$operationDefinitionName];
+    }
+
+    /**
+     * Returns all data Definition objects
+     *
+     * @return array
+     */
+    public function getAllObjects()
+    {
+        return $this->operationDefinitions;
+    }
+
+    /**
+     * DataDefintionArrayProcessor constructor.
+     */
+    private function __construct()
+    {
+        $this->dataDefExtractor = new OperationElementExtractor();
+    }
+
+    /**
+     * This method takes an operation such as create and a data type such as 'customer' and returns the corresponding
+     * data definition defined in metadata.xml
+     *
+     * @param string $operation
+     * @param string $dataType
+     * @return OperationDefinitionObject
+     */
+    public function getOperationDefinition($operation, $dataType)
+    {
+        return $this->getObject($operation . $dataType);
+    }
+
+    /**
+     * This method reads all dataDefinitions from metadata xml into memory.
+     * @return void
+     */
+    private function initDataDefinitions()
+    {
+        $objectManager = ObjectManagerFactory::getObjectManager();
+        $metadataParser = $objectManager->create(OperationDefinitionParser::class);
+        foreach ($metadataParser->readOperationMetadata()
+                 [OperationDefinitionObjectHandler::ENTITY_OPERATION_ROOT_TAG] as $dataDefName => $opDefArray) {
+            $operation = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_TYPE];
+            $dataType = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_DATA_TYPE];
+            $url = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_URL] ?? null;
+            $method = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_METHOD] ?? null;
+            $auth = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_AUTH] ?? null;
+            $successRegex = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_SUCCESS_REGEX] ?? null;
+            $returnRegex = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_RETURN_REGEX] ?? null;
+            $contentType = $opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_CONTENT_TYPE][0]['value']
+                ?? null;
+            $headers = [];
+            $params = [];
+            $operationElements = [];
+
+            if (array_key_exists(OperationDefinitionObjectHandler::ENTITY_OPERATION_HEADER, $opDefArray)) {
+                foreach ($opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_HEADER] as $headerEntry) {
+                    if (isset($headerEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE])
+                        && $headerEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE] !== 'none') {
+                        $headers[] = $headerEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_HEADER_PARAM]
+                            . ': '
+                            . $headerEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_HEADER_VALUE];
+                    }
+                }
+            }
+
+            if (array_key_exists(OperationDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM, $opDefArray)) {
+                foreach ($opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM] as $paramEntry) {
+                    $params[$paramEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_TYPE]]
+                    [$paramEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_KEY]] =
+                        $paramEntry[OperationDefinitionObjectHandler::ENTITY_OPERATION_URL_PARAM_VALUE];
+                }
+            }
+
+            // extract relevant OperationObjects as OperationElements
+            if (array_key_exists(OperationDefinitionObjectHandler::ENTITY_OPERATION_OBJECT, $opDefArray)) {
+                foreach ($opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_OBJECT] as $opElementArray) {
+                    $operationElements[] = $this->dataDefExtractor->extractOperationElement($opElementArray);
+                }
+            }
+
+            //handle loose operation fields
+            if (array_key_exists(OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY, $opDefArray)) {
+                foreach ($opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY] as $operationField) {
+                    $operationElements[] = new OperationElement(
+                        $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
+                        $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
+                        OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
+                        $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
+                    );
+                }
+            }
+
+            // handle loose json arrays
+            if (array_key_exists(OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY, $opDefArray)) {
+                foreach ($opDefArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY] as $operationField) {
+                    $subOperationElements = [];
+                    $value = null;
+                    $type = null;
+
+                    if (array_key_exists(
+                        OperationDefinitionObjectHandler::ENTITY_OPERATION_OBJECT,
+                        $operationField
+                    )) {
+                        $nestedDataElement = $this->dataDefExtractor->extractOperationElement(
+                            $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_OBJECT][0]
+                        );
+                        $subOperationElements[$nestedDataElement->getKey()] = $nestedDataElement;
+                        $value = $nestedDataElement->getValue();
+                        $type = $nestedDataElement->getKey();
+                    } else {
+                        $value = $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
+                        [OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
+                        $type = [OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
+                    }
+
+                    $operationElements[] = new OperationElement(
+                        $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
+                        $value,
+                        $type,
+                        $dataEntryType[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
+                        $subOperationElements
+                    );
+                }
+            }
+
+            $this->operationDefinitions[$operation . $dataType] = new OperationDefinitionObject(
+                $dataDefName,
+                $operation,
+                $dataType,
+                $method,
+                $url,
+                $auth,
+                $headers,
+                $params,
+                $operationElements,
+                $contentType,
+                $successRegex,
+                $returnRegex
+            );
+        }
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataDefinition.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/OperationDefinitionObject.php
similarity index 76%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataDefinition.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Objects/OperationDefinitionObject.php
index b09cfcc1f..8f9ac19a4 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataDefinition.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/OperationDefinitionObject.php
@@ -7,10 +7,12 @@
 namespace Magento\FunctionalTestingFramework\DataGenerator\Objects;
 
 /**
- * Class DataDefinition
+ * Class OperationDefinitionObject
  */
-class DataDefinition
+class OperationDefinitionObject
 {
+    const HTTP_CONTENT_TYPE_HEADER = 'Content-Type';
+
     /**
      * Data Definitions Name
      *
@@ -60,6 +62,13 @@ class DataDefinition
      */
     private $auth;
 
+    /**
+     * Content type of body
+     *
+     * @var string
+     */
+    private $contentType;
+
     /**
      * Relevant headers for the request
      *
@@ -79,14 +88,7 @@ class DataDefinition
      *
      * @var array
      */
-    private $metaData = [];
-
-    /**
-     * Store code in api url.
-     *
-     * @var string
-     */
-    private $storeCode;
+    private $operationMetadata = [];
 
     /**
      * Regex to check for request success.
@@ -103,7 +105,7 @@ class DataDefinition
     private $returnRegex;
 
     /**
-     * DataDefinition constructor.
+     * OperationDefinitionObject constructor.
      * @param string $name
      * @param string $operation
      * @param string $dataType
@@ -113,9 +115,9 @@ class DataDefinition
      * @param array $headers
      * @param array $params
      * @param array $metaData
+     * @param string $contentType
      * @param string $successRegex
      * @param string $returnRegex
-     * @param string $storeCode
      */
     public function __construct(
         $name,
@@ -127,23 +129,30 @@ public function __construct(
         $headers,
         $params,
         $metaData,
+        $contentType,
         $successRegex = null,
-        $returnRegex = null,
-        $storeCode = 'default'
+        $returnRegex = null
     ) {
         $this->name = $name;
         $this->operation = $operation;
         $this->dataType = $dataType;
         $this->apiMethod = $apiMethod;
-        $this->apiUri = $apiUri;
+        $this->apiUri = trim($apiUri, '/');
         $this->auth = $auth;
         $this->headers = $headers;
         $this->params = $params;
-        $this->metaData = $metaData;
-        $this->storeCode = $storeCode;
+        $this->operationMetadata = $metaData;
         $this->successRegex = $successRegex;
         $this->returnRegex = $returnRegex;
         $this->apiUrl = null;
+
+        if (!empty($contentType)) {
+            $this->contentType = $contentType;
+        } else {
+            $this->contentType = 'application/x-www-form-urlencoded';
+        }
+        // add content type as a header
+        $this->headers[] = self::HTTP_CONTENT_TYPE_HEADER . ': ' . $this->contentType;
     }
 
     /**
@@ -179,27 +188,20 @@ public function getApiMethod()
     /**
      * Getter for api url for a store.
      *
-     * @param string $storeCode
      * @return string
      */
-    public function getApiUrl($storeCode)
+    public function getApiUrl()
     {
-        if (isset($storeCode)) {
-            $this->storeCode = $storeCode;
-        }
-
-        if (strpos($this->auth, 'Formkey') === false) {
-            $this->apiUrl = '/rest/' . $this->storeCode . '/' . trim($this->apiUri, '/');
-        } else {
-            $this->apiUrl = trim($this->apiUri, '/') . '/';
-        }
+        if (!$this->apiUrl) {
+            $this->apiUrl = $this->apiUri;
 
-        if (array_key_exists('path', $this->params)) {
-            $this->addPathParam();
-        }
+            if (array_key_exists('path', $this->params)) {
+                $this->addPathParam();
+            }
 
-        if (array_key_exists('query', $this->params)) {
-            $this->addQueryParams();
+            if (array_key_exists('query', $this->params)) {
+                $this->addQueryParams();
+            }
         }
 
         return $this->apiUrl;
@@ -226,23 +228,23 @@ public function getHeaders()
     }
 
     /**
-     * Getter for data metadata
+     * Getter for Content-type
      *
-     * @return array
+     * @return string
      */
-    public function getMetaData()
+    public function getContentType()
     {
-        return $this->metaData;
+        return $this->contentType;
     }
 
     /**
-     * Getter for store code.
+     * Getter for data metadata
      *
-     * @return string
+     * @return array
      */
-    public function getStoreCode()
+    public function getOperationMetadata()
     {
-        return $this->storeCode;
+        return $this->operationMetadata;
     }
 
     /**
@@ -278,19 +280,18 @@ private function addPathParam()
     }
 
     /**
-     * Function to append query params where necessary
+     * Function to append or add query parameters
      *
      * @return void
      */
-    private function addQueryParams()
+    public function addQueryParams()
     {
         foreach ($this->params['query'] as $paramName => $paramValue) {
-            if (strpos($this->apiUrl, '?') == false) {
+            if (strpos($this->apiUrl, '?') === false) {
                 $this->apiUrl = $this->apiUrl . "?";
             } else {
                 $this->apiUrl = $this->apiUrl . "&";
             }
-
             $this->apiUrl = $this->apiUrl . $paramName . "=" . $paramValue;
         }
     }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/OperationElement.php
similarity index 96%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Objects/OperationElement.php
index afa066780..0580018fd 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/OperationElement.php
@@ -6,7 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\DataGenerator\Objects;
 
-class DataElement
+class OperationElement
 {
     /**
      * Data parameter name
@@ -50,7 +50,7 @@ class DataElement
     private $required;
 
     /**
-     * DataElement constructor.
+     * OperationElement constructor.
      * @param string $key
      * @param string $value
      * @param string $type
@@ -118,7 +118,7 @@ public function getRequired()
      * @param string $type
      * @return array
      */
-    public function getNestedDataElement($type)
+    public function getNestedOperationElement($type)
     {
         if (array_key_exists($type, $this->nestedElements)) {
             return $this->nestedElements[$type];
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/DataProfileSchemaParser.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/DataProfileSchemaParser.php
index c9ac3dda2..0a40afe09 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/DataProfileSchemaParser.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/DataProfileSchemaParser.php
@@ -13,6 +13,13 @@
  */
 class DataProfileSchemaParser
 {
+    /**
+     * Data Profiles.
+     *
+     * @var DataInterface
+     */
+    private $dataProfiles;
+
     /**
      * DataProfileSchemaParser constructor.
      * @param DataInterface $dataProfiles
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/OperationMetadataParser.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/OperationDefinitionParser.php
similarity index 80%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/OperationMetadataParser.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/OperationDefinitionParser.php
index b3c6cc514..e7a68435c 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/OperationMetadataParser.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Parsers/OperationDefinitionParser.php
@@ -9,10 +9,17 @@
 use Magento\FunctionalTestingFramework\Config\DataInterface;
 
 /**
- * Class OperationMetadataParser
+ * Class OperationDefinitionParser
  */
-class OperationMetadataParser
+class OperationDefinitionParser
 {
+    /**
+     * Meta Data.
+     *
+     * @var DataInterface
+     */
+    private $metadata;
+
     /**
      * MetadataParser constructor.
      * @param DataInterface $metadata
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
index 7a56c06ec..2fd97eeb3 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
@@ -101,24 +101,24 @@ private function setFormKey()
      * Send request to the remote server.
      *
      * @param string $url
-     * @param array $params
+     * @param array $data
      * @param string $method
      * @param mixed $headers
      * @return void
      * @throws TestFrameworkException
      */
-    public function write($url, $params = [], $method = CurlInterface::POST, $headers = [])
+    public function write($url, $data = [], $method = CurlInterface::POST, $headers = [])
     {
         $apiUrl = self::$adminUrl . $url;
         if ($this->formKey) {
-            $params['form_key'] = $this->formKey;
+            $data['form_key'] = $this->formKey;
         } else {
             throw new TestFrameworkException(
                 sprintf('Form key is absent! Url: "%s" Response: "%s"', $url, $this->response)
             );
         }
 
-        $this->transport->write($apiUrl, str_replace('null', '', http_build_query($params)), $method, $headers);
+        $this->transport->write($apiUrl, str_replace('null', '', http_build_query($data)), $method, $headers);
     }
 
     /**
@@ -134,7 +134,7 @@ public function read($successRegex = null, $returnRegex = null)
         $this->response = $this->transport->read();
         $this->setFormKey();
 
-        if (isset($successRegex)) {
+        if (!empty($successRegex)) {
             preg_match(
                 '/' . preg_quote($successRegex, '/') . '/',
                 $this->response,
@@ -145,7 +145,7 @@ public function read($successRegex = null, $returnRegex = null)
             }
         }
 
-        if (isset($returnRegex)) {
+        if (!empty($returnRegex)) {
             preg_match(
                 '/' . preg_quote($returnRegex, '/') . '/',
                 $this->response,
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
index f5414598b..66321bf88 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
@@ -51,7 +51,8 @@ class WebapiExecutor extends AbstractExecutor implements CurlInterface
     private $storeCode;
 
     /**
-     * @construct
+     * WebapiExecutor Constructor.
+     *
      * @param string $storeCode
      */
     public function __construct($storeCode = 'default')
@@ -88,16 +89,16 @@ private function authorize()
      * Send request to the remote server.
      *
      * @param string $url
-     * @param array $params
+     * @param array $data
      * @param string $method
      * @param array $headers
      * @return void
      */
-    public function write($url, $params = [], $method = CurlInterface::POST, $headers = [])
+    public function write($url, $data = [], $method = CurlInterface::POST, $headers = [])
     {
         $this->transport->write(
-            parent::$baseUrl . ltrim($url, '/'),
-            json_encode($params, JSON_PRETTY_PRINT),
+            parent::$baseUrl . 'rest/' . $this->storeCode . '/' . trim($url, '/'),
+            json_encode($data, JSON_PRETTY_PRINT),
             $method,
             array_unique(array_merge($headers, $this->headers))
         );
@@ -108,7 +109,7 @@ public function write($url, $params = [], $method = CurlInterface::POST, $header
      *
      * @param string $successRegex
      * @param string $returnRegex
-     * @return string
+     * @return mixed
      */
     public function read($successRegex = null, $returnRegex = null)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
index 2a0166774..e7d73676e 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -7,12 +7,10 @@
 
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\AdminExecutor;
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\WebapiExecutor;
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataDefinitionObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\OperationDefinitionObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataDefinition;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataElement;
-use Magento\FunctionalTestingFramework\DataGenerator\Util\DataObjectExtractor;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationDefinitionObject;
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
 
 /**
@@ -20,9 +18,6 @@
  */
 class CurlHandler
 {
-    const PRIMITIVE_TYPES = ['string', 'boolean', 'integer', 'double', 'array'];
-    const EXCEPTION_REQUIRED_DATA = "%s of key \" %s\" in \"%s\" is required by metadata, but was not provided.";
-
     /**
      * Describes the operation for the executor ('create','update','delete')
      *
@@ -40,39 +35,30 @@ class CurlHandler
     /**
      * The data definitions used to map the operation.
      *
-     * @var DataDefinition $dataDefinition
-     */
-    private $dataDefinition;
-
-    /**
-     * The array of dependentEntities this class can be given. When finding linked entities, CurlHandler
-     * uses this repository before looking for static data.
-     *
-     * @var array
+     * @var OperationDefinitionObject $operationDefinition
      */
-    private $dependentEntities = [];
+    private $operationDefinition;
 
     /**
-     * Persisted data array.
+     * The request data.
      *
      * @var array
      */
-    private $persistedDataArray;
+    private $requestData;
 
     /**
-     * The array of entity name and number of objects being created,
-     * we don't need to track objects in update and delete operations.
+     * Store code in web api rest url.
      *
-     * @var array
+     * @var string
      */
-    private static $entitySequences = [];
+    private $storeCode;
 
     /**
-     * Store code in web api rest url.
+     * If the content type is Json.
      *
-     * @var string
+     * @var bool
      */
-    private $storeCode;
+    private $isJson;
 
     /**
      * Operation to Curl method mapping.
@@ -86,326 +72,125 @@ class CurlHandler
             'get' => CurlInterface::GET,
         ];
 
-    /**
-     * If it's a web api request.
-     *
-     * @var bool
-     */
-    private $isWebApiRequest;
-
     /**
      * ApiSubObject constructor.
      * @param string $operation
      * @param EntityDataObject $entityObject
-     * @param array $dependentEntities
      * @param string $storeCode
      */
-    public function __construct($operation, $entityObject, $dependentEntities = null, $storeCode = 'default')
+    public function __construct($operation, $entityObject, $storeCode = 'default')
     {
         $this->operation = $operation;
         $this->entityObject = $entityObject;
         $this->storeCode = $storeCode;
-        $this->isWebApiRequest = true;
-        if ($dependentEntities != null) {
-            foreach ($dependentEntities as $entity) {
-                $this->dependentEntities[$entity->getName()] = $entity;
-            }
-        }
 
-        $this->dataDefinition = DataDefinitionObjectHandler::getInstance()->getDataDefinition(
+        $this->operationDefinition = OperationDefinitionObjectHandler::getInstance()->getOperationDefinition(
             $this->operation,
             $this->entityObject->getType()
         );
+        $this->isJson = false;
     }
 
     /**
      * Executes an api request based on parameters given by constructor.
      *
-     * @return string | null
+     * @param array $dependentEntities
+     * @return array | null
+     * @throws TestFrameworkException
      */
-    public function executeRequest()
+    public function executeRequest($dependentEntities)
     {
-        $apiUrl = $this->dataDefinition->getApiUrl($this->storeCode);
-
-        $matchedParams = [];
-        preg_match_all("/[{](.+?)[}]/", $apiUrl, $matchedParams);
-
-        if (!empty($matchedParams)) {
-            foreach ($matchedParams[0] as $paramKey => $paramValue) {
-                $param = $this->entityObject->getDataByName(
-                    $matchedParams[1][$paramKey],
-                    EntityDataObject::CEST_UNIQUE_VALUE
-                );
-                $apiUrl = str_replace($paramValue, $param, $apiUrl);
-            }
-        }
-
         $executor = null;
         $successRegex = null;
         $returnRegex = null;
-        $headers = $this->dataDefinition->getHeaders();
-        $this->persistedDataArray = $this->convertDataArray($this->entityObject, $this->dataDefinition->getMetaData());
 
-        $authorization = $this->dataDefinition->getAuth();
-        switch ($authorization) {
-            case 'adminOauth':
-                $executor = new WebapiExecutor($this->storeCode);
-                $executor->write(
-                    $apiUrl,
-                    $this->persistedDataArray,
-                    self::$curlMethodMapping[$this->operation],
-                    $headers
-                );
-                break;
-            case 'adminFormkey':
-                $this->isWebApiRequest = false;
-                $executor = new AdminExecutor();
-                $executor->write(
-                    $apiUrl,
-                    $this->persistedDataArray,
-                    self::$curlMethodMapping[$this->operation],
-                    $headers
-                );
-                $successRegex = $this->dataDefinition->getSuccessRegex();
-                $returnRegex = $this->dataDefinition->getReturnRegex();
-                break;
-            case 'customFromkey':
-                $this->isWebApiRequest = false;
-                // TODO: add frontend request executor.
-                break;
-        }
-        $response = $executor->read($successRegex, $returnRegex);
-        $executor->close();
-        return $response;
-    }
-
-    /**
-     * If it's a web api request.
-     *
-     * @return bool
-     */
-    public function isWebApiRequest()
-    {
-        return $this->isWebApiRequest;
-    }
-
-    /**
-     * Get persisted data array.
-     *
-     * @return array
-     */
-    public function getPersistedDataArray()
-    {
-        return $this->persistedDataArray;
-    }
-
-    /**
-     * This function returns an array which is structurally equal to the data which is needed by the magento web api,
-     * magento backend / frontend requests for entity creation. The function retrieves an array describing the entity's
-     * metadata and traverses any dependencies recursively forming an array which represents the data structure for the
-     * request of the desired entity type.
-     *
-     * @param EntityDataObject $entityObject
-     * @param array $dataArrayMetadata
-     * @return array
-     * @throws \Exception
-     */
-    public function convertDataArray($entityObject, $dataArrayMetadata)
-    {
-        $dataArray = [];
-        self::incrementSequence($entityObject->getName());
-
-        foreach ($dataArrayMetadata as $dataElement) {
-            if ($dataElement->getType() == DataObjectExtractor::MATA_DATA_OBJECT_NAME) {
-                $entityObj = $this->resolveDataObjectAndEntityData($entityObject, $dataElement->getValue());
-                $dataArray[$dataElement->getValue()] =
-                    $this->convertDataArray($entityObject, $dataElement->getNestedMetadata());
-                continue;
-            }
-
-            $dataElementType = $dataElement->getValue();
-
-            if (in_array($dataElementType, CurlHandler::PRIMITIVE_TYPES)) {
-                $elementData = $entityObject->getDataByName(
-                    $dataElement->getKey(),
-                    EntityDataObject::CEST_UNIQUE_VALUE
-                );
-
-                // If data was defined at all, attempt to put it into JSON body
-                // If data was not defined, and element is required, throw exception
-                // If no data is defined, don't input defaults per primitive into JSON for the data
-                if ($elementData != null) {
-                    if (array_key_exists($dataElement->getKey(), $entityObject->getUniquenessData())) {
-                        $uniqueData = $entityObject->getUniquenessDataByName($dataElement->getKey());
-                        if ($uniqueData === 'suffix') {
-                            $elementData .= (string)self::getSequence($entityObject->getName());
-                        } else {
-                            $elementData = (string)self::getSequence($entityObject->getName()) . $elementData;
-                        }
-                    }
-
-                    $dataArray[$dataElement->getKey()] = $this->castValue($dataElementType, $elementData);
-                } elseif ($dataElement->getRequired()) {
-                    throw new \Exception(sprintf(
-                        CurlHandler::EXCEPTION_REQUIRED_DATA,
-                        $dataElement->getType(),
-                        $dataElement->getKey(),
-                        $this->entityObject->getName()
-                    ));
-                }
-            } else {
-                $entityNamesOfType = $entityObject->getLinkedEntitiesOfType($dataElementType);
-
-                // If an element is required by metadata, but was not provided in the entity, throw an exception
-                if ($dataElement->getRequired() && $entityNamesOfType == null) {
-                    throw new \Exception(sprintf(
-                        CurlHandler::EXCEPTION_REQUIRED_DATA,
-                        $dataElement->getType(),
-                        $dataElement->getKey(),
-                        $this->entityObject->getName()
-                    ));
-                }
-                foreach ($entityNamesOfType as $entityName) {
-                    $dataSubArray = $this->resolveNonPrimitiveElement($entityName, $dataElement);
-
-                    if ($dataElement->getType() == 'array') {
-                        $dataArray[$dataElement->getKey()][] = $dataSubArray;
-                    } else {
-                        $dataArray[$dataElement->getKey()] = $dataSubArray;
-                    }
-                }
-            }
-        }
-
-        return $dataArray;
-    }
+        $apiUrl = $this->resolveUrlReference($this->operationDefinition->getApiUrl());
+        $headers = $this->operationDefinition->getHeaders();
+        $authorization = $this->operationDefinition->getAuth();
+        $contentType = $this->operationDefinition->getContentType();
+        $successRegex = $this->operationDefinition->getSuccessRegex();
+        $returnRegex = $this->operationDefinition->getReturnRegex();
+
+        $operationDataResolver = new OperationDataArrayResolver($dependentEntities);
+        $this->requestData = $operationDataResolver->resolveOperationDataArray(
+            $this->entityObject,
+            $this->operationDefinition->getOperationMetadata(),
+            $this->operationDefinition->getOperation()
+        );
 
-    /**
-     * This function does a comparison of the entity object being matched to the data element. If there is a mismatch in
-     * type we attempt to use a nested entity, if the entities are properly matched, we simply return the object.
-     *
-     * @param EntityDataObject $entityObject
-     * @param string $dataElementValue
-     * @return EntityDataObject|null
-     */
-    private function resolveDataObjectAndEntityData($entityObject, $dataElementValue)
-    {
-        if ($dataElementValue != $entityObject->getType()) {
-            // if we have a mismatch attempt to retrieve linked data and return just the first linkage
-            $linkName = $entityObject->getLinkedEntitiesOfType($dataElementValue)[0];
-            return DataObjectHandler::getInstance()->getObject($linkName);
+        if (($contentType === 'application/json') && ($authorization === 'adminOauth')) {
+            $this->isJson = true;
+            $executor = new WebapiExecutor($this->storeCode);
+        } elseif ($authorization === 'adminFormKey') {
+            $executor = new AdminExecutor();
+            //TODO: add frontend request executor
+        //} elseif ($authorization === 'customFromKey') {
         }
 
-        return $entityObject;
-    }
-
-    /**
-     * Resolves dataObjects and pre-defined metadata (in other operation.xml file) referenced by the metadata.
-     *
-     * @param string $entityName
-     * @param DataElement $dataElement
-     * @return array
-     */
-    private function resolveNonPrimitiveElement($entityName, $dataElement)
-    {
-        $linkedEntityObj = $this->resolveLinkedEntityObject($entityName);
-
-        // in array case
-        if (!empty($dataElement->getNestedDataElement($dataElement->getValue()))
-            && $dataElement->getType() == 'array'
-        ) {
-            $dataSubArray = $this->convertDataArray(
-                $linkedEntityObj,
-                [$dataElement->getNestedDataElement($dataElement->getValue())]
+        if (!$executor) {
+            throw new TestFrameworkException(
+                sprintf(
+                    "Invalid content type and/or auth type. content type = %s, auth type = %s\n",
+                    $contentType,
+                    $authorization
+                )
             );
-
-            return $dataSubArray[$dataElement->getValue()];
         }
 
-        $metaData = DataDefinitionObjectHandler::getInstance()->getDataDefinition(
-            $this->operation,
-            $linkedEntityObj->getType()
-        )->getMetaData();
-
-        return $this->convertDataArray($linkedEntityObj, $metaData);
-    }
+        $executor->write(
+            $apiUrl,
+            $this->requestData,
+            self::$curlMethodMapping[$this->operation],
+            $headers
+        );
 
-    /**
-     * Method to wrap entity resolution, checks locally defined dependent entities first
-     *
-     * @param string $entityName
-     * @return EntityDataObject
-     */
-    private function resolveLinkedEntityObject($entityName)
-    {
-        // check our dependent entity list to see if we have this defined
-        if (array_key_exists($entityName, $this->dependentEntities)) {
-            return $this->dependentEntities[$entityName];
-        }
+        $response = $executor->read($successRegex, $returnRegex);
+        $executor->close();
 
-        return DataObjectHandler::getInstance()->getObject($entityName);
+        return $response;
     }
 
     /**
-     * Increment an entity's sequence number by 1.
+     * Getter for request data in array.
      *
-     * @param string $entityName
-     * @return void
+     * @return array
      */
-    private static function incrementSequence($entityName)
+    public function getRequestDataArray()
     {
-        if (array_key_exists($entityName, self::$entitySequences)) {
-            self::$entitySequences[$entityName]++;
-        } else {
-            self::$entitySequences[$entityName] = 1;
-        }
+        return $this->requestData;
     }
 
     /**
-     * Get the current sequence number for an entity.
+     * If content type of a request is Json.
      *
-     * @param string $entityName
-     * @return int
+     * @return bool
      */
-    private static function getSequence($entityName)
+    public function isContentTypeJson()
     {
-        if (array_key_exists($entityName, self::$entitySequences)) {
-            return self::$entitySequences[$entityName];
-        }
-        return 0;
+        return $this->isJson;
     }
 
-    // @codingStandardsIgnoreStart
     /**
-     * This function takes a string value and its corresponding type and returns the string cast
-     * into its the type passed.
+     * Resolve rul reference from entity data.
      *
-     * @param string $type
-     * @param string $value
-     * @return mixed
+     * @param string $urlIn
+     * @return string
      */
-    private function castValue($type, $value)
+    private function resolveUrlReference($urlIn)
     {
-        $newVal = $value;
+        $urlOut = $urlIn;
+        $matchedParams = [];
+        preg_match_all("/[{](.+?)[}]/", $urlIn, $matchedParams);
 
-        switch ($type) {
-            case 'string':
-                break;
-            case 'integer':
-                $newVal = (integer)$value;
-                break;
-            case 'boolean':
-                if (strtolower($newVal) === 'false') {
-                    return false;
-                }
-                $newVal = (boolean)$value;
-                break;
-            case 'double':
-                $newVal = (double)$value;
-                break;
+        if (!empty($matchedParams)) {
+            foreach ($matchedParams[0] as $paramKey => $paramValue) {
+                $param = $this->entityObject->getDataByName(
+                    $matchedParams[1][$paramKey],
+                    EntityDataObject::CEST_UNIQUE_VALUE
+                );
+                $urlOut = str_replace($paramValue, $param, $urlIn);
+            }
         }
-
-        return $newVal;
+        return $urlOut;
     }
-    // @codingStandardsIgnoreEnd
 }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
similarity index 57%
rename from src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
rename to src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
index 1b4b5ced2..bc8d0a477 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
@@ -9,9 +9,9 @@
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 
 /**
- * Class DataPersistHandler
+ * Class DataPersistenceHandler
  */
-class DataPersistHandler
+class DataPersistenceHandler
 {
     /**
      * Entity object data to use for create, delete, or update.
@@ -41,7 +41,7 @@ class DataPersistHandler
     private $storeCode;
 
     /**
-     * DataPersistHandler constructor.
+     * DataPersistenceHandler constructor.
      *
      * @param EntityDataObject $entityObject
      * @param array $dependentObjects
@@ -61,25 +61,15 @@ public function __construct($entityObject, $dependentObjects = null)
      */
     public function createEntity($storeCode = null)
     {
-        if (isset($storeCode)) {
+        if (!empty($storeCode)) {
             $this->storeCode = $storeCode;
         }
-        $curlHandler = new CurlHandler('create', $this->entityObject, $this->dependentObjects, $this->storeCode);
-        $result = $curlHandler->executeRequest();
-
-        $persistedDataArray = $curlHandler->getPersistedDataArray();
-        if ($curlHandler->isWebApiRequest()) {
-            $persistedDataArray = array_merge($persistedDataArray, json_decode($result, true));
-        } else {
-            $persistedDataArray = array_merge($persistedDataArray, ['return' => $result]);
-        }
-
-        $this->createdObject = new EntityDataObject(
-            $this->entityObject->getName(),
-            $this->entityObject->getType(),
-            $persistedDataArray,
-            null,
-            null
+        $curlHandler = new CurlHandler('create', $this->entityObject, $this->storeCode);
+        $result = $curlHandler->executeRequest($this->dependentObjects);
+        $this->setCreatedEntity(
+            $result,
+            $curlHandler->getRequestDataArray(),
+            $curlHandler->isContentTypeJson()
         );
     }
 
@@ -87,17 +77,15 @@ public function createEntity($storeCode = null)
      * Function which executes a delete request based on specific operation metadata
      *
      * @param string $storeCode
-     * @return string | false
+     * @return void
      */
     public function deleteEntity($storeCode = null)
     {
-        if (isset($storeCode)) {
+        if (!empty($storeCode)) {
             $this->storeCode = $storeCode;
         }
-        $curlHandler = new CurlHandler('delete', $this->createdObject, null, $this->storeCode);
-        $result = $curlHandler->executeRequest();
-
-        return $result;
+        $curlHandler = new CurlHandler('delete', $this->createdObject, $this->storeCode);
+        $result = $curlHandler->executeRequest($this->dependentObjects);
     }
 
     /**
@@ -124,4 +112,59 @@ public function getCreatedDataByName($dataName)
     {
 
     }*/
+
+    /**
+     * Save created entity.
+     *
+     * @param mixed $response
+     * @param array $requestDataArray
+     * @param bool $isJson
+     * @return void
+     */
+    private function setCreatedEntity($response, $requestDataArray, $isJson)
+    {
+        if ($isJson) {
+            $persistedData = array_merge($requestDataArray, json_decode($response, true));
+        } else {
+            $persistedData = array_merge(
+                $this->convertToFlatArray($requestDataArray),
+                ['return' => $response]
+            );
+        }
+
+        $this->createdObject = new EntityDataObject(
+            $this->entityObject->getName(),
+            $this->entityObject->getType(),
+            $persistedData,
+            null,
+            null
+        );
+    }
+
+    /**
+     * Convert an multi-dimensional array to flat array.
+     *
+     * @param array $arrayIn
+     * @param string $rootKey
+     * @return array
+     */
+    private function convertToFlatArray($arrayIn, $rootKey = '')
+    {
+        $arrayOut = [];
+        foreach ($arrayIn as $key => $value) {
+            if (is_array($value)) {
+                if (!empty($rootKey)) {
+                    $newRootKey = $rootKey . '[' . $key . ']';
+                } else {
+                    $newRootKey = $key;
+                }
+                $arrayOut = array_merge($arrayOut, $this->convertToFlatArray($value, $newRootKey));
+            } elseif (!empty($rootKey)) {
+                $arrayOut[$rootKey . '[' . $key . ']'] = $value;
+            } else {
+                $arrayOut[$key] = $value;
+            }
+        }
+        return $arrayOut;
+    }
 }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
new file mode 100644
index 000000000..f175b5271
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Persist;
+
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\OperationDefinitionObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationElement;
+use Magento\FunctionalTestingFramework\DataGenerator\Util\OperationElementExtractor;
+
+class OperationDataArrayResolver
+{
+    const PRIMITIVE_TYPES = [
+        'string',
+        'boolean',
+        'integer',
+        'double',
+        OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY
+    ];
+    const EXCEPTION_REQUIRED_DATA = "%s of key \" %s\" in \"%s\" is required by metadata, but was not provided.";
+
+    /**
+     * The array of entity name and number of objects being created,
+     * we don't need to track objects in update and delete operations.
+     *
+     * @var array
+     */
+    private static $entitySequences = [];
+
+    /**
+     * The array of dependentEntities this class can be given. When finding linked entities, APIExecutor
+     * uses this repository before looking for static data.
+     *
+     * @var array
+     */
+    private $dependentEntities = [];
+
+    /**
+     * OperationDataArrayResolver constructor.
+     *
+     * @param array $dependentEntities
+     */
+    public function __construct($dependentEntities = null)
+    {
+        //empty constructor
+        if ($dependentEntities !== null) {
+            foreach ($dependentEntities as $entity) {
+                $this->dependentEntities[$entity->getName()] = $entity;
+            }
+        }
+    }
+
+    /**
+     * This function returns an array which is structurally equal to the data which is needed by the magento web api,
+     * magento backend / frontend requests for entity creation. The function retrieves an array describing the entity's
+     * operation metadata and traverses any dependencies recursively forming an array which represents the data
+     * structure for the request of the desired entity type.
+     *
+     * @param EntityDataObject $entityObject
+     * @param array $operationMetadata
+     * @param string $operation
+     * @return array
+     * @throws \Exception
+     */
+    public function resolveOperationDataArray($entityObject, $operationMetadata, $operation)
+    {
+        $operationDataArray = [];
+        self::incrementSequence($entityObject->getName());
+
+        foreach ($operationMetadata as $operationElement) {
+            if ($operationElement->getType() == OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME) {
+                $entityObj = $this->resolveOperationObjectAndEntityData($entityObject, $operationElement->getValue());
+                $operationDataArray[$operationElement->getValue()] =
+                    $this->resolveOperationDataArray($entityObj, $operationElement->getNestedMetadata(), $operation);
+                continue;
+            }
+
+            $operationElementType = $operationElement->getValue();
+
+            if (in_array($operationElementType, self::PRIMITIVE_TYPES)) {
+                $elementData = $entityObject->getDataByName(
+                    $operationElement->getKey(),
+                    EntityDataObject::CEST_UNIQUE_VALUE
+                );
+
+                // If data was defined at all, attempt to put it into operation data array
+                // If data was not defined, and element is required, throw exception
+                // If no data is defined, don't input defaults per primitive into operation data array
+                if ($elementData != null) {
+                    if (array_key_exists($operationElement->getKey(), $entityObject->getUniquenessData())) {
+                        $uniqueData = $entityObject->getUniquenessDataByName($operationElement->getKey());
+                        if ($uniqueData === 'suffix') {
+                            $elementData .= (string)self::getSequence($entityObject->getName());
+                        } else {
+                            $elementData = (string)self::getSequence($entityObject->getName()) . $elementData;
+                        }
+                    }
+                    $operationDataArray[$operationElement->getKey()] = $this->castValue(
+                        $operationElementType,
+                        $elementData
+                    );
+
+                } elseif ($operationElement->getRequired()) {
+                    throw new \Exception(sprintf(
+                        self::EXCEPTION_REQUIRED_DATA,
+                        $operationElement->getType(),
+                        $operationElement->getKey(),
+                        $entityObject->getName()
+                    ));
+                }
+            } else {
+                $entityNamesOfType = $entityObject->getLinkedEntitiesOfType($operationElementType);
+
+                // If an element is required by metadata, but was not provided in the entity, throw an exception
+                if ($operationElement->getRequired() && $entityNamesOfType == null) {
+                    throw new \Exception(sprintf(
+                        self::EXCEPTION_REQUIRED_DATA,
+                        $operationElement->getType(),
+                        $operationElement->getKey(),
+                        $entityObject->getName()
+                    ));
+                }
+                foreach ($entityNamesOfType as $entityName) {
+                    $operationDataSubArray = $this->resolveNonPrimitiveElement(
+                        $entityName,
+                        $operationElement,
+                        $operation
+                    );
+
+                    if ($operationElement->getType() == OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY) {
+                        $operationDataArray[$operationElement->getKey()][] = $operationDataSubArray;
+                    } else {
+                        $operationDataArray[$operationElement->getKey()] = $operationDataSubArray;
+                    }
+                }
+            }
+        }
+
+        return $operationDataArray;
+    }
+
+    /**
+     * This function does a comparison of the entity object being matched to the operation element. If there is a
+     * mismatch in type we attempt to use a nested entity, if the entities are properly matched, we simply return
+     * the object.
+     *
+     * @param EntityDataObject $entityObject
+     * @param string $operationElementValue
+     * @return EntityDataObject|null
+     */
+    private function resolveOperationObjectAndEntityData($entityObject, $operationElementValue)
+    {
+        if ($operationElementValue != $entityObject->getType()) {
+            // if we have a mismatch attempt to retrieve linked data and return just the first linkage
+            $linkName = $entityObject->getLinkedEntitiesOfType($operationElementValue)[0];
+            return DataObjectHandler::getInstance()->getObject($linkName);
+        }
+
+        return $entityObject;
+    }
+
+    /**
+     * Resolves DataObjects and pre-defined metadata (in other operation.xml file) referenced by the operation
+     *
+     * @param string $entityName
+     * @param OperationElement $operationElement
+     * @param string $operation
+     * @return array
+     */
+    private function resolveNonPrimitiveElement($entityName, $operationElement, $operation)
+    {
+        $linkedEntityObj = $this->resolveLinkedEntityObject($entityName);
+
+        // in array case
+        if (!empty($operationElement->getNestedOperationElement($operationElement->getValue()))
+            && $operationElement->getType() == OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY
+        ) {
+            $operationSubArray = $this->resolveOperationDataArray(
+                $linkedEntityObj,
+                [$operationElement->getNestedOperationElement($operationElement->getValue())],
+                $operation
+            );
+
+            return $operationSubArray[$operationElement->getValue()];
+        }
+
+        $operationMetadata = OperationDefinitionObjectHandler::getInstance()->getOperationDefinition(
+            $operation,
+            $linkedEntityObj->getType()
+        )->getOperationMetadata();
+
+        return $this->resolveOperationDataArray($linkedEntityObj, $operationMetadata, $operation);
+    }
+
+    /**
+     * Method to wrap entity resolution, checks locally defined dependent entities first
+     *
+     * @param string $entityName
+     * @return EntityDataObject
+     */
+    private function resolveLinkedEntityObject($entityName)
+    {
+        // check our dependent entity list to see if we have this defined
+        if (array_key_exists($entityName, $this->dependentEntities)) {
+            return $this->dependentEntities[$entityName];
+        }
+
+        return DataObjectHandler::getInstance()->getObject($entityName);
+    }
+
+    /**
+     * Increment an entity's sequence number by 1.
+     *
+     * @param string $entityName
+     * @return void
+     */
+    private static function incrementSequence($entityName)
+    {
+        if (array_key_exists($entityName, self::$entitySequences)) {
+            self::$entitySequences[$entityName]++;
+        } else {
+            self::$entitySequences[$entityName] = 1;
+        }
+    }
+
+    /**
+     * Get the current sequence number for an entity.
+     *
+     * @param string $entityName
+     * @return int
+     */
+    private static function getSequence($entityName)
+    {
+        if (array_key_exists($entityName, self::$entitySequences)) {
+            return self::$entitySequences[$entityName];
+        }
+        return 0;
+    }
+
+    // @codingStandardsIgnoreStart
+    /**
+     * This function takes a string value and its corresponding type and returns the string cast
+     * into its the type passed.
+     *
+     * @param string $type
+     * @param string $value
+     * @return mixed
+     */
+    private function castValue($type, $value)
+    {
+        $newVal = $value;
+
+        switch ($type) {
+            case 'string':
+                break;
+            case 'integer':
+                $newVal = (integer)$value;
+                break;
+            case 'boolean':
+                if (strtolower($newVal) === 'false') {
+                    return false;
+                }
+                $newVal = (boolean)$value;
+                break;
+            case 'double':
+                $newVal = (double)$value;
+                break;
+        }
+
+        return $newVal;
+    }
+    // @codingStandardsIgnoreEnd
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
deleted file mode 100644
index 52aa04da9..000000000
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/DataObjectExtractor.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\FunctionalTestingFramework\DataGenerator\Util;
-
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataDefinitionObjectHandler;
-use Magento\FunctionalTestingFramework\DataGenerator\Objects\DataElement;
-
-class DataObjectExtractor
-{
-    const DATA_OBJECT_KEY = 'key';
-    const DATA_OBJECT_DATA_TYPE = 'dataType';
-    const DATA_OBJECT_ARRAY = 'array';
-    const DATA_OBJECT_ENTRY = 'entry';
-    const MATA_DATA_OBJECT_NAME = 'metaDataObject';
-    const DATA_OBJECT_ARRAY_VALUE = 'value';
-
-    /**
-     * DataObjectExtractor constructor.
-     */
-    public function __construct()
-    {
-        // public constructor
-    }
-
-    /**
-     * Takes an array representative of a dataObject and converts the array into a DataElement
-     *
-     * @param array $dataObjectArray
-     * @return DataElement
-     * @throws \Exception
-     */
-    public function extractDataObject($dataObjectArray)
-    {
-        // extract key
-        $dataDefKey = $dataObjectArray[DataObjectExtractor::DATA_OBJECT_KEY];
-
-        // extract dataType
-        $dataType = $dataObjectArray[DataObjectExtractor::DATA_OBJECT_DATA_TYPE];
-
-        $metaData = [];
-        $nestedDataElements = [];
-
-        // extract nested entries
-        if (array_key_exists(DataObjectExtractor::DATA_OBJECT_ENTRY, $dataObjectArray)) {
-            $this->extractDataEntries($metaData, $dataObjectArray[DataObjectExtractor::DATA_OBJECT_ENTRY]);
-        }
-
-        // extract nested arrays
-        if (array_key_exists(DataObjectExtractor::DATA_OBJECT_ARRAY, $dataObjectArray)) {
-            $this->extractDataArrays($metaData, $dataObjectArray[DataObjectExtractor::DATA_OBJECT_ARRAY]);
-        }
-
-        // extract nested
-        if (array_key_exists(DataObjectExtractor::MATA_DATA_OBJECT_NAME, $dataObjectArray)) {
-            foreach ($dataObjectArray[DataObjectExtractor::MATA_DATA_OBJECT_NAME] as $dataObject) {
-                $nestedDataElement = $this->extractDataObject($dataObject);
-                $metaData[] = $nestedDataElement;
-            }
-        }
-
-        // a dataObject specified in xml must contain corresponding metadata for the object
-        if (empty($metaData)) {
-            throw new \Exception("must specify dataObject metadata if declaration is used");
-        }
-
-        return new DataElement(
-            $dataDefKey,
-            $dataType,
-            DataObjectExtractor::MATA_DATA_OBJECT_NAME,
-            $dataObjectArray[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
-            $nestedDataElements,
-            $metaData
-        );
-    }
-
-    /**
-     * Creates and Adds relevant DataElements from data entries defined within dataObject array
-     *
-     * @param array &$metaData
-     * @param array $dataEntryArray
-     * @return void
-     */
-    private function extractDataEntries(&$metaData, $dataEntryArray)
-    {
-        foreach ($dataEntryArray as $dataEntryType) {
-            $metaData[] = new DataElement(
-                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
-                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
-                DataDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
-                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
-            );
-        }
-    }
-
-    /**
-     * Creates and Adds relevant DataElements from data arrays defined within dataObject array
-     *
-     * @param array &$dataArrayData
-     * @param array $dataArrayArray
-     * @return void
-     */
-    private function extractDataArrays(&$dataArrayData, $dataArrayArray)
-    {
-        foreach ($dataArrayArray as $dataEntryType) {
-            $dataElementValue =
-                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
-                [DataObjectExtractor::DATA_OBJECT_ARRAY_VALUE] ?? null;
-
-            $nestedDataElements = [];
-            if (array_key_exists(DataObjectExtractor::MATA_DATA_OBJECT_NAME, $dataEntryType)) {
-                //add the key to reference this object later
-                $dataObjectKeyedArray = $dataEntryType[DataObjectExtractor::MATA_DATA_OBJECT_NAME][0];
-                $dataObjectKeyedArray[DataObjectExtractor::DATA_OBJECT_KEY] =
-                    $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY];
-                $dataElement = $this->extractDataObject($dataObjectKeyedArray);
-                $dataElementValue = $dataElement->getValue();
-                $nestedDataElements[$dataElement->getValue()] = $dataElement;
-            }
-            $dataArrayData[] = new DataElement(
-                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
-                $dataElementValue,
-                DataDefinitionObjectHandler::ENTITY_OPERATION_ARRAY,
-                $dataEntryType[DataDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
-                $nestedDataElements
-            );
-        }
-    }
-}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Util/OperationElementExtractor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/OperationElementExtractor.php
new file mode 100644
index 000000000..6f2e3e447
--- /dev/null
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Util/OperationElementExtractor.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\FunctionalTestingFramework\DataGenerator\Util;
+
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\OperationDefinitionObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationElement;
+
+class OperationElementExtractor
+{
+    const OPERATION_OBJECT_KEY = 'key';
+    const OPERATION_OBJECT_DATA_TYPE = 'dataType';
+    const OPERATION_OBJECT_ARRAY = 'array';
+    const OPERATION_OBJECT_ENTRY = 'field';
+    const OPERATION_OBJECT_OBJ_NAME = 'object';
+    const OPERATION_OBJECT_ARRAY_VALUE = 'value';
+
+    /**
+     * OperationElementExtractor constructor.
+     */
+    public function __construct()
+    {
+        // public constructor
+    }
+
+    /**
+     * Takes an array representative of a dataObject and converts the array into a OperationElement
+     *
+     * @param array $operationElementArray
+     * @return OperationElement
+     * @throws \Exception
+     */
+    public function extractOperationElement($operationElementArray)
+    {
+        // extract key
+        $operationDefKey = $operationElementArray[OperationElementExtractor::OPERATION_OBJECT_KEY];
+
+        // extract dataType
+        $dataType = $operationElementArray[OperationElementExtractor::OPERATION_OBJECT_DATA_TYPE];
+
+        $operationElements = [];
+        $nestedOperationElements = [];
+
+        // extract nested entries
+        if (array_key_exists(OperationElementExtractor::OPERATION_OBJECT_ENTRY, $operationElementArray)) {
+            $this->extractOperationField(
+                $operationElements,
+                $operationElementArray[OperationElementExtractor::OPERATION_OBJECT_ENTRY]
+            );
+        }
+
+        // extract nested arrays
+        if (array_key_exists(OperationElementExtractor::OPERATION_OBJECT_ARRAY, $operationElementArray)) {
+            $this->extractOperationArray(
+                $operationElements,
+                $operationElementArray[OperationElementExtractor::OPERATION_OBJECT_ARRAY]
+            );
+        }
+
+        // extract nested
+        if (array_key_exists(OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME, $operationElementArray)) {
+            foreach ($operationElementArray[OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME] as $operationObject) {
+                $nestedOperationElement = $this->extractOperationElement($operationObject);
+                $operationElements[] = $nestedOperationElement;
+            }
+        }
+
+        // a dataObject specified in xml must contain corresponding metadata for the object
+        if (empty($operationElements)) {
+            throw new \Exception("must specify dataObject metadata if declaration is used");
+        }
+
+        return new OperationElement(
+            $operationDefKey,
+            $dataType,
+            OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME,
+            $operationElementArray[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
+            $nestedOperationElements,
+            $operationElements
+        );
+    }
+
+    /**
+     * Creates and Adds relevant DataElements from data entries defined within dataObject array
+     *
+     * @param array &$operationElements
+     * @param array $operationFieldArray
+     * @return void
+     */
+    private function extractOperationField(&$operationElements, $operationFieldArray)
+    {
+        foreach ($operationFieldArray as $operationFieldType) {
+            $operationElements[] = new OperationElement(
+                $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_KEY],
+                $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY_VALUE],
+                OperationDefinitionObjectHandler::ENTITY_OPERATION_ENTRY,
+                $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null
+            );
+        }
+    }
+
+    /**
+     * Creates and Adds relevant DataElements from data arrays defined within dataObject array
+     *
+     * @param array &$operationArrayData
+     * @param array $operationArrayArray
+     * @return void
+     */
+    private function extractOperationArray(&$operationArrayData, $operationArrayArray)
+    {
+        foreach ($operationArrayArray as $operationFieldType) {
+            $operationElementValue =
+                $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
+                [OperationElementExtractor::OPERATION_OBJECT_ARRAY_VALUE] ?? null;
+
+            $nestedOperationElements = [];
+            if (array_key_exists(OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME, $operationFieldType)) {
+                //add the key to reference this object later
+                $operationObjectKeyedArray = $operationFieldType
+                    [OperationElementExtractor::OPERATION_OBJECT_OBJ_NAME][0];
+                $operationObjectKeyedArray[OperationElementExtractor::OPERATION_OBJECT_KEY] =
+                    $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY];
+                $operationElement = $this->extractOperationElement($operationObjectKeyedArray);
+                $operationElementValue = $operationElement->getValue();
+                $nestedOperationElements[$operationElement->getValue()] = $operationElement;
+            }
+            $operationArrayData[] = new OperationElement(
+                $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
+                $operationElementValue,
+                OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY,
+                $operationFieldType[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
+                $nestedOperationElements
+            );
+        }
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
index 3587efdb1..eadc0e396 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd
@@ -6,11 +6,12 @@
                 <xs:element name="operation" maxOccurs="unbounded" minOccurs="0">
                     <xs:complexType>
                         <xs:choice minOccurs="0" maxOccurs="unbounded">
-                            <xs:element name="metaDataObject" type="metaDataObject" maxOccurs="unbounded" minOccurs="0"/>
-                            <xs:element name="entry" type="entry" maxOccurs="unbounded" minOccurs="0"/>
+                            <xs:element name="object" type="object" maxOccurs="unbounded" minOccurs="0"/>
+                            <xs:element name="field" type="entry" maxOccurs="unbounded" minOccurs="0"/>
                             <xs:element name="array" type="array" maxOccurs="unbounded" minOccurs="0"/>
                             <xs:element name="header" type="header" maxOccurs="unbounded" minOccurs="0"/>
                             <xs:element name="param" type="param" maxOccurs="unbounded" minOccurs="0"/>
+                            <xs:element name="contentType" type="xs:string" maxOccurs="1" minOccurs="1"/>
                         </xs:choice>
                         <xs:attribute type="xs:string" name="name"/>
                         <xs:attribute type="xs:string" name="dataType" use="required"/>
@@ -18,7 +19,6 @@
                         <xs:attribute type="xs:string" name="url"/>
                         <xs:attribute type="authEnum" name="auth"/>
                         <xs:attribute type="xs:string" name="method"/>
-                        <xs:attribute type="xs:string" name="storeCode" default="default"/>
                         <xs:attribute type="xs:string" name="successRegex"/>
                         <xs:attribute type="xs:string" name="returnRegex"/>
                     </xs:complexType>
@@ -26,11 +26,11 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:complexType name="metaDataObject">
+    <xs:complexType name="object">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="entry" type="entry" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="field" type="entry" maxOccurs="unbounded" minOccurs="0"/>
             <xs:element name="array" type="array" maxOccurs="unbounded" minOccurs="0"/>
-            <xs:element name="metaDataObject" type="metaDataObject" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="object" type="object" maxOccurs="unbounded" minOccurs="0"/>
         </xs:choice>
         <xs:attribute type="xs:string" name="key"/>
         <xs:attribute type="xs:string" name="dataType" use="required"/>
@@ -47,7 +47,7 @@
     </xs:complexType>
     <xs:complexType name="array">
         <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element name="metaDataObject" type="metaDataObject" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element name="object" type="object" maxOccurs="unbounded" minOccurs="0"/>
             <xs:element name="value" type="xs:string" maxOccurs="1" minOccurs="0"/>
         </xs:choice>
         <xs:attribute type="xs:string" name="key" use="required"/>
@@ -79,9 +79,8 @@
     <xs:simpleType name="authEnum" final="restriction" >
         <xs:restriction base="xs:string">
             <xs:enumeration value="adminOauth" />
-            <xs:enumeration value="customerOauth" />
-            <xs:enumeration value="adminFormkey" />
-            <xs:enumeration value="customerFormkey" />
+            <xs:enumeration value="adminFormKey" />
+            <xs:enumeration value="customerFormKey" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
\ No newline at end of file
diff --git a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
index 990f341d6..8e868d44d 100644
--- a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
+++ b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
@@ -32,19 +32,19 @@ public function addOption($option, $value);
      * Send request to the remote server.
      *
      * @param string $url
-     * @param mixed $params
+     * @param mixed $body
      * @param string $method
      * @param mixed $headers
      * @return void
      */
-    public function write($url, $params = [], $method = CurlInterface::POST, $headers = []);
+    public function write($url, $body = [], $method = CurlInterface::POST, $headers = []);
 
     /**
      * Read response from server.
      *
      * @param string $successRegex
      * @param string $returnRegex
-     * @return string|array
+     * @return mixed
      */
     public function read($successRegex = null, $returnRegex = null);
 
diff --git a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
index 8d826a331..38afcc5ab 100644
--- a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
+++ b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
@@ -118,13 +118,13 @@ public function setConfig(array $config = [])
      * Send request to the remote server.
      *
      * @param string $url
-     * @param mixed $params
+     * @param mixed $body
      * @param string $method
      * @param mixed $headers
      * @return void
      * @throws TestFrameworkException
      */
-    public function write($url, $params = [], $method = CurlInterface::POST, $headers = [])
+    public function write($url, $body = [], $method = CurlInterface::POST, $headers = [])
     {
         $this->applyConfig();
         $options = [
@@ -138,11 +138,11 @@ public function write($url, $params = [], $method = CurlInterface::POST, $header
         switch ($method) {
             case CurlInterface::POST:
                 $options[CURLOPT_POST] = true;
-                $options[CURLOPT_POSTFIELDS] = $params;
+                $options[CURLOPT_POSTFIELDS] = $body;
                 break;
             case CurlInterface::PUT:
                 $options[CURLOPT_CUSTOMREQUEST] = self::PUT;
-                $options[CURLOPT_POSTFIELDS] = $params;
+                $options[CURLOPT_POSTFIELDS] = $body;
                 break;
             case CurlInterface::DELETE:
                 $options[CURLOPT_CUSTOMREQUEST] = self::DELETE;
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index ce38c1cb3..3af4008b2 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -212,7 +212,7 @@ private function generateUseStatementsPhp()
         $useStatementsPhp = "use Magento\FunctionalTestingFramework\AcceptanceTester;\n";
 
         $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;\n";
-        $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistHandler;\n";
+        $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;\n";
         $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;\n";
 
         $allureStatements = [
@@ -500,15 +500,15 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
 
                     if ($hookObject) {
                         $createEntityFunctionCall = sprintf("\t\t\$this->%s->createEntity(", $key);
-                        $dataPersistHandlerFunctionCall = sprintf(
-                            "\t\t\$this->%s = new DataPersistHandler($%s",
+                        $dataPersistenceHandlerFunctionCall = sprintf(
+                            "\t\t\$this->%s = new DataPersistenceHandler($%s",
                             $key,
                             $entity
                         );
                     } else {
                         $createEntityFunctionCall = sprintf("\t\t\$%s->createEntity(", $key);
-                        $dataPersistHandlerFunctionCall = sprintf(
-                            "\t\t$%s = new DataPersistHandler($%s",
+                        $dataPersistenceHandlerFunctionCall = sprintf(
+                            "\t\t$%s = new DataPersistenceHandler($%s",
                             $key,
                             $entity
                         );
@@ -521,7 +521,7 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                     }
 
                     //If required-entities are defined, reassign dataObject to not overwrite the static definition.
-                    //Also, DataPersistHandler needs to be defined with customData array.
+                    //Also, DataPersistenceHandler needs to be defined with customData array.
                     if (!empty($requiredEntities)) {
                         $testSteps .= sprintf(
                             "\t\t$%s = new EntityDataObject($%s->getName(), $%s->getType(), $%s->getData()
@@ -535,14 +535,14 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                             $entity
                         );
 
-                        $dataPersistHandlerFunctionCall .= sprintf(
+                        $dataPersistenceHandlerFunctionCall .= sprintf(
                             ", [%s]);\n",
                             implode(', ', $requiredEntityObjects)
                         );
                     } else {
-                        $dataPersistHandlerFunctionCall .= ");\n";
+                        $dataPersistenceHandlerFunctionCall .= ");\n";
                     }
-                    $testSteps .= $dataPersistHandlerFunctionCall;
+                    $testSteps .= $dataPersistenceHandlerFunctionCall;
                     $testSteps .= $createEntityFunctionCall;
                     break;
                 case "deleteData":
@@ -874,7 +874,7 @@ private function generateHooksPhp($hookObjects)
             foreach ($hookObject->getActions() as $step) {
                 if ($step->getType() == "createData") {
                     $hooks .= "\t/**\n";
-                    $hooks .= sprintf("\t  * @var DataPersistHandler $%s;\n", $step->getMergeKey());
+                    $hooks .= sprintf("\t  * @var DataPersistenceHandler $%s;\n", $step->getMergeKey());
                     $hooks .= "\t */\n";
                     $hooks .= sprintf("\tprotected $%s;\n\n", $step->getMergeKey());
                     $createData = true;

From f9dd74a44b0f30a6631658f9bd17d861738c3661 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Fri, 29 Sep 2017 09:38:06 -0500
Subject: [PATCH 11/19] MQE-392: Generated code is incorrect if there is a
 space between parameters

- Added trim to parameter processing to prevent erroneous spaces.
---
 .../FunctionalTestingFramework/Test/Objects/ActionObject.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
index 767012694..cc473075e 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -392,11 +392,12 @@ private function matchParameterReferences($reference, $parameters)
             );
         }
 
-        //Attempt to Resolve {{data}} references to actual output.
+        //Attempt to Resolve {{data}} references to actual output. Trim parameter for whitespace before processing it.
         //If regex matched it means that it's either a 'StringLiteral' or $key.data$/$$key.data$$ reference.
         //Else assume it's a normal {{data.key}} reference and recurse through findAndReplace
         $resolvedParameters = [];
         foreach ($parameters as $parameter) {
+            $parameter = trim($parameter);
             preg_match_all("/[$'][\w.$]+[$']/", $parameter, $match);
             if (!empty($match[0])) {
                 $resolvedParameters[] = ltrim(rtrim($parameter, "'"), "'");

From 9010ab1d356b2e5333a2c08cb4f3772a0adb14ea Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Fri, 29 Sep 2017 09:43:36 -0500
Subject: [PATCH 12/19] MQE-393: [XML Parser] waitForLoadingMaskToDisppear
 usage causes parser Error

- Added waitForLoadingMaskToDisappear to di.xml
---
 etc/di.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index 081b324fc..6cb672c81 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -226,7 +226,7 @@
                 <item name="/config/cest/test/entity/required-entity" xsi:type="string">key</item>
                 <item name="/config/cest/test/actionGroup/argument" xsi:type="string">name</item>
                 <item name="/config/cest/test/createData/required-entity" xsi:type="string">name</item>
-                <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
             </argument>
             <argument name="fileName" xsi:type="string">*Cest.xml</argument>
             <argument name="defaultScope" xsi:type="string">Cest</argument>
@@ -236,9 +236,9 @@
     <virtualType name="Magento\FunctionalTestingFramework\Test\Config\Dom\ArrayNodeConfig" type="Magento\FunctionalTestingFramework\Config\Dom\ArrayNodeConfig">
         <arguments>
             <argument name="assocArrayAttributes" xsi:type="array">
-                <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
-                <item name="/config/cest/before/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
-                <item name="/config/cest/after/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/before/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/after/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
                 <item name="/config/cest/test" xsi:type="string">name</item>
                 <item name="/config/cest" xsi:type="string">name</item>
                 <item name="/config/cest/test/entity/data" xsi:type="string">key</item>

From ad8cad9882d051f36685442d977e0c4c4eab3b17 Mon Sep 17 00:00:00 2001
From: Ian Meron <imeron@magento.com>
Date: Mon, 2 Oct 2017 12:55:41 -0500
Subject: [PATCH 13/19] MQE-309:[Customizability] Update nested API dependency
 schema and execution

    - change test schema for simpler persisted entity relationships
    - change data persistence handler to resolve entity relationships
    - change data schema to allow var declaration as a placehold for persisted data
---
 etc/di.xml                                    | 16 +---
 .../Handlers/DataObjectHandler.php            | 18 ++++-
 .../OperationDefinitionObjectHandler.php      |  4 +-
 .../Objects/EntityDataObject.php              | 28 ++++++-
 .../Persist/DataPersistenceHandler.php        |  9 ++-
 .../Persist/OperationDataArrayResolver.php    | 78 ++++++++++++++++++-
 .../DataGenerator/etc/dataProfileSchema.xsd   | 10 +++
 .../Test/etc/testSchema.xsd                   |  2 +-
 .../Util/TestGenerator.php                    | 56 +++----------
 9 files changed, 152 insertions(+), 69 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index 40a10eb3f..81f36ceb0 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -204,10 +204,8 @@
             <argument name="idAttributes" xsi:type="array">
                 <item name="/config/cest" xsi:type="string">name</item>
                 <item name="/config/cest/test" xsi:type="string">name</item>
-                <item name="/config/cest/test/entity/data" xsi:type="string">key</item>
-                <item name="/config/cest/test/entity/required-entity" xsi:type="string">key</item>
                 <item name="/config/cest/test/actionGroup/argument" xsi:type="string">name</item>
-                <item name="/config/cest/test/createData/required-entity" xsi:type="string">name</item>
+                <item name="/config/cest/test/createData/required-entity" xsi:type="string">persistedKey</item>
                 <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
             </argument>
             <argument name="fileName" xsi:type="string">*Cest.xml</argument>
@@ -223,15 +221,9 @@
                 <item name="/config/cest/after/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
                 <item name="/config/cest/test" xsi:type="string">name</item>
                 <item name="/config/cest" xsi:type="string">name</item>
-                <item name="/config/cest/test/entity/data" xsi:type="string">key</item>
-                <item name="/config/cest/test/entity/required-entity" xsi:type="string">key</item>
-                <item name="/config/cest/test/createData/required-entity" xsi:type="string">name</item>
-                <item name="/config/cest/before/entity/data" xsi:type="string">key</item>
-                <item name="/config/cest/before/entity/required-entity" xsi:type="string">key</item>
-                <item name="/config/cest/before/createData/required-entity" xsi:type="string">name</item>
-                <item name="/config/cest/after/entity/data" xsi:type="string">key</item>
-                <item name="/config/cest/after/entity/required-entity" xsi:type="string">key</item>
-                <item name="/config/cest/after/createData/required-entity" xsi:type="string">name</item>
+                <item name="/config/cest/test/createData/required-entity" xsi:type="string">persistedKey</item>
+                <item name="/config/cest/before/createData/required-entity" xsi:type="string">persistedKey</item>
+                <item name="/config/cest/after/createData/required-entity" xsi:type="string">persistedKey</item>
                 <item name="/config/cest/test/actionGroup/argument" xsi:type="string">name</item>
             </argument>
             <argument name="numericArrays" xsi:type="array">
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php
index 633028538..f52659b34 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php
@@ -43,6 +43,12 @@ class DataObjectHandler implements ObjectHandlerInterface
     const ARRAY_ELEMENT_ITEM = 'item';
     const ARRAY_ELEMENT_ITEM_VALUE = 'value';
 
+    const VAR_VALUES = 'var';
+    const VAR_KEY = 'key';
+    const VAR_ENTITY = 'entityType';
+    const VAR_FIELD = 'entityKey';
+    const VAR_ENTITY_FIELD_SEPARATOR = '->';
+
     const REQUIRED_ENTITY = 'required-entity';
     const REQUIRED_ENTITY_TYPE = 'type';
     const REQUIRED_ENTITY_VALUE = 'value';
@@ -150,6 +156,7 @@ private function parseDataEntities()
             $dataValues = [];
             $linkedEntities = [];
             $arrayValues = [];
+            $vars = [];
             $uniquenessValues = [];
 
             if (array_key_exists(self::DATA_VALUES, $entity)) {
@@ -186,12 +193,21 @@ private function parseDataEntities()
                 }
             }
 
+            if (array_key_exists(self::VAR_VALUES, $entity)) {
+                foreach ($entity[self::VAR_VALUES] as $varElement) {
+                    $varKey = $varElement[self::VAR_KEY];
+                    $varValue = $varElement[self::VAR_ENTITY] . self::VAR_ENTITY_FIELD_SEPARATOR . $varElement[self::VAR_FIELD];
+                    $vars[$varKey] = $varValue;
+                }
+            }
+
             $entityDataObject = new EntityDataObject(
                 $entityName,
                 $entityType,
                 $dataValues,
                 $linkedEntities,
-                $uniquenessValues
+                $uniquenessValues,
+                $vars
             );
 
             $this->data[$entityDataObject->getName()] = $entityDataObject;
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
index 4d28caab0..9dda26324 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
@@ -201,14 +201,14 @@ private function initDataDefinitions()
                     } else {
                         $value = $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE][0]
                         [OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
-                        $type = [OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_VALUE];
+                        $type = OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY;
                     }
 
                     $operationElements[] = new OperationElement(
                         $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY_KEY],
                         $value,
                         $type,
-                        $dataEntryType[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
+                        $operationField[OperationDefinitionObjectHandler::ENTITY_OPERATION_REQUIRED] ?? null,
                         $subOperationElements
                     );
                 }
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php
index db602ad07..41730f3aa 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php
@@ -34,6 +34,13 @@ class EntityDataObject
      */
     private $linkedEntities = [];
 
+    /**
+     * An array of variable mappings for static data
+     *
+     * @var array
+     */
+    private $vars;
+
     /**
      * An array of Data Name to Data Value
      *
@@ -63,8 +70,9 @@ class EntityDataObject
      * @param array $data
      * @param array $linkedEntities
      * @param array $uniquenessData
+     * @param array $vars
      */
-    public function __construct($entityName, $entityType, $data, $linkedEntities, $uniquenessData)
+    public function __construct($entityName, $entityType, $data, $linkedEntities, $uniquenessData, $vars = [])
     {
         $this->name = $entityName;
         $this->type = $entityType;
@@ -73,6 +81,8 @@ public function __construct($entityName, $entityType, $data, $linkedEntities, $u
         if ($uniquenessData) {
             $this->uniquenessData = $uniquenessData;
         }
+
+        $this->vars = $vars;
     }
 
     /**
@@ -189,6 +199,22 @@ public function getDataByName($dataName, $uniDataFormat)
         return null;
     }
 
+    /**
+     * Function which returns a reference to another entity (e.g. a var with entity="category" field="id" returns as
+     * category->id)
+     *
+     * @param string $dataKey
+     * @return array|null
+     */
+    public function getVarReference($dataKey)
+    {
+        if (array_key_exists($dataKey, $this->vars)) {
+            return $this->vars[$dataKey];
+        }
+
+        return null;
+    }
+
     /**
      * This function takes an array of entityTypes indexed by name and a string that represents the type of interest.
      * The function returns an array of entityNames relevant to the specified type.
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
index bc8d0a477..b44382aed 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
@@ -31,7 +31,7 @@ class DataPersistenceHandler
      * Array of dependent entities, handed to CurlHandler when entity is created.
      * @var array|null
      */
-    private $dependentObjects = [];
+    private $dependentObjects;
 
     /**
      * Store code in web api rest url.
@@ -46,11 +46,14 @@ class DataPersistenceHandler
      * @param EntityDataObject $entityObject
      * @param array $dependentObjects
      */
-    public function __construct($entityObject, $dependentObjects = null)
+    public function __construct($entityObject, $dependentObjects = [])
     {
         $this->entityObject = clone $entityObject;
-        $this->dependentObjects = $dependentObjects;
         $this->storeCode = 'default';
+
+        foreach ($dependentObjects as $dependentObject) {
+            $this->dependentObjects[] = $dependentObject->getCreatedObject();
+        }
     }
 
     /**
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
index f175b5271..49cb535a8 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
@@ -18,8 +18,7 @@ class OperationDataArrayResolver
         'string',
         'boolean',
         'integer',
-        'double',
-        OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY
+        'double'
     ];
     const EXCEPTION_REQUIRED_DATA = "%s of key \" %s\" in \"%s\" is required by metadata, but was not provided.";
 
@@ -82,9 +81,10 @@ public function resolveOperationDataArray($entityObject, $operationMetadata, $op
             $operationElementType = $operationElement->getValue();
 
             if (in_array($operationElementType, self::PRIMITIVE_TYPES)) {
-                $elementData = $entityObject->getDataByName(
+                $elementData = $this->resolvePrimitiveReference(
+                    $entityObject,
                     $operationElement->getKey(),
-                    EntityDataObject::CEST_UNIQUE_VALUE
+                    $operationElement->getType()
                 );
 
                 // If data was defined at all, attempt to put it into operation data array
@@ -143,6 +143,67 @@ public function resolveOperationDataArray($entityObject, $operationMetadata, $op
         return $operationDataArray;
     }
 
+    /**
+     * Resolves a reference for a primitive piece of data, if the data cannot be found as a defined field, the method
+     * looks to see if any vars have been declared with the same operationKey and resolves based on defined dependent
+     * entities.
+     *
+     * @param EntityDataObject $entityObject
+     * @param string $operationKey
+     * @param string $operationElementType
+     * @return array|string
+     */
+    private function resolvePrimitiveReference($entityObject, $operationKey, $operationElementType)
+    {
+        $elementData = $entityObject->getDataByName(
+            $operationKey,
+            EntityDataObject::CEST_UNIQUE_VALUE
+        );
+
+        if ($elementData == null && $entityObject->getVarReference($operationKey) != null) {
+            list($type, $field) = explode(
+                DataObjectHandler::VAR_ENTITY_FIELD_SEPARATOR,
+                $entityObject->getVarReference($operationKey)
+            );
+
+            if ($operationElementType == OperationDefinitionObjectHandler::ENTITY_OPERATION_ARRAY) {
+                $elementDatas = [];
+                $entities = $this->getDependentEntitiesOfType($type);
+                foreach ($entities as $entity) {
+                    $elementDatas[] = $entity->getDataByName($field, EntityDataObject::CEST_UNIQUE_VALUE);
+                }
+
+                return $elementDatas;
+
+            }
+
+            $entity = $this->getDependentEntitiesOfType($type)[0];
+            $elementData = $entity->getDataByName($field, EntityDataObject::CEST_UNIQUE_VALUE);
+        }
+
+        return $elementData;
+    }
+
+    /**
+     * Returns all dependent entities of the type passed in as an arg (the dependent entities are given at runtime,
+     * and are not statically defined).
+     *
+     * @param string $type
+     * @return array
+     */
+    private function getDependentEntitiesOfType($type)
+    {
+        $entitiesOfType = [];
+
+        foreach ($this->dependentEntities as $dependentEntity) {
+            if ($dependentEntity->getType() == $type) {
+                $entitiesOfType[] = $dependentEntity;
+            }
+        }
+
+        return $entitiesOfType;
+    }
+
     /**
      * This function does a comparison of the entity object being matched to the operation element. If there is a
      * mismatch in type we attempt to use a nested entity, if the entities are properly matched, we simply return
@@ -254,6 +315,15 @@ private function castValue($type, $value)
     {
         $newVal = $value;
 
+        if (is_array($value)) {
+            $newVals = [];
+            foreach($value as $val) {
+                $newVals[] = $this->castValue($type, $val);
+            }
+
+            return $newVals;
+        }
+
         switch ($type) {
             case 'string':
                 break;
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd
index 24a7eed6b..c0494c911 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd
@@ -30,6 +30,16 @@
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
+            <xs:element name="var" maxOccurs="unbounded" minOccurs="0">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="dataType">
+                            <xs:attribute name="entityType" type="xs:string"/>
+                            <xs:attribute name="entityKey" type="xs:string"/>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
             <xs:element name="required-entity" type="requiredEntityType" maxOccurs="unbounded" minOccurs="0">
                 <xs:annotation>
                     <xs:documentation>
diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
index c0677a132..b64c6d839 100644
--- a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
+++ b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
@@ -380,7 +380,7 @@
     <xs:complexType name="requiredEntityType">
         <xs:simpleContent>
             <xs:extension base="xs:string">
-                <xs:attribute type="xs:string" name="name" use="required"/>
+                <xs:attribute type="xs:string" name="persistedKey" use="required"/>
                 <xs:attribute type="xs:boolean" name="remove" default="false"/>
                 <xs:attribute type="xs:string" name="before"/>
                 <xs:attribute type="xs:string" name="after"/>
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 3af4008b2..2f197e8b5 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -18,6 +18,8 @@
 class TestGenerator
 {
 
+    const REQUIRED_ENTITY_REFERENCE = 'persistedKey';
+
     /**
      * Path to the export dir.
      *
@@ -487,13 +489,16 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                     foreach ($customActionAttributes as $customAttribute) {
                         if (is_array($customAttribute) && $customAttribute['nodeName'] = 'required-entity') {
                             if ($hookObject) {
-                                $requiredEntities [] = "\$this->" . $customAttribute['name'] . "->getName() => " .
-                                    "\$this->" . $customAttribute['name'] . "->getType()";
-                                $requiredEntityObjects [] = '$this->' . $customAttribute['name'];
+                                $requiredEntities [] = "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
+                                    "->getName() => " . "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
+                                    "->getType()";
+                                $requiredEntityObjects [] = '$this->' . $customAttribute
+                                    [self::REQUIRED_ENTITY_REFERENCE];
                             } else {
-                                $requiredEntities [] = "\$" . $customAttribute['name'] . "->getName() => "
-                                    . "\$" . $customAttribute['name'] . "->getType()";
-                                $requiredEntityObjects [] = '$' . $customAttribute['name'];
+                                $requiredEntities [] = "\$" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE]
+                                    . "->getName() => " . "\$" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
+                                    "->getType()";
+                                $requiredEntityObjects [] = '$' . $customAttribute[self::REQUIRED_ENTITY_REFERENCE];
                             }
                         }
                     }
@@ -523,18 +528,6 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                     //If required-entities are defined, reassign dataObject to not overwrite the static definition.
                     //Also, DataPersistenceHandler needs to be defined with customData array.
                     if (!empty($requiredEntities)) {
-                        $testSteps .= sprintf(
-                            "\t\t$%s = new EntityDataObject($%s->getName(), $%s->getType(), $%s->getData()
-                            , array_merge($%s->getLinkedEntities(), [%s]), $%s->getUniquenessData());\n",
-                            $entity,
-                            $entity,
-                            $entity,
-                            $entity,
-                            $entity,
-                            implode(", ", $requiredEntities),
-                            $entity
-                        );
-
                         $dataPersistenceHandlerFunctionCall .= sprintf(
                             ", [%s]);\n",
                             implode(', ', $requiredEntityObjects)
@@ -560,33 +553,6 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
                         $testSteps .= sprintf("\t\t$%s->deleteEntity();\n", $key);
                     }
                     break;
-                case "entity":
-                    $entityData = '[';
-                    foreach ($stepsData[$customActionAttributes['name']] as $dataKey => $dataValue) {
-                        $variableReplace = $this->resolveTestVariable($dataValue, true);
-                        $entityData .= sprintf("\"%s\" => \"%s\", ", $dataKey, $variableReplace);
-                    }
-                    $entityData .= ']';
-                    if ($hookObject) {
-                        // no uniqueness attributes for data allowed within entity defined in cest.
-                        $testSteps .= sprintf(
-                            "\t\t\$this->%s = new EntityDataObject(\"%s\",\"%s\",%s,null,null);\n",
-                            $customActionAttributes['name'],
-                            $customActionAttributes['name'],
-                            $customActionAttributes['type'],
-                            $entityData
-                        );
-                    } else {
-                        // no uniqueness attributes for data allowed within entity defined in cest.
-                        $testSteps .= sprintf(
-                            "\t\t$%s = new EntityDataObject(\"%s\",\"%s\",%s,null,null);\n",
-                            $customActionAttributes['name'],
-                            $customActionAttributes['name'],
-                            $customActionAttributes['type'],
-                            $entityData
-                        );
-                    }
-                    break;
                 case "dontSeeCurrentUrlEquals":
                 case "dontSeeCurrentUrlMatches":
                 case "seeInPopup":

From cef0e3abf43ab52513c620f3b68df014bae16b96 Mon Sep 17 00:00:00 2001
From: Ian Meron <imeron@magento.com>
Date: Mon, 2 Oct 2017 13:35:13 -0500
Subject: [PATCH 14/19] MQE-309:[Customizability] Update nested API dependency
 schema and execution

- remove old entity test schema declarations
---
 .../Test/etc/testSchema.xsd                   | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
index b64c6d839..edabbcbea 100644
--- a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
+++ b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
@@ -105,7 +105,6 @@
             <xs:element type="dontSeeOptionIsSelectedType" name="dontSeeOptionIsSelected" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="doubleClickType" name="doubleClick" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="dragAndDropType" name="dragAndDrop" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element type="entityDeclarationType" name="entity" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="executeInSeleniumType" name="executeInSelenium" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="executeJSType" name="executeJS" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element type="fillFieldType" name="fillField" minOccurs="0" maxOccurs="unbounded"/>
@@ -618,38 +617,6 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
-    <xs:complexType name="entityDeclarationType">
-        <xs:choice>
-            <xs:element name="data" type="entityDataType" maxOccurs="unbounded" minOccurs="0"/>
-            <xs:element name="required-entity" type="entityRequiredEntityType" maxOccurs="unbounded" minOccurs="0"/>
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string" use="required"/>
-        <xs:attribute name="type" type="xs:string" use="required"/>
-        <xs:attribute type="xs:string" name="mergeKey" use="required"/>
-        <xs:attribute type="xs:boolean" name="remove" default="false"/>
-        <xs:attribute type="xs:string" name="before"/>
-        <xs:attribute type="xs:string" name="after"/>
-    </xs:complexType>
-    <xs:complexType name="entityDataType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute type="xs:string" name="key" use="required"/>
-                <xs:attribute type="xs:boolean" name="remove" default="false"/>
-                <xs:attribute type="xs:string" name="before"/>
-                <xs:attribute type="xs:string" name="after"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="entityRequiredEntityType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute type="xs:string" name="key" use="required"/>
-                <xs:attribute type="xs:boolean" name="remove" default="false"/>
-                <xs:attribute type="xs:string" name="before"/>
-                <xs:attribute type="xs:string" name="after"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
     <xs:complexType name="executeInSeleniumType">
         <xs:simpleContent>
             <xs:extension base="xs:string">

From 8b873a8baa0aa1ecf748ded3097035462a985d2a Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Tue, 3 Oct 2017 13:44:23 -0500
Subject: [PATCH 15/19] MQE-391: Variable is not correctly resolved when array
 symbol ([ or ]) is inside $$ signs

- Updated Regex for persisted variable replacement.
---
 src/Magento/FunctionalTestingFramework/Util/TestGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 2f197e8b5..2780df25a 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -772,7 +772,7 @@ private function resolveTestVariable($inputString, $quoteBreak = false)
         $replaced = false;
 
         // Check for Cest-scope variables first, stricter regex match.
-        preg_match_all("/\\$\\$[\w.]+\\$\\$/", $outputString, $matches);
+        preg_match_all("/\\$\\$[\w.\[\]]+\\$\\$/", $outputString, $matches);
         foreach ($matches[0] as $match) {
             $replacement = null;
             $variable = $this->stripAndSplitReference($match, '$$');
@@ -791,7 +791,7 @@ private function resolveTestVariable($inputString, $quoteBreak = false)
         }
 
         // Check Test-scope variables
-        preg_match_all("/\\$[\w.]+\\$/", $outputString, $matches);
+        preg_match_all("/\\$[\w.\[\]]+\\$/", $outputString, $matches);
         foreach ($matches[0] as $match) {
             $replacement = null;
             $variable = $this->stripAndSplitReference($match, '$');

From 72dab137e83b98283615699db27a5d476a19de4b Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Tue, 3 Oct 2017 13:49:06 -0500
Subject: [PATCH 16/19] MQE-414: [XML Parser] PageObject/SectionObject picking
 up SampleTemplates

- Edited di.xml to use Module instead of Mask for Pages/Sections.
---
 etc/di.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index 81f36ceb0..de716b7eb 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -74,27 +74,27 @@
     </virtualType>
     <virtualType name="Magento\FunctionalTestingFramework\Config\Reader\Page" type="Magento\FunctionalTestingFramework\Config\Reader\Filesystem">
         <arguments>
-            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Mask</argument>
+            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Module</argument>
             <argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
             <argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Page</argument>
             <argument name="idAttributes" xsi:type="array">
                 <item name="/config/page" xsi:type="string">name</item>
                 <item name="/config/page/section" xsi:type="string">name</item>
             </argument>
-            <argument name="fileName" xsi:type="string">#\.xml$#</argument>
+            <argument name="fileName" xsi:type="string">*Page.xml</argument>
             <argument name="defaultScope" xsi:type="string">Page</argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\FunctionalTestingFramework\Config\Reader\Section" type="Magento\FunctionalTestingFramework\Config\Reader\Filesystem">
         <arguments>
-            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Mask</argument>
+            <argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Module</argument>
             <argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
             <argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Section</argument>
             <argument name="idAttributes" xsi:type="array">
                 <item name="/config/section" xsi:type="string">name</item>
                 <item name="/config/section/element" xsi:type="string">name</item>
             </argument>
-            <argument name="fileName" xsi:type="string">#\.xml$#</argument>
+            <argument name="fileName" xsi:type="string">*Section.xml</argument>
             <argument name="defaultScope" xsi:type="string">Section</argument>
         </arguments>
     </virtualType>

From 3ba4a6d599780b37ff2511662c0b3c316deb76dd Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Wed, 4 Oct 2017 13:00:15 -0500
Subject: [PATCH 17/19] MQE-410: [Generator] Bad output with Parameterized
 Persisted Unique data

- Changed selector resolution to call uniquenessFunctionCall. Solves issue with safe backwards compatibility.
- Generator was stripping ' from selector strings like: #'{{name}}', turning that into #{{name}} when resolved.
---
 .../FunctionalTestingFramework/Util/TestGenerator.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
index 2780df25a..971688fcf 100644
--- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
@@ -397,7 +397,7 @@ private function generateStepsPhp($stepsObject, $stepsData, $hookObject = false)
             if (isset($customActionAttributes['selectorArray'])) {
                 $selector = $customActionAttributes['selectorArray'];
             } elseif (isset($customActionAttributes['selector'])) {
-                $selector = $this->wrapWithDoubleQuotes($customActionAttributes['selector']);
+                $selector = $this->addUniquenessFunctionCall($customActionAttributes['selector']);
             }
 
             if (isset($customActionAttributes['selector1'])) {
@@ -1050,7 +1050,7 @@ private function wrapWithDoubleQuotes($input)
     }
 
     /**
-     * Strip beginning and ending quotes of input string.
+     * Strip beginning and ending double quotes of input string.
      *
      * @param string $input
      * @return string
@@ -1060,10 +1060,10 @@ private function stripWrappedQuotes($input)
         if (empty($input)) {
             return '';
         }
-        if (substr($input, 0, 1) === '"' || substr($input, 0, 1) === "'") {
+        if (substr($input, 0, 1) === '"') {
             $input = substr($input, 1);
         }
-        if (substr($input, -1, 1) === '"' || substr($input, -1, 1) === "'") {
+        if (substr($input, -1, 1) === '"') {
             $input = substr($input, 0, -1);
         }
         return $input;

From e12f672cee6a4b5ab8e08d03a6a906323fef1e8d Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <okolesnyk@magento.com>
Date: Thu, 5 Oct 2017 15:45:02 +0300
Subject: [PATCH 18/19] MQE-424: Fix static code issues in MFTF tests and MFTF

---
 .../DataGenerator/Persist/Curl/AdminExecutor.php          | 4 ++--
 .../DataGenerator/Persist/Curl/WebapiExecutor.php         | 4 ++--
 .../DataGenerator/Persist/DataPersistenceHandler.php      | 2 +-
 .../Util/Protocol/CurlInterface.php                       | 8 ++++----
 .../Util/Protocol/CurlTransport.php                       | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
index 2fd97eeb3..5e90cf7d8 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
@@ -103,7 +103,7 @@ private function setFormKey()
      * @param string $url
      * @param array $data
      * @param string $method
-     * @param mixed $headers
+     * @param array $headers
      * @return void
      * @throws TestFrameworkException
      */
@@ -162,7 +162,7 @@ public function read($successRegex = null, $returnRegex = null)
      * Add additional option to cURL.
      *
      * @param int $option the CURLOPT_* constants
-     * @param mixed $value
+     * @param int|string|bool|array $value
      * @return void
      */
     public function addOption($option, $value)
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
index 66321bf88..652f620b4 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
@@ -109,7 +109,7 @@ public function write($url, $data = [], $method = CurlInterface::POST, $headers
      *
      * @param string $successRegex
      * @param string $returnRegex
-     * @return mixed
+     * @return string
      */
     public function read($successRegex = null, $returnRegex = null)
     {
@@ -121,7 +121,7 @@ public function read($successRegex = null, $returnRegex = null)
      * Add additional option to cURL.
      *
      * @param  int $option the CURLOPT_* constants
-     * @param  mixed $value
+     * @param  int|string|bool|array $value
      * @return void
      */
     public function addOption($option, $value)
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
index b44382aed..7c80765b7 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
@@ -119,7 +119,7 @@ public function getCreatedDataByName($dataName)
     /**
      * Save created entity.
      *
-     * @param mixed $response
+     * @param string|array $response
      * @param array $requestDataArray
      * @param bool $isJson
      * @return void
diff --git a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
index 8e868d44d..792e0c6d4 100644
--- a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
+++ b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlInterface.php
@@ -23,7 +23,7 @@ interface CurlInterface
      * Add additional option to cURL.
      *
      * @param int $option
-     * @param mixed $value
+     * @param int|string|bool|array $value
      * @return $this
      */
     public function addOption($option, $value);
@@ -32,9 +32,9 @@ public function addOption($option, $value);
      * Send request to the remote server.
      *
      * @param string $url
-     * @param mixed $body
+     * @param array $body
      * @param string $method
-     * @param mixed $headers
+     * @param array $headers
      * @return void
      */
     public function write($url, $body = [], $method = CurlInterface::POST, $headers = []);
@@ -44,7 +44,7 @@ public function write($url, $body = [], $method = CurlInterface::POST, $headers
      *
      * @param string $successRegex
      * @param string $returnRegex
-     * @return mixed
+     * @return string|array
      */
     public function read($successRegex = null, $returnRegex = null);
 
diff --git a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
index 38afcc5ab..5f02f476d 100644
--- a/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
+++ b/src/Magento/FunctionalTestingFramework/Util/Protocol/CurlTransport.php
@@ -93,7 +93,7 @@ public function setOptions(array $options = [])
      * Add additional option to cURL.
      *
      * @param int $option
-     * @param mixed $value
+     * @param int|string|bool|array $value
      * @return $this
      */
     public function addOption($option, $value)
@@ -118,9 +118,9 @@ public function setConfig(array $config = [])
      * Send request to the remote server.
      *
      * @param string $url
-     * @param mixed $body
+     * @param array $body
      * @param string $method
-     * @param mixed $headers
+     * @param array $headers
      * @return void
      * @throws TestFrameworkException
      */
@@ -228,7 +228,7 @@ public function getError()
      * Get information regarding a specific transfer.
      *
      * @param int $opt CURLINFO option
-     * @return mixed
+     * @return string|array
      */
     public function getInfo($opt = 0)
     {

From a0f3637629b04be0aadf4a7dd64b03b9a0cc9219 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Thu, 5 Oct 2017 14:45:12 -0500
Subject: [PATCH 19/19] MQE-403: Cannot use multiple actionGroups in Test

- di.xml update, turns out there's way more wrong here than just di.xml
- Changed CAP to append actiongroup Mergekey to steps when processing ActionGroups, otherwise the CAP would find duplicate keys and overwrite them (since the ActionGroup steps technically had the same keys).
---
 etc/di.xml                                    |  8 +++---
 .../Test/Objects/ActionGroupObject.php        | 28 +++++++++----------
 .../Test/Util/ActionMergeUtil.php             |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index de716b7eb..c07bfe127 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -206,7 +206,7 @@
                 <item name="/config/cest/test" xsi:type="string">name</item>
                 <item name="/config/cest/test/actionGroup/argument" xsi:type="string">name</item>
                 <item name="/config/cest/test/createData/required-entity" xsi:type="string">persistedKey</item>
-                <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/test/(acceptPopup|actionGroup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
             </argument>
             <argument name="fileName" xsi:type="string">*Cest.xml</argument>
             <argument name="defaultScope" xsi:type="string">Cest</argument>
@@ -216,9 +216,9 @@
     <virtualType name="Magento\FunctionalTestingFramework\Test\Config\Dom\ArrayNodeConfig" type="Magento\FunctionalTestingFramework\Config\Dom\ArrayNodeConfig">
         <arguments>
             <argument name="assocArrayAttributes" xsi:type="array">
-                <item name="/config/cest/test/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
-                <item name="/config/cest/before/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
-                <item name="/config/cest/after/(acceptPopup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/test/(acceptPopup|actionGroup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/before/(acceptPopup|actionGroup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
+                <item name="/config/cest/after/(acceptPopup|actionGroup|amOnPage|amOnUrl|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|createData|deleteData|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|performOn|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText)" xsi:type="string">mergeKey</item>
                 <item name="/config/cest/test" xsi:type="string">name</item>
                 <item name="/config/cest" xsi:type="string">name</item>
                 <item name="/config/cest/test/createData/required-entity" xsi:type="string">persistedKey</item>
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
index e51117e36..a88bcae61 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
@@ -54,9 +54,10 @@ public function __construct($name, $arguments, $actions)
      * Gets the ordered steps including merged waits
      *
      * @param array $arguments
+     * @param string $actionReferenceKey
      * @return array
      */
-    public function getSteps($arguments)
+    public function getSteps($arguments, $actionReferenceKey)
     {
         $mergeUtil = new ActionMergeUtil();
         $args = $this->arguments;
@@ -65,7 +66,7 @@ public function getSteps($arguments)
             $args = array_merge($args, $arguments);
         }
 
-        return $mergeUtil->resolveActionSteps($this->getResolvedActionsWithArgs($args), true);
+        return $mergeUtil->resolveActionSteps($this->getResolvedActionsWithArgs($args, $actionReferenceKey), true);
     }
 
     /**
@@ -73,17 +74,18 @@ public function getSteps($arguments)
      * action objects with proper argument.field references.
      *
      * @param array $arguments
+     * @param string $actionReferenceKey
      * @return array
      */
-    private function getResolvedActionsWithArgs($arguments)
+    private function getResolvedActionsWithArgs($arguments, $actionReferenceKey)
     {
         $resolvedActions = [];
         $regexPattern = '/{{([\w]+)/';
 
         foreach ($this->parsedActions as $action) {
             $varAttributes = array_intersect(self::VAR_ATTRIBUTES, array_keys($action->getCustomActionAttributes()));
+            $newActionAttributes = [];
             if (!empty($varAttributes)) {
-                $newActionAttributes = [];
                 // 1 check to see if we have pertinent var
                 foreach ($varAttributes as $varAttribute) {
                     $attributeValue = $action->getCustomActionAttributes()[$varAttribute];
@@ -98,18 +100,14 @@ private function getResolvedActionsWithArgs($arguments)
                         $matches
                     );
                 }
-
-                $resolvedActions[$action->getMergeKey()] = new ActionObject(
-                    $action->getMergeKey(),
-                    $action->getType(),
-                    array_merge($action->getCustomActionAttributes(), $newActionAttributes),
-                    $action->getLinkedAction(),
-                    $action->getOrderOffset()
-                );
-            } else {
-                // add action here if we do not see any userInput in this particular action
-                $resolvedActions[$action->getMergeKey()] = $action;
             }
+            $resolvedActions[$action->getMergeKey() . $actionReferenceKey] = new ActionObject(
+                $action->getMergeKey() . $actionReferenceKey,
+                $action->getType(),
+                array_merge($action->getCustomActionAttributes(), $newActionAttributes),
+                $action->getLinkedAction(),
+                $action->getOrderOffset()
+            );
         }
 
         return $resolvedActions;
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php b/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
index 133ace223..ad38df07f 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
@@ -77,7 +77,7 @@ private function resolveActionGroups($mergedSteps)
                     $mergedStep->getCustomActionAttributes()[ActionObjectExtractor::ACTION_GROUP_REF]
                 );
                 $args = $mergedStep->getCustomActionAttributes()[ActionObjectExtractor::ACTION_GROUP_ARGUMENTS] ?? null;
-                $actionsToMerge = $actionGroup->getSteps($args);
+                $actionsToMerge = $actionGroup->getSteps($args, $key);
                 $newOrderedList = $newOrderedList + $actionsToMerge;
             } else {
                 $newOrderedList[$key]  = $mergedStep;