MAGETWO-85060: Move code from 2.2.2 to develop

- address code review comments

Author: Joan He

app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php

@@ -8,7 +8,7 @@
 use Magento\Analytics\Model\Connector\Http\ConverterInterface;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\HTTP\Adapter\CurlFactory;
-use Magento\Analytics\Model\Connector\Http\ResponseFactory;
+use Magento\Framework\HTTP\ResponseFactory;
 
 /**
  * A CURL HTTP client.

app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php

@@ -7,6 +7,8 @@
 
 /**
  * Represents converter interface for http request and response body.
+ *
+ * @api
  */
 interface ConverterInterface
 {

app/code/Magento/Analytics/Model/Connector/Http/JsonConverter.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Analytics\Model\Connector\Http;
 
+use Magento\Framework\Serialize\Serializer\Json;
+
 /**
  * Represents JSON converter for http request and response body.
  */
@@ -15,25 +17,35 @@ class JsonConverter implements ConverterInterface
      */
     const CONTENT_TYPE_HEADER = 'Content-Type: application/json';
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    public function __construct(Json $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
     /**
      * @param string $body
      *
      * @return array
      */
     public function fromBody($body)
     {
-        $decodedBody = json_decode($body, 1);
+        $decodedBody = $this->serializer->unserialize($body);
         return $decodedBody === null ? [$body] : $decodedBody;
     }
 
-    /**
+    /**c
      * @param array $data
      *
      * @return string
      */
     public function toBody(array $data)
     {
-        return json_encode($data);
+        return $this->serializer->serialize($data);
     }
 
     /**

app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/Client/CurlTest.php

@@ -74,7 +74,7 @@ protected function setUp()
             ->willReturn($this->curlMock);
 
         $this->responseFactoryMock = $this->getMockBuilder(
-            \Magento\Analytics\Model\Connector\Http\ResponseFactory::class
+            \Magento\Framework\HTTP\ResponseFactory::class
         )
         ->disableOriginalConstructor()
         ->getMock();

app/code/Magento/Analytics/Test/Unit/Model/Connector/Http/JsonConverterTest.php

@@ -6,26 +6,69 @@
 namespace Magento\Analytics\Test\Unit\Model\Connector\Http;
 
 use Magento\Analytics\Model\Connector\Http\JsonConverter;
+use Magento\Framework\Serialize\Serializer\Json;
 
 class JsonConverterTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManagerHelper;
+
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * @var JsonConverter
+     */
+    private $converter;
+
+    protected function setUp()
+    {
+        $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->serializerMock = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->converter = $this->objectManagerHelper->getObject(
+            JsonConverter::class,
+            ['serializer' => $this->serializerMock]
+        );
+    }
+
     public function testConverterContainsHeader()
     {
-        $converter = new JsonConverter();
-        $this->assertEquals(JsonConverter::CONTENT_TYPE_HEADER, $converter->getContentTypeHeader());
+        $this->assertEquals(JsonConverter::CONTENT_TYPE_HEADER, $this->converter->getContentTypeHeader());
+    }
+
+    /**
+     * @param array|null $unserializedResult
+     * @param array $expected
+     * @dataProvider convertBodyDataProvider
+     */
+    public function testConvertBody($unserializedResult, $expected)
+    {
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn($unserializedResult);
+        $this->assertEquals($expected, $this->converter->fromBody('body'));
     }
 
-    public function testConvertBody()
+    public function convertBodyDataProvider()
     {
-        $body = '{"token": "secret-token"}';
-        $converter = new JsonConverter();
-        $this->assertEquals(json_decode($body, 1), $converter->fromBody($body));
+        return [
+            [null, ['body']],
+            [['unserializedBody'], ['unserializedBody']]
+        ];
     }
 
     public function testConvertData()
     {
         $data = ["token" => "secret-token"];
-        $converter = new JsonConverter();
-        $this->assertEquals(json_encode($data), $converter->toBody($data));
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->willReturn('serializedResult');
+        $this->assertEquals('serializedResult', $this->converter->toBody(["token" => "secret-token"]));
     }
 }

app/code/Magento/Analytics/Model/Connector/Http/ResponseFactory.php renamed to lib/internal/Magento/Framework/HTTP/ResponseFactory.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Analytics\Model\Connector\Http;
+namespace Magento\Framework\HTTP;
 
 /**
  * A factory for an HTTP response.