Move the SPARQL serializer.

modules/rdf_export/src/Controller/RdfExportController.php

@@ -6,7 +6,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
-use Drupal\rdf_entity\SparqlSerializerInterface;
+use Drupal\sparql_entity_storage\SparqlSerializerInterface;
 use EasyRdf\Format;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
@@ -21,14 +21,14 @@ class RdfExportController extends ControllerBase {
   /**
    * The SPARQL serializer service.
    *
-   * @var \Drupal\rdf_entity\SparqlSerializerInterface
+   * @var \Drupal\sparql_entity_storage\SparqlSerializerInterface
    */
   protected $sparqlSerializer;
 
   /**
    * Instantiates a new RdfExportController object.
    *
-   * @param \Drupal\rdf_entity\SparqlSerializerInterface $sparql_serializer
+   * @param \Drupal\sparql_entity_storage\SparqlSerializerInterface $sparql_serializer
    *   The SPARQL serializer interface.
    */
   public function __construct(SparqlSerializerInterface $sparql_serializer) {
@@ -40,7 +40,7 @@ public function __construct(SparqlSerializerInterface $sparql_serializer) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('rdf_entity.serializer')
+      $container->get('sparql_entity.serializer')
     );
   }
 

modules/rdf_export/tests/src/Functional/RdfExportTest.php

