Refactoring

src/Command/GenerateFaviconsCommand.php

@@ -35,7 +35,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return Command::SUCCESS;
     }
 
-    private function generateFavicon($color, $size): void
+    private function generateFavicon(string $color, int $size): void
     {
         $file = __DIR__.'/../../public/favicon-'.$color.'-'.$size.'.png';
 

src/Controller/ElasticsearchIndexController.php

@@ -341,11 +341,11 @@ public function create(Request $request): Response
         if ($form->isSubmitted() && $form->isValid()) {
             try {
                 $json = [];
-                if ($index->getSettings()) {
-                    $json['settings'] = $index->getSettings();
+                if ($index->getSettingsJson()) {
+                    $json['settings'] = json_decode($index->getSettingsJson(), true);
                 }
-                if ($index->getMappings()) {
-                    $json['mappings'] = $index->getMappings();
+                if ($index->getMappingsJson()) {
+                    $json['mappings'] = json_decode($index->getMappingsJson(), true);
                 }
                 $callRequest = new CallRequestModel();
                 $callRequest->setMethod('PUT');
@@ -406,8 +406,8 @@ public function update(Request $request, string $index): Response
 
         if ($form->isSubmitted() && $form->isValid()) {
             try {
-                if ($index->getMappings()) {
-                    $json = $index->getMappings();
+                if ($index->getMappingsJson()) {
+                    $json = json_decode($index->getMappingsJson(), true);
                     $callRequest = new CallRequestModel();
                     $callRequest->setMethod('PUT');
                     $callRequest->setPath('/'.$index->getName().'/_mapping');

src/Exception/CallException.php

@@ -6,7 +6,7 @@
 
 class CallException extends RuntimeException
 {
-    public function __construct($message)
+    public function __construct(string $message)
     {
         parent::__construct($message);
     }

src/Exception/ConnectionException.php

@@ -6,7 +6,7 @@
 
 class ConnectionException extends RuntimeException
 {
-    public function __construct($message)
+    public function __construct(string $message)
     {
         parent::__construct($message);
     }

src/Form/Type/ElasticsearchComponentTemplateType.php

@@ -3,8 +3,6 @@
 
 namespace App\Form\Type;
 
-use App\Form\EventListener\MappingsSettingsAliasesSubscriber;
-use App\Form\EventListener\MetadataSubscriber;
 use App\Manager\ElasticsearchComponentTemplateManager;
 use App\Model\CallRequestModel;
 use App\Model\ElasticsearchComponentTemplateModel;
@@ -43,10 +41,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             $fields[] = 'name';
         }
         $fields[] = 'version';
-        $fields[] = 'settings';
-        $fields[] = 'mappings';
-        $fields[] = 'aliases';
-        $fields[] = 'metadata';
+        $fields[] = 'settings_json';
+        $fields[] = 'mappings_json';
+        $fields[] = 'aliases_json';
+        $fields[] = 'metadata_json';
 
         foreach ($fields as $field) {
             switch ($field) {
@@ -76,8 +74,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'settings':
-                    $builder->add('settings', TextareaType::class, [
+                case 'settings_json':
+                    $builder->add('settings_json', TextareaType::class, [
                         'label' => 'settings',
                         'required' => false,
                         'constraints' => [
@@ -87,8 +85,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'mappings':
-                    $builder->add('mappings', TextareaType::class, [
+                case 'mappings_json':
+                    $builder->add('mappings_json', TextareaType::class, [
                         'label' => 'mappings',
                         'required' => false,
                         'constraints' => [
@@ -101,8 +99,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'aliases':
-                    $builder->add('aliases', TextareaType::class, [
+                case 'aliases_json':
+                    $builder->add('aliases_json', TextareaType::class, [
                         'label' => 'aliases',
                         'required' => false,
                         'constraints' => [
@@ -112,8 +110,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'metadata':
-                    $builder->add('metadata', TextareaType::class, [
+                case 'metadata_json':
+                    $builder->add('metadata_json', TextareaType::class, [
                         'label' => 'metadata',
                         'required' => false,
                         'constraints' => [
@@ -141,9 +139,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 }
             }
         });
-
-        $builder->addEventSubscriber(new MappingsSettingsAliasesSubscriber());
-        $builder->addEventSubscriber(new MetadataSubscriber());
     }
 
     public function configureOptions(OptionsResolver $resolver): void

src/Form/Type/ElasticsearchIlmPolicyType.php

@@ -38,10 +38,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         if ('create' == $options['context']) {
             $fields[] = 'name';
         }
-        $fields[] = 'hot';
-        $fields[] = 'warm';
-        $fields[] = 'cold';
-        $fields[] = 'delete';
+        $fields[] = 'hot_json';
+        $fields[] = 'warm_json';
+        $fields[] = 'cold_json';
+        $fields[] = 'delete_json';
 
         foreach ($fields as $field) {
             switch ($field) {
@@ -56,8 +56,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'hot':
-                    $builder->add('hot', TextareaType::class, [
+                case 'hot_json':
+                    $builder->add('hot_json', TextareaType::class, [
                         'label' => 'hot',
                         'required' => false,
                         'constraints' => [
@@ -67,8 +67,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'warm':
-                    $builder->add('warm', TextareaType::class, [
+                case 'warm_json':
+                    $builder->add('warm_json', TextareaType::class, [
                         'label' => 'warm',
                         'required' => false,
                         'constraints' => [
@@ -81,8 +81,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'cold':
-                    $builder->add('cold', TextareaType::class, [
+                case 'cold_json':
+                    $builder->add('cold_json', TextareaType::class, [
                         'label' => 'cold',
                         'required' => false,
                         'constraints' => [
@@ -92,8 +92,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         'help_html' => true,
                     ]);
                     break;
-                case 'delete':
-                    $builder->add('delete', TextareaType::class, [
+                case 'delete_json':
+                    $builder->add('delete_json', TextareaType::class, [
                         'label' => 'delete',
                         'required' => false,
                         'constraints' => [
@@ -106,34 +106,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             }
         }
 
-        $builder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
-            $form = $event->getForm();
-
-            if ($form->has('hot') && $form->get('hot')->getData()) {
-                $fieldOptions = $form->get('hot')->getConfig()->getOptions();
-                $fieldOptions['data'] = json_encode($form->get('hot')->getData(), JSON_PRETTY_PRINT);
-                $form->add('hot', TextareaType::class, $fieldOptions);
-            }
-
-            if ($form->has('warm') && $form->get('warm')->getData()) {
-                $fieldOptions = $form->get('warm')->getConfig()->getOptions();
-                $fieldOptions['data'] = json_encode($form->get('warm')->getData(), JSON_PRETTY_PRINT);
-                $form->add('warm', TextareaType::class, $fieldOptions);
-            }
-
-            if ($form->has('cold') && $form->get('cold')->getData()) {
-                $fieldOptions = $form->get('cold')->getConfig()->getOptions();
-                $fieldOptions['data'] = json_encode($form->get('cold')->getData(), JSON_PRETTY_PRINT);
-                $form->add('cold', TextareaType::class, $fieldOptions);
-            }
-
-            if ($form->has('delete') && $form->get('delete')->getData()) {
-                $fieldOptions = $form->get('delete')->getConfig()->getOptions();
-                $fieldOptions['data'] = json_encode($form->get('delete')->getData(), JSON_PRETTY_PRINT);
-                $form->add('delete', TextareaType::class, $fieldOptions);
-            }
-        });
-
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($options) {
             $form = $event->getForm();
             $data = $event->getData();
@@ -149,26 +121,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     }
                 }
             }
-
-            if ($form->has('hot') && $form->get('hot')->getData()) {
-                $data->setHot(json_decode($form->get('hot')->getData(), true));
-                $event->setData($data);
-            }
-
-            if ($form->has('warm') && $form->get('warm')->getData()) {
-                $data->setWarm(json_decode($form->get('warm')->getData(), true));
-                $event->setData($data);
-            }
-
-            if ($form->has('cold') && $form->get('cold')->getData()) {
-                $data->setCold(json_decode($form->get('cold')->getData(), true));
-                $event->setData($data);
-            }
-
-            if ($form->has('delete') && $form->get('delete')->getData()) {
-                $data->setDelete(json_decode($form->get('delete')->getData(), true));
-                $event->setData($data);
-            }
         });
     }