Merge pull request #21 from skurfuerst/make-system-work-with-simplesearch

BUGFIX: make dependency with Elasticsearch optional

Author: daniellienert

Classes/Flowpack/SearchPlugin/Controller/SuggestController.php

@@ -11,6 +11,7 @@
  * source code.
  */
 
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Mvc\Controller\ActionController;
 
@@ -20,8 +21,8 @@
 class SuggestController extends ActionController
 {
     /**
-     * @Flow\Inject
-     * @var \Flowpack\ElasticSearch\ContentRepositoryAdaptor\ElasticSearchClient
+     * Dynamic dependency; to make the system work with SimpleSearch
+     * @var ElasticSearchClient
      */
     protected $elasticSearchClient;
 
@@ -32,6 +33,20 @@ class SuggestController extends ActionController
         'json' => 'TYPO3\Flow\Mvc\View\JsonView'
     ];
 
+    /**
+     * Sets the ElasticSearchClient instance needed for this to work. If no client is set,
+     * this controller cannot be used; but at least the package can otherwise be used with
+     * e.g. SimpleSearch.
+     *
+     * @return void
+     */
+    public function initializeObject()
+    {
+        if ($this->objectManager->isRegistered(ElasticSearchClient::class)) {
+            $this->elasticSearchClient = $this->objectManager->get(ElasticSearchClient::class);
+        }
+    }
+
     /**
      * @param string $term
      * @return void
@@ -47,6 +62,10 @@ public function indexAction($term)
             ]
         ];
 
+        if ($this->elasticSearchClient === null) {
+            throw new \RuntimeException('The SuggestController needs an ElasticSearchClient, it seems you run without the flowpack/elasticsearch-contentrepositoryadaptor package, though.', 1487189823);
+        }
+
         $response = $this->elasticSearchClient->getIndex()->request('POST', '/_suggest', [], json_encode($request))->getTreatedContent();
         $suggestions = array_map(function ($option) {
             return $option['text'];