Support ElasticSearch 5.0 added

Content/ArticleDataProvider.php

@@ -13,9 +13,9 @@
 
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\Compound\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Search;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
@@ -249,7 +249,7 @@ private function getSearchResult(array $filters, $limit, $page, $pageSize, $loca
             $this->appendSortBy($filters['sortBy'], $sortMethod, $search);
         }
 
-        return $repository->execute($search);
+        return $repository->findDocuments($search);
     }
 
     /**

Content/ArticleSelectionContentType.php

@@ -12,7 +12,7 @@
 namespace Sulu\Bundle\ArticleBundle\Content;
 
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
 use Sulu\Bundle\ArticleBundle\Metadata\ArticleViewDocumentIdTrait;
 use Sulu\Component\Content\Compat\PropertyInterface;
@@ -72,7 +72,7 @@ public function getContentData(PropertyInterface $property)
 
         $result = [];
         /** @var ArticleViewDocumentInterface $articleDocument */
-        foreach ($repository->execute($search) as $articleDocument) {
+        foreach ($repository->findDocuments($search) as $articleDocument) {
             $result[array_search($articleDocument->getUuid(), $value, false)] = $articleDocument;
         }
 

Controller/ArticleController.php

@@ -15,12 +15,12 @@
 use FOS\RestBundle\Routing\ClassResourceInterface;
 use JMS\Serializer\SerializationContext;
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\BoolQuery;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\Compound\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\FullText\MatchQuery;
+use ONGR\ElasticsearchDSL\Query\FullText\MultiMatchQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use ONGR\ElasticsearchDSL\Query\MatchQuery;
-use ONGR\ElasticsearchDSL\Query\MultiMatchQuery;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
 use Sulu\Bundle\ArticleBundle\Admin\ArticleAdmin;
 use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
@@ -154,7 +154,7 @@ public function cgetAction(Request $request)
         $search->setFrom(($page - 1) * $limit);
 
         $result = [];
-        foreach ($repository->execute($search) as $document) {
+        foreach ($repository->findDocuments($search) as $document) {
             if (false !== ($index = array_search($document->getUuid(), $ids))) {
                 $result[$index] = $document;
             } else {
@@ -185,7 +185,7 @@ public function cgetAction(Request $request)
     /**
      * Returns single article.
      *
-     * @param string $uuid
+     * @param string  $uuid
      * @param Request $request
      *
      * @return Response
@@ -238,7 +238,7 @@ public function postAction(Request $request)
      * Update articles.
      *
      * @param Request $request
-     * @param string $uuid
+     * @param string  $uuid
      *
      * @return Response
      */
@@ -313,7 +313,7 @@ public function deleteAction($id)
      *
      * @Post("/articles/{uuid}")
      *
-     * @param string $uuid
+     * @param string  $uuid
      * @param Request $request
      *
      * @return Response
@@ -380,7 +380,7 @@ public function getSecurityContext()
     /**
      * Persists the document using the given information.
      *
-     * @param array $data
+     * @param array  $data
      * @param object $document
      * @param string $locale
      *

Document/Index/ArticleIndexer.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchBundle\Service\Manager;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use Sulu\Bundle\ArticleBundle\Document\ArticleDocument;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocument;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
@@ -254,7 +254,7 @@ public function remove($document)
         $search = $repository->createSearch()
             ->addQuery(new TermQuery('uuid', $document->getUuid()))
             ->setSize(1000);
-        foreach ($repository->execute($search) as $viewDocument) {
+        foreach ($repository->findDocuments($search) as $viewDocument) {
             $this->manager->remove($viewDocument);
         }
     }
@@ -279,7 +279,7 @@ public function clear()
             ->setSize($pageSize);
 
         do {
-            $result = $repository->execute($search);
+            $result = $repository->findDocuments($search);
             foreach ($result as $document) {
                 $this->manager->remove($document);
             }

Markup/ArticleLinkProvider.php

@@ -12,8 +12,8 @@
 namespace Sulu\Bundle\ArticleBundle\Markup;
 
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
-use ONGR\ElasticsearchDSL\Query\RangeQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\RangeQuery;
 use ONGR\ElasticsearchDSL\Search;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
 use Sulu\Bundle\ArticleBundle\Document\Index\DocumentFactory;
@@ -42,9 +42,9 @@ class ArticleLinkProvider implements LinkProviderInterface
     private $types;
 
     /**
-     * @param Manager $manager
+     * @param Manager         $manager
      * @param DocumentFactory $documentFactory
-     * @param array $types
+     * @param array           $types
      */
     public function __construct(Manager $manager, DocumentFactory $documentFactory, array $types)
     {
@@ -87,7 +87,8 @@ public function preload(array $hrefs, $locale, $published = true)
             $search->addQuery(new RangeQuery('authored', ['lte' => 'now']));
         }
 
-        $documents = $this->manager->execute([$this->documentFactory->getClass('article')], $search);
+        $repository = $this->manager->getRepository($this->documentFactory->getClass('article'));
+        $documents = $repository->findDocuments($search);
 
         $result = [];
         /** @var ArticleViewDocumentInterface $document */

Resources/doc/installation.md

@@ -42,18 +42,15 @@ sulu_core:
                     type: "article"
 
 ongr_elasticsearch:
-    connections:
-        default:
-            index_name: su_articles
-        live:
-            index_name: su_articles_live
     managers:
         default:
-            connection: default
+            index: 
+                index_name: su_articles
             mappings:
                 - SuluArticleBundle
         live:
-            connection: live
+            index:
+                index_name: su_articles_live
             mappings:
                 - SuluArticleBundle
 ```

Sitemap/ArticleSitemapProvider.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchBundle\Service\Manager;
 use ONGR\ElasticsearchBundle\Service\Repository;
-use ONGR\ElasticsearchDSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\TermQuery;
 use Sulu\Bundle\ArticleBundle\Document\ArticleViewDocumentInterface;
 use Sulu\Bundle\ArticleBundle\Document\Index\DocumentFactoryInterface;
 use Sulu\Bundle\WebsiteBundle\Sitemap\Sitemap;
@@ -72,11 +72,11 @@ public function build($page, $portalKey, $locale)
     private function getBulk(Repository $repository, $from, $size)
     {
         $search = $repository->createSearch()
-            ->addQuery(new TermQuery('seo.hide_in_sitemap', false))
+            ->addQuery(new TermQuery('seo.hide_in_sitemap', 'false'))
             ->setFrom($from)
             ->setSize($size);
 
-        return $repository->execute($search);
+        return $repository->findDocuments($search);
     }
 
     /**
@@ -94,7 +94,7 @@ public function getMaxPage()
     {
         $repository = $this->manager->getRepository($this->documentFactory->getClass('article'));
         $search = $repository->createSearch()
-            ->addQuery(new TermQuery('seo.hide_in_sitemap', false));
+            ->addQuery(new TermQuery('seo.hide_in_sitemap', 'false'));
 
         return ceil($repository->count($search) / self::PAGE_SIZE);
     }

Teaser/ArticleTeaserProvider.php

@@ -12,7 +12,7 @@
 namespace Sulu\Bundle\ArticleBundle\Teaser;
 
 use ONGR\ElasticsearchBundle\Service\Manager;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
 use Sulu\Bundle\ArticleBundle\Metadata\ArticleViewDocumentIdTrait;
 use Sulu\Bundle\ContentBundle\Teaser\Configuration\TeaserConfiguration;
 use Sulu\Bundle\ContentBundle\Teaser\Provider\TeaserProviderInterface;
@@ -88,7 +88,7 @@ public function find(array $ids, $locale)
         $search->addQuery(new IdsQuery($articleIds));
 
         $result = [];
-        foreach ($repository->execute($search) as $item) {
+        foreach ($repository->findDocuments($search) as $item) {
             $excerpt = $item->getExcerpt();
             $result[] = new Teaser(
                 $item->getUuid(),

Tests/Unit/Content/ArticleSelectionContentTypeTest.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchBundle\Service\Manager;
 use ONGR\ElasticsearchBundle\Service\Repository;
-use ONGR\ElasticsearchDSL\Query\IdsQuery;
+use ONGR\ElasticsearchDSL\Query\TermLevel\IdsQuery;
 use ONGR\ElasticsearchDSL\Search;
 use Prophecy\Argument;
 use Sulu\Bundle\ArticleBundle\Content\ArticleSelectionContentType;
@@ -64,7 +64,7 @@ function ($id) {
                 }
             )
         )->shouldBeCalled();
-        $repository->execute($search->reveal())->willReturn($articles);
+        $repository->findDocuments($search->reveal())->willReturn($articles);
 
         $contentType = new ArticleSelectionContentType(
             $manager->reveal(),

Tests/app/AppKernel.php

@@ -38,6 +38,11 @@ public function registerContainerConfiguration(LoaderInterface $loader)
             $loader->load(__DIR__ . '/config/versioning.yml');
         }
 
-        $loader->load(__DIR__ . '/config/config.yml');
+        // If version is lower then 5.6 it is an testcase for elasticsearch 2.*, so different ONGR config is needed
+        if (phpversion() < 5.6) {
+            $loader->load(__DIR__ . '/config/config_es2.yml');
+        } else {
+            $loader->load(__DIR__ . '/config/config.yml');
+        }
     }
 }

Tests/app/config/config.yml

@@ -14,18 +14,15 @@ sulu_core:
                     type: "article"
 
 ongr_elasticsearch:
-    connections:
-        default:
-            index_name: su_articles_test
-        live:
-            index_name: su_articles_test_live
     managers:
         default:
-            connection: default
+            index:
+                index_name: su_articles_test
             mappings:
                 - SuluArticleBundle
         live:
-            connection: live
+            index:
+                index_name: su_articles_test_live
             mappings:
                 - SuluArticleBundle
 # Sulu Routing

Tests/app/config/config_es2.yml

@@ -0,0 +1,37 @@
+# Doctrine Configuration
+doctrine:
+    dbal:
+        dbname:   "su_articles_test"
+
+sulu_core:
+    content:
+        structure:
+            default_type:
+                article: "default"
+            paths:
+                article:
+                    path: "%kernel.root_dir%/Resources/articles"
+                    type: "article"
+
+ongr_elasticsearch:
+    connections:
+        default:
+            index_name: su_articles_test
+        live:
+            index_name: su_articles_test_live
+    managers:
+        default:
+            connection: default
+            mappings:
+                - SuluArticleBundle
+        live:
+            connection: live
+            mappings:
+                - SuluArticleBundle
+# Sulu Routing
+sulu_route:
+    mappings:
+        Sulu\Bundle\ArticleBundle\Document\ArticleDocument:
+            generator: schema
+            options:
+                route_schema: /articles/{object.getTitle()}

composer.json

@@ -6,7 +6,7 @@
     "require": {
         "php": "^5.5 || ^7.0",
         "sulu/sulu": "^1.5.3 || dev-develop",
-        "ongr/elasticsearch-bundle": "~1.0"
+        "ongr/elasticsearch-bundle": "^1.2.9 || ~5.0"
     },
     "require-dev": {
         "zendframework/zend-stdlib": "2.3.1 as 2.0.0rc5",