MCP-767: Improve Consumers Order Creation Throughput

- Fix issue with underscore between alphanumerical characters in data objects;

Author: adifucan

app/code/Magento/Sales/Model/Order/Payment.php

@@ -2272,6 +2272,21 @@ public function setCcLast4($ccLast4)
         return $this->setData(OrderPaymentInterface::CC_LAST_4, $ccLast4);
     }
 
+    /**
+     * @inheritDoc
+     *
+     * Because cc_last_4 data attribute violates data contract (use underscore (_) between alphanumerical characters),
+     * this ad hoc method is for setting cc_last_4 data value in \Magento\Framework\Api\DataObjectHelper::_setDataValues
+     */
+    public function setCustomAttribute($attributeCode, $attributeValue)
+    {
+        if ($attributeCode === OrderPaymentInterface::CC_LAST_4) {
+            return parent::setData(OrderPaymentInterface::CC_LAST_4, $attributeValue);
+        }
+
+        return parent::setCustomAttribute($attributeCode, $attributeValue);
+    }
+
     /**
      * @inheritdoc
      */

lib/internal/Magento/Framework/Api/DataObjectHelper.php

@@ -94,6 +94,7 @@ public function populateWithArray($dataObject, array $data, $interfaceName)
      * @param string $interfaceName
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _setDataValues($dataObject, array $data, $interfaceName)
     {
@@ -300,11 +301,11 @@ private function getSetters(object $dataObject): array
                     ',',
                     strtolower(
                         // (0) remove all not setter
-                        // (1) add _ before upper letter or digits
+                        // (1) add _ before upper letter
                         // (2) remove set_ in start of name
                         // (3) add name without is_ prefix
                         preg_replace(
-                            ['/(^|,)(?!set)[^,]*/S','/(.)([A-Z]|[0-9]+)/S', '/(^|,)set_/iS', '/(^|,)is_([^,]+)/is'],
+                            ['/(^|,)(?!set)[^,]*/S','/(.)([A-Z])/S', '/(^|,)set_/iS', '/(^|,)is_([^,]+)/is'],
                             ['', '$1_$2', '$1', '$1$2,is_$2'],
                             implode(',', $dataObjectMethods)
                         )

lib/internal/Magento/Framework/Api/ImageContent.php

@@ -56,18 +56,6 @@ public function setBase64EncodedData($data)
         return $this->setData(self::BASE64_ENCODED_DATA, $data);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setData($key, $value)
-    {
-        if ($key === 'base_64_encoded_data') {
-            return parent::setData(self::BASE64_ENCODED_DATA, $value);
-        }
-
-        return parent::setData($key, $value);
-    }
-
     /**
      * {@inheritdoc}
      *