Remove arElasticSearchIndexDecorator.

- 'inline' scripts are deprecated, changed to 'source'
artefactual · Oct 3, 2024 · 9dab063 · 9dab063
1 parent 173950b
commit 9dab063
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 86 deletions.
diff --git a/lib/job/arUpdatePublicationStatusJob.class.php b/lib/job/arUpdatePublicationStatusJob.class.php
@@ -78,7 +78,7 @@ public function runJob($parameters)
 
         $queryScript = \Elastica\Script\AbstractScript::create([
             'script' => [
-                'inline' => 'ctx._source.publicationStatusId = '.$publicationStatus->id,
+                'source' => 'ctx._source.publicationStatusId = '.$publicationStatus->id,
                 'lang' => 'painless',
             ],
         ]);

diff --git a/lib/task/tools/updatePublicationStatusTask.class.php b/lib/task/tools/updatePublicationStatusTask.class.php
@@ -166,7 +166,7 @@ protected function updatePublicationStatusDescendants($resource, $publicationSta
 
         $queryScript = \Elastica\Script\AbstractScript::create([
             'script' => [
-                'inline' => 'ctx._source.publicationStatusId = '.$publicationStatus->id,
+                'source' => 'ctx._source.publicationStatusId = '.$publicationStatus->id,
                 'lang' => 'painless',
             ],
         ]);

diff --git a/plugins/arElasticSearchPlugin/lib/arElasticSearchIndexDecorator.class.php b/plugins/arElasticSearchPlugin/lib/arElasticSearchIndexDecorator.class.php
diff --git a/plugins/arElasticSearchPlugin/lib/arElasticSearchPlugin.class.php b/plugins/arElasticSearchPlugin/lib/arElasticSearchPlugin.class.php
@@ -92,7 +92,7 @@ public function __construct(array $options = [])
 
         // TODO: arElasticSearchIndexDecorator can be removed when Elastica >= 6.x. It is present to
         // provide Elastica/Index::updateByQuery().
-        $this->index = new arElasticSearchIndexDecorator($this->client->getIndex($this->config['index']['name']));
+        $this->index = $this->client->getIndex($this->config['index']['name']);
 
         // Load batch mode configuration
         $this->batchMode = true === $this->config['batch_mode'];