MAGETWO-28253: Downloadable Integration API

Yu Tang · Yu Tang · commit 54d63c7f0912 · 2015-04-28T11:48:51.000-05:00
- Changed linkId to id
    - Removed obsolete classes
diff --git a/app/code/Magento/Downloadable/Api/Data/SampleContentInterface.php b/app/code/Magento/Downloadable/Api/Data/SampleContentInterface.php
diff --git a/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php b/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
@@ -54,8 +54,8 @@ public function save($sku, LinkInterface $link, $isGlobalScopeContent = false);
     /**
      * Delete downloadable link
      *
-     * @param int $linkId
+     * @param int $id
      * @return bool
      */
-    public function delete($linkId);
+    public function delete($id);
 }
diff --git a/app/code/Magento/Downloadable/Api/SampleRepositoryInterface.php b/app/code/Magento/Downloadable/Api/SampleRepositoryInterface.php
@@ -26,8 +26,8 @@ public function save(
     /**
      * Delete downloadable sample
      *
-     * @param int $sampleId
+     * @param int $id
      * @return bool
      */
-    public function delete($sampleId);
+    public function delete($id);
 }
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -337,10 +337,10 @@ protected function updateLink(
     /**
      * {@inheritdoc}
      */
-    public function delete($linkId)
+    public function delete($id)
     {
         /** @var $link \Magento\Downloadable\Model\Link */
-        $link = $this->linkFactory->create()->load($linkId);
+        $link = $this->linkFactory->create()->load($id);
         if (!$link->getId()) {
             throw new NoSuchEntityException(__('There is no downloadable link with provided ID.'));
         }
diff --git a/app/code/Magento/Downloadable/Model/Sample/Content.php b/app/code/Magento/Downloadable/Model/Sample/Content.php
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -214,10 +214,10 @@ protected function updateSample(
     /**
      * {@inheritdoc}
      */
-    public function delete($sampleId)
+    public function delete($id)
     {
         /** @var $sample \Magento\Downloadable\Model\Sample */
-        $sample = $this->sampleFactory->create()->load($sampleId);
+        $sample = $this->sampleFactory->create()->load($id);
         if (!$sample->getId()) {
             throw new NoSuchEntityException(__('There is no downloadable sample with provided ID.'));
         }
diff --git a/app/code/Magento/Downloadable/etc/di.xml b/app/code/Magento/Downloadable/etc/di.xml
@@ -68,7 +68,6 @@
     <preference for="\Magento\Downloadable\Api\SampleRepositoryInterface" type="\Magento\Downloadable\Model\SampleRepository" />
     <preference for="\Magento\Downloadable\Api\Data\LinkInterface" type="\Magento\Downloadable\Model\Link" />
     <preference for="\Magento\Downloadable\Api\Data\SampleInterface" type="\Magento\Downloadable\Model\Sample" />
-    <preference for="\Magento\Downloadable\Api\Data\SampleContentInterface" type="\Magento\Downloadable\Model\Sample\Content" />
     <preference for="\Magento\Downloadable\Api\Data\File\ContentInterface" type="\Magento\Downloadable\Model\File\Content" />
     <preference for="\Magento\Downloadable\Api\Data\File\ContentUploaderInterface" type="\Magento\Downloadable\Model\File\ContentUploader" />
     <preference for="\Magento\Downloadable\Model\Product\TypeHandler\TypeHandlerInterface" type="\Magento\Downloadable\Model\Product\TypeHandler\TypeHandler" />
diff --git a/app/code/Magento/Downloadable/etc/webapi.xml b/app/code/Magento/Downloadable/etc/webapi.xml
@@ -25,13 +25,13 @@
             <resource ref="Magento_Downloadable::downloadable" />
         </resources>
     </route>
-    <route url="/V1/products/:sku/downloadable-links/:linkId" method="PUT">
+    <route url="/V1/products/:sku/downloadable-links/:id" method="PUT">
         <service class="Magento\Downloadable\Api\LinkRepositoryInterface" method="save"/>
         <resources>
             <resource ref="Magento_Downloadable::downloadable" />
         </resources>
     </route>
-    <route url="/V1/products/downloadable-links/:linkId" method="DELETE">
+    <route url="/V1/products/downloadable-links/:id" method="DELETE">
         <service class="Magento\Downloadable\Api\LinkRepositoryInterface" method="delete"/>
         <resources>
             <resource ref="Magento_Downloadable::downloadable" />
@@ -43,13 +43,13 @@
             <resource ref="Magento_Downloadable::downloadable" />
         </resources>
     </route>
-    <route url="/V1/products/:sku/downloadable-links/samples/:sampleId" method="PUT">
+    <route url="/V1/products/:sku/downloadable-links/samples/:id" method="PUT">
     <service class="Magento\Downloadable\Api\SampleRepositoryInterface" method="save"/>
     <resources>
         <resource ref="Magento_Downloadable::downloadable" />
     </resources>
 </route>
-    <route url="/V1/products/downloadable-links/samples/:sampleId" method="DELETE">
+    <route url="/V1/products/downloadable-links/samples/:id" method="DELETE">
         <service class="Magento\Downloadable\Api\SampleRepositoryInterface" method="delete"/>
         <resources>
             <resource ref="Magento_Downloadable::downloadable" />

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ public function save($sku, LinkInterface $link, $isGlobalScopeContent = false);`
`54`	`54`	`/**`
`55`	`55`	`* Delete downloadable link`
`56`	`56`	`*`
`57`		`- * @param int $linkId`
	`57`	`+ * @param int $id`
`58`	`58`	`* @return bool`
`59`	`59`	`*/`
`60`		`- public function delete($linkId);`
	`60`	`+ public function delete($id);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public function save(`
`26`	`26`	`/**`
`27`	`27`	`* Delete downloadable sample`
`28`	`28`	`*`
`29`		`- * @param int $sampleId`
	`29`	`+ * @param int $id`
`30`	`30`	`* @return bool`
`31`	`31`	`*/`
`32`		`- public function delete($sampleId);`
	`32`	`+ public function delete($id);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,10 +337,10 @@ protected function updateLink(`
`337`	`337`	`/**`
`338`	`338`	`* {@inheritdoc}`
`339`	`339`	`*/`
`340`		`- public function delete($linkId)`
	`340`	`+ public function delete($id)`
`341`	`341`	`{`
`342`	`342`	`/** @var $link \Magento\Downloadable\Model\Link */`
`343`		`- $link = $this->linkFactory->create()->load($linkId);`
	`343`	`+ $link = $this->linkFactory->create()->load($id);`
`344`	`344`	`if (!$link->getId()) {`
`345`	`345`	`throw new NoSuchEntityException(__('There is no downloadable link with provided ID.'));`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,10 +214,10 @@ protected function updateSample(`
`214`	`214`	`/**`
`215`	`215`	`* {@inheritdoc}`
`216`	`216`	`*/`
`217`		`- public function delete($sampleId)`
	`217`	`+ public function delete($id)`
`218`	`218`	`{`
`219`	`219`	`/** @var $sample \Magento\Downloadable\Model\Sample */`
`220`		`- $sample = $this->sampleFactory->create()->load($sampleId);`
	`220`	`+ $sample = $this->sampleFactory->create()->load($id);`
`221`	`221`	`if (!$sample->getId()) {`
`222`	`222`	`throw new NoSuchEntityException(__('There is no downloadable sample with provided ID.'));`
`223`	`223`	`}`