TASK: Clean up (mostly) use statements

Author: kdambekalns

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/AbstractDriver.php

@@ -14,7 +14,6 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
 use TYPO3\Flow\Annotations as Flow;
-use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 
 /**
  * Abstract Elasticsearch driver

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/AbstractIndexerDriver.php

@@ -11,9 +11,6 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
-use TYPO3\Flow\Annotations as Flow;
 use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 
 /**

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version1/IndexerDriver.php

@@ -11,7 +11,6 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\AbstractIndexerDriver;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DriverInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexerDriverInterface;
@@ -98,6 +97,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
         if ($closestFulltextNode->isRemoved()) {
             // fulltext root is removed, abort silently...
             $this->logger->log(sprintf('NodeIndexer (%s): Fulltext root found for %s (%s) not updated, it is removed', $closestFulltextNodeDocumentIdentifier, $node->getPath(), $node->getIdentifier()), LOG_DEBUG, null, 'ElasticSearch (CR)');
+
             return null;
         }
 

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version2/DocumentDriver.php

@@ -15,7 +15,6 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use TYPO3\Flow\Annotations as Flow;
-use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
 use TYPO3\TYPO3CR\Domain\Model\NodeType;
 
 /**

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version2/IndexerDriver.php

@@ -99,6 +99,7 @@ public function fulltext(NodeInterface $node, array $fulltextIndexOfNode, $targe
         if ($closestFulltextNode->isRemoved()) {
             // fulltext root is removed, abort silently...
             $this->logger->log(sprintf('NodeIndexer (%s): Fulltext root found for %s (%s) not updated, it is removed', $closestFulltextNodeDocumentIdentifier, $node->getPath(), $node->getIdentifier()), LOG_DEBUG, null, 'ElasticSearch (CR)');
+
             return null;
         }
 

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

@@ -84,6 +84,7 @@ class ElasticSearchQueryBuilder implements QueryBuilderInterface, ProtectedConte
 
     /**
      * The ElasticSearch request, as it is being built up.
+     *
      * @var QueryInterface
      * @Flow\Inject
      */
@@ -172,7 +173,6 @@ public function sort($configuration)
      *
      * This algorithm can be re-checked when https://github.com/elasticsearch/elasticsearch/issues/3300 is merged.
      *
-     *
      * @param integer $limit
      * @return ElasticSearchQueryBuilder
      * @api
@@ -201,7 +201,6 @@ public function limit($limit)
     /**
      * output records starting at $from
      *
-     *
      * @param integer $from
      * @return ElasticSearchQueryBuilder
      * @api
@@ -304,6 +303,7 @@ public function lessThanOrEqual($propertyName, $value)
     public function queryFilter($filterType, $filterOptions, $clauseType = 'must')
     {
         $this->request->queryFilter($filterType, $filterOptions, $clauseType);
+
         return $this;
     }
 
@@ -320,6 +320,7 @@ public function queryFilter($filterType, $filterOptions, $clauseType = 'must')
     public function appendAtPath($path, array $data)
     {
         $this->request->appendAtPath($path, $data);
+
         return $this;
     }
 
@@ -410,6 +411,7 @@ public function fieldBasedAggregation($name, $field, $type = "terms", $parentPat
     public function aggregation($name, array $aggregationDefinition, $parentPath = null)
     {
         $this->request->aggregation($name, $aggregationDefinition, $parentPath);
+
         return $this;
     }
 
@@ -464,6 +466,7 @@ public function termSuggestions($text, $field = '_all', $name = 'suggestions')
     public function suggestions($name, array $suggestionDefinition)
     {
         $this->request->suggestions($name, $suggestionDefinition);
+
         return $this;
     }
 
@@ -500,6 +503,7 @@ public function getTotalItems()
         if (isset($this->result['hits']['total'])) {
             return (int)$this->result['hits']['total'];
         }
+
         return 0;
     }
 
@@ -673,6 +677,7 @@ public function query(NodeInterface $contextNode)
     public function request($path, $requestPart)
     {
         $this->request->setByPath($path, $requestPart);
+
         return $this;
     }
 
@@ -747,6 +752,7 @@ public function __call($method, array $arguments)
             throw new Exception(sprintf('Method "%s" does not exist in the current Request object "%s"', $method, get_class($this->request)), 1486763515);
         }
         call_user_func_array([$this->request, $method], $arguments);
+
         return $this;
     }
 }

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Exception.php

@@ -11,8 +11,6 @@
  * source code.
  */
 
-use TYPO3\Flow\Annotations as Flow;
-
 class Exception extends \TYPO3\Flow\Exception
 {
 }

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Exception/DriverConfigurationException.php

@@ -12,7 +12,6 @@
  */
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
-use TYPO3\Flow\Annotations as Flow;
 
 /**
  * Elastic Driver Configuration exception

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Exception/QueryBuildingException.php

@@ -12,7 +12,6 @@
  */
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
-use TYPO3\Flow\Annotations as Flow;
 
 /**
  * A Query Building Exception

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Factory/AbstractDriverSpecificObjectFactory.php

@@ -11,10 +11,7 @@
  * source code.
  */
 
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DocumentDriverInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DriverInterface;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexerDriverInterface;
-use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\QueryInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\DriverConfigurationException;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
 use TYPO3\Flow\Annotations as Flow;
@@ -63,6 +60,7 @@ protected function resolve($type)
         if (!isset($this->mapping[$version][$type]['arguments'])) {
             return new $className();
         }
+
         return new $className(...array_values($this->mapping[$version][$type]['arguments']));
     }
 }