elasticsearch

Author: soyuka

src/Elasticsearch/Metadata/Document/Factory/AttributeDocumentMetadataFactory.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory;
 
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
+use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
 use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException;
 use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata;
 
@@ -26,10 +27,16 @@
  */
 final class AttributeDocumentMetadataFactory implements DocumentMetadataFactoryInterface
 {
+    /**
+     * @var ResourceMetadataFactoryInterface|ResourceMetadataCollectionFactoryInterface
+     */
     private $resourceMetadataFactory;
     private $decorated;
 
-    public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, ?DocumentMetadataFactoryInterface $decorated = null)
+    /**
+     * @param ResourceMetadataFactoryInterface|ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory
+     */
+    public function __construct($resourceMetadataFactory, ?DocumentMetadataFactoryInterface $decorated = null)
     {
         $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->decorated = $decorated;
@@ -52,17 +59,21 @@ public function create(string $resourceClass): DocumentMetadata
         $resourceMetadata = null;
 
         if (!$documentMetadata || null === $documentMetadata->getIndex()) {
+            /** @var ResourceMetadata|ResourceMetadataCollection */
             $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
 
-            if (null !== $index = $resourceMetadata->getAttribute('elasticsearch_index')) {
+            $index = $resourceMetadata instanceof ResourceMetadata ? $resourceMetadata->getAttribute('elasticsearch_index') : $resourceMetadata->getOperation()->getExtraProperties('elasticsearch_index');
+
+            if (null !== $index) {
                 $documentMetadata = $documentMetadata ? $documentMetadata->withIndex($index) : new DocumentMetadata($index);
             }
         }
 
         if (!$documentMetadata || DocumentMetadata::DEFAULT_TYPE === $documentMetadata->getType()) {
             $resourceMetadata = $resourceMetadata ?? $this->resourceMetadataFactory->create($resourceClass);
+            $type = $resourceMetadata instanceof ResourceMetadata ? $resourceMetadata->getAttribute('elasticsearch_type') : $resourceMetadata->getOperation()->getExtraProperties('elasticsearch_type');
 
-            if (null !== $type = $resourceMetadata->getAttribute('elasticsearch_type')) {
+            if (null !== $type) {
                 $documentMetadata = $documentMetadata ? $documentMetadata->withType($type) : new DocumentMetadata(null, $type);
             }
         }

src/Elasticsearch/Metadata/Document/Factory/CatDocumentMetadataFactory.php

@@ -14,8 +14,11 @@
 namespace ApiPlatform\Elasticsearch\Metadata\Document\Factory;
 
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
+use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
 use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException;
 use ApiPlatform\Elasticsearch\Metadata\Document\DocumentMetadata;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\Util\Inflector;
 use Elasticsearch\Client;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
@@ -32,10 +35,16 @@
 final class CatDocumentMetadataFactory implements DocumentMetadataFactoryInterface
 {
     private $client;
+    /**
+     * @var ResourceMetadataFactoryInterface|ResourceMetadataCollectionFactoryInterface
+     */
     private $resourceMetadataFactory;
     private $decorated;
 
-    public function __construct(Client $client, ResourceMetadataFactoryInterface $resourceMetadataFactory, ?DocumentMetadataFactoryInterface $decorated = null)
+    /**
+     * @param ResourceMetadataFactoryInterface|ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory
+     */
+    public function __construct(Client $client, $resourceMetadataFactory, ?DocumentMetadataFactoryInterface $decorated = null)
     {
         $this->client = $client;
         $this->resourceMetadataFactory = $resourceMetadataFactory;
@@ -60,7 +69,15 @@ public function create(string $resourceClass): DocumentMetadata
             return $documentMetadata;
         }
 
-        if (null === $resourceShortName = $this->resourceMetadataFactory->create($resourceClass)->getShortName()) {
+        /** @var ResourceMetadata|ResourceMetadataCollection */
+        $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
+        if ($resourceMetadata instanceof ResourceMetadata) {
+            $resourceShortName = $resourceMetadata->getShortName();
+        } else {
+            $resourceShortName = $resourceMetadata->getOperation()->getShortName();
+        }
+
+        if (null === $resourceShortName) {
             return $this->handleNotFound($documentMetadata, $resourceClass);
         }
 

src/Elasticsearch/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactory.php

@@ -13,8 +13,6 @@
 
 namespace ApiPlatform\Elasticsearch\Metadata\Resource\Factory;
 
-use ApiPlatform\Elasticsearch\Exception\IndexNotFoundException;
-use ApiPlatform\Elasticsearch\Metadata\Document\Factory\DocumentMetadataFactoryInterface;
 use ApiPlatform\Elasticsearch\State\CollectionProvider;
 use ApiPlatform\Elasticsearch\State\ItemProvider;
 use ApiPlatform\Metadata\CollectionOperationInterface;
@@ -28,14 +26,8 @@ final class ElasticsearchProviderResourceMetadataCollectionFactory implements Re
      */
     private $decorated;
 
-    /**
-     * @var DocumentMetadataFactoryInterface
-     */
-    private $documentMetadataFactory;
-
-    public function __construct(DocumentMetadataFactoryInterface $documentMetadataFactory, ResourceMetadataCollectionFactoryInterface $decorated)
+    public function __construct(ResourceMetadataCollectionFactoryInterface $decorated)
     {
-        $this->documentMetadataFactory = $documentMetadataFactory;
         $this->decorated = $decorated;
     }
 
@@ -46,12 +38,6 @@ public function create(string $resourceClass): ResourceMetadataCollection
     {
         $resourceMetadataCollection = $this->decorated->create($resourceClass);
 
-        try {
-            $this->documentMetadataFactory->create($resourceClass);
-        } catch (IndexNotFoundException $e) {
-            return $resourceMetadataCollection;
-        }
-
         foreach ($resourceMetadataCollection as $i => $resourceMetadata) {
             $operations = $resourceMetadata->getOperations();
 

src/Symfony/Bundle/Resources/config/elasticsearch.xml

@@ -24,13 +24,13 @@
         </service>
 
         <service id="api_platform.elasticsearch.metadata.document.metadata_factory.attribute" class="ApiPlatform\Elasticsearch\Metadata\Document\Factory\AttributeDocumentMetadataFactory" decorates="api_platform.elasticsearch.metadata.document.metadata_factory" decoration-priority="20" public="false">
-            <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory.retro_compatible" />
             <argument type="service" id="api_platform.elasticsearch.metadata.document.metadata_factory.attribute.inner" />
         </service>
 
         <service id="api_platform.elasticsearch.metadata.document.metadata_factory.cat" class="ApiPlatform\Elasticsearch\Metadata\Document\Factory\CatDocumentMetadataFactory" decorates="api_platform.elasticsearch.metadata.document.metadata_factory" decoration-priority="10" public="false">
             <argument type="service" id="api_platform.elasticsearch.client" />
-            <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory.retro_compatible" />
             <argument type="service" id="api_platform.elasticsearch.metadata.document.metadata_factory.cat.inner" />
         </service>
 

src/Symfony/Bundle/Resources/config/v3/elasticsearch.xml

@@ -25,7 +25,6 @@
         </service>
 
         <service id="api_platform.elasticsearch.metadata.resource.metadata_collection_factory" class="ApiPlatform\Elasticsearch\Metadata\Resource\Factory\ElasticsearchProviderResourceMetadataCollectionFactory" decorates="api_platform.metadata.resource.metadata_collection_factory" decoration-priority="40">
-            <argument type="service" id="api_platform.elasticsearch.metadata.document.metadata_factory" />
             <argument type="service" id="api_platform.elasticsearch.metadata.resource.metadata_collection_factory.inner" />
         </service>