TASK: Add / clean up imports

kdambekalns · kdambekalns · commit b8ddbbf0b2d6 · 2025-10-31T15:52:07.000+01:00
diff --git a/Classes/AssetExtraction/IngestAttachmentAssetExtractor.php b/Classes/AssetExtraction/IngestAttachmentAssetExtractor.php
@@ -13,10 +13,12 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
 use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Search\AssetExtraction\AssetExtractorInterface;
 use Neos\ContentRepository\Search\Dto\AssetContent;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
+use Neos\Flow\Http\Exception;
 use Neos\Flow\Log\ThrowableStorageInterface;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Media\Domain\Model\AssetInterface;
@@ -58,8 +60,8 @@ class IngestAttachmentAssetExtractor implements AssetExtractorInterface
      * @param AssetInterface $asset
      * @return AssetContent
      * @throws \Flowpack\ElasticSearch\Transfer\Exception
-     * @throws \Flowpack\ElasticSearch\Transfer\Exception\ApiException
-     * @throws \Neos\Flow\Http\Exception
+     * @throws ApiException
+     * @throws Exception
      */
     public function extract(AssetInterface $asset): AssetContent
     {
diff --git a/Classes/Client/ClientFactory.php b/Classes/Client/ClientFactory.php
@@ -15,6 +15,7 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Flowpack\ElasticSearch\Domain\Model\Client;
+use Flowpack\ElasticSearch\Exception;
 use Neos\Flow\Annotations as Flow;
 
 /**
@@ -32,7 +33,7 @@ class ClientFactory
      * Create a client
      *
      * @return Client
-     * @throws \Flowpack\ElasticSearch\Exception
+     * @throws Exception
      */
     public function create(): Client
     {
diff --git a/Classes/Command/NodeTypeCommandController.php b/Classes/Command/NodeTypeCommandController.php
@@ -13,6 +13,7 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\NodeTypeIndexingConfiguration;
 use Neos\ContentRepository\Domain\Model\NodeType;
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
@@ -69,7 +70,7 @@ public function showCommand(?string $nodeType = null): void
     /**
      * Shows a list of NodeTypes and if they are configured to be indexable or not
      *
-     * @throws \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception
+     * @throws Exception
      */
     public function showIndexableConfigurationCommand(): void
     {
diff --git a/Classes/Driver/DocumentDriverInterface.php b/Classes/Driver/DocumentDriverInterface.php
@@ -14,9 +14,7 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\Domain\Model\Index;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
-use Neos\ContentRepository\Domain\Model\NodeType;
 
 /**
  * Elasticsearch Document Driver Interface
diff --git a/Classes/Driver/NodeTypeMappingBuilderInterface.php b/Classes/Driver/NodeTypeMappingBuilderInterface.php
@@ -15,6 +15,7 @@
  */
 
 use Flowpack\ElasticSearch\Domain\Model\Index;
+use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Flowpack\ElasticSearch\Mapping\MappingCollection;
 use Neos\Error\Messages\Result;
 
@@ -27,7 +28,7 @@ interface NodeTypeMappingBuilderInterface
      * Builds a Mapping Collection from the configured node types
      *
      * @param Index $index
-     * @return MappingCollection<\Flowpack\ElasticSearch\Domain\Model\Mapping>
+     * @return MappingCollection<Mapping>
      */
     public function buildMappingInformation(Index $index): MappingCollection;
 
diff --git a/Classes/Driver/Version6/DocumentDriver.php b/Classes/Driver/Version6/DocumentDriver.php
@@ -15,12 +15,8 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DocumentDriverInterface;
-use Flowpack\ElasticSearch\Domain\Model\Index;
-use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
-use Neos\ContentRepository\Domain\Model\NodeType;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\Utility\LogEnvironment;
 
 /**
  * Document driver for Elasticsearch version 6.x
diff --git a/Classes/Driver/Version6/IndexerDriver.php b/Classes/Driver/Version6/IndexerDriver.php
@@ -14,7 +14,6 @@
  */
 
 use Neos\Flow\Annotations as Flow;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractIndexerDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexerDriverInterface;
 use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
diff --git a/Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php b/Classes/Driver/Version6/Mapping/NodeTypeMappingBuilder.php
@@ -13,6 +13,7 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\NodeTypeIndexingConfiguration;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractNodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Index;
@@ -39,8 +40,8 @@ class NodeTypeMappingBuilder extends AbstractNodeTypeMappingBuilder
      * Builds a Mapping Collection from the configured node types
      *
      * @param Index $index
-     * @return MappingCollection<\Flowpack\ElasticSearch\Domain\Model\Mapping>
-     * @throws \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception
+     * @return MappingCollection<Mapping>
+     * @throws Exception
      */
     public function buildMappingInformation(Index $index): MappingCollection
     {
diff --git a/Classes/Driver/Version6/RequestDriver.php b/Classes/Driver/Version6/RequestDriver.php
@@ -17,6 +17,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\RequestDriverInterface;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Http\Exception;
 
 /**
  * Request driver for Elasticsearch version 6.x
@@ -28,7 +29,7 @@ class RequestDriver extends AbstractDriver implements RequestDriverInterface
     /**
      * {@inheritdoc}
      * @throws \Flowpack\ElasticSearch\Exception
-     * @throws \Neos\Flow\Http\Exception
+     * @throws Exception
      */
     public function bulk(Index $index, $request): array
     {
diff --git a/Classes/Eel/ElasticSearchQueryBuilder.php b/Classes/Eel/ElasticSearchQueryBuilder.php
@@ -21,7 +21,6 @@
 use Neos\Flow\Log\ThrowableStorageInterface;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\Persistence\Exception\IllegalObjectTypeException;
-use Neos\Flow\Persistence\QueryResultInterface;
 use Psr\Log\LoggerInterface;
 use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
@@ -575,7 +574,7 @@ public function getFullElasticSearchHitForNode(NodeInterface $node): ?array
      *
      * This method is rather internal; just to be called from the ElasticSearchQueryResult. For the public API, please use execute()
      *
-     * @return array<\Neos\ContentRepository\Domain\Model\NodeInterface>
+     * @return array<NodeInterface>
      * @throws Exception
      * @throws \Flowpack\ElasticSearch\Exception
      * @throws \Neos\Flow\Http\Exception
diff --git a/Classes/Eel/ElasticSearchQueryResult.php b/Classes/Eel/ElasticSearchQueryResult.php
@@ -13,6 +13,7 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\Exception;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Persistence\QueryInterface;
@@ -50,7 +51,7 @@ public function __construct(ElasticSearchQuery $elasticSearchQuery)
      *
      * @return void
      * @throws \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception
-     * @throws \Flowpack\ElasticSearch\Exception
+     * @throws Exception
      * @throws \Neos\Flow\Http\Exception
      */
     protected function initialize(): void
@@ -181,7 +182,7 @@ public function toArray(): array
 
     /**
      * {@inheritdoc}
-     * @throws \Flowpack\ElasticSearch\Exception
+     * @throws Exception
      */
     public function count()
     {
diff --git a/Classes/ElasticSearchClient.php b/Classes/ElasticSearchClient.php
@@ -140,7 +140,7 @@ public function getIndexNamePrefix(): string
      * Retrieve the index to be used for querying or on-the-fly indexing.
      * In Elasticsearch, this index is an *alias* to the currently used index.
      *
-     * @return \Flowpack\ElasticSearch\Domain\Model\Index
+     * @return Index
      * @throws Exception
      * @throws \Flowpack\ElasticSearch\Exception
      * @throws ConfigurationException
diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php
@@ -36,7 +36,6 @@
 use Neos\ContentRepository\Search\Indexer\AbstractNodeIndexer;
 use Neos\ContentRepository\Search\Indexer\BulkNodeIndexerInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Persistence\Exception\IllegalObjectTypeException;
 use Neos\Utility\Exception\FilesException;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Psr\Log\LoggerInterface;
diff --git a/Classes/Service/IndexWorkspaceTrait.php b/Classes/Service/IndexWorkspaceTrait.php
@@ -14,7 +14,11 @@
  * source code.
  */
 
+use Neos\ContentRepository\Domain\Factory\NodeFactory;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator;
+use Neos\ContentRepository\Domain\Service\ContextFactoryInterface;
+use Neos\ContentRepository\Search\Indexer\NodeIndexingManager;
 use Neos\Flow\Annotations as Flow;
 
 /**
@@ -25,25 +29,25 @@ trait IndexWorkspaceTrait
 {
     /**
      * @Flow\Inject
-     * @var \Neos\ContentRepository\Domain\Factory\NodeFactory
+     * @var NodeFactory
      */
     protected $nodeFactory;
 
     /**
      * @Flow\Inject
-     * @var \Neos\ContentRepository\Domain\Service\ContextFactoryInterface
+     * @var ContextFactoryInterface
      */
     protected $contextFactory;
 
     /**
      * @Flow\Inject
-     * @var \Neos\ContentRepository\Domain\Service\ContentDimensionCombinator
+     * @var ContentDimensionCombinator
      */
     protected $contentDimensionCombinator;
 
     /**
      * @Flow\Inject
-     * @var \Neos\ContentRepository\Search\Indexer\NodeIndexingManager
+     * @var NodeIndexingManager
      */
     protected $nodeIndexingManager;
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;`
`17`	`17`	`use Flowpack\ElasticSearch\Domain\Model\Client;`
	`18`	`+use Flowpack\ElasticSearch\Exception;`
`18`	`19`	`use Neos\Flow\Annotations as Flow;`
`19`	`20`
`20`	`21`	`/**`
`@@ -32,7 +33,7 @@ class ClientFactory`
`32`	`33`	`* Create a client`
`33`	`34`	`*`
`34`	`35`	`* @return Client`
`35`		`- * @throws \Flowpack\ElasticSearch\Exception`
	`36`	`+ * @throws Exception`
`36`	`37`	`*/`
`37`	`38`	`public function create(): Client`
`38`	`39`	`{`