@@ -51,22 +51,23 @@ protected function setUp() {
    * Tests the RDF export functionality.
    */
   public function testRdfExport() {
+    $fixture_dir = drupal_get_path('module', 'sparql_entity_storage') . '/tests/fixtures/content-negotiation/rdf_entity';
     $this->drupalLogin($this->drupalCreateUser(['export rdf metadata']));
 
     $this->drupalGet($this->entity->toUrl('rdf-export'));
     $page = $this->getSession()->getPage();
     $page->clickLink('Turtle Terse RDF Triple Language');
     $this->assertSession()->statusCodeEquals(200);
     $actual_content = $page->getContent();
-    $expected_content = trim(file_get_contents(__DIR__ . "/../../../../../tests/fixtures/content-negotiation/rdf_entity/turtle"));
+    $expected_content = trim(file_get_contents("$fixture_dir/turtle"));
     $this->assertEquals($expected_content, $actual_content);
 
     $this->drupalGet($this->entity->toUrl('rdf-export'));
     $page = $this->getSession()->getPage();
     $page->clickLink('RDF/XML');
     $this->assertSession()->statusCodeEquals(200);
     $actual_content = $page->getContent();
-    $expected_content = trim(file_get_contents(__DIR__ . "/../../../../../tests/fixtures/content-negotiation/rdf_entity/rdfxml"));
+    $expected_content = trim(file_get_contents("$fixture_dir/rdfxml"));
     $this->assertEquals($expected_content, $actual_content);
   }
 

rdf_entity.services.yml

@@ -4,41 +4,6 @@ services:
     arguments: ['@current_route_match']
     tags:
       - { name: 'context_provider' }
-  rdf_entity.serializer:
-    class: Drupal\rdf_entity\SparqlSerializer
-    arguments: ['@sparql_endpoint', '@sparql.graph_handler']
-  rdf_entity.encoder_base:
-    abstract: true
-    class: Drupal\rdf_entity\Encoder\SparqlEncoder
-  rdf_entity.encoder.jsonld:
-    parent: rdf_entity.encoder_base
-    tags:
-      - { name: encoder, format: jsonld }
-  rdf_entity.encoder.rdfxml:
-    parent: rdf_entity.encoder_base
-    tags:
-      - { name: encoder, format: rdfxml }
-  rdf_entity.encoder.ntriples:
-    parent: rdf_entity.encoder_base
-    tags:
-      - { name: encoder, format: ntriples }
-  rdf_entity.encoder.turtle:
-    parent: rdf_entity.encoder_base
-    tags:
-      - { name: encoder, format: turtle }
-  rdf_entity.encoder.n3:
-    parent: rdf_entity.encoder_base
-    tags:
-      - { name: encoder, format: n3 }
-  rdf_entity.sparql_entity_normalizer:
-    class: Drupal\rdf_entity\Normalizer\SparqlEntityNormalizer
-    arguments: ['@rdf_entity.serializer', '@entity_type.manager']
-    tags:
-      - { name: normalizer, priority: 10 }
-  rdf_entity.rdf_content_type.subscriber:
-    class: Drupal\rdf_entity\EventSubscriber\RdfContentTypesSubscriber
-    tags:
-      - { name: event_subscriber }
 
   # Deprecated services.
   sparql_endpoint:
@@ -47,3 +12,9 @@ services:
   plugin.manager.rdf_entity.id:
     alias: plugin.manager.sparql_entity_id
     deprecated: "Service '%service_id%' is deprecated. Use 'plugin.manager.sparql_entity_id' service instead."
+  rdf_entity.serializer:
+    alias: sparql_entity.serializer
+    deprecated: "Service '%service_id%' is deprecated. Use 'sparql_entity.serializer' service instead."
+  rdf_entity.sparql_entity_normalizer:
+    alias: sparql.entity_normalizer
+    deprecated: "Service '%service_id%' is deprecated. Use 'sparql.entity_normalizer' service instead."

sparql_entity_storage/sparql_entity_storage.services.yml

@@ -51,3 +51,39 @@ services:
     arguments: ['@typed_data_manager']
     tags:
     - { name: event_subscriber }
+
+  sparql_entity.serializer:
+    class: Drupal\sparql_entity_storage\SparqlSerializer
+    arguments: ['@sparql.endpoint', '@sparql.graph_handler']
+  sparql_entity.encoder_base:
+    abstract: true
+    class: Drupal\sparql_entity_storage\Encoder\SparqlEncoder
+  sparql_entity.encoder.jsonld:
+    parent: sparql_entity.encoder_base
+    tags:
+      - { name: encoder, format: jsonld }
+  sparql_entity.encoder.rdfxml:
+    parent: sparql_entity.encoder_base
+    tags:
+      - { name: encoder, format: rdfxml }
+  sparql_entity.encoder.ntriples:
+    parent: sparql_entity.encoder_base
+    tags:
+      - { name: encoder, format: ntriples }
+  sparql_entity.encoder.turtle:
+    parent: sparql_entity.encoder_base
+    tags:
+      - { name: encoder, format: turtle }
+  sparql_entity.encoder.n3:
+    parent: sparql_entity.encoder_base
+    tags:
+      - { name: encoder, format: n3 }
+  sparql.entity_normalizer:
+    class: Drupal\rdf_entity\Normalizer\SparqlEntityNormalizer
+    arguments: ['@sparql_entity.serializer', '@entity_type.manager']
+    tags:
+      - { name: normalizer, priority: 10 }
+  sparql.content_type.subscriber:
+    class: Drupal\sparql_entity_storage\EventSubscriber\SparqlContentTypesSubscriber
+    tags:
+      - { name: event_subscriber }

src/Encoder/SparqlEncoder.php → sparql_entity_storage/src/Encoder/SparqlEncoder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\rdf_entity\Encoder;
+namespace Drupal\sparql_entity_storage\Encoder;
 
 use Drupal\rdf_entity\SparqlEncoderInterface;
 use EasyRdf\Format;

src/EventSubscriber/RdfContentTypesSubscriber.php → sparql_entity_storage/src/EventSubscriber/SparqlContentTypesSubscriber.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\rdf_entity\EventSubscriber;
+namespace Drupal\sparql_entity_storage\EventSubscriber;
 
-use Drupal\rdf_entity\Encoder\SparqlEncoder;
+use Drupal\sparql_entity_storage\Encoder\SparqlEncoder;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Event subscriber for adding RDF content types to the request.
  */
-class RdfContentTypesSubscriber implements EventSubscriberInterface {
+class SparqlContentTypesSubscriber implements EventSubscriberInterface {
 
   /**
    * Register content type formats on the request object.

src/Normalizer/NormalizerBase.php → sparql_entity_storage/src/Normalizer/NormalizerBase.php

@@ -2,9 +2,9 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\rdf_entity\Normalizer;
+namespace Drupal\sparql_entity_storage\Normalizer;
 
-use Drupal\rdf_entity\Encoder\SparqlEncoder;
+use Drupal\sparql_entity_storage\Encoder\SparqlEncoder;
 use Drupal\serialization\Normalizer\NormalizerBase as SerializationNormalizerBase;
 
 /**

src/SparqlSerializer.php → sparql_entity_storage/src/SparqlSerializer.php

@@ -2,11 +2,10 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\rdf_entity;
+namespace Drupal\sparql_entity_storage;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\sparql_entity_storage\Database\Driver\sparql\ConnectionInterface;
-use Drupal\sparql_entity_storage\SparqlEntityStorageGraphHandlerInterface;
 use EasyRdf\Graph;
 
 /**
@@ -15,7 +14,7 @@
 class SparqlSerializer implements SparqlSerializerInterface {
 
   /**
-   * The Sparql connection object.
+   * The SPARQL connection object.
    *
    * @var \Drupal\sparql_entity_storage\Database\Driver\sparql\ConnectionInterface
    */

src/SparqlSerializerInterface.php → sparql_entity_storage/src/SparqlSerializerInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types = 1);
 
-namespace Drupal\rdf_entity;
+namespace Drupal\sparql_entity_storage;
 
 use Drupal\Core\Entity\ContentEntityInterface;
 

tests/src/Kernel/SparqlSerializerTest.php → sparql_entity_storage/tests/src/Kernel/SparqlSerializerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\rdf_entity\Kernel;
+namespace Drupal\Tests\sparql_entity_storage\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\rdf_entity\Entity\Rdf;
@@ -50,7 +50,7 @@ public function testContentNegotiation() {
     $entity->save();
 
     $encoders = $this->container->getParameter('sparql_entity.encoders');
-    $serializer = $this->container->get('rdf_entity.serializer');
+    $serializer = $this->container->get('sparql_entity.serializer');
     foreach ($encoders as $format => $content_type) {
       $serialized = trim($serializer->serializeEntity($entity, $format));
       $expected = trim(file_get_contents(__DIR__ . "/../../fixtures/content-negotiation/rdf_entity/$format"));

src/Normalizer/SparqlEntityNormalizer.php

@@ -6,7 +6,8 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\rdf_entity\SparqlSerializer;
+use Drupal\sparql_entity_storage\Normalizer\NormalizerBase;
+use Drupal\sparql_entity_storage\SparqlSerializer;
 use Drupal\sparql_entity_storage\SparqlEntityStorageInterface;
 
 /**
@@ -17,7 +18,7 @@ class SparqlEntityNormalizer extends NormalizerBase {
   /**
    * The serializer service.
    *
-   * @var \Drupal\rdf_entity\SparqlSerializerInterface
+   * @var \Drupal\sparql_entity_storage\SparqlSerializerInterface
    */
   protected $sparqlSerializer;
 
@@ -31,7 +32,7 @@ class SparqlEntityNormalizer extends NormalizerBase {
   /**
    * RdfEntityNormalizer constructor.
    *
-   * @param \Drupal\rdf_entity\SparqlSerializer $rdf_serializer
+   * @param \Drupal\sparql_entity_storage\SparqlSerializer $rdf_serializer
    *   RDF Serializer service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.