magento-engcom/bulk-api#7 Add extension point to WebAPI

- fixed unit tests
- changed matching algorithm for request processors

Author: vrann

app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php

@@ -22,13 +22,6 @@ interface RequestProcessorInterface
      */
     public function process(\Magento\Framework\Webapi\Rest\Request $request);
 
-    /**
-     * Return processor request prefix
-     *
-     * @return string
-     */
-    public function getProcessorPath();
-
     /**
      * Method should return true for all the request current processor can process.
      *

app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php

@@ -54,26 +54,19 @@ public function process(\Magento\Framework\Webapi\Rest\Request $request)
         $responseBody = $this->swaggerGenerator->generate(
             $requestedServices,
             $request->getScheme(),
-            $request->getHttpHost(flase),
+            $request->getHttpHost(false),
             $request->getRequestUri()
         );
         $this->response->setBody($responseBody)->setHeader('Content-Type', 'application/json');
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProcessorPath()
-    {
-        return self::PROCESSOR_PATH;
-    }
 
     /**
      * {@inheritdoc}
      */
     public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
     {
-        if (strpos(ltrim($request->getPathInfo(), '/'), $this->getProcessorPath()) === 0) {
+        if (strpos(ltrim($request->getPathInfo(), '/'), self::PROCESSOR_PATH) === 0) {
             return true;
         }
         return false;

app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php

@@ -18,7 +18,7 @@
  */
 class SynchronousRequestProcessor implements RequestProcessorInterface
 {
-    const PROCESSOR_PATH = 'V1';
+    const PROCESSOR_PATH = "/V\n+/";
 
     /**
      * @var RestResponse
@@ -107,20 +107,12 @@ public function process(\Magento\Framework\Webapi\Rest\Request $request)
         $this->response->prepareResponse($outputData);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getProcessorPath()
-    {
-        return self::PROCESSOR_PATH;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
     {
-        if (strpos(ltrim($request->getPathInfo(), '/'), $this->getProcessorPath()) === 0) {
+        if (preg_match(self::PROCESSOR_PATH, ltrim($request->getPathInfo(), '/')) === 0) {
             return true;
         }
         return false;

app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php

@@ -192,7 +192,7 @@ public function testDispatchSchemaRequest()
 
         $schema = 'Some REST schema content';
         $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
-        $this->requestProcessorPool->process($this->_requestMock);
+        $this->requestProcessorPool->getProcessor($this->_requestMock)->process($this->_requestMock);
 
         $this->assertEquals($schema, $this->_responseMock->getBody());
     }
@@ -225,7 +225,7 @@ public function testDispatchAllSchemaRequest()
 
         $schema = 'Some REST schema content';
         $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
-        $this->requestProcessorPool->process($this->_requestMock);
+        $this->requestProcessorPool->getProcessor($this->_requestMock)->process($this->_requestMock);
 
         $this->assertEquals($schema, $this->_responseMock->getBody());
     }