Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1875118 by damiankloip, tim.plunkett: Move resource plugins to correct modules.

8.0.x
webchick 2014-07-02 12:40:54 -07:00
parent 21fc02cf5c
commit 8ca26dcf34
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/modules/rest/src/Plugin/rest/resource/DBLogResource.php → core/modules/dblog/src/Plugin/rest/resource/DBLogResource.php
View File

@ -5,11 +5,11 @@
* Definition of Drupal\rest\Plugin\rest\resource\DBLogResource. * Definition of Drupal\rest\Plugin\rest\resource\DBLogResource.
*/ */
namespace Drupal\rest\Plugin\rest\resource; namespace Drupal\dblog\Plugin\rest\resource;
use Drupal\rest\Plugin\ResourceBase; use Drupal\rest\Plugin\ResourceBase;
use Drupal\rest\ResourceResponse; use Drupal\rest\ResourceResponse;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
@ -25,17 +25,6 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
*/ */
class DBLogResource extends ResourceBase { class DBLogResource extends ResourceBase {
/**
* Overrides \Drupal\rest\Plugin\ResourceBase::routes().
*/
public function routes() {
// Only expose routes if the dblog module is enabled.
if (\Drupal::moduleHandler()->moduleExists('dblog')) {
return parent::routes();
}
return new RouteCollection();
}
/** /**
* Responds to GET requests. * Responds to GET requests.
* *
@ -53,7 +42,10 @@ class DBLogResource extends ResourceBase {
if (!empty($record)) { if (!empty($record)) {
return new ResourceResponse($record); return new ResourceResponse($record);
} }
throw new NotFoundHttpException(t('Log entry with ID @id was not found', array('@id' => $id)));
} }
throw new NotFoundHttpException(t('Log entry with ID @id was not found', array('@id' => $id)));
throw new HttpException(t('No log entry ID was provided'));
} }
} }

8
core/modules/rest/src/Tests/DBLogTest.php → core/modules/dblog/src/Tests/Rest/DbLogResourceTest.php
View File

@ -5,22 +5,22 @@
* Definition of Drupal\rest\test\DBLogTest. * Definition of Drupal\rest\test\DBLogTest.
*/ */
namespace Drupal\rest\Tests; namespace Drupal\dblog\Tests\Rest;
use Drupal\Component\Serialization\Json; use Drupal\Component\Serialization\Json;
use Drupal\rest\Tests\RESTTestBase; use Drupal\rest\Tests\RESTTestBase;
/** /**
* Tests the Watchdog resource to retrieve log messages. * Tests the Watchdog REST resource to retrieve log messages.
*/ */
class DBLogTest extends RESTTestBase { class DbLogResourceTest extends RESTTestBase {
/** /**
* Modules to enable. * Modules to enable.
* *
* @var array * @var array
*/ */
public static $modules = array('hal', 'rest', 'dblog'); public static $modules = array('hal', 'dblog');
public static function getInfo() { public static function getInfo() {
return array( return array(