Merge pull request #241 from kdambekalns/code-cleanup

kdambekalns · web-flow · commit a1b77af4e0b2 · 2018-01-12T17:39:09.000+01:00
TASK: Some (automated) code cleanup
diff --git a/Classes/Driver/Version1/DocumentDriver.php b/Classes/Driver/Version1/DocumentDriver.php
@@ -15,9 +15,9 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\DocumentDriverInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Index;
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Domain\Model\NodeType;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Document driver for Elasticsearch version 1.x
diff --git a/Classes/Driver/Version1/IndexDriver.php b/Classes/Driver/Version1/IndexDriver.php
@@ -57,6 +57,7 @@ public function indexesByAlias($alias)
 
         // return empty array if content from response cannot be read as an array
         $treatedContent = $response->getTreatedContent();
+
         return is_array($treatedContent) ? array_keys($treatedContent) : [];
     }
 }
diff --git a/Classes/Driver/Version1/IndexerDriver.php b/Classes/Driver/Version1/IndexerDriver.php
@@ -15,8 +15,8 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\IndexerDriverInterface;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Indexer driver for Elasticsearch version 1.x
diff --git a/Classes/Driver/Version2/DocumentDriver.php b/Classes/Driver/Version2/DocumentDriver.php
@@ -14,8 +14,8 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version1;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Index;
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeType;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Document driver for Elasticsearch version 2.x
diff --git a/Classes/Driver/Version2/IndexerDriver.php b/Classes/Driver/Version2/IndexerDriver.php
@@ -14,8 +14,8 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Driver\Version1;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
 use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Indexer driver for Elasticsearch version 2.x
diff --git a/Classes/Eel/ElasticSearchQueryBuilder.php b/Classes/Eel/ElasticSearchQueryBuilder.php
@@ -16,11 +16,11 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\ContentRepository\Search\Search\QueryBuilderInterface;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
-use Neos\ContentRepository\Domain\Model\NodeInterface;
-use Neos\ContentRepository\Search\Search\QueryBuilderInterface;
 
 /**
  * Query Builder for ElasticSearch Queries
diff --git a/Classes/Eel/ElasticSearchQueryResult.php b/Classes/Eel/ElasticSearchQueryResult.php
@@ -11,9 +11,9 @@
  * source code.
  */
 
+use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Persistence\QueryResultInterface;
-use Neos\ContentRepository\Domain\Model\NodeInterface;
 
 class ElasticSearchQueryResult implements QueryResultInterface, ProtectedContextAwareInterface
 {
diff --git a/Classes/Eel/SearchResultHelper.php b/Classes/Eel/SearchResultHelper.php
@@ -12,7 +12,6 @@
  */
 
 use Neos\Eel\ProtectedContextAwareInterface;
-use Neos\Flow\Annotations as Flow;
 
 /**
  * Eel Helper to process the ElasticSearch Query Result
diff --git a/Classes/ElasticSearchClient.php b/Classes/ElasticSearchClient.php
@@ -13,7 +13,6 @@
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexNameStrategyInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  * The elasticsearch client to be used by the content repository adapter. Singleton, can be injected.
@@ -44,6 +43,7 @@ public function getIndexName()
         if ($name === '') {
             throw new Exception('Index name can not be null');
         }
+
         return $name;
     }
 
diff --git a/Classes/Indexer/Error/BulkIndexingError.php b/Classes/Indexer/Error/BulkIndexingError.php
@@ -87,14 +87,14 @@ public function message()
         return $this->message;
     }
 
-
     /**
      * @return string
      */
     protected function renderErrors()
     {
         $bulkRequest = json_encode($this->currentBulkRequest, JSON_PRETTY_PRINT);
         $errors = json_encode($this->errors, JSON_PRETTY_PRINT);
+
         return sprintf("Payload:\n========\n\n%s\n\nErrors:\n=======\n\n%s\n\n", $bulkRequest, $errors);
     }
 }
diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php
@@ -25,13 +25,13 @@
 use Flowpack\ElasticSearch\Domain\Model\Document as ElasticSearchDocument;
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Flowpack\ElasticSearch\Transfer\Exception\ApiException;
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
 use Neos\ContentRepository\Domain\Service\ContentDimensionCombinator;
 use Neos\ContentRepository\Domain\Service\Context;
 use Neos\ContentRepository\Domain\Service\ContextFactory;
 use Neos\ContentRepository\Search\Indexer\AbstractNodeIndexer;
 use Neos\ContentRepository\Search\Indexer\BulkNodeIndexerInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Indexer for Content Repository Nodes. Triggered from the NodeIndexingManager.
