abstracted warmers

Author: Martynas Sudintas

Client/Connection.php

@@ -457,7 +457,7 @@ public function clearCache()
 
     /**
      * Adds warmer to conatiner.
-     * 
+     *
      * @param WarmerInterface $warmer
      */
     public function addWarmer(WarmerInterface $warmer)
@@ -467,39 +467,58 @@ public function addWarmer(WarmerInterface $warmer)
 
     /**
      * Loads warmers into elasticseach.
-     * 
+     *
      * @param array $names Warmers names to put.
      */
     public function putWarmers(array $names = [])
     {
-        foreach ($this->warmers->getWarmers() as $name => $body) {
-            if (empty($names) || in_array($name, $names)) {
-                $this->getClient()->indices()->putWarmer(
-                    [
-                        'index' => $this->getIndexName(),
-                        'name' => $name,
-                        'body' => $body,
-                    ]
-                );
-            }
-        }
+        $this->warmersAction('put', $names);
     }
 
     /**
      * Deletes warmers from elasticsearch index.
-     * 
+     *
      * @param array $names Warmers names to delete.
      */
     public function deleteWarmers(array $names = [])
+    {
+        $this->warmersAction('delete', $names);
+    }
+
+    /**
+     * Executes warmers actions.
+     *
+     * @param string $action Action name.
+     * @param array  $names  Warmers names.
+     *
+     * @throws \LogicException
+     */
+    private function warmersAction($action, $names = [])
     {
         foreach ($this->warmers->getWarmers() as $name => $body) {
             if (empty($names) || in_array($name, $names)) {
-                $this->getClient()->indices()->deleteWarmer(
-                    [
-                        'index' => $this->getIndexName(),
-                        'name' => $name,
-                    ]
-                );
+                switch($action)
+                {
+                    case 'put':
+                        $this->getClient()->indices()->putWarmer(
+                            [
+                                'index' => $this->getIndexName(),
+                                'name' => $name,
+                                'body' => $body,
+                            ]
+                        );
+                        break;
+                    case 'delete':
+                        $this->getClient()->indices()->deleteWarmer(
+                            [
+                                'index' => $this->getIndexName(),
+                                'name' => $name,
+                            ]
+                        );
+                        break;
+                    default:
+                        throw new \LogicException('Unknown warmers action');
+                }
             }
         }
     }

Command/AbstractElasticsearchCommand.php

@@ -48,7 +48,7 @@ protected function getManager($name)
 
     /**
      * Returns elasticsearch connection by name.
-     * 
+     *
      * @param string $name
      *
      * @return \ONGR\ElasticsearchBundle\Client\Connection
@@ -64,7 +64,7 @@ protected function getConnection($name)
      * @param string $name Connection name.
      *
      * @return string
-     * 
+     *
      * @throws \RuntimeException
      */
     private function getManagerNameByConnection($name)

Command/AbstractWarmerCommand.php

@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Command;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * Class AbstractWarmerCommand.
+ */
+abstract class AbstractWarmerCommand extends AbstractElasticsearchCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this
+            ->addArgument(
+                'names',
+                InputArgument::IS_ARRAY | InputArgument::OPTIONAL,
+                'Warmers names.',
+                []
+            )
+            ->addOption(
+                'connection',
+                'c',
+                InputOption::VALUE_REQUIRED,
+                'Connection name.',
+                'default'
+            );
+    }
+}

Command/WarmerDeleteCommand.php

@@ -19,28 +19,15 @@
 /**
  * This command removes warmers from elasticsearch index.
  */
-class WarmerDeleteCommand extends AbstractElasticsearchCommand
+class WarmerDeleteCommand extends AbstractWarmerCommand
 {
     /**
      * {@inheritdoc}
      */
     protected function configure()
     {
-        $this
-            ->setName('es:warmer:delete')
-            ->addArgument(
-                'names',
-                InputArgument::IS_ARRAY | InputArgument::OPTIONAL,
-                'Warmers names to delete from index.',
-                []
-            )
-            ->addOption(
-                'connection',
-                'c',
-                InputOption::VALUE_REQUIRED,
-                'Connection name to delete warmers from.',
-                'default'
-            );
+        parent::configure();
+        $this->setName('es:warmer:delete');
     }
 
     /**
@@ -51,7 +38,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $names = $input->getArgument('names');
         $this->getConnection($input->getOption('connection'))->deleteWarmers($names);
 
-        $message = '';
         if (empty($names)) {
             $message = 'All warmers have been deleted from <info>%s</info> index.';
         } else {

Command/WarmerPutCommand.php

@@ -19,28 +19,15 @@
 /**
  * This command puts warmers into elasticsearch index.
  */
-class WarmerPutCommand extends AbstractElasticsearchCommand
+class WarmerPutCommand extends AbstractWarmerCommand
 {
     /**
      * {@inheritdoc}
      */
     protected function configure()
     {
-        $this
-            ->setName('es:warmer:put')
-            ->addArgument(
-                'names',
-                InputArgument::IS_ARRAY | InputArgument::OPTIONAL,
-                'Warmers names to put into index.',
-                []
-            )
-            ->addOption(
-                'connection',
-                'c',
-                InputOption::VALUE_REQUIRED,
-                'Connection name to put warmers to.',
-                'default'
-            );
+        parent::configure();
+        $this->setName('es:warmer:put');
     }
 
     /**
@@ -51,7 +38,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $names = $input->getArgument('names');
         $this->getConnection($input->getOption('connection'))->putWarmers($names);
 
-        $message = '';
         if (empty($names)) {
             $message = 'All warmers have been put into <info>%s</info> index.';
         } else {

Tests/app/fixture/Acme/TestBundle/Document/Product.php

@@ -24,8 +24,6 @@
  */
 class Product extends Item implements DocumentInterface
 {
-    use DocumentTrait;
-
     /**
      * @var string
      *