BUGFIX: Remove coupling with the Elastic Adapter

dfeyer · dfeyer · commit aaa17987f7dc · 2017-12-12T22:50:36.000+01:00
diff --git a/Classes/Controller/SuggestController.php b/Classes/Controller/SuggestController.php
@@ -24,13 +24,11 @@ class SuggestController extends ActionController
     use CreateContentContextTrait;
 
     /**
-     * @Flow\Inject
-     * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient
+     * @var ElasticSearchClient
      */
     protected $elasticSearchClient;
 
     /**
-     * @Flow\Inject
      * @var ElasticSearchQueryBuilder
      */
     protected $elasticSearchQueryBuilder;
@@ -52,6 +50,7 @@ public function initializeObject()
     {
         if ($this->objectManager->isRegistered(ElasticSearchClient::class)) {
             $this->elasticSearchClient = $this->objectManager->get(ElasticSearchClient::class);
+            $this->elasticSearchQueryBuilder = $this->objectManager->get(ElasticSearchQueryBuilder::class);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,11 @@ class SuggestController extends ActionController`
`24`	`24`	`use CreateContentContextTrait;`
`25`	`25`
`26`	`26`	`/**`
`27`		`- * @Flow\Inject`
`28`		`- * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient`
	`27`	`+ * @var ElasticSearchClient`
`29`	`28`	`*/`
`30`	`29`	`protected $elasticSearchClient;`
`31`	`30`
`32`	`31`	`/**`
`33`		`- * @Flow\Inject`
`34`	`32`	`* @var ElasticSearchQueryBuilder`
`35`	`33`	`*/`
`36`	`34`	`protected $elasticSearchQueryBuilder;`
`@@ -52,6 +50,7 @@ public function initializeObject()`
`52`	`50`	`{`
`53`	`51`	`if ($this->objectManager->isRegistered(ElasticSearchClient::class)) {`
`54`	`52`	`$this->elasticSearchClient = $this->objectManager->get(ElasticSearchClient::class);`
	`53`	`+ $this->elasticSearchQueryBuilder = $this->objectManager->get(ElasticSearchQueryBuilder::class);`
`55`	`54`	`}`
`56`	`55`	`}`
`57`	`56`