Merge pull request #677 from saimaz/patch-exception

Added custom exception for bulk with error body in message

Author: saimaz

Exception/BulkWithErrorsException.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Exception;
+
+class BulkWithErrorsException extends \Exception
+{
+    /**
+     * @var array
+     */
+    protected $response;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($message = '', $code = 0, \Exception $previous = null, $response = [])
+    {
+        parent::__construct($message, $code, $previous);
+        $this->response = $response;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+}

Service/Manager.php

@@ -12,12 +12,11 @@
 namespace ONGR\ElasticsearchBundle\Service;
 
 use Elasticsearch\Client;
-use Elasticsearch\Common\Exceptions\ClientErrorResponseException;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
 use ONGR\ElasticsearchBundle\Event\Events;
 use ONGR\ElasticsearchBundle\Event\BulkEvent;
-use ONGR\ElasticsearchBundle\Event\PersistEvent;
 use ONGR\ElasticsearchBundle\Event\CommitEvent;
+use ONGR\ElasticsearchBundle\Exception\BulkWithErrorsException;
 use ONGR\ElasticsearchBundle\Mapping\MetadataCollector;
 use ONGR\ElasticsearchBundle\Result\AbstractResultsIterator;
 use ONGR\ElasticsearchBundle\Result\Converter;
@@ -356,7 +355,7 @@ public function refresh(array $params = [])
      *
      * @return null|array
      *
-     * @throws ClientErrorResponseException
+     * @throws BulkWithErrorsException
      */
     public function commit(array $params = [])
     {
@@ -373,8 +372,11 @@ public function commit(array $params = [])
             $this->stopwatch('stop', 'bulk');
 
             if ($bulkResponse['errors']) {
-                throw new ClientErrorResponseException(
-                    'An error occurred during the commit to elasticsearch'
+                throw new BulkWithErrorsException(
+                    json_encode($bulkResponse),
+                    0,
+                    null,
+                    $bulkResponse
                 );
             }
 

Tests/Functional/Service/ManagerTest.php

@@ -362,8 +362,7 @@ public function testParseResultsException()
     /**
      * Tests the exception thrown by the commit method
      *
-     * @expectedException \Elasticsearch\Common\Exceptions\ClientErrorResponseException
-     * @expectedExceptionMessage An error occurred during the commit to elasticsearch
+     * @expectedException \ONGR\ElasticsearchBundle\Exception\BulkWithErrorsException
      */
     public function testCommitException()
     {