diff --git a/Classes/Mapping/NodeTypeMappingBuilder.php b/Classes/Mapping/NodeTypeMappingBuilder.php
@@ -14,10 +14,10 @@
 use Flowpack\ElasticSearch\Domain\Model\Index;
 use Flowpack\ElasticSearch\Domain\Model\Mapping;
 use Flowpack\ElasticSearch\Mapping\MappingCollection;
-use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Configuration\ConfigurationManager;
 use Neos\ContentRepository\Domain\Model\NodeType;
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Configuration\ConfigurationManager;
 
 /**
  * Builds the mapping information for ContentRepository Node Types in Elasticsearch
diff --git a/Classes/Service/IndexNameStrategy.php b/Classes/Service/IndexNameStrategy.php
@@ -33,6 +33,7 @@ public function get()
         if ($name === '') {
             throw new Exception('Index name can not be null, check Settings at path: Neos.ContentRepository.Search.elasticSearch.indexName');
         }
+
         return $name;
     }
 }
diff --git a/Classes/Service/IndexNameStrategyInterface.php b/Classes/Service/IndexNameStrategyInterface.php
@@ -11,7 +11,6 @@
  * source code.
  */
 
-
 /**
  * Get Index Name
  */
diff --git a/Classes/Service/IndexWorkspaceTrait.php b/Classes/Service/IndexWorkspaceTrait.php
@@ -11,8 +11,8 @@
  * source code.
  */
 
-use Neos\Flow\Annotations as Flow;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Flow\Annotations as Flow;
 
 /**
  * Index Workspace Trait
diff --git a/Classes/ViewHelpers/GetHitArrayForNodeViewHelper.php b/Classes/ViewHelpers/GetHitArrayForNodeViewHelper.php
@@ -12,8 +12,8 @@
  */
 
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Eel\ElasticSearchQueryResult;
-use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper;
 use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * View helper to get the raw "hits" array of an ElasticSearchQueryResult for a

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public function indexesByAlias($alias)`
`57`	`57`
`58`	`58`	`// return empty array if content from response cannot be read as an array`
`59`	`59`	`$treatedContent = $response->getTreatedContent();`
	`60`	`+`
`60`	`61`	`return is_array($treatedContent) ? array_keys($treatedContent) : [];`
`61`	`62`	`}`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`* source code.`
`12`	`12`	`*/`
`13`	`13`
	`14`	`+use Neos\ContentRepository\Domain\Model\NodeInterface;`
`14`	`15`	`use Neos\Eel\ProtectedContextAwareInterface;`
`15`	`16`	`use Neos\Flow\Persistence\QueryResultInterface;`
`16`		`-use Neos\ContentRepository\Domain\Model\NodeInterface;`
`17`	`17`
`18`	`18`	`class ElasticSearchQueryResult implements QueryResultInterface, ProtectedContextAwareInterface`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Service\IndexNameStrategyInterface;`
`15`	`15`	`use Neos\Flow\Annotations as Flow;`
`16`		`-use Neos\Flow\Configuration\ConfigurationManager;`
`17`	`16`
`18`	`17`	`/**`
`19`	`18`	`* The elasticsearch client to be used by the content repository adapter. Singleton, can be injected.`
`@@ -44,6 +43,7 @@ public function getIndexName()`
`44`	`43`	`if ($name === '') {`
`45`	`44`	`throw new Exception('Index name can not be null');`
`46`	`45`	`}`
	`46`	`+`
`47`	`47`	`return $name;`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -87,14 +87,14 @@ public function message()`
`87`	`87`	`return $this->message;`
`88`	`88`	`}`
`89`	`89`
`90`		`-`
`91`	`90`	`/**`
`92`	`91`	`* @return string`
`93`	`92`	`*/`
`94`	`93`	`protected function renderErrors()`
`95`	`94`	`{`
`96`	`95`	`$bulkRequest = json_encode($this->currentBulkRequest, JSON_PRETTY_PRINT);`
`97`	`96`	`$errors = json_encode($this->errors, JSON_PRETTY_PRINT);`
	`97`	`+`
`98`	`98`	`return sprintf("Payload:\n========\n\n%s\n\nErrors:\n=======\n\n%s\n\n", $bulkRequest, $errors);`
`99`	`99`	`}`
`100`	`100`	`}`